diff options
| author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-21 17:55:23 +0000 |
|---|---|---|
| committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-21 17:55:23 +0000 |
| commit | 226c6a1bdc6a50af1b6a7c374a1268f51a5bc23c (patch) | |
| tree | d6325105afc9aefcbd3b3e177f8f036e66195e9f /ext/psych/lib/psych.rb | |
| parent | 2a1569d6932b843b4b02883685fa05cd3c82d992 (diff) | |
* ext/psych/*: update to Psych 2.0.14
* test/psych/*: ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51657 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/psych/lib/psych.rb')
| -rw-r--r-- | ext/psych/lib/psych.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb index 085e828224..ef8f12a472 100644 --- a/ext/psych/lib/psych.rb +++ b/ext/psych/lib/psych.rb @@ -1,4 +1,10 @@ -require 'psych.so' +case RUBY_ENGINE +when 'jruby' + require 'psych_jars' + org.jruby.ext.psych.PsychLibrary.new.load(JRuby.runtime, false) +else + require 'psych.so' +end require 'psych/nodes' require 'psych/streaming' require 'psych/visitors' @@ -217,7 +223,7 @@ require 'psych/class_loader' module Psych # The version is Psych you're using - VERSION = '2.0.13' + VERSION = '2.0.14' # The version of libyaml Psych is using LIBYAML_VERSION = Psych.libyaml_version.join '.' |