Skip to content

Commit

Permalink
Merge pull request #499 from deivid-rodriguez/drop_91_support
Browse files Browse the repository at this point in the history
Drop jruby 9.1 support
  • Loading branch information
headius authored Jun 10, 2021
2 parents 772ac94 + 8be1d87 commit b550819
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 11 deletions.
14 changes: 6 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.rdoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
1 change: 0 additions & 1 deletion spec/warbler/task_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion warbler.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down

0 comments on commit b550819

Please sign in to comment.