diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativePlatformLibsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativePlatformLibsIT.kt index 1df06316127..1176c08eeb2 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativePlatformLibsIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativePlatformLibsIT.kt @@ -143,8 +143,9 @@ class NativePlatformLibsIT : BaseGradleIT() { deleteInstalledCompilers() fun buildPlatformLibrariesWithoutAndWithCaches(target: KonanTarget) { - with(platformLibrariesProject(target.presetName)) { - val targetName = target.name + val presetName = target.presetName + val targetName = target.name + with(platformLibrariesProject(presetName)) { // Build libraries without caches. buildWithLightDist("tasks") { assertSuccessful() @@ -152,7 +153,7 @@ class NativePlatformLibsIT : BaseGradleIT() { } // Change cache kind and check that platform libraries generator was executed. - buildWithLightDist("tasks", "-Pkotlin.native.cacheKind.$targetName=static") { + buildWithLightDist("tasks", "-Pkotlin.native.cacheKind.$presetName=static") { assertSuccessful() assertContains("Precompile platform libraries for $targetName (precompilation: static)") } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/kotlin-library/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/kotlin-library/gradle.properties index a1a68852174..83d2782ee73 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/kotlin-library/gradle.properties +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/kotlin-library/gradle.properties @@ -1 +1 @@ -kotlin.native.cacheKind.ios_x64=none \ No newline at end of file +kotlin.native.cacheKind.iosX64=none \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/second-library/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/second-library/gradle.properties index a1a68852174..83d2782ee73 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/second-library/gradle.properties +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/second-library/gradle.properties @@ -1 +1 @@ -kotlin.native.cacheKind.ios_x64=none \ No newline at end of file +kotlin.native.cacheKind.iosX64=none \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt index de35734af2b..d0fabeb4812 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt @@ -22,6 +22,7 @@ import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.utils.SingleWarningPerBuild import org.jetbrains.kotlin.konan.target.KonanTarget +import org.jetbrains.kotlin.konan.target.presetName import org.jetbrains.kotlin.statistics.metrics.StringMetrics import java.io.File import java.util.* @@ -205,7 +206,7 @@ internal class PropertiesProvider private constructor(private val project: Proje * Dependencies caching strategy for [target]. */ fun nativeCacheKindForTarget(target: KonanTarget): NativeCacheKind? = - property("kotlin.native.cacheKind.${target.name}")?.let { NativeCacheKind.byCompilerArgument(it) } + property("kotlin.native.cacheKind.${target.presetName}")?.let { NativeCacheKind.byCompilerArgument(it) } /** * Ignore overflow in [org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessageOutputStreamHandler]