Allow to use Gradle property to configure JDK path

2017-09-21 05:50:50 +02:00
parent 4428ba0bb7
commit 3d8486e8a6
2 changed files with 4 additions and 1 deletions
@@ -19,7 +19,8 @@ data class JdkId(val explicit: Boolean, val majorVersion: JdkMajorVersion, var v
 fun Project.getConfiguredJdks(): List<JdkId> {
    val res = arrayListOf<JdkId>()
    for (jdkMajorVersion in JdkMajorVersion.values()) {
-        val explicitJdkEnvVal = System.getenv(jdkMajorVersion.name)
+        val explicitJdkEnvVal = findProperty(jdkMajorVersion.name)?.toString()
+                ?: System.getenv(jdkMajorVersion.name)
                ?: jdkAlternativeVarNames[jdkMajorVersion]?.mapNotNull { System.getenv(it) }?.firstOrNull()
                ?: continue
        val explicitJdk = File(explicitJdkEnvVal)