From 33de71f7920d0d7e9986145e584a38613856e551 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 10 Jun 2019 20:51:11 +0300 Subject: [PATCH] Call configureJvmProject once per project in afterEvaluate Calling it twice does not seem to make sense now --- build.gradle.kts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index cd038f0bb6b..833c345c5d6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -339,8 +339,6 @@ allprojects { internalKotlinRepo?.let(::maven) } - configureJvmProject(javaHome!!, jvmTarget!!) - val commonCompilerArgs = listOfNotNull( "-Xallow-kotlin-package", "-Xread-deserialized-contracts", @@ -381,10 +379,8 @@ allprojects { task("listDistJar") { listConfigurationContents("distJar") } afterEvaluate { - if (javaHome != defaultJavaHome || jvmTarget != defaultJvmTarget) { - logger.info("configuring project $name to compile to the target jvm version $jvmTarget using jdk: $javaHome") - configureJvmProject(javaHome!!, jvmTarget!!) - } // else we will actually fail during the first task execution. We could not fail before configuration is done due to impact on import in IDE + logger.info("configuring project $name to compile to the target jvm version $jvmTarget using jdk: $javaHome") + configureJvmProject(javaHome!!, jvmTarget!!) fun File.toProjectRootRelativePathOrSelf() = (relativeToOrNull(rootDir)?.takeUnless { it.startsWith("..") } ?: this).path