summaryrefslogtreecommitdiff
path: root/ext/psych
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-12-15 11:00:40 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-12-15 11:00:40 +0000
commitf9ee1409fa6c21ed890f927e1ec1962507d1d456 (patch)
treeab2d43819b2a60570685d9cc5dcb9afbf78d9649 /ext/psych
parentb53456731ebb9dab5b7cbfcd6789afcab2575e1e (diff)
Update psych-2.2.2
* It fixed only JRuby dependency issue. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57083 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/psych')
-rw-r--r--ext/psych/lib/psych/versions.rb2
-rw-r--r--ext/psych/psych.gemspec3
2 files changed, 3 insertions, 2 deletions
diff --git a/ext/psych/lib/psych/versions.rb b/ext/psych/lib/psych/versions.rb
index b01fa7d..455a014 100644
--- a/ext/psych/lib/psych/versions.rb
+++ b/ext/psych/lib/psych/versions.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: false
module Psych
# The version is Psych you're using
- VERSION = '2.2.1'
+ VERSION = '2.2.2'
if RUBY_ENGINE == 'jruby'
DEFAULT_SNAKEYAML_VERSION = '1.17'.freeze
diff --git a/ext/psych/psych.gemspec b/ext/psych/psych.gemspec
index df91ff4..9597e98 100644
--- a/ext/psych/psych.gemspec
+++ b/ext/psych/psych.gemspec
@@ -1,4 +1,5 @@
# -*- encoding: utf-8 -*-
+$:.unshift File.expand_path("../lib", __FILE__)
require 'psych'
Gem::Specification.new do |s|
@@ -33,7 +34,7 @@ DESCRIPTION
if RUBY_ENGINE == 'jruby'
s.platform = 'java'
s.files.concat ["ext/java/PsychEmitter.java", "ext/java/PsychLibrary.java", "ext/java/PsychParser.java", "ext/java/PsychToRuby.java", "ext/java/PsychYamlTree.java", "lib/psych_jars.rb", "lib/psych.jar"]
- s.requirements = "jar org.yaml:snakeyaml, #{Psych::DEFAULT_SNAKEYAML_VERSION}"
+ s.requirements = "jar org.yaml:snakeyaml, 1.17"
s.add_dependency 'jar-dependencies', '>= 0.1.7'
s.add_development_dependency 'ruby-maven'
else