From a3fc8191a7efc1540eec2649654a43f7e775f332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Fri, 14 Feb 2020 00:26:37 +0100 Subject: Remove unnecessary version guard from versions.rb Removing it triggers the following warnings when running `bundle` under jruby from the root of the `psych` repo prints the following warnings: ``` /path/to/jruby-9.2.9.0/lib/ruby/gems/shared/gems/psych-3.1.0-java/lib/psych/versions.rb:7: warning: already initialized constant VERSION /path/to//jruby-9.2.9.0/lib/ruby/gems/shared/gems/psych-3.1.0-java/lib/psych/versions.rb:10: warning: already initialized constant DEFAULT_SNAKEYAML_VERSION ``` This is because bundler loads the versions file relatively from the local gemspec, and then internally loads the psych gem, causing the redefinition warnings. Instead, we modify the $LOAD_PATH so that when working locally on the `psych` repo, the local version of `psych` gets used. --- lib/psych/versions.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/psych/versions.rb b/lib/psych/versions.rb index 731ba95..dfa1917 100644 --- a/lib/psych/versions.rb +++ b/lib/psych/versions.rb @@ -2,7 +2,7 @@ # frozen_string_literal: true module Psych # The version of Psych you are using - VERSION = '3.1.0' unless defined?(::Psych::VERSION) + VERSION = '3.1.0' if RUBY_ENGINE == 'jruby' DEFAULT_SNAKEYAML_VERSION = '1.23'.freeze -- cgit v1.2.3