svn commit: r1437741 - in /buildr/trunk/lib/buildr/scala: bdd.rb compiler.rb

[bo...@apache.org]

Author: boisvert
Date: Wed Jan 23 21:22:46 2013
New Revision: 1437741

URL: http://svn.apache.org/viewvc?rev=1437741&view=rev
Log:
Basic support for Scala 2.10

Modified:
    buildr/trunk/lib/buildr/scala/bdd.rb
    buildr/trunk/lib/buildr/scala/compiler.rb

Modified: buildr/trunk/lib/buildr/scala/bdd.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/scala/bdd.rb?rev=1437741&r1=1437740&r2=1437741&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/scala/bdd.rb (original)
+++ buildr/trunk/lib/buildr/scala/bdd.rb Wed Jan 23 21:22:46 2013
@@ -137,7 +137,7 @@ module Buildr::Scala
       when Buildr::Scala.version?("2.9")
         '1.11'
       else
-        fail "No default specs2 version for Scala #{Scala.version_without_build}"
+        '1.12.3' # default for Scala 2.10 and beyond
     end
 
     class << self

Modified: buildr/trunk/lib/buildr/scala/compiler.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/scala/compiler.rb?rev=1437741&r1=1437740&r2=1437741&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/scala/compiler.rb (original)
+++ buildr/trunk/lib/buildr/scala/compiler.rb Wed Jan 23 21:22:46 2013
@@ -95,6 +95,11 @@ module Buildr::Scala
       version = Buildr.settings.build['scala.version'] || DEFAULT_VERSION
       ns.library!      'org.scala-lang:scala-library:jar:>=' + version
       ns.compiler!     'org.scala-lang:scala-compiler:jar:>=' + version
+      unless ::Buildr::Scala.version?(2.7, 2.8, 2.9)
+        # added in Scala 2.10
+        ns.reflect!      'org.scala-lang:scala-reflect:jar:>=' + version
+        ns.actors!       'org.scala-lang:scala-actors:jar:>=' + version
+      end
     end
 
     ZINC_REQUIRES = ArtifactNamespace.for(self) do |ns|