From 5c852347a1e9df076ac2a0cccf64427874fddadd Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Mon, 14 Aug 2023 13:36:18 +0200 Subject: [PATCH] [Gradle] Copy ABI_SNAPSHOT_FILE_NAME constant It allows getting rid of the dependency on `:compiler:incremental-compilation-impl` #KT-61449 In Progress --- .../jetbrains/kotlin/gradle/tasks/AbstractKotlinCompile.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/AbstractKotlinCompile.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/AbstractKotlinCompile.kt index 7ac7d3df3d8..2f4cd49390b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/AbstractKotlinCompile.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/AbstractKotlinCompile.kt @@ -38,13 +38,14 @@ import org.jetbrains.kotlin.gradle.plugin.internal.UsesBuildIdProviderService import org.jetbrains.kotlin.gradle.plugin.statistics.KotlinBuildStatsService import org.jetbrains.kotlin.gradle.report.* import org.jetbrains.kotlin.gradle.utils.* -import org.jetbrains.kotlin.incremental.IncrementalCompilerRunner import org.jetbrains.kotlin.statistics.metrics.BooleanMetrics import org.jetbrains.kotlin.statistics.metrics.StringMetrics import java.io.File import javax.inject.Inject import org.jetbrains.kotlin.gradle.tasks.cleanOutputsAndLocalState as cleanOutputsAndLocalStateUtil +private const val ABI_SNAPSHOT_FILE_NAME = "abi-snapshot.bin" + @DisableCachingByDefault(because = "Abstract super-class, not to be instantiated directly") abstract class AbstractKotlinCompile @Inject constructor( objectFactory: ObjectFactory, @@ -141,12 +142,12 @@ abstract class AbstractKotlinCompile @Inject constr @get:Internal val abiSnapshotFile - get() = taskBuildCacheableOutputDirectory.file(IncrementalCompilerRunner.ABI_SNAPSHOT_FILE_NAME) + get() = taskBuildCacheableOutputDirectory.file(ABI_SNAPSHOT_FILE_NAME) @get:Input val abiSnapshotRelativePath: Property = objectFactory.property(String::class.java).value( //TODO update to support any jar changes - "$name/${IncrementalCompilerRunner.ABI_SNAPSHOT_FILE_NAME}" + "$name/${ABI_SNAPSHOT_FILE_NAME}" ) @get:Internal