diff options
| author | Charles Oliver Nutter <headius@headius.com> | 2017-02-23 09:37:22 -0600 |
|---|---|---|
| committer | Charles Oliver Nutter <headius@headius.com> | 2017-02-23 09:37:22 -0600 |
| commit | fc55b92ed76836ded814149628828bc424bd3af1 (patch) | |
| tree | dec8aa873326956069daa5291bee4a5439960556 | |
| parent | ed272d20cf0930231abe82b5d90dbd9827b9243e (diff) | |
| download | psych-fc55b92ed76836ded814149628828bc424bd3af1.tar.gz | |
Remove load of psych during gem builds and bump snakeyaml to 1.18.
Fixes #293.
Fixes jruby/jruby#4492.
| -rw-r--r-- | Rakefile | 4 | ||||
| -rw-r--r-- | lib/psych/versions.rb | 2 | ||||
| -rw-r--r-- | psych.gemspec | 4 |
3 files changed, 3 insertions, 7 deletions
@@ -1,5 +1,3 @@ -$LOAD_PATH.unshift './lib' -load 'psych/versions.rb' require "bundler/gem_tasks" require "rake/testtask" @@ -19,7 +17,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=1.17", '-Dverbose=true') + Maven::Ruby::Maven.new.exec('dependency:build-classpath', "-Dsnakeyaml.version=1.18", '-Dverbose=true') ext.source_version = '1.7' ext.target_version = '1.7' ext.classpath = File.read('pkg/classpath') diff --git a/lib/psych/versions.rb b/lib/psych/versions.rb index 455a014..b818eb9 100644 --- a/lib/psych/versions.rb +++ b/lib/psych/versions.rb @@ -4,6 +4,6 @@ module Psych VERSION = '2.2.2' if RUBY_ENGINE == 'jruby' - DEFAULT_SNAKEYAML_VERSION = '1.17'.freeze + DEFAULT_SNAKEYAML_VERSION = '1.18'.freeze end end diff --git a/psych.gemspec b/psych.gemspec index cf8bac3..7a20d02 100644 --- a/psych.gemspec +++ b/psych.gemspec @@ -1,6 +1,4 @@ # -*- encoding: utf-8 -*- -$:.unshift File.expand_path("../lib", __FILE__) -require 'psych' Gem::Specification.new do |s| s.name = "psych" @@ -34,7 +32,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, 1.17" + s.requirements = "jar org.yaml:snakeyaml, 1.18" s.add_dependency 'jar-dependencies', '>= 0.1.7' s.add_development_dependency 'ruby-maven' else |