Additional tweaks for new Ant namespaces.

jruby · Oct 10, 2017 · 4b6695f · 4b6695f
1 parent 122b902
commit 4b6695f
Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/lib/pom.rb b/lib/pom.rb
@@ -38,7 +38,7 @@ def initialize( name, version, default_spec = true )
    ImportedGem.new( 'jar-dependencies', '${jar-dependencies.version}' ),
    ImportedGem.new( 'net-telnet', '0.1.1'),
    ImportedGem.new( 'did_you_mean', '1.0.1'),
-   ImportedGem.new( 'rake-ant', '1.0.1'),
+   ImportedGem.new( 'rake-ant', '1.0.4'),
   ]
 
 project 'JRuby Lib Setup' do

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -190,7 +190,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>rake-ant</artifactId>
-      <version>1.0.0</version>
+      <version>1.0.4</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>

diff --git a/spec/java_integration/ant/ant_spec.rb b/spec/java_integration/ant/ant_spec.rb
@@ -22,8 +22,12 @@
   after :each do
     ENV['JAVA_HOME'] = @previous_java_home
     Ant.instance_eval do
-      remove_const(:JAVA_HOME)
-      const_set(:JAVA_HOME, @previous_java_home)
+      begin
+        remove_const(:JAVA_HOME)
+        const_set(:JAVA_HOME, @previous_java_home)
+      rescue NameError
+        # ignore, JAVA_HOME constant is not necessarily set now
+      end
     end
   end
 

diff --git a/spec/java_integration/ant/rake_spec.rb b/spec/java_integration/ant/rake_spec.rb
@@ -2,7 +2,6 @@
 require 'rake'
 # Do this hoo-hah with import because we don't want Rake's version of "import".
 def import(*args); java_import(*args); end
-require 'ant/rake'
 
 describe Ant, "Rake helpers" do
   include Ant::RSpec::AntExampleGroup

diff --git a/spec/java_integration/ant_spec_helper.rb b/spec/java_integration/ant_spec_helper.rb
@@ -2,7 +2,7 @@
 require 'ant'
 require 'tmpdir'
 
-class Ant
+class Rake::Ant
   module RSpec
     module AntExampleGroup
       def self.included(example_group)