From 05703389a04a114db1a60bc365c21f40f675e884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Thu, 10 Jun 2021 20:33:52 +0200 Subject: [PATCH 1/4] The test task doesn't actually exist This should at least allow the jruby-head task to start. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e55f7548..029e503a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,6 @@ script: bundle exec rake $TASK matrix: include: - rvm: jruby-head - env: TASK=test - rvm: jruby-9.1.17.0 env: TASK=integration - rvm: jruby-9.1.16.0 From 82f9515ba650bf7a4b86b425191042c8d7cbac7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Thu, 10 Jun 2021 20:34:36 +0200 Subject: [PATCH 2/4] jruby-head can be moved to the main matrix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 029e503a..e763fb75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ rvm: - jruby-9.1.17.0 - jruby-9.2.0.0 + - jruby-head jdk: - openjdk8 branches: @@ -13,7 +14,6 @@ env: script: bundle exec rake $TASK matrix: include: - - rvm: jruby-head - rvm: jruby-9.1.17.0 env: TASK=integration - rvm: jruby-9.1.16.0 From c39be4c851a89f5de42185052300013752803f59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Thu, 10 Jun 2021 20:24:50 +0200 Subject: [PATCH 3/4] Drop jruby 9.1 support --- .travis.yml | 9 ++++----- README.rdoc | 2 +- spec/warbler/task_spec.rb | 1 - warbler.gemspec | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index e763fb75..47f06302 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ rvm: - - jruby-9.1.17.0 - jruby-9.2.0.0 - jruby-head jdk: @@ -14,13 +13,13 @@ env: script: bundle exec rake $TASK matrix: include: - - rvm: jruby-9.1.17.0 + - rvm: jruby-9.2.0.0 env: TASK=integration - - rvm: jruby-9.1.16.0 + - rvm: jruby-9.2.0.0 env: RAKE_VERSION="~>10.1" - - rvm: jruby-9.1.16.0 + - rvm: jruby-9.2.0.0 env: RAKE_VERSION="~>11.2" - - rvm: jruby-9.1.16.0 + - rvm: jruby-9.2.0.0 env: RAKE_VERSION="~>12.3" allow_failures: - rvm: jruby-head diff --git a/README.rdoc b/README.rdoc index 778992b6..7cd9e642 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.1.0.0 and up. +Version 2.x of Warbler supports versions of JRuby from 9.2.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. diff --git a/spec/warbler/task_spec.rb b/spec/warbler/task_spec.rb index 6404b521..088c5dcb 100644 --- a/spec/warbler/task_spec.rb +++ b/spec/warbler/task_spec.rb @@ -134,7 +134,6 @@ def run_task(t) class_file_bytes = zf.get_input_stream('WEB-INF/lib/ruby_one_nine.class') {|io| io.read } class_file_bytes[0..3].should == [0xCA,0xFE,0xBA,0xBE].map { |magic_char| magic_char.chr }.join - skip('Broken in JRuby <= 9.2.0.0') if JRUBY_VERSION < '9.2.0.1' # NOTE: (9.1 has V1_7 hardcoded) class_file_bytes[6..7].should == bytecode_version.map { |magic_char| magic_char.chr }.join end end diff --git a/warbler.gemspec b/warbler.gemspec index 5f294910..c16c52e2 100644 --- a/warbler.gemspec +++ b/warbler.gemspec @@ -26,7 +26,7 @@ bundle up all of your application files for deployment to a Java environment.} gem.rdoc_options = ["--main", "README.rdoc", "-H", "-f", "darkfish"] - gem.required_ruby_version = ">= 2.1" + gem.required_ruby_version = ">= 2.5" gem.add_runtime_dependency 'rake', ['>= 10.1.0'] gem.add_runtime_dependency 'jruby-jars', ['>= 9.0.0'] From 8be1d877115c3c97dd51f4b6886d425632c69924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Thu, 10 Jun 2021 20:25:42 +0200 Subject: [PATCH 4/4] Run tests against the latest release in the 9.2 series --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 47f06302..b9886379 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ rvm: - - jruby-9.2.0.0 + - jruby-9.2.18.0 - jruby-head jdk: - openjdk8 @@ -13,13 +13,13 @@ env: script: bundle exec rake $TASK matrix: include: - - rvm: jruby-9.2.0.0 + - rvm: jruby-9.2.18.0 env: TASK=integration - - rvm: jruby-9.2.0.0 + - rvm: jruby-9.2.18.0 env: RAKE_VERSION="~>10.1" - - rvm: jruby-9.2.0.0 + - rvm: jruby-9.2.18.0 env: RAKE_VERSION="~>11.2" - - rvm: jruby-9.2.0.0 + - rvm: jruby-9.2.18.0 env: RAKE_VERSION="~>12.3" allow_failures: - rvm: jruby-head