Skip to content

Commit

Permalink
Merge pull request #614 from heroku/jkutner/jvm_version
Browse files Browse the repository at this point in the history
Added explicit case for JVM version 8 or 1.8 in system.properties
  • Loading branch information
schneems authored Aug 15, 2017
2 parents 12f1ac7 + aa9a6c6 commit dbf4ffb
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/language_pack/helpers/jvm_installer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def install(jruby_version, forced = false)
fetch_env_untar('JDK_URL_1_7') || fetch_untar(JVM_1_7_PATH, "openjdk-7")
when "1.6", "6"
fetch_env_untar('JDK_URL_1_6') || fetch_untar(JVM_1_6_PATH, "openjdk-6")
when nil
when "1.8", "8", nil
if @stack == "cedar"
if forced || Gem::Version.new(jruby_version) >= Gem::Version.new("1.7.4")
fetch_untar(JVM_1_7_PATH, "openjdk-7")
Expand Down

0 comments on commit dbf4ffb

Please sign in to comment.