From ebb75813f9d058e6f50399fe17a24a50194f1ba3 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Wed, 26 Feb 2020 19:36:14 +0300 Subject: [PATCH] Build: Don't disable incremental compilation for CI Using different incremental setting for KotlinCompile makes impossible using caches built on CI since it is marked as @Input. Same property for JavaCompile marked as @Internal. We do clean checkout now so it shouldn't matter but we want to build incrementally in some cases for Dev builds on CI. --- build.gradle.kts | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index ea408da0cbb..31c99dd92e0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,5 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import org.gradle.plugins.ide.idea.model.IdeaModel -import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import proguard.gradle.ProGuardTask @@ -448,17 +447,12 @@ allprojects { } gradle.taskGraph.whenReady { - if (isTeamcityBuild) { - logger.warn("CI build profile is active (IC is off, proguard is on). Use -Pteamcity=false to reproduce local build") - for (task in allTasks) { - when (task) { - is AbstractKotlinCompile<*> -> task.incremental = false - is JavaCompile -> task.options.isIncremental = false - } - } - } else { - logger.warn("Local build profile is active (IC is on, proguard is off). Use -Pteamcity=true to reproduce TC build") - } + fun Boolean.toOnOff(): String = if (this) "on" else "off" + val profile = if (isTeamcityBuild) "CI" else "Local" + + logger.warn("$profile build profile is active (proguard is ${kotlinBuildProperties.proguard.toOnOff()}" + + ", jar compression is ${kotlinBuildProperties.jarCompression.toOnOff()})." + + " Use -Pteamcity= to reproduce CI/local build") allTasks.filterIsInstance().forEach { task -> task.entryCompression = if (kotlinBuildProperties.jarCompression)