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/07/20 22:32:28 UTC
svn commit: r965988 - in /buildr/trunk: CHANGELOG lib/buildr/scala/bdd.rb
lib/buildr/scala/tests.rb spec/sandbox.rb spec/scala/bdd_spec.rb
spec/scala/compiler_spec.rb spec/scala/scala.rb spec/scala/tests_spec.rb
Author: boisvert
Date: Tue Jul 20 20:32:28 2010
New Revision: 965988
URL: http://svn.apache.org/viewvc?rev=965988&view=rev
Log:
BUILDR-484 Upgrade to Scala 2.8.0 (final) and associated dependencies (ScalaCheck 1.7, ScalaTest 1.2, Specs 1.6.5)
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/lib/buildr/scala/bdd.rb
buildr/trunk/lib/buildr/scala/tests.rb
buildr/trunk/spec/sandbox.rb
buildr/trunk/spec/scala/bdd_spec.rb
buildr/trunk/spec/scala/compiler_spec.rb
buildr/trunk/spec/scala/scala.rb
buildr/trunk/spec/scala/tests_spec.rb
Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=965988&r1=965987&r2=965988&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Tue Jul 20 20:32:28 2010
@@ -3,6 +3,8 @@
* Change: BUILDR-473 Update jruby-openssl dependency version or support a range of versions
* Change: BUILDR-478 Upgrade to net-ssh 2.0.23 and net-sftp 2.0.4 (Shane Witbeck)
* Change: BUILDR-475 Support for long names on tar.gz (updated to minitar 0.5.3)
+* Change: BUILDR-484 Upgrade to Scala 2.8.0 (final) and associated dependencies
+ (ScalaCheck 1.7, ScalaTest 1.2, Specs 1.6.5)
* Fixed: BUILDR-144 Filter does not preserve file permissions
* Fixed: BUILDR-163 cobertura-check
* Fixed: BUILDR-203 Compiler guessing very inefficient
Modified: buildr/trunk/lib/buildr/scala/bdd.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/scala/bdd.rb?rev=965988&r1=965987&r2=965988&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/scala/bdd.rb (original)
+++ buildr/trunk/lib/buildr/scala/bdd.rb Tue Jul 20 20:32:28 2010
@@ -32,19 +32,23 @@ module Buildr::Scala
@lang = :scala
@bdd_dir = :spec
- VERSION = '1.6.2.1'
+ VERSION = '1.6.5'
class << self
def version
Buildr.settings.build['scala.specs'] || VERSION
end
+ def artifact
+ Buildr.settings.build['scala.specs.artifact'] || "specs_#{Buildr::Scala.version}"
+ end
+
def dependencies
unless @dependencies
super
+ specs = (version =~ /:/) ? [version] : ["org.scala-tools.testing:#{artifact}:jar:#{version}"]
# Add utility classes (e.g. SpecsSingletonRunner) and other dependencies
- @dependencies |= [ File.join(File.dirname(__FILE__)) ] +
- ["org.scala-tools.testing:specs:jar:#{version}"] +
+ @dependencies |= [ File.join(File.dirname(__FILE__)) ] + specs +
Check.dependencies + JUnit.dependencies + Scalac.dependencies
end
@dependencies
Modified: buildr/trunk/lib/buildr/scala/tests.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/scala/tests.rb?rev=965988&r1=965987&r2=965988&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/scala/tests.rb (original)
+++ buildr/trunk/lib/buildr/scala/tests.rb Tue Jul 20 20:32:28 2010
@@ -23,7 +23,7 @@ require 'buildr/java/tests'
module Buildr::Scala
# Scala::Check is available when using Scala::Test or Scala::Specs
module Check
- VERSION = '1.6'
+ VERSION = '1.7'
class << self
def version
@@ -34,8 +34,12 @@ module Buildr::Scala
Buildr.settings.build['scala.check.classifier'] || ""
end
+ def artifact
+ Buildr.settings.build['scala.check.artifact'] || "scalacheck_#{Buildr::Scala.version}"
+ end
+
def dependencies
- ["org.scala-tools.testing:scalacheck:jar:#{classifier}:#{version}"]
+ (version =~ /:/) ? [version] : ["org.scala-tools.testing:#{artifact}:jar:#{classifier}:#{version}"]
end
private
@@ -56,7 +60,7 @@ module Buildr::Scala
# * :java_args -- Arguments passed as is to the JVM.
class ScalaTest < Buildr::TestFramework::Java
- VERSION = '1.0.1'
+ VERSION = '1.2'
class << self
def version
Modified: buildr/trunk/spec/sandbox.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/sandbox.rb?rev=965988&r1=965987&r2=965988&view=diff
==============================================================================
--- buildr/trunk/spec/sandbox.rb (original)
+++ buildr/trunk/spec/sandbox.rb Tue Jul 20 20:32:28 2010
@@ -21,15 +21,20 @@ 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"
+# Force Scala 2.8.0 for specs; don't want to rely on SCALA_HOME
+Buildr.settings.build['scala.version'] = "2.8.0"
# Add a 'require' here only for optional extensions, not for extensions that should be loaded by default.
require 'buildr/groovy'
require 'buildr/scala'
Java.load # Anything added to the classpath.
-artifacts(TestFramework.frameworks.map(&:dependencies).flatten, JUnit.ant_taskdef, Buildr::Groovy::Groovyc.dependencies).each do |path|
+artifacts(
+ TestFramework.frameworks.map(&:dependencies).flatten,
+ JUnit.ant_taskdef,
+ Buildr::Groovy::Groovyc.dependencies,
+ Buildr::Scala::Specs.dependencies
+).each do |path|
file(path).invoke
end
Modified: buildr/trunk/spec/scala/bdd_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/scala/bdd_spec.rb?rev=965988&r1=965987&r2=965988&view=diff
==============================================================================
--- buildr/trunk/spec/scala/bdd_spec.rb (original)
+++ buildr/trunk/spec/scala/bdd_spec.rb Tue Jul 20 20:32:28 2010
@@ -19,8 +19,8 @@ require File.join(File.dirname(__FILE__)
describe Buildr::Scala::Specs do
before(:each) do
- # Force Scala 2.7.7 for specs; don't want to rely on SCALA_HOME
- Buildr.settings.build['scala.version'] = "2.7.7"
+ # Force Scala 2.8.0 for specs; don't want to rely on SCALA_HOME
+ Buildr.settings.build['scala.version'] = "2.8.0"
end
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=965988&r1=965987&r2=965988&view=diff
==============================================================================
--- buildr/trunk/spec/scala/compiler_spec.rb (original)
+++ buildr/trunk/spec/scala/compiler_spec.rb Tue Jul 20 20:32:28 2010
@@ -20,8 +20,8 @@ require File.join(File.dirname(__FILE__)
share_as :ScalacCompiler do
before(:each) do
- # Force Scala 2.7.7 for specs; don't want to rely on SCALA_HOME
- Buildr.settings.build['scala.version'] = "2.7.7"
+ # Force Scala 2.8.0 for specs; don't want to rely on SCALA_HOME
+ Buildr.settings.build['scala.version'] = "2.8.0"
end
it 'should identify itself from source directories' do
Modified: buildr/trunk/spec/scala/scala.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/scala/scala.rb?rev=965988&r1=965987&r2=965988&view=diff
==============================================================================
--- buildr/trunk/spec/scala/scala.rb (original)
+++ buildr/trunk/spec/scala/scala.rb Tue Jul 20 20:32:28 2010
@@ -18,8 +18,8 @@ require File.join(File.dirname(__FILE__)
describe 'scala' do
# Specific version of Scala required for specs
- required_version = '2.7.7'
- scala_version_str = "2.7.7.final"
+ required_version = '2.8.0'
+ scala_version_str = "2.8.0.final"
it 'should automatically add the remote scala-tools.org repository' do
# NOTE: the sandbox environment clears "repositories.remote" so we can't
Modified: buildr/trunk/spec/scala/tests_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/scala/tests_spec.rb?rev=965988&r1=965987&r2=965988&view=diff
==============================================================================
--- buildr/trunk/spec/scala/tests_spec.rb (original)
+++ buildr/trunk/spec/scala/tests_spec.rb Tue Jul 20 20:32:28 2010
@@ -27,8 +27,8 @@ require File.join(File.dirname(__FILE__)
describe Buildr::Scala::ScalaTest do
before(:each) do
- # Force Scala 2.7.7 for specs; don't want to rely on SCALA_HOME
- Buildr.settings.build['scala.version'] = "2.7.7"
+ # Force Scala 2.8.0 for specs; don't want to rely on SCALA_HOME
+ Buildr.settings.build['scala.version'] = "2.8.0"
end
it 'should be the default test framework when test cases are in Scala' do