From 6b3d6756d835cbf73e807b092456616657141225 Mon Sep 17 00:00:00 2001 From: Michael Zaccari Date: Wed, 23 Nov 2016 12:51:23 -0500 Subject: [PATCH 1/2] fix: load ruby-prof for mri This fixes bundle installs for JRuby --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 6b145aa1..89ed374d 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ group :test do end group :profile do - gem 'ruby-prof' + gem 'ruby-prof', :platforms => :ruby end platforms :rbx do From 61d54e640b819e4a00748272497b55a04236d951 Mon Sep 17 00:00:00 2001 From: Michael Zaccari Date: Wed, 23 Nov 2016 12:56:48 -0500 Subject: [PATCH 2/2] refactor: upgrade rubyzip to 1.2.0 The fix for JRuby's ObjectSpace is the motivation for this PR. There doesn't appear to be any breaking changes, mostly bugfixes: https://github.com/rubyzip/rubyzip/blob/master/Changelog.md#120 All tests pass with MRI/JRuby --- axlsx.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/axlsx.gemspec b/axlsx.gemspec index b4cec557..81c30c71 100644 --- a/axlsx.gemspec +++ b/axlsx.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |s| s.test_files = Dir.glob("{test/**/*}") s.add_runtime_dependency 'nokogiri', '>= 1.6.6' - s.add_runtime_dependency 'rubyzip', '~> 1.1.7' + s.add_runtime_dependency 'rubyzip', '~> 1.2' s.add_runtime_dependency "htmlentities", "~> 4.3.4" s.add_runtime_dependency "mimemagic", "~> 0.3"