From 939754237f43a130a90e088f8f9e9b28caea5a46 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Sun, 21 Jul 2019 12:16:56 +0900
Subject: [PATCH 1/2] Do not use add_development_dependency.

---
 Gemfile       | 7 +++++++
 psych.gemspec | 5 -----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index fa75df15..bcfa159b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,10 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :development do
+  gem 'rake-compiler', ">= 0.4.1"
+  gem 'minitest', "~> 5.0"
+  gem 'rake-compiler-dock', ">= 0.6.3", :platforms => :ruby
+  gem 'ruby-maven', :platforms => :jruby
+end
diff --git a/psych.gemspec b/psych.gemspec
index 469ee5de..f564c51b 100644
--- a/psych.gemspec
+++ b/psych.gemspec
@@ -51,9 +51,6 @@ DESCRIPTION
   s.rubygems_version = "2.5.1"
   s.required_rubygems_version = Gem::Requirement.new(">= 0")
 
-  s.add_development_dependency 'rake-compiler', ">= 0.4.1"
-  s.add_development_dependency 'minitest', "~> 5.0"
-
   if RUBY_ENGINE == 'jruby'
     s.platform = 'java'
     s.files.concat [
@@ -67,9 +64,7 @@ DESCRIPTION
     ]
     s.requirements = "jar org.yaml:snakeyaml, #{Psych::DEFAULT_SNAKEYAML_VERSION}"
     s.add_dependency 'jar-dependencies', '>= 0.1.7'
-    s.add_development_dependency 'ruby-maven'
   else
     s.extensions = ["ext/psych/extconf.rb"]
-    s.add_development_dependency 'rake-compiler-dock', ">= 0.6.3"
   end
 end

From 25ae263252c101289754d8be4a114fce797e8f7e Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Sun, 21 Jul 2019 12:21:27 +0900
Subject: [PATCH 2/2] Drop to support fat gem support.

  ref. https://github.com/ruby/bigdecimal/pull/149
---
 Gemfile      |  1 -
 Rakefile     | 16 +---------------
 lib/psych.rb |  6 +-----
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/Gemfile b/Gemfile
index bcfa159b..3937d61b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,6 +5,5 @@ gemspec
 group :development do
   gem 'rake-compiler', ">= 0.4.1"
   gem 'minitest', "~> 5.0"
-  gem 'rake-compiler-dock', ">= 0.6.3", :platforms => :ruby
   gem 'ruby-maven', :platforms => :jruby
 end
diff --git a/Rakefile b/Rakefile
index 345edcd3..d08e0963 100644
--- a/Rakefile
+++ b/Rakefile
@@ -28,21 +28,7 @@ if RUBY_PLATFORM =~ /java/
   end
 else
   require 'rake/extensiontask'
-  spec = Gem::Specification.load("psych.gemspec")
-  Rake::ExtensionTask.new("psych", spec) do |ext|
-    ext.lib_dir = File.join(*['lib', ENV['FAT_DIR']].compact)
-    ext.cross_compile = true
-    ext.cross_platform = %w[x86-mingw32 x64-mingw32]
-    ext.cross_compiling do |s|
-      s.files.concat ["lib/2.3/psych.so", "lib/2.4/psych.so", "lib/2.5/psych.so"]
-    end
-  end
-end
-
-desc "Compile binaries for mingw platform using rake-compiler-dock"
-task 'build:mingw' do
-  require 'rake_compiler_dock'
-  RakeCompilerDock.sh "bundle && rake cross native gem RUBY_CC_VERSION=2.5.0:2.4.0:2.3.0"
+  Rake::ExtensionTask.new("psych")
 end
 
 task :default => [:compile, :test]
diff --git a/lib/psych.rb b/lib/psych.rb
index 2a2ec2af..9513f794 100644
--- a/lib/psych.rb
+++ b/lib/psych.rb
@@ -10,11 +10,7 @@
     org.jruby.ext.psych.PsychLibrary.new.load(JRuby.runtime, false)
   end
 else
-  begin
-    require "#{RUBY_VERSION[/\d+\.\d+/]}/psych.so"
-  rescue LoadError
-    require 'psych.so'
-  end
+  require 'psych.so'
 end
 require 'psych/nodes'
 require 'psych/streaming'