|
@@ -155,14 +155,14 @@ class BuildPlugin implements Plugin<Project> {
|
|
|
println " Gradle Version : ${project.gradle.gradleVersion}"
|
|
|
println " OS Info : ${System.getProperty('os.name')} ${System.getProperty('os.version')} (${System.getProperty('os.arch')})"
|
|
|
if (gradleJavaVersionDetails != compilerJavaVersionDetails || gradleJavaVersionDetails != runtimeJavaVersionDetails) {
|
|
|
- println " Compiler JDK Version : ${getPaddedMajorVersion(compilerJavaVersionEnum)} (${compilerJavaVersionDetails})"
|
|
|
+ println " Compiler JDK Version : ${compilerJavaVersionEnum} (${compilerJavaVersionDetails})"
|
|
|
println " Compiler java.home : ${compilerJavaHome}"
|
|
|
- println " Runtime JDK Version : ${getPaddedMajorVersion(runtimeJavaVersionEnum)} (${runtimeJavaVersionDetails})"
|
|
|
+ println " Runtime JDK Version : ${runtimeJavaVersionEnum} (${runtimeJavaVersionDetails})"
|
|
|
println " Runtime java.home : ${runtimeJavaHome}"
|
|
|
- println " Gradle JDK Version : ${getPaddedMajorVersion(JavaVersion.toVersion(gradleJavaVersion))} (${gradleJavaVersionDetails})"
|
|
|
+ println " Gradle JDK Version : ${JavaVersion.toVersion(gradleJavaVersion)} (${gradleJavaVersionDetails})"
|
|
|
println " Gradle java.home : ${gradleJavaHome}"
|
|
|
} else {
|
|
|
- println " JDK Version : ${getPaddedMajorVersion(JavaVersion.toVersion(gradleJavaVersion))} (${gradleJavaVersionDetails})"
|
|
|
+ println " JDK Version : ${JavaVersion.toVersion(gradleJavaVersion)} (${gradleJavaVersionDetails})"
|
|
|
println " JAVA_HOME : ${gradleJavaHome}"
|
|
|
}
|
|
|
println " Random Testing Seed : ${project.testSeed}"
|
|
@@ -232,10 +232,6 @@ class BuildPlugin implements Plugin<Project> {
|
|
|
project.ext.java9Home = project.rootProject.ext.java9Home
|
|
|
}
|
|
|
|
|
|
- private static String getPaddedMajorVersion(JavaVersion compilerJavaVersionEnum) {
|
|
|
- compilerJavaVersionEnum.getMajorVersion().toString().padLeft(2)
|
|
|
- }
|
|
|
-
|
|
|
private static String findCompilerJavaHome() {
|
|
|
final String compilerJavaHome = System.getenv('JAVA_HOME')
|
|
|
final String compilerJavaProperty = System.getProperty('compiler.java')
|