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/11/29 20:25:59 UTC
svn commit: r1040236 - in /buildr/trunk: ./ lib/buildr/scala/ spec/
spec/scala/
Author: boisvert
Date: Mon Nov 29 19:25:58 2010
New Revision: 1040236
URL: http://svn.apache.org/viewvc?rev=1040236&view=rev
Log:
Update to Scala 2.8.1, ScalaCheck 1.8, Specs 1.6.6
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/lib/buildr/scala/bdd.rb
buildr/trunk/lib/buildr/scala/compiler.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/doc_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=1040236&r1=1040235&r2=1040236&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Mon Nov 29 19:25:58 2010
@@ -8,6 +8,9 @@
* Added: BUILDR-552 Projects may now be defined using project(:name) and a block
* Change: BUILDR-540 Upgrade to rspec 2.1.0
* Change: BUILDR-546 Upgrade to Rubyzip 0.9.4 (Michael Guymon)
+* Change: Upgrade default Scala compiler version to 2.8.1-final
+* Change: Upgrade to ScalaCheck 1.8
+* Change: Upgrade to Specs 1.6.6
* Fixed: BUILDR-542 Release task: SVN tagging fails if parent tag directory
does not exist yet (Gerolf Seitz)
* Fixed: BUILDR-543 POMs are installed and uploaded twice when using artifacts
Modified: buildr/trunk/lib/buildr/scala/bdd.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/scala/bdd.rb?rev=1040236&r1=1040235&r2=1040236&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/scala/bdd.rb (original)
+++ buildr/trunk/lib/buildr/scala/bdd.rb Mon Nov 29 19:25:58 2010
@@ -32,7 +32,7 @@ module Buildr::Scala
@lang = :scala
@bdd_dir = :spec
- VERSION = '1.6.5'
+ VERSION = '1.6.6'
class << self
def version
Modified: buildr/trunk/lib/buildr/scala/compiler.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/scala/compiler.rb?rev=1040236&r1=1040235&r2=1040236&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/scala/compiler.rb (original)
+++ buildr/trunk/lib/buildr/scala/compiler.rb Mon Nov 29 19:25:58 2010
@@ -19,7 +19,7 @@ require 'buildr/core/compile'
require 'buildr/packaging'
module Buildr::Scala
- DEFAULT_VERSION = '2.8.0'
+ DEFAULT_VERSION = '2.8.1'
class << self
Modified: buildr/trunk/lib/buildr/scala/tests.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/scala/tests.rb?rev=1040236&r1=1040235&r2=1040236&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/scala/tests.rb (original)
+++ buildr/trunk/lib/buildr/scala/tests.rb Mon Nov 29 19:25:58 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.7'
+ VERSION = '1.8'
class << self
def version
Modified: buildr/trunk/spec/sandbox.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/sandbox.rb?rev=1040236&r1=1040235&r2=1040236&view=diff
==============================================================================
--- buildr/trunk/spec/sandbox.rb (original)
+++ buildr/trunk/spec/sandbox.rb Mon Nov 29 19:25:58 2010
@@ -21,8 +21,8 @@ Buildr.application.instance_eval { @rake
repositories.remote << 'http://repo1.maven.org/maven2'
repositories.remote << 'http://scala-tools.org/repo-releases'
-# Force Scala 2.8.0 for specs; don't want to rely on SCALA_HOME
-Buildr.settings.build['scala.version'] = "2.8.0"
+# Force Scala 2.8.1 for specs; don't want to rely on SCALA_HOME
+Buildr.settings.build['scala.version'] = "2.8.1"
# Add a 'require' here only for optional extensions, not for extensions that should be loaded by default.
require 'buildr/clojure'
Modified: buildr/trunk/spec/scala/bdd_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/scala/bdd_spec.rb?rev=1040236&r1=1040235&r2=1040236&view=diff
==============================================================================
--- buildr/trunk/spec/scala/bdd_spec.rb (original)
+++ buildr/trunk/spec/scala/bdd_spec.rb Mon Nov 29 19:25:58 2010
@@ -19,8 +19,8 @@ require File.expand_path(File.join(File.
describe Buildr::Scala::Specs do
before(:each) do
- # Force Scala 2.8.0 for specs; don't want to rely on SCALA_HOME
- Buildr.settings.build['scala.version'] = "2.8.0"
+ # Force Scala 2.8.1 for specs; don't want to rely on SCALA_HOME
+ Buildr.settings.build['scala.version'] = "2.8.1"
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=1040236&r1=1040235&r2=1040236&view=diff
==============================================================================
--- buildr/trunk/spec/scala/compiler_spec.rb (original)
+++ buildr/trunk/spec/scala/compiler_spec.rb Mon Nov 29 19:25:58 2010
@@ -20,8 +20,8 @@ require File.expand_path(File.join(File.
share_as :ScalacCompiler do
before(:each) do
- # Force Scala 2.8.0 for specs; don't want to rely on SCALA_HOME
- Buildr.settings.build['scala.version'] = "2.8.0"
+ # Force Scala 2.8.1 for specs; don't want to rely on SCALA_HOME
+ Buildr.settings.build['scala.version'] = "2.8.1"
end
it 'should identify itself from source directories' do
Modified: buildr/trunk/spec/scala/doc_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/scala/doc_spec.rb?rev=1040236&r1=1040235&r2=1040236&view=diff
==============================================================================
--- buildr/trunk/spec/scala/doc_spec.rb (original)
+++ buildr/trunk/spec/scala/doc_spec.rb Mon Nov 29 19:25:58 2010
@@ -19,8 +19,8 @@ require File.expand_path(File.join(File.
describe "Scaladoc" do
before(:each) do
- # Force Scala 2.8.0 for specs; don't want to rely on SCALA_HOME
- Buildr.settings.build['scala.version'] = "2.8.0"
+ # Force Scala 2.8.1 for specs; don't want to rely on SCALA_HOME
+ Buildr.settings.build['scala.version'] = "2.8.1"
end
it 'should pick -doc-title from project name by default' do
@@ -52,7 +52,7 @@ describe "Scaladoc" do
project('foo').doc.options[:"doc-title"].should eql('explicit')
end
- it 'should convert :windowtitle to -doc-title for Scala 2.8.0' do
+ it 'should convert :windowtitle to -doc-title for Scala 2.8.1' do
write 'src/main/scala/com/example/Test.scala', 'package com.example; class Test { val i = 1 }'
define('foo') do
doc.using :windowtitle => "foo"
Modified: buildr/trunk/spec/scala/scala.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/scala/scala.rb?rev=1040236&r1=1040235&r2=1040236&view=diff
==============================================================================
--- buildr/trunk/spec/scala/scala.rb (original)
+++ buildr/trunk/spec/scala/scala.rb Mon Nov 29 19:25:58 2010
@@ -18,8 +18,8 @@ require File.expand_path(File.join(File.
describe 'scala' do
# Specific version of Scala required for specs
- required_version = '2.8.0'
- scala_version_str = "2.8.0.final"
+ required_version = '2.8.1'
+ scala_version_str = "2.8.1.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=1040236&r1=1040235&r2=1040236&view=diff
==============================================================================
--- buildr/trunk/spec/scala/tests_spec.rb (original)
+++ buildr/trunk/spec/scala/tests_spec.rb Mon Nov 29 19:25:58 2010
@@ -27,8 +27,8 @@ require File.expand_path(File.join(File.
describe Buildr::Scala::ScalaTest do
before(:each) do
- # Force Scala 2.8.0 for specs; don't want to rely on SCALA_HOME
- Buildr.settings.build['scala.version'] = "2.8.0"
+ # Force Scala 2.8.1 for specs; don't want to rely on SCALA_HOME
+ Buildr.settings.build['scala.version'] = "2.8.1"
end
it 'should be the default test framework when test cases are in Scala' do