8000 Relax version requirement for rubyzip by ioanatia · Pull Request #491 · jruby/warbler · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Relax version requirement for rubyzip #491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
rvm:
- jruby-9.0.5.0
- jruby-9.1.17.0
- jruby-9.2.0.0
jdk:
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.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.

Expand Down
2 changes: 1 addition & 1 deletion spec/warbler/jar_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion warbler.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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'
gem.add_development_dependency 'jbundler', '~> 0.9'
gem.add_development_dependency 'rspec', '~> 2.10'
end
0