buildr 1.4.5-java → 1.4.6-java

data/spec/scala/doc_spec.rb

@@ -18,11 +18,6 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers')
 
 describe "Scaladoc" do
 
-  before(:each) do
-    # 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
     define 'foo' do
       compile.using(:scalac)
@@ -52,7 +47,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.1' do
+  it 'should convert :windowtitle to -doc-title for Scala 2.8.1 and later' do
     write 'src/main/scala/com/example/Test.scala', 'package com.example; class Test { val i = 1 }'
     define('foo') do
       doc.using :windowtitle => "foo"
@@ -63,7 +58,7 @@ describe "Scaladoc" do
       0 # normal return
     end
     project('foo').doc.invoke
-  end
+  end unless Buildr::Scala.version?(2.7, "2.8.0")
 end
 
 describe "package(:scaladoc)" do

data/spec/scala/scala.rb

@@ -17,9 +17,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 describe 'scala' do
-  # Specific version of Scala required for specs
-  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
@@ -28,11 +25,7 @@ describe 'scala' do
     # repositories.remote.should include('http://scala-tools.org/repo-releases')
   end
 
-  it "specifications require Scala #{required_version}" do
-    Scala.version.should eql(required_version)
-  end
-
   it "should provide the Scala version string" do
-    Scala.version_str.should eql(scala_version_str)
+    Scala.version_str.should eql(Buildr::Scala::SCALA_VERSION_FOR_SPECS)
   end
 end

data/spec/scala/tests_spec.rb

@@ -22,15 +22,23 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers')
 #  -test exclude group
 #  -test include Suite's
 #  -test exclude Suite's
+#
+describe "scalatest version" do
 
+  case
+  when Buildr::Scala.version?(2.8)
+    it 'should be 1.3 for scala 2.8' do
+      Scala::ScalaTest.dependencies.should include("org.scalatest:scalatest:jar:1.3")
+    end
+  when Buildr::Scala.version?(2.9)
+    it 'should be 1.6.1 for scala 2.9' do
+      Scala::ScalaTest.dependencies.should include("org.scalatest:scalatest_2.9.0:jar:1.6.1")
+    end
+  end
+end
 
 describe Buildr::Scala::ScalaTest do
-  
-  before(:each) do
-    # 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
     write 'src/test/scala/com/example/MySuite.scala', <<-SCALA
       package com.example

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: buildr
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 1
   - 4
-  - 5
-  version: 1.4.5
+  - 6
+  version: 1.4.6
 platform: java
 authors: 
 - Apache Buildr
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-21 00:00:00 -08:00
-default_executable: 
+date: 2011-06-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -306,9 +305,25 @@ dependencies:
   type: :runtime
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
-  name: sdoc
+  name: jekyll
   prerelease: false
   requirement: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 0
+        - 10
+        - 0
+        version: 0.10.0
+  type: :development
+  version_requirements: *id019
+- !ruby/object:Gem::Dependency 
+  name: sdoc
+  prerelease: false
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -318,7 +333,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id019
+  version_requirements: *id020
 description: |
   Apache Buildr is a build system for Java-based applications, including support
   for Scala, Groovy and a growing number of JVM languages and tools.  We wanted
@@ -337,217 +352,214 @@ extra_rdoc_files:
 - LICENSE
 - NOTICE
 files: 
-- addon/buildr/org/apache/buildr/BuildrNail$Main.class
+- addon/buildr/emma.rb
+- addon/buildr/drb.rb
+- addon/buildr/antlr.rb
+- addon/buildr/jibx.rb
+- addon/buildr/protobuf.rb
+- addon/buildr/nailgun.rb
+- addon/buildr/hibernate.rb
 - addon/buildr/org/apache/buildr/BuildrNail.class
-- addon/buildr/org/apache/buildr/JettyWrapper.java
+- addon/buildr/org/apache/buildr/BuildrNail$Main.class
 - addon/buildr/org/apache/buildr/JettyWrapper.class
 - addon/buildr/org/apache/buildr/BuildrNail.java
 - addon/buildr/org/apache/buildr/JettyWrapper$1.class
 - addon/buildr/org/apache/buildr/JettyWrapper$BuildrHandler.class
-- addon/buildr/hibernate.rb
-- addon/buildr/javacc.rb
-- addon/buildr/cobertura.rb
-- addon/buildr/protobuf.rb
-- addon/buildr/nailgun.rb
+- addon/buildr/org/apache/buildr/JettyWrapper.java
+- addon/buildr/jaxb_xjc.rb
 - addon/buildr/jetty.rb
-- addon/buildr/xmlbeans.rb
+- addon/buildr/cobertura.rb
+- addon/buildr/javacc.rb
 - addon/buildr/jdepend.rb
-- addon/buildr/jibx.rb
-- addon/buildr/drb.rb
-- addon/buildr/jaxb_xjc.rb
-- addon/buildr/antlr.rb
-- addon/buildr/emma.rb
-- addon/buildr/openjpa.rb
 - addon/buildr/bnd.rb
+- addon/buildr/openjpa.rb
+- addon/buildr/xmlbeans.rb
 - bin/buildr
-- doc/css/default.css
-- doc/css/syntax.css
-- doc/css/print.css
-- doc/scripts/install-osx.sh
-- doc/scripts/buildr-git.rb
-- doc/scripts/gitflow.rb
-- doc/scripts/install-jruby.sh
-- doc/scripts/install-linux.sh
-- doc/projects.textile
-- doc/settings_profiles.textile
-- doc/contributing.textile
-- doc/more_stuff.textile
-- doc/installing.textile
-- doc/languages.textile
-- doc/mailing_lists.textile
-- doc/testing.textile
 - doc/_config.yml
-- doc/releasing.textile
+- doc/testing.textile
+- doc/preface.textile
+- doc/packaging.textile
+- doc/languages.textile
+- doc/index.textile
 - doc/artifacts.textile
+- doc/projects.textile
+- doc/installing.textile
+- doc/css/print.css
+- doc/css/syntax.css
+- doc/css/default.css
 - doc/download.textile
-- doc/building.textile
-- doc/extending.textile
 - doc/images/growl-icon.tiff
 - doc/images/asf-logo.gif
-- doc/images/zbuildr.png
-- doc/images/1442160941-frontcover.jpg
-- doc/images/asf-logo.png
-- doc/images/project-structure.png
+- doc/images/zbuildr.tif
 - doc/images/note.png
-- doc/images/buildr.png
-- doc/images/buildr-hires.png
+- doc/images/asf-logo.png
 - doc/images/favicon.png
+- doc/images/1442160941-frontcover.jpg
 - doc/images/tip.png
-- doc/images/zbuildr.tif
+- doc/images/buildr.png
+- doc/images/zbuildr.png
+- doc/images/project-structure.png
+- doc/images/buildr-hires.png
+- doc/releasing.textile
+- doc/more_stuff.textile
+- doc/extending.textile
+- doc/contributing.textile
+- doc/building.textile
+- doc/settings_profiles.textile
 - doc/_layouts/preface.html
 - doc/_layouts/default.html
-- doc/packaging.textile
-- doc/index.textile
-- doc/preface.textile
+- doc/mailing_lists.textile
 - doc/quick_start.textile
+- doc/scripts/install-osx.sh
+- doc/scripts/install-linux.sh
+- doc/scripts/install-jruby.sh
+- doc/scripts/buildr-git.rb
+- doc/scripts/gitflow.rb
 - etc/KEYS
-- lib/buildr.rb
-- lib/buildr/scala.rb
-- lib/buildr/ide/eclipse/scala.rb
-- lib/buildr/ide/eclipse/plugin.rb
-- lib/buildr/ide/eclipse/java.rb
-- lib/buildr/ide/eclipse.rb
-- lib/buildr/ide/idea.rb
-- lib/buildr/packaging/artifact_namespace.rb
-- lib/buildr/packaging/gems.rb
-- lib/buildr/packaging/zip.rb
-- lib/buildr/packaging/#package.rb.rej#
-- lib/buildr/packaging/package.rb
-- lib/buildr/packaging/ziptask.rb
-- lib/buildr/packaging/artifact_search.rb
-- lib/buildr/packaging/archive.rb
-- lib/buildr/packaging/artifact.rb
-- lib/buildr/packaging/tar.rb
-- lib/buildr/packaging/version_requirement.rb
-- lib/buildr/resources/icons-license.txt
-- lib/buildr/resources/buildr.icns
-- lib/buildr/resources/completed.png
-- lib/buildr/resources/failed.png
 - lib/buildr/ide.rb
-- lib/buildr/version.rb
-- lib/buildr/shell.rb
-- lib/buildr/core.rb
-- lib/buildr/packaging.rb
-- lib/buildr/clojure/shell.rb
-- lib/buildr/scala/org/apache/buildr/SpecsSingletonRunner.class
-- lib/buildr/scala/org/apache/buildr/SpecsSingletonRunner.java
-- lib/buildr/scala/bdd.rb
-- lib/buildr/scala/shell.rb
-- lib/buildr/scala/#Untitled-2#
 - lib/buildr/scala/compiler.rb
 - lib/buildr/scala/tests.rb
+- lib/buildr/scala/shell.rb
+- lib/buildr/scala/org/apache/buildr/SpecsSingletonRunner.java
+- lib/buildr/scala/org/apache/buildr/SpecsSingletonRunner.class
 - lib/buildr/scala/doc.rb
-- lib/buildr/java.rb
-- lib/buildr/core/osx.rb
-- lib/buildr/core/build.rb
-- lib/buildr/core/progressbar.rb
-- lib/buildr/core/application.rb
-- lib/buildr/core/generate.rb
-- lib/buildr/core/util.rb
-- lib/buildr/core/#application.rb#
-- lib/buildr/core/shell.rb
-- lib/buildr/core/compile.rb
-- lib/buildr/core/help.rb
-- lib/buildr/core/common.rb
-- lib/buildr/core/test.rb
-- lib/buildr/core/environment.rb
-- lib/buildr/core/filter.rb
-- lib/buildr/core/checks.rb
-- lib/buildr/core/cc.rb
-- lib/buildr/core/doc.rb
-- lib/buildr/core/transports.rb
-- lib/buildr/core/jrebel.rb
-- lib/buildr/core/project.rb
-- lib/buildr/core/run.rb
-- lib/buildr/core/linux.rb
-- lib/buildr/java/org/apache/buildr/JavaTestFilter.java
-- lib/buildr/java/org/apache/buildr/JavaTestFilter.class
-- lib/buildr/java/bdd.rb
+- lib/buildr/scala/bdd.rb
+- lib/buildr/clojure.rb
+- lib/buildr/java/emma.rb
 - lib/buildr/java/external.rb
 - lib/buildr/java/pom.rb
+- lib/buildr/java/jruby.rb
 - lib/buildr/java/ecj.rb
-- lib/buildr/java/rjb.rb
-- lib/buildr/java/cobertura.rb
-- lib/buildr/java/jtestr_result.rb
-- lib/buildr/java/packaging.rb
 - lib/buildr/java/compiler.rb
-- lib/buildr/java/jruby.rb
+- lib/buildr/java/test_result.rb
+- lib/buildr/java/ant.rb
+- lib/buildr/java/rjb.rb
 - lib/buildr/java/tests.rb
-- lib/buildr/java/commands.rb
-- lib/buildr/java/doc.rb
 - lib/buildr/java/jtestr_runner.rb.erb
-- lib/buildr/java/ant.rb
+- lib/buildr/java/org/apache/buildr/JavaTestFilter.class
+- lib/buildr/java/org/apache/buildr/JavaTestFilter.java
+- lib/buildr/java/doc.rb
+- lib/buildr/java/bdd.rb
+- lib/buildr/java/commands.rb
 - lib/buildr/java/deprecated.rb
-- lib/buildr/java/test_result.rb
-- lib/buildr/java/emma.rb
+- lib/buildr/java/packaging.rb
+- lib/buildr/java/jtestr_result.rb
+- lib/buildr/java/cobertura.rb
 - lib/buildr/java/version_requirement.rb
 - lib/buildr/groovy.rb
-- lib/buildr/groovy/bdd.rb
-- lib/buildr/groovy/shell.rb
+- lib/buildr/resources/icons-license.txt
+- lib/buildr/resources/buildr.icns
+- lib/buildr/resources/failed.png
+- lib/buildr/resources/completed.png
+- lib/buildr/shell.rb
+- lib/buildr/packaging/artifact_search.rb
+- lib/buildr/packaging/gems.rb
+- lib/buildr/packaging/ziptask.rb
+- lib/buildr/packaging/package.rb
+- lib/buildr/packaging/zip.rb
+- lib/buildr/packaging/tar.rb
+- lib/buildr/packaging/archive.rb
+- lib/buildr/packaging/artifact.rb
+- lib/buildr/packaging/artifact_namespace.rb
+- lib/buildr/packaging/version_requirement.rb
 - lib/buildr/groovy/compiler.rb
+- lib/buildr/groovy/shell.rb
 - lib/buildr/groovy/doc.rb
-- lib/buildr/clojure.rb
+- lib/buildr/groovy/bdd.rb
+- lib/buildr/java.rb
+- lib/buildr/core.rb
+- lib/buildr/packaging.rb
+- lib/buildr/version.rb
+- lib/buildr/ide/idea.rb
+- lib/buildr/ide/eclipse/plugin.rb
+- lib/buildr/ide/eclipse/java.rb
+- lib/buildr/ide/eclipse/scala.rb
+- lib/buildr/ide/eclipse.rb
+- lib/buildr/core/progressbar.rb
+- lib/buildr/core/util.rb
+- lib/buildr/core/filter.rb
+- lib/buildr/core/jrebel.rb
+- lib/buildr/core/build.rb
+- lib/buildr/core/help.rb
+- lib/buildr/core/environment.rb
+- lib/buildr/core/application.rb
+- lib/buildr/core/shell.rb
+- lib/buildr/core/transports.rb
+- lib/buildr/core/doc.rb
+- lib/buildr/core/common.rb
+- lib/buildr/core/cc.rb
+- lib/buildr/core/generate.rb
+- lib/buildr/core/checks.rb
+- lib/buildr/core/linux.rb
+- lib/buildr/core/osx.rb
+- lib/buildr/core/project.rb
+- lib/buildr/core/compile.rb
+- lib/buildr/core/run.rb
+- lib/buildr/core/test.rb
+- lib/buildr/clojure/shell.rb
+- lib/buildr/scala.rb
 - lib/buildr/run.rb
+- lib/buildr.rb
+- rakelib/stage.rake
 - rakelib/checks.rake
-- rakelib/package.rake
+- rakelib/rspec.rake
+- rakelib/setup.rake
+- rakelib/all-in-one.rake
+- rakelib/release.rake
 - rakelib/metrics.rake
 - rakelib/doc.rake
-- rakelib/release.rake
-- rakelib/stage.rake
-- rakelib/all-in-one.rake
-- rakelib/setup.rake
-- rakelib/rspec.rake
-- spec/ide/idea_spec.rb
-- spec/ide/eclipse_spec.rb
-- spec/sandbox.rb
+- rakelib/package.rake
+- spec/version_requirement_spec.rb
+- spec/scala/tests_spec.rb
+- spec/scala/bdd_spec.rb
+- spec/scala/doc_spec.rb
+- spec/scala/compiler_spec.rb
+- spec/scala/scala.rb
+- spec/java/packaging_spec.rb
+- spec/java/external_spec.rb
+- spec/java/ant_spec.rb
+- spec/java/cobertura_spec.rb
+- spec/java/tests_spec.rb
+- spec/java/commands_spec.rb
+- spec/java/test_coverage_helper.rb
+- spec/java/bdd_spec.rb
+- spec/java/emma_spec.rb
+- spec/java/java_spec.rb
+- spec/java/doc_spec.rb
+- spec/java/ecj_spec.rb
+- spec/java/compiler_spec.rb
+- spec/java/run_spec.rb
+- spec/spec_helpers.rb
 - spec/packaging/packaging_spec.rb
 - spec/packaging/archive_spec.rb
-- spec/packaging/packaging_helper.rb
 - spec/packaging/artifact_spec.rb
+- spec/packaging/packaging_helper.rb
 - spec/packaging/artifact_namespace_spec.rb
-- spec/addon/drb_spec.rb
+- spec/groovy/bdd_spec.rb
+- spec/groovy/doc_spec.rb
+- spec/groovy/compiler_spec.rb
 - spec/addon/jaxb_xjc_spec.rb
 - spec/addon/bnd_spec.rb
-- spec/spec_helpers.rb
-- spec/scala/bdd_spec.rb
-- spec/scala/scala.rb
-- spec/scala/tests_spec.rb
-- spec/scala/compiler_spec.rb
-- spec/scala/doc_spec.rb
-- spec/version_requirement_spec.rb
-- spec/core/cc_spec.rb
+- spec/addon/drb_spec.rb
+- spec/ide/eclipse_spec.rb
+- spec/ide/idea_spec.rb
+- spec/xpath_matchers.rb
+- spec/core/shell_spec.rb
+- spec/core/generate_spec.rb
+- spec/core/application_spec.rb
 - spec/core/extension_spec.rb
+- spec/core/common_spec.rb
 - spec/core/build_spec.rb
-- spec/core/application_spec.rb
+- spec/core/transport_spec.rb
+- spec/core/project_spec.rb
+- spec/core/doc_spec.rb
 - spec/core/compile_spec.rb
-- spec/core/shell_spec.rb
 - spec/core/util_spec.rb
+- spec/core/cc_spec.rb
 - spec/core/checks_spec.rb
 - spec/core/test_spec.rb
-- spec/core/generate_spec.rb
-- spec/core/doc_spec.rb
-- spec/core/common_spec.rb
-- spec/core/transport_spec.rb
 - spec/core/run_spec.rb
-- spec/core/project_spec.rb
-- spec/java/bdd_spec.rb
-- spec/java/test_coverage_helper.rb
-- spec/java/packaging_spec.rb
-- spec/java/commands_spec.rb
-- spec/java/ecj_spec.rb
-- spec/java/external_spec.rb
-- spec/java/java_spec.rb
-- spec/java/cobertura_spec.rb
-- spec/java/tests_spec.rb
-- spec/java/ant_spec.rb
-- spec/java/compiler_spec.rb
-- spec/java/emma_spec.rb
-- spec/java/doc_spec.rb
-- spec/java/run_spec.rb
-- spec/xpath_matchers.rb
-- spec/groovy/bdd_spec.rb
-- spec/groovy/compiler_spec.rb
-- spec/groovy/doc_spec.rb
+- spec/sandbox.rb
 - buildr.gemspec
 - buildr.buildfile
 - LICENSE
@@ -557,7 +569,6 @@ files:
 - Rakefile
 - _buildr
 - _jbuildr
-has_rdoc: true
 homepage: http://buildr.apache.org/
 licenses: []
 
@@ -593,7 +604,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: buildr
-rubygems_version: 1.5.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Build like you code