diff options
author | Charles Oliver Nutter <headius@headius.com> | 2016-12-13 16:36:50 -0600 |
---|---|---|
committer | Charles Oliver Nutter <headius@headius.com> | 2016-12-13 16:47:47 -0600 |
commit | cb13c8b48797454767092ddfa135d749309e0a76 (patch) | |
tree | acc48eb406ec2484f487b02c9c7595cbe5b41148 | |
parent | 893d2fe7ba05e246a2378f20b480f6191e04e456 (diff) | |
download | psych-cb13c8b48797454767092ddfa135d749309e0a76.zip |
Hardcode Snakeyaml versions to avoid conflict with JRuby consts.
-rw-r--r-- | Rakefile | 2 | ||||
-rw-r--r-- | psych.gemspec | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -17,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=#{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/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 |