allow bundler >= 2

mkristian · Jan 27, 2020 · d5a9256 · d5a9256
1 parent 08f19e1
commit d5a9256
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -3,6 +3,6 @@
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.1.8</version>
+    <version>0.4.4</version>
   </extension>
 </extensions>
diff --git a/Mavenfile b/Mavenfile
@@ -4,8 +4,8 @@ gemfile
 
 properties( 'jruby.versions' => "${jruby.version}, 9.0.4.0",
             # just lock the versions
-            'jruby.version' => '1.7.23',
-            'jruby.plugins.version' => '1.1.3' )
+            'jruby.version' => '9.2.9.0',
+            'jruby.plugins.version' => '1.1.8' )
 
 jruby_plugin( :minitest, :minispecDirectory => "spec/*_spec.rb" ) do
   execute_goals(:spec)

diff --git a/Readme.md b/Readme.md
@@ -51,6 +51,12 @@ Running the integration test
 
 ```bash
 ./mvnw verify
+./mvnw clean verify
+```
+or a single integration test
+```bash
+./mvnw verify -Dinvoker.test=running_rspec_via_rake
+./mvnw clean verify -Dinvoker.test=running_rspec_via_rake
 ```
 
 Building the gem (see ./pkg)

diff --git a/jbundler.gemspec b/jbundler.gemspec
@@ -29,7 +29,7 @@ END
   s.add_runtime_dependency 'maven-tools', '~> 1.1'
 
   s.add_runtime_dependency "ruby-maven", "~> 3.3", '>= 3.3.8'
-  s.add_runtime_dependency "bundler", "~> 1.5"
+  s.add_runtime_dependency "bundler", "> 1.5", "< 3.0.0"
   s.add_runtime_dependency "jar-dependencies", "~> 0.3"
   s.add_development_dependency "rake", "~> 10.0"
   s.add_development_dependency "minitest", "~> 5.3"