1 files changed, 32 insertions, 21 deletions
diff --git a/ext/psych/psych.gemspec b/ext/psych/psych.gemspec
index 65dd7156cb..a3fc53a8b9 100644
--- a/ext/psych/psych.gemspec
+++ b/ext/psych/psych.gemspec
@@ -21,31 +21,41 @@ DESCRIPTION
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
 
-  # for ruby core repository. It was generated by `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  # for ruby core repository.
+  # It was generated by
+  # `git ls-files -z`.split("\x0").reject { |f|
+  #   f.match(%r{^\.git|^(test|spec|features|bin|tool)/|^[A-Z]\w+file$|/extlibs$|\.(gemspec|java)$|jar})
+  # }
   s.files = [
-    ".gitignore", "Gemfile", "LICENSE", "Mavenfile", "README.md", "Rakefile", "bin/console",
-    "bin/setup", "ext/psych/depend", "ext/psych/extconf.rb", "ext/psych/psych.c", "ext/psych/psych.h",
-    "ext/psych/psych_emitter.c", "ext/psych/psych_emitter.h", "ext/psych/psych_parser.c", "ext/psych/psych_parser.h",
-    "ext/psych/psych_to_ruby.c", "ext/psych/psych_to_ruby.h", "ext/psych/psych_yaml_tree.c", "ext/psych/psych_yaml_tree.h",
-    "ext/psych/yaml/LICENSE", "ext/psych/yaml/api.c", "ext/psych/yaml/config.h", "ext/psych/yaml/dumper.c",
-    "ext/psych/yaml/emitter.c", "ext/psych/yaml/loader.c", "ext/psych/yaml/parser.c", "ext/psych/yaml/reader.c",
-    "ext/psych/yaml/scanner.c", "ext/psych/yaml/writer.c", "ext/psych/yaml/yaml.h", "ext/psych/yaml/yaml_private.h",
-    "lib/psych.rb", "lib/psych/class_loader.rb", "lib/psych/coder.rb", "lib/psych/core_ext.rb", "lib/psych/exception.rb",
-    "lib/psych/handler.rb", "lib/psych/handlers/document_stream.rb", "lib/psych/handlers/recorder.rb",
-    "lib/psych/json/ruby_events.rb", "lib/psych/json/stream.rb", "lib/psych/json/tree_builder.rb",
-    "lib/psych/json/yaml_events.rb", "lib/psych/nodes.rb", "lib/psych/nodes/alias.rb", "lib/psych/nodes/document.rb",
-    "lib/psych/nodes/mapping.rb", "lib/psych/nodes/node.rb", "lib/psych/nodes/scalar.rb", "lib/psych/nodes/sequence.rb",
-    "lib/psych/nodes/stream.rb", "lib/psych/omap.rb", "lib/psych/parser.rb", "lib/psych/scalar_scanner.rb",
-    "lib/psych/set.rb", "lib/psych/stream.rb", "lib/psych/streaming.rb", "lib/psych/syntax_error.rb",
-    "lib/psych/tree_builder.rb", "lib/psych/versions.rb", "lib/psych/visitors.rb","lib/psych/visitors/depth_first.rb",
-    "lib/psych/visitors/emitter.rb", "lib/psych/visitors/json_tree.rb", "lib/psych/visitors/to_ruby.rb",
-    "lib/psych/visitors/visitor.rb", "lib/psych/visitors/yaml_tree.rb", "lib/psych/y.rb", "psych.gemspec"
+    "CONTRIBUTING.md", "LICENSE", "README.md", "ext/psych/depend",
+    "ext/psych/extconf.rb", "ext/psych/psych.c", "ext/psych/psych.h",
+    "ext/psych/psych_emitter.c", "ext/psych/psych_emitter.h",
+    "ext/psych/psych_parser.c", "ext/psych/psych_parser.h",
+    "ext/psych/psych_to_ruby.c", "ext/psych/psych_to_ruby.h",
+    "ext/psych/psych_yaml_tree.c", "ext/psych/psych_yaml_tree.h",
+    "lib/psych.rb", "lib/psych/class_loader.rb", "lib/psych/coder.rb",
+    "lib/psych/core_ext.rb", "lib/psych/exception.rb", "lib/psych/handler.rb",
+    "lib/psych/handlers/document_stream.rb", "lib/psych/handlers/recorder.rb",
+    "lib/psych/json/ruby_events.rb", "lib/psych/json/stream.rb",
+    "lib/psych/json/tree_builder.rb", "lib/psych/json/yaml_events.rb",
+    "lib/psych/nodes.rb", "lib/psych/nodes/alias.rb",
+    "lib/psych/nodes/document.rb", "lib/psych/nodes/mapping.rb",
+    "lib/psych/nodes/node.rb", "lib/psych/nodes/scalar.rb",
+    "lib/psych/nodes/sequence.rb", "lib/psych/nodes/stream.rb",
+    "lib/psych/omap.rb", "lib/psych/parser.rb", "lib/psych/scalar_scanner.rb",
+    "lib/psych/set.rb", "lib/psych/stream.rb", "lib/psych/streaming.rb",
+    "lib/psych/syntax_error.rb", "lib/psych/tree_builder.rb",
+    "lib/psych/versions.rb", "lib/psych/visitors.rb",
+    "lib/psych/visitors/depth_first.rb", "lib/psych/visitors/emitter.rb",
+    "lib/psych/visitors/json_tree.rb", "lib/psych/visitors/to_ruby.rb",
+    "lib/psych/visitors/visitor.rb", "lib/psych/visitors/yaml_tree.rb",
+    "lib/psych/y.rb"
   ]
 
   s.rdoc_options = ["--main", "README.md"]
   s.extra_rdoc_files = ["README.md"]
 
-  s.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  s.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
   s.required_rubygems_version = Gem::Requirement.new(">= 0")
 
   if RUBY_ENGINE == 'jruby'
@@ -55,15 +65,16 @@ DESCRIPTION
       "ext/java/org/jruby/ext/psych/PsychLibrary.java",
       "ext/java/org/jruby/ext/psych/PsychParser.java",
       "ext/java/org/jruby/ext/psych/PsychToRuby.java",
-      "ext/java/org/jruby/ext/psych/PsychYamlTree.java",
       "lib/psych_jars.rb",
       "lib/psych.jar"
     ]
-    s.requirements = "jar org.yaml:snakeyaml, #{version_module::Psych::DEFAULT_SNAKEYAML_VERSION}"
+    s.requirements = "jar org.snakeyaml:snakeyaml-engine, #{version_module::Psych::DEFAULT_SNAKEYAML_VERSION}"
     s.add_dependency 'jar-dependencies', '>= 0.1.7'
   else
     s.extensions = ["ext/psych/extconf.rb"]
     s.add_dependency 'stringio'
   end
 
+  s.metadata['msys2_mingw_dependencies'] = 'libyaml'
+  s.metadata['changelog_uri'] = s.homepage + '/releases'
 end