summaryrefslogtreecommitdiff
path: root/ext/psych/lib
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-30 13:55:02 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-30 13:55:02 +0000
commit48e251df47c6f00adbd48a23c5fe58a1b406c060 (patch)
tree5aee813a86772cfdfc3c46c8f90b432b7e5395dd /ext/psych/lib
parent5e4b84552286d07c45ad167f0b3127624bda6b4d (diff)
Update psych-2.2.1
It fixed segmentation fault related with GC. https://github.com/ruby/psych/pull/296 and removed deprecated code of Ruby 1.8. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56944 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/psych/lib')
-rw-r--r--ext/psych/lib/psych.rb4
-rw-r--r--ext/psych/lib/psych/versions.rb7
2 files changed, 7 insertions, 4 deletions
diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb
index ecef46c024..b117b25f45 100644
--- a/ext/psych/lib/psych.rb
+++ b/ext/psych/lib/psych.rb
@@ -1,4 +1,5 @@
# frozen_string_literal: false
+require 'psych/versions'
case RUBY_ENGINE
when 'jruby'
require 'psych_jars'
@@ -223,9 +224,6 @@ require 'psych/class_loader'
# # => "a"
module Psych
- # The version is Psych you're using
- VERSION = '2.1.1'
-
# The version of libyaml Psych is using
LIBYAML_VERSION = Psych.libyaml_version.join '.'
diff --git a/ext/psych/lib/psych/versions.rb b/ext/psych/lib/psych/versions.rb
index 5f7652b097..b01fa7df1b 100644
--- a/ext/psych/lib/psych/versions.rb
+++ b/ext/psych/lib/psych/versions.rb
@@ -1,4 +1,9 @@
# frozen_string_literal: false
module Psych
- DEFAULT_SNAKEYAML_VERSION = '1.14'.freeze
+ # The version is Psych you're using
+ VERSION = '2.2.1'
+
+ if RUBY_ENGINE == 'jruby'
+ DEFAULT_SNAKEYAML_VERSION = '1.17'.freeze
+ end
end