buildr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toulm...@apache.org
Subject [6/7] buildr git commit: Fix scaladoc by adding the 2 missing modules
Date Mon, 15 Aug 2016 06:10:43 GMT
Fix scaladoc by adding the 2 missing modules


Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/6784bb73
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/6784bb73
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/6784bb73

Branch: refs/heads/master
Commit: 6784bb7332e96de3c71745b4b8b69227703d2cdb
Parents: c18b855
Author: Antoine Toulme <antoine@lunar-ocean.com>
Authored: Sun Aug 14 22:21:47 2016 -0700
Committer: Antoine Toulme <antoine@lunar-ocean.com>
Committed: Sun Aug 14 22:21:47 2016 -0700

----------------------------------------------------------------------
 lib/buildr/scala/compiler.rb |  3 +++
 spec/scala/doc_spec.rb       | 11 -----------
 2 files changed, 3 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/buildr/blob/6784bb73/lib/buildr/scala/compiler.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/scala/compiler.rb b/lib/buildr/scala/compiler.rb
index c22cb27..8846d1e 100644
--- a/lib/buildr/scala/compiler.rb
+++ b/lib/buildr/scala/compiler.rb
@@ -152,6 +152,9 @@ module Buildr::Scala
         # added in Scala 2.10
         ns.reflect!      'org.scala-lang:scala-reflect:jar:>=' + version
         ns.actors!       'org.scala-lang:scala-actors:jar:>=' + version
+        ns.xml!          'org.scala-lang.modules:scala-xml_2.11:jar:1.0.5'
+        ns.parser_combinators! 'org.scala-lang.modules:scala-parser-combinators_2.11:jar:1.0.4'
+
       end
     end
 

http://git-wip-us.apache.org/repos/asf/buildr/blob/6784bb73/spec/scala/doc_spec.rb
----------------------------------------------------------------------
diff --git a/spec/scala/doc_spec.rb b/spec/scala/doc_spec.rb
index 855d651..30cb58e 100644
--- a/spec/scala/doc_spec.rb
+++ b/spec/scala/doc_spec.rb
@@ -47,8 +47,6 @@ describe "Scaladoc" do
     project('foo').doc.options[:"doc-title"].should eql('explicit')
   end
 
-if Java.java.lang.System.getProperty("java.runtime.version") >= "1.6"
-
   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
@@ -69,14 +67,8 @@ if Java.java.lang.System.getProperty("java.runtime.version") >= "1.6"
     project('foo').doc.invoke
   end unless Buildr::Scala.version?(2.7, "2.8.0")
 
-elsif Buildr::VERSION >= '1.5'
-  raise "JVM version guard in #{__FILE__} should be removed since it is assumed that Java
1.5 is no longer supported."
-end
-
 end
 
-if Java.java.lang.System.getProperty("java.runtime.version") >= "1.6"
-
 describe "package(:scaladoc)" do
   it "should generate target/project-version-scaladoc.jar" do
     write 'src/main/scala/Foo.scala', 'class Foo'
@@ -97,6 +89,3 @@ describe "package(:scaladoc)" do
   end
 end
 
-elsif Buildr::VERSION >= '1.5'
-  raise "JVM version guard in #{__FILE__} should be removed since it is assumed that Java
1.5 is no longer supported."
-end


Mime
View raw message