You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by bo...@apache.org on 2010/04/05 04:19:00 UTC
svn commit: r930783 - in /buildr/trunk/spec: sandbox.rb scala/bdd_spec.rb
scala/compiler_spec.rb scala/tests_spec.rb
Author: boisvert
Date: Mon Apr 5 02:18:59 2010
New Revision: 930783
URL: http://svn.apache.org/viewvc?rev=930783&view=rev
Log:
Force specs to use Scala 2.7.7
Modified:
buildr/trunk/spec/sandbox.rb
buildr/trunk/spec/scala/bdd_spec.rb
buildr/trunk/spec/scala/compiler_spec.rb
buildr/trunk/spec/scala/tests_spec.rb
Modified: buildr/trunk/spec/sandbox.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/sandbox.rb?rev=930783&r1=930782&r2=930783&view=diff
==============================================================================
--- buildr/trunk/spec/sandbox.rb (original)
+++ buildr/trunk/spec/sandbox.rb Mon Apr 5 02:18:59 2010
@@ -21,6 +21,9 @@ Buildr.application.instance_eval { @rake
repositories.remote << 'http://repo1.maven.org/maven2'
repositories.remote << 'http://scala-tools.org/repo-releases'
+# Force Scala 2.7.7 for specs; don't want to rely on SCALA_HOME
+Buildr.settings.build['scala.version'] = "2.7.7"
+
# Add a 'require' here only for optional extensions, not for extensions that should be loaded by default.
require 'buildr/groovy'
require 'buildr/scala'
@@ -111,6 +114,9 @@ module Sandbox
end
Buildr.options.proxy.http = nil
+ # Force Scala 2.7.7 for specs; don't want to rely on SCALA_HOME
+ Buildr.settings.build['scala.version'] = "2.7.7"
+
# Don't output crap to the console.
trace false
verbose false
Modified: buildr/trunk/spec/scala/bdd_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/scala/bdd_spec.rb?rev=930783&r1=930782&r2=930783&view=diff
==============================================================================
--- buildr/trunk/spec/scala/bdd_spec.rb (original)
+++ buildr/trunk/spec/scala/bdd_spec.rb Mon Apr 5 02:18:59 2010
@@ -15,7 +15,6 @@
require File.join(File.dirname(__FILE__), '../spec_helpers')
-require 'buildr/scala'
describe Buildr::Scala::Specs do
it 'should be the default when tests in src/spec/scala' do
Modified: buildr/trunk/spec/scala/compiler_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/scala/compiler_spec.rb?rev=930783&r1=930782&r2=930783&view=diff
==============================================================================
--- buildr/trunk/spec/scala/compiler_spec.rb (original)
+++ buildr/trunk/spec/scala/compiler_spec.rb Mon Apr 5 02:18:59 2010
@@ -15,7 +15,6 @@
require File.join(File.dirname(__FILE__), '../spec_helpers')
-require 'buildr/scala'
# need to test both with and without SCALA_HOME
share_as :ScalacCompiler do
Modified: buildr/trunk/spec/scala/tests_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/scala/tests_spec.rb?rev=930783&r1=930782&r2=930783&view=diff
==============================================================================
--- buildr/trunk/spec/scala/tests_spec.rb (original)
+++ buildr/trunk/spec/scala/tests_spec.rb Mon Apr 5 02:18:59 2010
@@ -15,7 +15,6 @@
require File.join(File.dirname(__FILE__), '../spec_helpers')
-require 'buildr/scala'
# TODO's
# -test passing System props