From 2a3bb2968e2d407bc8efa860a8b4ec83a2f7b28d Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 3 Jul 2019 12:47:23 +0300 Subject: [PATCH] Revert "Call configureJvmProject once per project in afterEvaluate" This reverts commit 33de71f7 --- build.gradle.kts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7b652803cdb..82a3ef5620d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -339,6 +339,8 @@ allprojects { internalKotlinRepo?.let(::maven) } + configureJvmProject(javaHome!!, jvmTarget!!) + val commonCompilerArgs = listOfNotNull( "-Xallow-kotlin-package", "-Xread-deserialized-contracts", @@ -379,8 +381,10 @@ allprojects { task("listDistJar") { listConfigurationContents("distJar") } afterEvaluate { - logger.info("configuring project $name to compile to the target jvm version $jvmTarget using jdk: $javaHome") - configureJvmProject(javaHome!!, jvmTarget!!) + 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 fun File.toProjectRootRelativePathOrSelf() = (relativeToOrNull(rootDir)?.takeUnless { it.startsWith("..") } ?: this).path