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

[MPP] Remove obsolete targets from MppCInteropDependencyTransformationIT.ComplexProject

Browse Source 
^KT-58822
This commit is contained in:
Timofey Solonin
2023-06-09 14:15:37 +02:00
committed by Space Team
parent da1fde2477
commit 76eef2adb1
4 changed files with 16 additions and 68 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/MppCInteropDependencyTransformationIT.kt
+8 -28
View File
@@ -25,10 +25,6 @@ import org.junit.Test
*/ */
abstract class MppCInteropDependencyTransformationIT : BaseGradleIT() { abstract class MppCInteropDependencyTransformationIT : BaseGradleIT() {
enum class DependencyMode {
Project, Repository
}
override fun defaultBuildOptions(): BuildOptions = super.defaultBuildOptions().run { override fun defaultBuildOptions(): BuildOptions = super.defaultBuildOptions().run {
copy( copy(
forceOutputToStdout = true, forceOutputToStdout = true,
@@ -85,8 +81,8 @@ abstract class MppCInteropDependencyTransformationIT : BaseGradleIT() {
} }
if (HostManager.hostIsMingw || HostManager.hostIsMac) { if (HostManager.hostIsMingw || HostManager.hostIsMac) {
assertTasksExecuted(":p2:compileWindowsMainKotlinMetadata") assertTasksExecuted(":p2:compileKotlinWindowsX64")
assertTasksExecuted(":p3:compileWindowsMainKotlinMetadata") assertTasksExecuted(":p3:compileKotlinWindowsX64")
} }
/* Assert p2 & p3 transformed cinterop dependencies */ /* Assert p2 & p3 transformed cinterop dependencies */
@@ -143,7 +139,7 @@ abstract class MppCInteropDependencyTransformationIT : BaseGradleIT() {
getCommonizerDependencies(sourceSetName).withoutNativeDistributionDependencies() getCommonizerDependencies(sourceSetName).withoutNativeDistributionDependencies()
.assertDependencyFilesMatches(".*cinterop-simple.*", ".*cinterop-withPosix.*") .assertDependencyFilesMatches(".*cinterop-simple.*", ".*cinterop-withPosix.*")
.assertTargetOnAllDependencies( .assertTargetOnAllDependencies(
CommonizerTarget(LINUX_ARM64, LINUX_X64, IOS_ARM64, IOS_X64, MACOS_X64, MINGW_X64, MINGW_X86) CommonizerTarget(LINUX_ARM64, LINUX_X64, IOS_ARM64, IOS_X64, MACOS_X64, MINGW_X64)
) )
} }
@@ -167,18 +163,10 @@ abstract class MppCInteropDependencyTransformationIT : BaseGradleIT() {
} }
} }
if (HostManager.hostIsMingw || HostManager.hostIsMac) { listOf("linuxMain", "linuxTest").forEach { sourceSetName ->
listOf("windowsMain", "windowsTest").forEach { sourceSetName -> getCommonizerDependencies(sourceSetName).withoutNativeDistributionDependencies()
getCommonizerDependencies(sourceSetName).withoutNativeDistributionDependencies() .assertDependencyFilesMatches(".*cinterop-simple.*", ".*cinterop-withPosix.*")
.assertDependencyFilesMatches(".*cinterop-simple.*", ".*cinterop-withPosix.*") .assertTargetOnAllDependencies(CommonizerTarget(LINUX_ARM64, LINUX_X64))
.assertTargetOnAllDependencies(CommonizerTarget(MINGW_X64, MINGW_X86))
}
listOf("linuxMain", "linuxTest").forEach { sourceSetName ->
getCommonizerDependencies(sourceSetName).withoutNativeDistributionDependencies()
.assertDependencyFilesMatches(".*cinterop-simple.*", ".*cinterop-withPosix.*")
.assertTargetOnAllDependencies(CommonizerTarget(LINUX_ARM64, LINUX_X64))
}
} }
} }
@@ -191,7 +179,7 @@ abstract class MppCInteropDependencyTransformationIT : BaseGradleIT() {
getCommonizerDependencies(sourceSetName).withoutNativeDistributionDependencies() getCommonizerDependencies(sourceSetName).withoutNativeDistributionDependencies()
.assertDependencyFilesMatches(".*cinterop-simple.*", ".*cinterop-withPosix.*") .assertDependencyFilesMatches(".*cinterop-simple.*", ".*cinterop-withPosix.*")
.assertTargetOnAllDependencies( .assertTargetOnAllDependencies(
CommonizerTarget(LINUX_ARM64, LINUX_X64, IOS_ARM64, IOS_X64, MACOS_X64, MINGW_X64, MINGW_X86) CommonizerTarget(LINUX_ARM64, LINUX_X64, IOS_ARM64, IOS_X64, MACOS_X64, MINGW_X64)
) )
} }
@@ -208,14 +196,6 @@ abstract class MppCInteropDependencyTransformationIT : BaseGradleIT() {
.assertTargetOnAllDependencies(CommonizerTarget(IOS_ARM64, IOS_X64)) .assertTargetOnAllDependencies(CommonizerTarget(IOS_ARM64, IOS_X64))
} }
} }
if (HostManager.hostIsMingw || HostManager.hostIsMac) {
listOf("windowsMain", "windowsTest").forEach { sourceSetName ->
getCommonizerDependencies(sourceSetName).withoutNativeDistributionDependencies()
.assertDependencyFilesMatches(".*cinterop-simple.*", ".*cinterop-withPosix.*")
.assertTargetOnAllDependencies(CommonizerTarget(MINGW_X64, MINGW_X86))
}
}
} }
@Test @Test
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/cinterop-MetadataDependencyTransformation/p1/build.gradle.kts
+2 -8
View File
@@ -37,8 +37,6 @@ kotlin {
ios() ios()
mingwX64("windowsX64") mingwX64("windowsX64")
@Suppress("DEPRECATION_ERROR")
mingwX86("windowsX86")
val commonMain by sourceSets.getting val commonMain by sourceSets.getting
val concurrentMain by sourceSets.creating val concurrentMain by sourceSets.creating
@@ -52,9 +50,7 @@ kotlin {
val appleMain by sourceSets.creating val appleMain by sourceSets.creating
val macosMain by sourceSets.getting val macosMain by sourceSets.getting
val iosMain by sourceSets.getting val iosMain by sourceSets.getting
val windowsMain by sourceSets.creating
val windowsX64Main by sourceSets.getting val windowsX64Main by sourceSets.getting
val windowsX86Main by sourceSets.getting
commonMain { commonMain {
-jsMain -jsMain
@@ -71,10 +67,8 @@ kotlin {
-linuxX64Main -linuxX64Main
} }
} }
-windowsMain {
-windowsX64Main -windowsX64Main
-windowsX86Main
}
} }
} }
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/cinterop-MetadataDependencyTransformation/p2/build.gradle.kts
+4 -14
View File
@@ -29,8 +29,6 @@ kotlin {
ios() ios()
mingwX64("windowsX64") mingwX64("windowsX64")
@Suppress("DEPRECATION_ERROR")
mingwX86("windowsX86")
val commonMain by sourceSets.getting val commonMain by sourceSets.getting
val commonTest by sourceSets.getting val commonTest by sourceSets.getting
@@ -51,12 +49,8 @@ kotlin {
val macosTest by sourceSets.getting val macosTest by sourceSets.getting
val iosMain by sourceSets.getting val iosMain by sourceSets.getting
val iosTest by sourceSets.getting val iosTest by sourceSets.getting
val windowsMain by sourceSets.creating
val windowsTest by sourceSets.creating
val windowsX64Main by sourceSets.getting val windowsX64Main by sourceSets.getting
val windowsX64Test by sourceSets.getting val windowsX64Test by sourceSets.getting
val windowsX86Main by sourceSets.getting
val windowsX86Test by sourceSets.getting
commonMain { commonMain {
-jvmMain -jvmMain
@@ -71,10 +65,8 @@ kotlin {
-linuxX64Main -linuxX64Main
} }
} }
-windowsMain {
-windowsX64Main -windowsX64Main
-windowsX86Main
}
} }
} }
@@ -90,10 +82,8 @@ kotlin {
-linuxX64Test -linuxX64Test
} }
} }
-windowsTest {
-windowsX64Test -windowsX64Test
-windowsX86Test
}
} }
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/cinterop-MetadataDependencyTransformation/p3/build.gradle.kts
+2 -18
View File
@@ -24,8 +24,6 @@ kotlin {
linuxX64() linuxX64()
ios() ios()
mingwX64("windowsX64") mingwX64("windowsX64")
@Suppress("DEPRECATION_ERROR")
mingwX86("windowsX86")
val commonMain by sourceSets.getting val commonMain by sourceSets.getting
val commonTest by sourceSets.getting val commonTest by sourceSets.getting
@@ -40,12 +38,8 @@ kotlin {
val linuxX64Test by sourceSets.getting val linuxX64Test by sourceSets.getting
val iosMain by sourceSets.getting val iosMain by sourceSets.getting
val iosTest by sourceSets.getting val iosTest by sourceSets.getting
val windowsMain by sourceSets.creating
val windowsTest by sourceSets.creating
val windowsX64Main by sourceSets.getting val windowsX64Main by sourceSets.getting
val windowsX64Test by sourceSets.getting val windowsX64Test by sourceSets.getting
val windowsX86Main by sourceSets.getting
val windowsX86Test by sourceSets.getting
commonMain { commonMain {
-jvmMain -jvmMain
@@ -68,13 +62,8 @@ kotlin {
Expected to see p1:nativeMain cinterops Expected to see p1:nativeMain cinterops
*/ */
-windowsAndLinuxMain { -windowsAndLinuxMain {
-windowsMain
-linuxX64Main
}
-windowsMain {
-windowsX64Main -windowsX64Main
-windowsX86Main -linuxX64Main
} }
} }
} }
@@ -87,13 +76,8 @@ kotlin {
} }
-windowsAndLinuxTest { -windowsAndLinuxTest {
-windowsTest
-linuxX64Test
}
-windowsTest {
-windowsX64Test -windowsX64Test
-windowsX86Test -linuxX64Test
} }
} }
} }