diff --git a/.travis.yml b/.travis.yml index e55f7548..b9886379 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ rvm: - - jruby-9.1.17.0 - - jruby-9.2.0.0 + - jruby-9.2.18.0 + - jruby-head jdk: - openjdk8 branches: @@ -13,15 +13,13 @@ env: script: bundle exec rake $TASK matrix: include: - - rvm: jruby-head - env: TASK=test - - rvm: jruby-9.1.17.0 + - rvm: jruby-9.2.18.0 env: TASK=integration - - rvm: jruby-9.1.16.0 + - rvm: jruby-9.2.18.0 env: RAKE_VERSION="~>10.1" - - rvm: jruby-9.1.16.0 + - rvm: jruby-9.2.18.0 env: RAKE_VERSION="~>11.2" - - rvm: jruby-9.1.16.0 + - rvm: jruby-9.2.18.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']