diff --git a/build.gradle.kts b/build.gradle.kts index 44296a157bf..d9c392dc064 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -525,12 +525,16 @@ allprojects { outputs.doNotCacheIf("https://youtrack.jetbrains.com/issue/KTI-112") { true } } - normalization { - runtimeClasspath { - ignore("META-INF/MANIFEST.MF") - ignore("META-INF/compiler.version") - ignore("META-INF/plugin.xml") - ignore("kotlin/KotlinVersionCurrentValue.class") + if (isConfigurationCacheDisabled) { + // Custom input normolization isn't supported by configuration cache at the moment + // See https://github.com/gradle/gradle/issues/13706 + normalization { + runtimeClasspath { + ignore("META-INF/MANIFEST.MF") + ignore("META-INF/compiler.version") + ignore("META-INF/plugin.xml") + ignore("kotlin/KotlinVersionCurrentValue.class") + } } } diff --git a/buildSrc/src/main/kotlin/CommonUtil.kt b/buildSrc/src/main/kotlin/CommonUtil.kt index fde7467fbfb..84028c32dce 100644 --- a/buildSrc/src/main/kotlin/CommonUtil.kt +++ b/buildSrc/src/main/kotlin/CommonUtil.kt @@ -82,5 +82,8 @@ fun Task.singleOutputFile(): File = when (this) { else -> outputs.files.singleFile } +val Project.isConfigurationCacheDisabled + get() = (gradle.startParameter as? org.gradle.api.internal.StartParameterInternal)?.isConfigurationCache != true + val Project.isIdeaActive get() = providers.systemProperty("idea.active").forUseAtConfigurationTime().isPresent \ No newline at end of file diff --git a/gradle/report.gradle.kts b/gradle/report.gradle.kts index 03d7d6cc043..146537a921c 100644 --- a/gradle/report.gradle.kts +++ b/gradle/report.gradle.kts @@ -10,7 +10,7 @@ import org.gradle.api.logging.Logger import org.gradle.api.tasks.TaskState import java.util.HashMap -if ((gradle.startParameter as? org.gradle.api.internal.StartParameterInternal)?.isConfigurationCache != true) { +if (isConfigurationCacheDisabled) { BuildTimeReporter.configure(gradle) }