From 5ff377c7976b808aefd7000a0c78edea3e515064 Mon Sep 17 00:00:00 2001 From: Ioana Tagirta Date: Thu, 25 Mar 2021 14:51:23 +0100 Subject: [PATCH 1/5] Relax version requirement for rubyzip --- warbler.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/warbler.gemspec b/warbler.gemspec index d4cf9998..41195a5b 100644 --- a/warbler.gemspec +++ b/warbler.gemspec @@ -31,7 +31,7 @@ bundle up all of your application files for deployment to a Java environment.} gem.add_runtime_dependency 'rake', ['>= 10.1.0'] gem.add_runtime_dependency 'jruby-jars', ['>= 9.0.0'] gem.add_runtime_dependency 'jruby-rack', ['>= 1.1.1', '< 1.3'] - gem.add_runtime_dependency 'rubyzip', ['~> 1.0', '< 1.4'] + gem.add_runtime_dependency 'rubyzip', ['>= 1.0.0', '<= 2.3.0'] gem.add_development_dependency 'jbundler', '~> 0.9' gem.add_development_dependency 'rspec', '~> 2.10' end From a464ba21d4d09df99a21bbf41f671e23c7cf2f80 Mon Sep 17 00:00:00 2001 From: Ioana Tagirta Date: Thu, 25 Mar 2021 17:14:49 +0100 Subject: [PATCH 2/5] Update warbler.gemspec Co-authored-by: Olle Jonsson --- warbler.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/warbler.gemspec b/warbler.gemspec index 41195a5b..5f294910 100644 --- a/warbler.gemspec +++ b/warbler.gemspec @@ -31,7 +31,7 @@ bundle up all of your application files for deployment to a Java environment.} gem.add_runtime_dependency 'rake', ['>= 10.1.0'] gem.add_runtime_dependency 'jruby-jars', ['>= 9.0.0'] gem.add_runtime_dependency 'jruby-rack', ['>= 1.1.1', '< 1.3'] - gem.add_runtime_dependency 'rubyzip', ['>= 1.0.0', '<= 2.3.0'] + gem.add_runtime_dependency 'rubyzip', '>= 1.0.0' gem.add_development_dependency 'jbundler', '~> 0.9' gem.add_development_dependency 'rspec', '~> 2.10' end From 95026c54f07b099883531eda9eee50c4d19025c8 Mon Sep 17 00:00:00 2001 From: Ioana Tagirta Date: Fri, 28 May 2021 17:59:37 +0200 Subject: [PATCH 3/5] Change spec --- spec/warbler/jar_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/warbler/jar_spec.rb b/spec/warbler/jar_spec.rb index df6328a8..437cc9ff 100644 --- a/spec/warbler/jar_spec.rb +++ b/spec/warbler/jar_spec.rb @@ -183,7 +183,7 @@ def apply_extra_config(config) jar.compile(config) jar.apply(config) file_list(%r{sample_jar.*\.rb$}).size.should == 2 - file_list(%r{gems.*\.class$}).size.should >= 80 # depending on RubyZip version + file_list(%r{gems.*\.class$}).size.should >= 45 # depending on RubyZip version end it "does not compile included gems by default" do From ba95e731e1ac06ff05f1b5f38b63b2f878900840 Mon Sep 17 00:00:00 2001 From: Ioana Tagirta Date: Wed, 2 Jun 2021 11:55:20 +0200 Subject: [PATCH 4/5] Remove jruby-9.0.5.0 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9687ed4f..e55f7548 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ rvm: - - jruby-9.0.5.0 - jruby-9.1.17.0 - jruby-9.2.0.0 jdk: From c590f04a7871ee3d13900c2d28a04673324e274c Mon Sep 17 00:00:00 2001 From: Ioana Tagirta Date: Wed, 2 Jun 2021 12:35:04 +0200 Subject: [PATCH 5/5] Update README --- README.rdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rdoc b/README.rdoc index eb57f806..778992b6 100644 --- a/README.rdoc +++ b/README.rdoc @@ -7,7 +7,7 @@ all of your application files for deployment to a Java environment. Warbler provides a sane set of out-of-the box defaults that should allow most Ruby applications to assemble and Just Work. -Version 2.x of Warbler supports versions of JRuby from 9.0.0.0 and up. +Version 2.x of Warbler supports versions of JRuby from 9.1.0.0 and up. Version 1.4.x of Warbler supports versions of JRuby up to 1.7.x. The {1.x-dev branch}[https://github.com/jruby/warbler/tree/1.x-dev] is the working code for this.