Don't use java 1.6 for release.

It's becoming non-trivial to even get a 1.6 JDK these days.

Releases will be done with 1.8 instead
This commit is contained in:
Ben Gruver 2018-03-07 16:19:45 -08:00
parent 37eb703409
commit 1fed67b820

View File

@ -57,11 +57,6 @@ if (!('release' in gradle.startParameter.taskNames)) {
version += "-${versionSuffix}"
} else {
jcommanderVersion = 'com.beust:jcommander:1.64'
if (System.env.JDK6_HOME == null && !JavaVersion.current().isJava6()) {
throw new InvalidUserDataException("bzzzzzzzt. Release builds must be performed with java 6. " +
"Either run gradle with java 6, or define the JDK6_HOME environment variable.")
}
}
// Note: please don't use this. This is strictly for the official releases
@ -88,19 +83,6 @@ subprojects {
}
}
if (System.env.JDK6_HOME != null) {
sourceCompatibility = 1.6
targetCompatibility = 1.6
tasks.withType(JavaCompile) {
doFirst {
options.fork = true
options.bootClasspath = "$System.env.JDK6_HOME/jre/lib/rt.jar"
options.bootClasspath += "$File.pathSeparator$System.env.JDK6_HOME/jre/lib/jsse.jar"
}
}
}
version = parent.version
ext {