From f96153693ec069ddadbe779a5adc5540fe7917d2 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Mon, 13 Nov 2017 13:16:52 +0100 Subject: [PATCH] Make tools.jar search non-throwing --- buildSrc/src/main/kotlin/dependencies.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/buildSrc/src/main/kotlin/dependencies.kt b/buildSrc/src/main/kotlin/dependencies.kt index 547f944d4f4..624b5f4713a 100644 --- a/buildSrc/src/main/kotlin/dependencies.kt +++ b/buildSrc/src/main/kotlin/dependencies.kt @@ -86,8 +86,7 @@ private fun String.toMaybeVersionedJarRegex(): Regex { private val jreHome = System.getProperty("java.home") -fun firstFromJavaHomeThatExists(vararg paths: String): File = +fun firstFromJavaHomeThatExists(vararg paths: String): File? = paths.mapNotNull { File(jreHome, it).takeIf { it.exists() } }.firstOrNull() - ?: throw GradleException("Cannot find under '$jreHome' neither of: ${paths.joinToString()}") -fun toolsJar(): File = firstFromJavaHomeThatExists("../lib/tools.jar", "../Classes/tools.jar") +fun toolsJar(): File? = firstFromJavaHomeThatExists("../lib/tools.jar", "../Classes/tools.jar")