From d7a2e11011e8fc5add6c80240208e61e5821f01f Mon Sep 17 00:00:00 2001 From: Timofey Solonin Date: Tue, 13 Jun 2023 14:43:53 +0200 Subject: [PATCH] [MPP] Remove obsolete targets from CommonizerHierarchicalIT.commonizeHierarchicallyMultiModule ^KT-58822 --- .../p1/build.gradle.kts | 9 +-------- .../p2/build.gradle.kts | 9 +-------- .../p3/build.gradle.kts | 9 +-------- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/p1/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/p1/build.gradle.kts index 62b268e91f8..ef1cc15be5f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/p1/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/p1/build.gradle.kts @@ -25,8 +25,6 @@ kotlin { ios() mingwX64("windowsX64") - @Suppress("DEPRECATION_ERROR") - mingwX86("windowsX86") val commonMain by sourceSets.getting val concurrentMain by sourceSets.creating @@ -40,9 +38,7 @@ kotlin { val appleMain by sourceSets.creating val macosMain by sourceSets.getting val iosMain by sourceSets.getting - val windowsMain by sourceSets.creating val windowsX64Main by sourceSets.getting - val windowsX86Main by sourceSets.getting commonMain { -jsMain @@ -59,10 +55,7 @@ kotlin { -linuxX64Main } } - -windowsMain { - -windowsX64Main - -windowsX86Main - } + -windowsX64Main } } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/p2/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/p2/build.gradle.kts index a283fb57056..951e6a0a249 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/p2/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/p2/build.gradle.kts @@ -25,8 +25,6 @@ kotlin { ios() mingwX64("windowsX64") - @Suppress("DEPRECATION_ERROR") - mingwX86("windowsX86") val commonMain by sourceSets.getting val concurrentMain by sourceSets.creating @@ -40,9 +38,7 @@ kotlin { val appleMain by sourceSets.creating val macosMain by sourceSets.getting val iosMain by sourceSets.getting - val windowsMain by sourceSets.creating val windowsX64Main by sourceSets.getting - val windowsX86Main by sourceSets.getting commonMain { -jsMain @@ -59,10 +55,7 @@ kotlin { -linuxX64Main } } - -windowsMain { - -windowsX64Main - -windowsX86Main - } + -windowsX64Main } } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/p3/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/p3/build.gradle.kts index 62b268e91f8..ef1cc15be5f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/p3/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/p3/build.gradle.kts @@ -25,8 +25,6 @@ kotlin { ios() mingwX64("windowsX64") - @Suppress("DEPRECATION_ERROR") - mingwX86("windowsX86") val commonMain by sourceSets.getting val concurrentMain by sourceSets.creating @@ -40,9 +38,7 @@ kotlin { val appleMain by sourceSets.creating val macosMain by sourceSets.getting val iosMain by sourceSets.getting - val windowsMain by sourceSets.creating val windowsX64Main by sourceSets.getting - val windowsX86Main by sourceSets.getting commonMain { -jsMain @@ -59,10 +55,7 @@ kotlin { -linuxX64Main } } - -windowsMain { - -windowsX64Main - -windowsX86Main - } + -windowsX64Main } } }