From f27ca2300018f6dc61b58fb44e0a334af075e53f Mon Sep 17 00:00:00 2001 From: Timofey Solonin Date: Tue, 6 Jun 2023 18:00:27 +0200 Subject: [PATCH] [MPP][Gradle] Replace obsolete linuxArm32Hfp target with mingwX64 in MppCInteropDependencyTransformationIT.KT50952 ^KT-50952 ^KT-58822 --- .../kotlin/gradle/MppCInteropDependencyTransformationIT.kt | 2 +- .../p1/build.gradle.kts | 3 +-- .../p2/build.gradle.kts | 5 ++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppCInteropDependencyTransformationIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppCInteropDependencyTransformationIT.kt index 652f60cd8e2..32c6f369c68 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppCInteropDependencyTransformationIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppCInteropDependencyTransformationIT.kt @@ -315,7 +315,7 @@ abstract class MppCInteropDependencyTransformationIT : BaseGradleIT() { assertTasksUpToDate(":p2:transformCommonMainCInteropDependenciesMetadata") } - val optionsWithAdditionalTargetEnabled = options.withFreeCommandLineArgument("-Pp2.enableLinuxArm32Hfp") + val optionsWithAdditionalTargetEnabled = options.withFreeCommandLineArgument("-Pp2.enableAdditionalTarget") project.build(":p2:transformCommonMainCInteropDependenciesMetadata", options = optionsWithAdditionalTargetEnabled) { assertSuccessful() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/cinterop-MetadataDependencyTransformation-kt-50952/p1/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/cinterop-MetadataDependencyTransformation-kt-50952/p1/build.gradle.kts index b74b0a6b593..db0b5b79498 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/cinterop-MetadataDependencyTransformation-kt-50952/p1/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/cinterop-MetadataDependencyTransformation-kt-50952/p1/build.gradle.kts @@ -19,8 +19,7 @@ publishing { } kotlin { - @Suppress("DEPRECATION_ERROR") - linuxArm32Hfp() + mingwX64() val targetsWithInterop = listOf(linuxX64(), linuxArm64()) targets.withType().forEach { target -> diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/cinterop-MetadataDependencyTransformation-kt-50952/p2/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/cinterop-MetadataDependencyTransformation-kt-50952/p2/build.gradle.kts index 9dcf92255e3..6ebe7187f41 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/cinterop-MetadataDependencyTransformation-kt-50952/p2/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/cinterop-MetadataDependencyTransformation-kt-50952/p2/build.gradle.kts @@ -15,9 +15,8 @@ kotlin { linuxX64() linuxArm64() - if (properties.containsKey("p2.enableLinuxArm32Hfp")) { - @Suppress("DEPRECATION_ERROR") - linuxArm32Hfp() + if (properties.containsKey("p2.enableAdditionalTarget")) { + mingwX64() } targets.withType().configureEach {