Skip to content

Commit

Permalink
Update rake-compiler-dock to 0.7.0
Browse files Browse the repository at this point in the history
It adds support for ruby-2.6 and JRuby.
See rake-compiler/rake-compiler-dock#21
  • Loading branch information
larskanis authored and pitr-ch committed Jan 1, 2019
1 parent 5e18636 commit 9757a5a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 21 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -12,7 +12,7 @@ gem 'concurrent-ruby-ext', Concurrent::VERSION, options.merge(platform: :mri)
group :development do
gem 'rake', '~> 12.0'
gem 'rake-compiler', '~> 1.0'
gem 'rake-compiler-dock', '~> 0.6.0'
gem 'rake-compiler-dock', '~> 0.7.0'
gem 'pry', '~> 0.11', platforms: :mri
end

Expand Down
9 changes: 5 additions & 4 deletions Rakefile
Expand Up @@ -80,9 +80,10 @@ namespace :repackage do
# store gems in vendor cache for docker
sh 'bundle package'

# needed only if the jar is built outside of docker
Rake::Task['lib/concurrent/concurrent_ruby.jar'].invoke
RakeCompilerDock.exec 'support/cross_building.sh'
# build only the jar file not the whole gem for java platform, the jar is part the concurrent-ruby-x.y.z.gem
RakeCompilerDock.sh 'bundle install --local && bundle exec rake lib/concurrent/concurrent_ruby.jar --trace', rubyvm: :jruby
# build all gem files
RakeCompilerDock.sh 'bundle install --local && bundle exec rake cross native package --trace'
end
end
end
Expand Down Expand Up @@ -275,7 +276,7 @@ namespace :release do
end

desc '* build all *.gem files necessary for release'
task :build => 'repackage:all'
task :build => [:clobber, 'repackage:all']

desc '* test actual installed gems instead of cloned repository on MRI and JRuby'
task :test do
Expand Down
16 changes: 0 additions & 16 deletions support/cross_building.sh

This file was deleted.

0 comments on commit 9757a5a

Please sign in to comment.