Skip to content

Commit

Permalink
Fix: update default java version
Browse files Browse the repository at this point in the history
  • Loading branch information
flaviomu committed Mar 29, 2018
1 parent 5966045 commit 15fdc62
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions gradle/gradle/packaging.plugin-vimdriver-amazon.debian.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ ext {
task logDebianPackageJavaDependency() {
// print the logs about the correct java dependency
doLast() {
if (project.hasProperty('javaVersion') && (javaVersion == "8")) {
println " * Adding debian package dependency to Java 8"
if (project.hasProperty('javaVersion') && (javaVersion == "7")) {
println " * Adding debian package dependency to Java 7"
}
else {
println " * Adding debian package dependency to Java 7"
println " * Adding debian package dependency to Java 8"
}
}
}
Expand All @@ -54,11 +54,11 @@ task makeDeb(type: Deb, dependsOn: [jar, build, logDebianPackageJavaDependency])
preInstall file('gradle/gradle/scripts/debian/preinst')

// set the correct java dependency
if (project.hasProperty('javaVersion') && (javaVersion == "8")) {
requires('openjdk-8-jre')
if (project.hasProperty('javaVersion') && (javaVersion == "7")) {
requires('openjdk-7-jre')
}
else {
requires('openjdk-7-jre')
requires('openjdk-8-jre')
}

// Copy files from "from path" to "into path"
Expand Down

0 comments on commit 15fdc62

Please sign in to comment.