Add JDK detection

This commit is contained in:
Ilya Chernikov
2017-09-11 15:20:43 +02:00
parent 0c085cd0a2
commit e26b421e6c
3 changed files with 197 additions and 2 deletions
+11 -2
View File
@@ -38,6 +38,13 @@ buildScan {
setLicenseAgree("yes")
}
val configuredJdks: List<JdkId> =
getConfiguredJdks().also {
it.forEach {
logger.info("Using ${it.majorVersion} home: ${it.homeDir}")
}
}
val buildNumber = "1.1-SNAPSHOT"
extra["build.number"] = buildNumber
@@ -288,8 +295,10 @@ tasks {
}
fun jdkPath(version: String): String {
val varName = "JDK_${version.replace(".", "")}"
return System.getenv(varName) ?: throw GradleException ("Please set environment variable $varName to point to JDK $version installation")
val jdkName = "JDK_${version.replace(".", "")}"
val jdkMajorVersion = JdkMajorVersion.valueOf(jdkName)
return configuredJdks.find { it.majorVersion == jdkMajorVersion }?.homeDir?.canonicalPath
?: throw GradleException ("Please set environment variable $jdkName to point to JDK $version installation")
}
fun Project.configureJvmProject(javaHome: String, javaVersion: String) {