From 1fed67b820808589bf3b71d01f2276e21c6548ef Mon Sep 17 00:00:00 2001 From: Ben Gruver Date: Wed, 7 Mar 2018 16:19:45 -0800 Subject: [PATCH] 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 --- build.gradle | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/build.gradle b/build.gradle index 360e3db0..edaa4cd2 100644 --- a/build.gradle +++ b/build.gradle @@ -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 {