[Gradle] Remove cacheKind from IT

^KT-80715

Author: AYastrebov

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/KotlinNativeLinkIT.kt

@@ -74,7 +74,6 @@ internal class KotlinNativeLinkIT : KGPBaseTest() {
                 buildCacheEnabled = true,
                 freeArgs = defaultBuildOptions.freeArgs + "--rerun-tasks",
                 nativeOptions = defaultBuildOptions.nativeOptions.copy(
-                    cacheKind = NativeCacheKind.STATIC,
                     // Required as this only reproduces from CacheBuilder.
                     cacheOrchestration = "gradle"
                 )

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeDownloadAndPlatformLibsIT.kt

@@ -80,12 +80,7 @@ class NativeDownloadAndPlatformLibsIT : KGPBaseTest() {
             environmentVariables = EnvironmentalVariables(Pair("KONAN_DATA_DIR", anotherKonanDataDir.absolutePathString()))
         ) {
             build(
-                "linkDebugExecutableNative",
-                buildOptions = defaultBuildOptions.copy(
-                    nativeOptions = defaultBuildOptions.nativeOptions.copy(
-                        cacheKind = null
-                    )
-                )
+                "linkDebugExecutableNative"
             ) {
                 assertOutputDoesNotContain("w: Failed to build cache")
                 assertTasksExecuted(":linkDebugExecutableNative")

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeIncrementalCompilationIT.kt

@@ -26,7 +26,6 @@ class NativeIncrementalCompilationIT : KGPBaseTest() {
 
     override val defaultBuildOptions = super.defaultBuildOptions.copy(
         nativeOptions = BuildOptions.NativeOptions(
-            cacheKind = NativeCacheKind.STATIC,
             incremental = true
         )
     )

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeIrLinkerIssuesIT.kt

@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.gradle.native
 import org.gradle.api.logging.LogLevel
 import org.gradle.util.GradleVersion
 import org.jetbrains.kotlin.gradle.KOTLIN_VERSION
-import org.jetbrains.kotlin.gradle.dsl.NativeCacheKind
 import org.jetbrains.kotlin.gradle.testbase.*
 import org.jetbrains.kotlin.konan.library.KONAN_PLATFORM_LIBS_NAME_PREFIX
 import org.junit.jupiter.api.Disabled
@@ -18,7 +17,6 @@ import org.junit.jupiter.api.condition.OS
 import org.junit.jupiter.api.io.TempDir
 import java.nio.file.Path
 import kotlin.test.assertEquals
-import kotlin.test.assertNotNull
 
 @DisplayName("Tests for K/N builds with ir linker issues")
 @NativeGradlePluginTests
@@ -35,17 +33,16 @@ internal class NativeIrLinkerIssuesIT : KGPBaseTest() {
         OS.MAC,
         architectures = ["aarch64"],
         disabledReason =
-        "Run this test only on macOS x64," +
-                " arm64 requires newer ktor (>=1.6.5) and coroutines (>=1.5.2-native-mt) " +
-                "that compatible to each other and don't fail this way."
+            "Run this test only on macOS x64," +
+                    " arm64 requires newer ktor (>=1.6.5) and coroutines (>=1.5.2-native-mt) " +
+                    "that compatible to each other and don't fail this way."
     )
     fun shouldBuildKtorAndCoroutines(gradleVersion: GradleVersion) {
 
         buildApplicationAndFail(
             directoryPrefix = null,
             projectName = "native-ir-linker-issues-ktor-and-coroutines",
             localRepo = null,
-            nativeCacheKind = NativeCacheKind.STATIC,
             gradleVersion = gradleVersion
         ) {
             """
@@ -106,7 +103,6 @@ internal class NativeIrLinkerIssuesIT : KGPBaseTest() {
 
         buildConflictingLibrariesAndApplication(
             directoryPrefix = "native-ir-linker-issues-gone-declaration",
-            nativeCacheKind = NativeCacheKind.STATIC,
             gradleVersion = gradleVersion,
             localRepo = tempDir
         ) {
@@ -132,41 +128,6 @@ internal class NativeIrLinkerIssuesIT : KGPBaseTest() {
         }
     }
 
-    @Disabled("Under investigation via KT-72935")
-    @DisplayName("KT-41378: declaration that is gone - without cache")
-    @GradleTest
-    fun shouldBuildIrLinkerWithoutCache(
-        gradleVersion: GradleVersion,
-        @TempDir tempDir: Path,
-    ) {
-        buildConflictingLibrariesAndApplication(
-            directoryPrefix = "native-ir-linker-issues-gone-declaration",
-            nativeCacheKind = NativeCacheKind.NONE,
-            gradleVersion = gradleVersion,
-            localRepo = tempDir
-        ) {
-            """
-            e: Module "org.sample:libb (org.sample:libb-native)" has a reference to symbol sample.liba/C|null[0]. Neither the module itself nor its dependencies contain such declaration.
-            
-            This could happen if the required dependency is missing in the project. Or if there is a dependency of "org.sample:libb (org.sample:libb-native)" that has a different version in the project than the version that "org.sample:libb (org.sample:libb-native): 1.0" was initially compiled with. Please check that the project configuration is correct and has consistent versions of all required dependencies.
-            
-            The list of "org.sample:libb (org.sample:libb-native): 1.0" dependencies that may lead to conflicts:
-            1. "org.sample:liba (org.sample:liba-native): 2.0" (was initially compiled with "org.sample:liba (org.sample:liba-native): 1.0")
-            
-            Project dependencies:
-            +--- org.sample:liba (org.sample:liba-native): 2.0
-            |    \--- org.jetbrains.kotlin:kotlin-stdlib: $KOTLIN_VERSION
-            +--- org.sample:libb (org.sample:libb-native): 1.0
-            |    ^^^ This module requires symbol sample.liba/C|null[0].
-            |    +--- org.sample:liba (org.sample:liba-native): 1.0 -> 2.0 (*)
-            |    \--- org.jetbrains.kotlin:kotlin-stdlib: $KOTLIN_VERSION
-            \--- org.jetbrains.kotlin:kotlin-stdlib: $KOTLIN_VERSION
-            
-            (*) - dependencies omitted (listed previously)
-            """.trimIndent()
-        }
-    }
-
     @DisplayName("KT-47285: symbol type mismatch - with cache")
     @GradleTest
     @OsCondition(supportedOn = [OS.MAC, OS.LINUX], enabledOnCI = [OS.LINUX])
@@ -177,7 +138,6 @@ internal class NativeIrLinkerIssuesIT : KGPBaseTest() {
     ) {
         buildConflictingLibrariesAndApplication(
             directoryPrefix = "native-ir-linker-issues-symbol-mismatch",
-            nativeCacheKind = NativeCacheKind.STATIC,
             gradleVersion = gradleVersion,
             localRepo = tempDir
         ) {
@@ -204,44 +164,8 @@ internal class NativeIrLinkerIssuesIT : KGPBaseTest() {
         }
     }
 
-    @DisplayName("KT-47285: symbol type mismatch - without cache")
-    @GradleTest
-    fun shouldBuildIrLinkerSymbolTypeMismatchWithoutCache(
-        gradleVersion: GradleVersion,
-        @TempDir tempDir: Path,
-    ) {
-        buildConflictingLibrariesAndApplication(
-            directoryPrefix = "native-ir-linker-issues-symbol-mismatch",
-            nativeCacheKind = NativeCacheKind.NONE,
-            gradleVersion = gradleVersion,
-            localRepo = tempDir
-        ) {
-            """
-            e: The symbol of unexpected type encountered during IR deserialization: IrClassSymbolImpl, sample.liba/B|null[0]. IrTypeAliasSymbol is expected.
-            
-            This could happen if there are two libraries, where one library was compiled against the different version of the other library than the one currently used in the project. Please check that the project configuration is correct and has consistent versions of dependencies.
-            
-            The list of libraries that depend on "org.sample:liba (org.sample:liba-native)" and may lead to conflicts:
-            1. "org.sample:libb (org.sample:libb-native): 1.0" (was compiled against "org.sample:liba (org.sample:liba-native): 1.0" but "org.sample:liba (org.sample:liba-native): 2.0" is used in the project)
-            
-            Project dependencies:
-            +--- org.sample:liba (org.sample:liba-native): 2.0
-            |    ^^^ This module contains symbol sample.liba/B|null[0] that is the cause of the conflict.
-            |    \--- org.jetbrains.kotlin:kotlin-stdlib: $KOTLIN_VERSION
-            +--- org.sample:libb (org.sample:libb-native): 1.0
-            |    +--- org.sample:liba (org.sample:liba-native): 1.0 -> 2.0 (*)
-            |    |    ^^^ This module contains symbol sample.liba/B|null[0] that is the cause of the conflict.
-            |    \--- org.jetbrains.kotlin:kotlin-stdlib: $KOTLIN_VERSION
-            \--- org.jetbrains.kotlin:kotlin-stdlib: ${KOTLIN_VERSION}
-            
-            (*) - dependencies omitted (listed previously)
-            """.trimIndent()
-        }
-    }
-
     private fun buildConflictingLibrariesAndApplication(
         directoryPrefix: String,
-        nativeCacheKind: NativeCacheKind,
         gradleVersion: GradleVersion,
         localRepo: Path,
         expectedErrorMessage: () -> String,
@@ -254,7 +178,6 @@ internal class NativeIrLinkerIssuesIT : KGPBaseTest() {
             directoryPrefix = directoryPrefix,
             projectName = "app",
             localRepo = localRepo,
-            nativeCacheKind = nativeCacheKind,
             gradleVersion = gradleVersion,
             expectedErrorMessage = expectedErrorMessage
         )
@@ -264,11 +187,10 @@ internal class NativeIrLinkerIssuesIT : KGPBaseTest() {
         directoryPrefix: String?,
         projectName: String,
         localRepo: Path?,
-        nativeCacheKind: NativeCacheKind,
         gradleVersion: GradleVersion,
         expectedErrorMessage: () -> String,
     ) {
-        prepareProject(directoryPrefix, projectName, localRepo, nativeCacheKind, gradleVersion) {
+        prepareProject(directoryPrefix, projectName, localRepo, gradleVersion) {
             buildAndFail("linkDebugExecutableNative", buildOptions = this.buildOptions.copy(logLevel = LogLevel.DEBUG)) {
 
                 val errorMessage = ERROR_LINE_REGEX.findAll(getOutputForTask(":linkDebugExecutableNative"))
@@ -289,7 +211,7 @@ internal class NativeIrLinkerIssuesIT : KGPBaseTest() {
     private fun buildAndPublishLibrary(
         directoryPrefix: String, projectName: String, localRepo: Path, gradleVersion: GradleVersion,
     ) {
-        prepareProject(directoryPrefix, projectName, localRepo, nativeCacheKind = NativeCacheKind.STATIC, gradleVersion) {
+        prepareProject(directoryPrefix, projectName, localRepo, gradleVersion) {
             build("publish")
         }
     }
@@ -298,15 +220,12 @@ internal class NativeIrLinkerIssuesIT : KGPBaseTest() {
         directoryPrefix: String?,
         projectName: String,
         localRepo: Path?,
-        nativeCacheKind: NativeCacheKind,
         gradleVersion: GradleVersion,
         block: TestProject.() -> Unit,
     ) {
         nativeProject(
-            directoryPrefix + "/" + projectName,
+            "$directoryPrefix/$projectName",
             gradleVersion = gradleVersion,
-            buildOptions = defaultBuildOptions.copy(
-                nativeOptions = defaultBuildOptions.nativeOptions.copy(cacheKind = nativeCacheKind)),
             localRepoDir = localRepo
         ) {
             block()
@@ -318,9 +237,5 @@ internal class NativeIrLinkerIssuesIT : KGPBaseTest() {
         private val KONAN_PLATFORM_LIB_DEPENDENCY_REGEX =
             ".*${KONAN_PLATFORM_LIBS_NAME_PREFIX.replace(".", "\\.")}.*".toRegex()
 
-        private fun findKotlinNativeCompilerVersion(output: String): String? = findParameterInOutput(
-            "for_test_kotlin_native_compiler_version",
-            output
-        )
     }
 }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/BuildOptions.kt

@@ -10,7 +10,6 @@ import org.gradle.api.logging.configuration.WarningMode
 import org.gradle.internal.logging.LoggingConfigurationBuildOptions.StacktraceOption
 import org.gradle.util.GradleVersion
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
-import org.jetbrains.kotlin.gradle.dsl.NativeCacheKind
 import org.jetbrains.kotlin.gradle.plugin.mpp.KmpIsolatedProjectsSupport
 import org.jetbrains.kotlin.gradle.report.BuildReportType
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompilerExecutionStrategy
@@ -158,7 +157,6 @@ data class BuildOptions(
     )
 
     data class NativeOptions(
-        val cacheKind: NativeCacheKind? = NativeCacheKind.NONE,
         val cocoapodsGenerateWrapper: Boolean? = null,
         val cocoapodsPlatform: String? = null,
         val cocoapodsConfiguration: String? = null,
@@ -344,11 +342,6 @@ data class BuildOptions(
     private fun addNativeOptionsToArguments(
         arguments: MutableList<String>,
     ) {
-
-        nativeOptions.cacheKind?.let {
-            arguments.add("-Pkotlin.native.cacheKind=${nativeOptions.cacheKind.name.lowercase()}")
-        }
-
         nativeOptions.cocoapodsGenerateWrapper?.let {
             arguments.add("-Pkotlin.native.cocoapods.generate.wrapper=${it}")
         }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/kotlin-library/gradle.properties

@@ -1,2 +1 @@
-kotlin.mpp.enableCInteropCommonization=true
-kotlin.native.cacheKind=static
+kotlin.mpp.enableCInteropCommonization=true