diff options
| author | Charles Oliver Nutter <headius@headius.com> | 2016-11-17 12:01:19 -0600 |
|---|---|---|
| committer | Charles Oliver Nutter <headius@headius.com> | 2016-11-17 12:01:19 -0600 |
| commit | 146a637e2205b2b36a6fa83fc0c6f7ce0c74e123 (patch) | |
| tree | 6dd9d6eb27b8713cfc3760646f07de416d3f49e7 | |
| parent | cf1264d636417bbd5ce51e1c284a452f0cf1f8ba (diff) | |
| download | psych-146a637e2205b2b36a6fa83fc0c6f7ce0c74e123.tar.gz | |
Update to snakeyaml 1.17.update_snakeyaml
I had to hard-code two places that referenced a constant under
Psych because neither the Rakefile nor a "gem build" loads that
file. It was picking up the older version in my current JRuby
process.
| -rw-r--r-- | Rakefile | 2 | ||||
| -rw-r--r-- | ext/java/PsychParser.java | 5 | ||||
| -rw-r--r-- | lib/psych/versions.rb | 2 | ||||
| -rw-r--r-- | psych.gemspec | 2 |
4 files changed, 5 insertions, 6 deletions
@@ -15,7 +15,7 @@ if RUBY_PLATFORM =~ /java/ # and tell maven via system properties the snakeyaml version # this is basically the same as running from the commandline: # rmvn dependency:build-classpath -Dsnakeyaml.version='use version from Psych::DEFAULT_SNAKEYAML_VERSION here' - Maven::Ruby::Maven.new.exec( 'dependency:build-classpath', "-Dsnakeyaml.version=#{Psych::DEFAULT_SNAKEYAML_VERSION}", '-Dverbose=true')#, '--quiet' ) + Maven::Ruby::Maven.new.exec( 'dependency:build-classpath', "-Dsnakeyaml.version=1.17", '-Dverbose=true')#, '--quiet' ) ext.source_version = '1.7' ext.target_version = '1.7' ext.classpath = File.read('pkg/classpath') diff --git a/ext/java/PsychParser.java b/ext/java/PsychParser.java index b6868f9..ec00501 100644 --- a/ext/java/PsychParser.java +++ b/ext/java/PsychParser.java @@ -241,10 +241,9 @@ public class PsychParser extends RubyObject { private void handleDocumentStart(ThreadContext context, DocumentStartEvent dse, boolean tainted, IRubyObject handler) { Ruby runtime = context.runtime; DumperOptions.Version _version = dse.getVersion(); - Integer[] versionInts = _version == null ? null : _version.getArray(); - IRubyObject version = versionInts == null ? + IRubyObject version = _version == null ? RubyArray.newArray(runtime) : - RubyArray.newArray(runtime, runtime.newFixnum(versionInts[0]), runtime.newFixnum(versionInts[1])); + RubyArray.newArray(runtime, runtime.newFixnum(_version.major()), runtime.newFixnum(_version.minor())); Map<String, String> tagsMap = dse.getTags(); RubyArray tags = RubyArray.newArray(runtime); diff --git a/lib/psych/versions.rb b/lib/psych/versions.rb index 5f7652b..62fca91 100644 --- a/lib/psych/versions.rb +++ b/lib/psych/versions.rb @@ -1,4 +1,4 @@ # frozen_string_literal: false module Psych - DEFAULT_SNAKEYAML_VERSION = '1.14'.freeze + DEFAULT_SNAKEYAML_VERSION = '1.17'.freeze end diff --git a/psych.gemspec b/psych.gemspec index 6276365..21f74ea 100644 --- a/psych.gemspec +++ b/psych.gemspec @@ -32,7 +32,7 @@ DESCRIPTION if RUBY_PLATFORM =~ /java/ require 'psych/versions' s.platform = 'java' - 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 |