azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MPP] Remove obsolete targets from CommonizerHierarchicalIT.commonizeHierarchically

Browse Source 
^KT-58822
This commit is contained in:
Timofey Solonin
2023-06-14 21:51:10 +02:00
committed by Space Team
parent 0ff9982b31
commit 5df50c0fca
3 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerHierarchicalIT.kt
+1 -7
View File
@@ -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()
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppIdeDependencyResolutionIT.kt
+1 -1
View File
@@ -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 ->
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchically/p1/build.gradle.kts
-2
View File
@@ -37,8 +37,6 @@ kotlin {
iosSimulatorArm64()
mingwX64()
@Suppress("DEPRECATION_ERROR")
mingwX86()
sourceSets.all {
languageSettings.optIn("kotlin.RequiresOptIn")