From e18769a0ac70d08555ceffaaf10b229ff638266b Mon Sep 17 00:00:00 2001
From: Lars Kanis <lars@greiz-reinsdorf.de>
Date: Wed, 26 Dec 2018 00:24:21 +0100
Subject: [PATCH] Update Windows cross build for ruby-2.6

Add a JRuby task which makes use of new JRuby support in rake-compiler-dock-0.7.0
---
 .cross_rubies |  2 ++
 Gemfile       |  2 +-
 Rakefile      | 10 ++++++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.cross_rubies b/.cross_rubies
index 6e8a31c069..9810448bbe 100644
--- a/.cross_rubies
+++ b/.cross_rubies
@@ -1,3 +1,5 @@
+2.6.0:i686-w64-mingw32
+2.6.0:x86_64-w64-mingw32
 2.5.0:i686-w64-mingw32
 2.5.0:x86_64-w64-mingw32
 2.4.0:i686-w64-mingw32
diff --git a/Gemfile b/Gemfile
index 174fed538a..cfb4b8f25a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,7 @@ gem "hoe-git", "~>1.6", :group => [:development, :test]
 gem "minitest", "~>5.8.4", :group => [:development, :test]
 gem "rake", "~>12.0", :group => [:development, :test]
 gem "rake-compiler", "~>1.0.3", :group => [:development, :test]
-gem "rake-compiler-dock", "~>0.6.2", :group => [:development, :test]
+gem "rake-compiler-dock", "~>0.7.0", :group => [:development, :test]
 gem "racc", "~>1.4.14", :group => [:development, :test]
 gem "rexical", "~>1.0.5", :group => [:development, :test]
 gem "concourse", "~>0.15", :group => [:development, :test]
diff --git a/Rakefile b/Rakefile
index a7391dfe07..e25329d87a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -138,7 +138,7 @@ HOE = Hoe.spec 'nokogiri' do
     ["minitest",           "~> 5.8.4"],
     ["rake",               "~> 12.0"],
     ["rake-compiler",      "~> 1.0.3"],
-    ["rake-compiler-dock", "~> 0.6.2"],
+    ["rake-compiler-dock", "~> 0.7.0"],
     ["racc",               "~> 1.4.14"],
     ["rexical",            "~> 1.0.5"],
     ["concourse",          "~> 0.15"],
@@ -316,10 +316,16 @@ task :cross do
   end
 end
 
-desc "build a windows gem without all the ceremony."
+desc "build a windows gem without all the ceremony"
 task "gem:windows" do
   require "rake_compiler_dock"
   RakeCompilerDock.sh "bundle && rake cross native gem MAKE='nice make -j`nproc`' RUBY_CC_VERSION=#{ENV['RUBY_CC_VERSION']}"
 end
 
+desc "build a jruby gem with docker"
+task "gem:jruby" do
+  require "rake_compiler_dock"
+  RakeCompilerDock.sh "bundle && rake java gem", rubyvm: 'jruby'
+end
+
 # vim: syntax=Ruby