Skip to content

Commit d971204

Browse files
committed
jruby: retain original SNAKEYAML_VERSION
1 parent 4cb157d commit d971204

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

ext/java/org/jruby/ext/psych/PsychLibrary.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@ public void load(final Ruby runtime, boolean wrap) {
6565
}
6666
String snakeyamlVersion = props.getProperty("version", DUMMY_VERSION);
6767

68+
RubyString version = runtime.newString(snakeyamlVersion);
69+
version.setFrozen(true);
70+
psych.setConstant("SNAKEYAML_VERSION", version); // e.g. 2.10-SNAPSHOT
71+
6872
if (snakeyamlVersion.endsWith("-SNAPSHOT")) {
6973
snakeyamlVersion = snakeyamlVersion.substring(0, snakeyamlVersion.length() - "-SNAPSHOT".length());
7074
}
7175

72-
RubyString version = runtime.newString(snakeyamlVersion + ".0");
73-
version.setFrozen(true);
74-
psych.setConstant("SNAKEYAML_VERSION", version);
75-
76-
String[] versionParts = version.toString().split("\\.");
76+
String[] versionParts = (snakeyamlVersion + ".0").split("\\."); // 2.10-SNAPSHOT -> 2.10.0
7777
final RubyArray versionElements = runtime.newArray(runtime.newFixnum(Integer.parseInt(versionParts[0])), runtime.newFixnum(Integer.parseInt(versionParts[1])), runtime.newFixnum(Integer.parseInt(versionParts[2])));
7878
versionElements.setFrozen(true);
7979

0 commit comments

Comments
 (0)