svn commit: r705012 - in /incubator/buildr/trunk: CHANGELOG lib/buildr.rb lib/buildr/scala/compiler.rb lib/buildr/scala/tests.rb spec/sandbox.rb

[as...@apache.org]

Author: assaf
Date: Wed Oct 15 12:59:55 2008
New Revision: 705012

URL: http://svn.apache.org/viewvc?rev=705012&view=rev
Log:
Fixed: BUILDR-172 Scala compiler not loaded by default.

Modified:
    incubator/buildr/trunk/CHANGELOG
    incubator/buildr/trunk/lib/buildr.rb
    incubator/buildr/trunk/lib/buildr/scala/compiler.rb
    incubator/buildr/trunk/lib/buildr/scala/tests.rb
    incubator/buildr/trunk/spec/sandbox.rb

Modified: incubator/buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/CHANGELOG?rev=705012&r1=705011&r2=705012&view=diff
==============================================================================
--- incubator/buildr/trunk/CHANGELOG (original)
+++ incubator/buildr/trunk/CHANGELOG Wed Oct 15 12:59:55 2008
@@ -1,4 +1,5 @@
 1.3.4 (Pending)
+* Fixed:  BUILDR-172 Scala compiler not loaded by default.
 
 1.3.3 (2008-10-08)
 * Added:  JtestR support. Implemented pending jtestr specs.

Modified: incubator/buildr/trunk/lib/buildr.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr.rb?rev=705012&r1=705011&r2=705012&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr.rb (original)
+++ incubator/buildr/trunk/lib/buildr.rb Wed Oct 15 12:59:55 2008
@@ -20,6 +20,7 @@
 require 'buildr/core'
 require 'buildr/packaging'
 require 'buildr/java'
+require 'buildr/scala'
 require 'buildr/ide'
 
 # Methods defined in Buildr are both instance methods (e.g. when included in Project)
@@ -32,4 +33,4 @@
 end
 
 # Prevent RSpec runner from running at_exit.
-require 'spec'
\ No newline at end of file
+require 'spec'

Modified: incubator/buildr/trunk/lib/buildr/scala/compiler.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/scala/compiler.rb?rev=705012&r1=705011&r2=705012&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/scala/compiler.rb (original)
+++ incubator/buildr/trunk/lib/buildr/scala/compiler.rb Wed Oct 15 12:59:55 2008
@@ -106,4 +106,4 @@
 
 # Scala compiler comes first, ahead of Javac, this allows it to pick
 # projects that mix Scala and Java code by spotting Scala code first.
-Buildr::Compiler.compilers.unshift Buildr::Scala::Scalac
\ No newline at end of file
+Buildr::Compiler.compilers << Buildr::Scala::Scalac

Modified: incubator/buildr/trunk/lib/buildr/scala/tests.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/scala/tests.rb?rev=705012&r1=705011&r2=705012&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/scala/tests.rb (original)
+++ incubator/buildr/trunk/lib/buildr/scala/tests.rb Wed Oct 15 12:59:55 2008
@@ -74,7 +74,7 @@
   # * :properties  -- Hash of system properties available to the test case.
   # * :environment -- Hash of environment variables available to the test case.
   # * :java_args   -- Arguments passed as is to the JVM.
-  class ScalaTest < TestFramework::Java
+  class ScalaTest < Buildr::TestFramework::Java
 
     VERSION = '0.9.3'
 
@@ -200,4 +200,4 @@
   ScalaTest = Scala::ScalaTest
 end
 
-Buildr::TestFramework << Buildr::Scala::ScalaTest
\ No newline at end of file
+Buildr::TestFramework << Buildr::Scala::ScalaTest

Modified: incubator/buildr/trunk/spec/sandbox.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/spec/sandbox.rb?rev=705012&r1=705011&r2=705012&view=diff
==============================================================================
--- incubator/buildr/trunk/spec/sandbox.rb (original)
+++ incubator/buildr/trunk/spec/sandbox.rb Wed Oct 15 12:59:55 2008
@@ -22,7 +22,6 @@
 repositories.remote << 'http://scala-tools.org/repo-releases'
 
 require 'buildr/groovy'
-require 'buildr/scala'
 
 Java.load # Anything added to the classpath.
 task('buildr:scala:download').invoke