diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerHierarchicalIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerHierarchicalIT.kt index 46b2bbdaaaa..0283807e6ad 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerHierarchicalIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerHierarchicalIT.kt @@ -36,11 +36,6 @@ open class CommonizerHierarchicalIT : BaseGradleIT() { assertNoDuplicateLibraryWarning() } - build(":p1:compileMingwMainKotlinMetadata") { - assertSuccessful() - assertFileExists("p1/build/classes/kotlin/metadata/mingwMain/klib/p1_mingwMain.klib") - } - build(":p1:compileAppleAndLinuxMainKotlinMetadata") { assertSuccessful() assertFileExists("p1/build/classes/kotlin/metadata/appleAndLinuxMain/klib/p1_appleAndLinuxMain.klib") @@ -82,10 +77,9 @@ open class CommonizerHierarchicalIT : BaseGradleIT() { assertNoDuplicateLibraryWarning() } - build(":p1:mingwX64MainKlibrary", ":p1:mingwX86MainKlibrary") { + build(":p1:mingwX64MainKlibrary") { assertSuccessful() assertFileExists("p1/build/classes/kotlin/mingwX64/main/klib/p1.klib") - assertFileExists("p1/build/classes/kotlin/mingwX86/main/klib/p1.klib") assertNoDuplicateLibraryWarning() } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppIdeDependencyResolutionIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppIdeDependencyResolutionIT.kt index e7e0d53d7e9..f0627167eba 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppIdeDependencyResolutionIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppIdeDependencyResolutionIT.kt @@ -65,7 +65,7 @@ class MppIdeDependencyResolutionIT : KGPBaseTest() { } val nativeMainTarget = CommonizerTarget( - LINUX_X64, LINUX_ARM64, MACOS_X64, MACOS_ARM64, IOS_X64, IOS_ARM64, IOS_SIMULATOR_ARM64, MINGW_X64, MINGW_X86 + LINUX_X64, LINUX_ARM64, MACOS_X64, MACOS_ARM64, IOS_X64, IOS_ARM64, IOS_SIMULATOR_ARM64, MINGW_X64 ) nativeMainDependencies.forEach { dependency -> diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchically/p1/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchically/p1/build.gradle.kts index 8f7123a01a9..8a34edf1b5c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchically/p1/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchically/p1/build.gradle.kts @@ -37,8 +37,6 @@ kotlin { iosSimulatorArm64() mingwX64() - @Suppress("DEPRECATION_ERROR") - mingwX86() sourceSets.all { languageSettings.optIn("kotlin.RequiresOptIn")