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

[MPP] Replace obsolete linuxArm32Hfp with mingwX64 in CommonizerIT test for KT-48138

Browse Source 
^KT-48138
^KT-58822
This commit is contained in:
Timofey Solonin
2023-06-07 18:25:31 +02:00
committed by Space Team
parent 4cb90aed52
commit bc306844af
2 changed files with 6 additions and 6 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/CommonizerIT.kt
+1 -1
View File
@@ -633,7 +633,7 @@ open class CommonizerIT : BaseGradleIT() {
val nativeMain = getCommonizerDependencies("nativeMain") val nativeMain = getCommonizerDependencies("nativeMain")
nativeMain.withoutNativeDistributionDependencies().assertDependencyFilesMatches(".*cinterop-dummy") nativeMain.withoutNativeDistributionDependencies().assertDependencyFilesMatches(".*cinterop-dummy")
nativeMain.onlyNativeDistributionDependencies().assertNotEmpty() 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") val nativeTest = getCommonizerDependencies("nativeTest")
nativeTest.onlyNativeDistributionDependencies().assertNotEmpty() nativeTest.onlyNativeDistributionDependencies().assertNotEmpty()
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-48138-nativeMain-nativeTest-different-targets/build.gradle.kts
+5 -5
View File
@@ -22,29 +22,29 @@ repositories {
kotlin { kotlin {
linuxX64() linuxX64()
linuxArm64() linuxArm64()
@Suppress("DEPRECATION_ERROR") mingwX64()
linuxArm32Hfp()
val commonMain by sourceSets.getting val commonMain by sourceSets.getting
val nativeMain by sourceSets.creating val nativeMain by sourceSets.creating
val linuxX64Main by sourceSets.getting val linuxX64Main by sourceSets.getting
val linuxArm64Main by sourceSets.getting val linuxArm64Main by sourceSets.getting
val linuxArm32HfpMain by sourceSets.getting val mingwX64Main by sourceSets.getting
nativeMain.dependsOn(commonMain) nativeMain.dependsOn(commonMain)
linuxX64Main.dependsOn(nativeMain) linuxX64Main.dependsOn(nativeMain)
linuxArm64Main.dependsOn(nativeMain) linuxArm64Main.dependsOn(nativeMain)
linuxArm32HfpMain.dependsOn(nativeMain) mingwX64Main.dependsOn(nativeMain)
val commonTest by sourceSets.getting val commonTest by sourceSets.getting
val nativeTest by sourceSets.creating val nativeTest by sourceSets.creating
val linuxX64Test by sourceSets.getting val linuxX64Test by sourceSets.getting
val linuxArm64Test by sourceSets.getting val linuxArm64Test by sourceSets.getting
val mingwX64Test by sourceSets.getting
nativeTest.dependsOn(commonTest) nativeTest.dependsOn(commonTest)
linuxX64Test.dependsOn(nativeTest) linuxX64Test.dependsOn(nativeTest)
linuxArm64Test.dependsOn(nativeTest) linuxArm64Test.dependsOn(nativeTest)
/* NOTE: linuxArm32HfpTest does not depend on nativeTest */ /* NOTE: mingwX64Test does not depend on nativeTest */
targets.withType<KotlinNativeTarget>().forEach { target -> targets.withType<KotlinNativeTarget>().forEach { target ->
target.compilations.getByName("main").cinterops.create("dummy") { target.compilations.getByName("main").cinterops.create("dummy") {