diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt index 32ab803cb7c..8a51a58e553 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt @@ -633,7 +633,7 @@ open class CommonizerIT : BaseGradleIT() { val nativeMain = getCommonizerDependencies("nativeMain") nativeMain.withoutNativeDistributionDependencies().assertDependencyFilesMatches(".*cinterop-dummy") nativeMain.onlyNativeDistributionDependencies().assertNotEmpty() - nativeMain.assertTargetOnAllDependencies(CommonizerTarget(LINUX_X64, LINUX_ARM64, LINUX_ARM32_HFP)) + nativeMain.assertTargetOnAllDependencies(CommonizerTarget(LINUX_X64, LINUX_ARM64, MINGW_X64)) val nativeTest = getCommonizerDependencies("nativeTest") nativeTest.onlyNativeDistributionDependencies().assertNotEmpty() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-48138-nativeMain-nativeTest-different-targets/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-48138-nativeMain-nativeTest-different-targets/build.gradle.kts index bf3fc7f331a..ee0e461a26a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-48138-nativeMain-nativeTest-different-targets/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-48138-nativeMain-nativeTest-different-targets/build.gradle.kts @@ -22,29 +22,29 @@ repositories { kotlin { linuxX64() linuxArm64() - @Suppress("DEPRECATION_ERROR") - linuxArm32Hfp() + mingwX64() val commonMain by sourceSets.getting val nativeMain by sourceSets.creating val linuxX64Main by sourceSets.getting val linuxArm64Main by sourceSets.getting - val linuxArm32HfpMain by sourceSets.getting + val mingwX64Main by sourceSets.getting nativeMain.dependsOn(commonMain) linuxX64Main.dependsOn(nativeMain) linuxArm64Main.dependsOn(nativeMain) - linuxArm32HfpMain.dependsOn(nativeMain) + mingwX64Main.dependsOn(nativeMain) val commonTest by sourceSets.getting val nativeTest by sourceSets.creating val linuxX64Test by sourceSets.getting val linuxArm64Test by sourceSets.getting + val mingwX64Test by sourceSets.getting nativeTest.dependsOn(commonTest) linuxX64Test.dependsOn(nativeTest) linuxArm64Test.dependsOn(nativeTest) - /* NOTE: linuxArm32HfpTest does not depend on nativeTest */ + /* NOTE: mingwX64Test does not depend on nativeTest */ targets.withType().forEach { target -> target.compilations.getByName("main").cinterops.create("dummy") {