summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Oliver Nutter <headius@headius.com>2018-09-19 11:12:36 -0500
committerCharles Oliver Nutter <headius@headius.com>2018-09-19 11:12:36 -0500
commit96705dee85f767e9bb8a04f319ec3a2a90d29ac0 (patch)
tree05d66325a240ff4d16e5e9e9ea25a7a6313f4b72
parent7eba02c8ff311ab6a5cb25480420c3cad9212a36 (diff)
downloadpsych-96705dee85f767e9bb8a04f319ec3a2a90d29ac0.zip
Update to SnakeYAML 1.23.
-rw-r--r--ext/java/PsychParser.java2
-rw-r--r--lib/psych/versions.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/java/PsychParser.java b/ext/java/PsychParser.java
index aa6ab01..b660a0f 100644
--- a/ext/java/PsychParser.java
+++ b/ext/java/PsychParser.java
@@ -296,7 +296,7 @@ public class PsychParser extends RubyObject {
IRubyObject tag = stringOrNilFor(runtime, se.getTag(), tainted);
IRubyObject plain_implicit = runtime.newBoolean(se.getImplicit().canOmitTagInPlainScalar());
IRubyObject quoted_implicit = runtime.newBoolean(se.getImplicit().canOmitTagInNonPlainScalar());
- IRubyObject style = runtime.newFixnum(translateStyle(se.getStyle()));
+ IRubyObject style = runtime.newFixnum(translateStyle(se.getScalarStyle()));
IRubyObject val = stringFor(runtime, se.getValue(), tainted);
invoke(context, handler, "scalar", val, anchor, tag, plain_implicit,
diff --git a/lib/psych/versions.rb b/lib/psych/versions.rb
index b7e55d3..ed93609 100644
--- a/lib/psych/versions.rb
+++ b/lib/psych/versions.rb
@@ -4,6 +4,6 @@ module Psych
VERSION = '3.1.0.pre1'
if RUBY_ENGINE == 'jruby'
- DEFAULT_SNAKEYAML_VERSION = '1.21'.freeze
+ DEFAULT_SNAKEYAML_VERSION = '1.23'.freeze
end
end