diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Rakefile | 2 | ||||
| -rw-r--r-- | ext/java/PsychParser.java | 5 | ||||
| -rw-r--r-- | psych.gemspec | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 43df507..8988303 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,8 @@ matrix: before_install: gem install bundler --no-document +script: rake + addons: apt: packages: @@ -19,7 +19,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') + Maven::Ruby::Maven.new.exec('dependency:build-classpath', "-Dsnakeyaml.version=1.17", '-Dverbose=true') 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/psych.gemspec b/psych.gemspec index 019c4c5..9597e98 100644 --- a/psych.gemspec +++ b/psych.gemspec @@ -34,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 |