From b5942204dc65dbb330c1d58785aa1ab33b2b4d2f Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Tue, 13 Jul 2021 15:46:20 +0300 Subject: [PATCH] [KLIB] Enable accidentally disabled IC for klibs in K/JS --- .../kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index 9f9cca3cdba..f4026e418e4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -48,14 +48,11 @@ import org.jetbrains.kotlin.gradle.logging.GradlePrintingMessageCollector import org.jetbrains.kotlin.gradle.logging.kotlinDebug import org.jetbrains.kotlin.gradle.plugin.* import org.jetbrains.kotlin.gradle.plugin.mpp.* -import org.jetbrains.kotlin.gradle.plugin.mpp.associateWithTransitiveClosure import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinCompilationData import org.jetbrains.kotlin.gradle.plugin.statistics.KotlinBuildStatsService import org.jetbrains.kotlin.gradle.report.ReportingSettings import org.jetbrains.kotlin.gradle.targets.js.ir.isProduceUnzippedKlib import org.jetbrains.kotlin.gradle.utils.* -import org.jetbrains.kotlin.gradle.utils.isParentOf -import org.jetbrains.kotlin.gradle.utils.pathsAsStringRelativeTo import org.jetbrains.kotlin.incremental.ChangedFiles import org.jetbrains.kotlin.incremental.IncrementalCompilerRunner import org.jetbrains.kotlin.library.impl.isKotlinLibrary @@ -749,10 +746,10 @@ abstract class Kotlin2JsCompile @Inject constructor( } "-Xir-produce-klib-dir" in kotlinOptions.freeCompilerArgs -> { KotlinBuildStatsService.applyIfInitialised { - it.report(BooleanMetrics.JS_KLIB_INCREMENTAL, false) + it.report(BooleanMetrics.JS_KLIB_INCREMENTAL, incrementalJsKlib) } - false - } // TODO: it's not supported yet + incrementalJsKlib + } "-Xir-produce-klib-file" in kotlinOptions.freeCompilerArgs -> { KotlinBuildStatsService.applyIfInitialised { it.report(BooleanMetrics.JS_KLIB_INCREMENTAL, incrementalJsKlib)