Merge pull request #788 from larskanis/update-windows-and-jruby-build

Update rake-compiler-dock to 0.7.0

Author: pitr-ch

Gemfile

@@ -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
 

Rakefile

@@ -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
@@ -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