From fee670e1a5de276083bf56262c3dc2a016cc797b Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Wed, 18 Aug 2021 17:07:51 +0200 Subject: [PATCH] [Gradle] Add test and assertions to cover ^KT-47523 --- .../jetbrains/kotlin/gradle/CommonizerIT.kt | 41 +++++++++++++++ .../p1/build.gradle.kts | 28 +++++++--- .../p1/libs/include/dummy.h | 1 + .../p1/src/nativeInterop/cinterop/dummy.def | 0 .../kotlin/{NativeMain.kt => commonMain.kt} | 5 +- .../kotlin/NativeMainParent.kt | 6 ++- .../kotlin/NativePlatformMain.kt | 5 +- .../build.gradle.kts | 51 +++++++++++++++++++ .../gradle.properties | 5 ++ .../libs/include/dummy.h | 1 + .../settings.gradle.kts | 10 ++++ .../src/commonMain/kotlin/CommonMain.kt | 5 ++ .../src/nativeInterop/cinterop/dummy.def | 0 .../src/nativeMain/kotlin/commonMain.kt | 5 ++ .../kotlin/NativePlatformMain.kt | 5 ++ .../kotlin/{NativeMain.kt => commonMain.kt} | 0 .../kotlin/{NativeMain.kt => commonMain.kt} | 0 .../kotlin/{NativeMain.kt => commonMain.kt} | 0 18 files changed, 157 insertions(+), 11 deletions(-) create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/p1/libs/include/dummy.h create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/p1/src/nativeInterop/cinterop/dummy.def rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/p1/src/nativeMain/kotlin/{NativeMain.kt => commonMain.kt} (53%) create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/build.gradle.kts create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/gradle.properties create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/libs/include/dummy.h create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/settings.gradle.kts create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/src/commonMain/kotlin/CommonMain.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/src/nativeInterop/cinterop/dummy.def create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/src/nativeMain/kotlin/commonMain.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/src/nativePlatformMain/kotlin/NativePlatformMain.kt rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/src/nativeMain/kotlin/{NativeMain.kt => commonMain.kt} (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeInteropUsingPosixApis/src/nativeMain/kotlin/{NativeMain.kt => commonMain.kt} (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeSQLiteAndCurlInterop/src/nativeMain/kotlin/{NativeMain.kt => commonMain.kt} (100%) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt index 070c2de5571..f6a027c586c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt @@ -323,20 +323,27 @@ class CommonizerIT : BaseGradleIT() { line.matches(Regex(""".*Dependency:.*[pP]osix""")) } + fun CompiledProject.containsDummyCInteropDependency(): Boolean = output.lineSequence().any { line -> + line.matches(Regex(""".*Dependency:.*cinterop-dummy.*""")) + } + with(Project("commonize-kt-46248-singleNativeTargetPropagation")) { build(":p1:listNativeMainDependencies") { assertSuccessful() assertTrue(containsPosixDependency(), "Expected dependency on posix in nativeMain") + assertTrue(containsDummyCInteropDependency(), "Expected dependency on dummy cinterop in nativeMain") } build(":p1:listNativeMainParentDependencies") { assertSuccessful() assertTrue(containsPosixDependency(), "Expected dependency on posix in nativeMainParent") + assertTrue(containsDummyCInteropDependency(), "Expected dependency on dummy cinterop in nativeMain") } build(":p1:listCommonMainDependencies") { assertSuccessful() assertFalse(containsPosixDependency(), "Expected **no** dependency on posix in commonMain (because of jvm target)") + assertFalse(containsDummyCInteropDependency(), "Expected **no** dependency on dummy cinterop in nativeMain") } build("assemble") { @@ -347,6 +354,40 @@ class CommonizerIT : BaseGradleIT() { } } + @Test + fun `test KT-46248 single supported native target dependency propagation - cinterop`() { + fun CompiledProject.containsCinteropDependency(): Boolean { + val nativeMainContainsCInteropDependencyRegex = Regex(""".*Dependency:.*cinterop-dummy.*""") + return output.lineSequence().any { line -> + line.matches(nativeMainContainsCInteropDependencyRegex) + } + } + + with(Project("commonize-kt-47523-singleNativeTargetPropagation-cinterop")) { + build("listNativePlatformMainDependencies") { + assertSuccessful() + assertFalse( + containsCinteropDependency(), + "Expected sourceSet 'nativeMain' to list cinterop dependency (not necessary, since included in compilation)" + ) + } + + build("listNativeMainDependencies") { + assertSuccessful() + assertTrue(containsCinteropDependency(), "Expected sourceSet 'nativeMain' to list cinterop dependency") + } + + build("listCommonMainDependencies") { + assertSuccessful() + assertTrue(containsCinteropDependency(), "Expected sourceSet 'commonMain' to list cinterop dependency") + } + + build("assemble") { + assertSuccessful() + } + } + } + @Test fun `test KT-46856 filename too long - all native targets configured`() { with(Project("commonize-kt-46856-all-targets")) { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/p1/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/p1/build.gradle.kts index 4e302999545..437e621daea 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/p1/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/p1/build.gradle.kts @@ -16,14 +16,16 @@ plugins { fun registerListDependenciesTask(sourceSet: KotlinSourceSet) { tasks.register("list${sourceSet.name.capitalize()}Dependencies") { + val dependencyConfiguration = project.configurations.getByName( + "${sourceSet.name}IntransitiveDependenciesMetadata" + ) + dependsOn("commonize") + dependsOn(dependencyConfiguration) + doLast { - val dependencies = project.configurations.findByName( - "${sourceSet.name}IntransitiveDependenciesMetadata" - )?.files.orEmpty() - + val dependencies = dependencyConfiguration.files.orEmpty() logger.quiet("${sourceSet.name} Dependencies | Count: ${dependencies.size}") - dependencies.forEach { dependencyFile -> logger.quiet("Dependency: ${dependencyFile.path}") } @@ -32,21 +34,21 @@ fun registerListDependenciesTask(sourceSet: KotlinSourceSet) { } kotlin { - - when { + val nativePlatform = when { isMac -> macosX64("nativePlatform") isLinux -> linuxX64("nativePlatform") isWindows -> mingwX64("nativePlatform") else -> throw IllegalStateException("Unsupported host") } - when { + val unsupportedNativePlatform = when { isMac -> mingwX64("unsupportedNativePlatform") else -> macosX64("unsupportedNativePlatform") } jvm() + val commonMain by sourceSets.getting val jvmMain by sourceSets.getting val nativeMain by sourceSets.creating @@ -64,6 +66,16 @@ kotlin { } } + nativePlatform.compilations.getByName("main").cinterops.create("dummy") { + headers("libs/include/dummy.h") + compilerOpts.add("-Ilibs/include") + } + + unsupportedNativePlatform.compilations.getByName("main").cinterops.create("dummy") { + headers("libs/include/dummy.h") + compilerOpts.add("-Ilibs/include") + } + registerListDependenciesTask(commonMain) registerListDependenciesTask(nativeMain) registerListDependenciesTask(nativeMainParent) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/p1/libs/include/dummy.h b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/p1/libs/include/dummy.h new file mode 100644 index 00000000000..8c2c1f0b6e0 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/p1/libs/include/dummy.h @@ -0,0 +1 @@ +void dummyFunction(); \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/p1/src/nativeInterop/cinterop/dummy.def b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/p1/src/nativeInterop/cinterop/dummy.def new file mode 100644 index 00000000000..e69de29bb2d diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/p1/src/nativeMain/kotlin/NativeMain.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/p1/src/nativeMain/kotlin/commonMain.kt similarity index 53% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/p1/src/nativeMain/kotlin/NativeMain.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/p1/src/nativeMain/kotlin/commonMain.kt index 3f254ff2a00..22c3f6130a9 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/p1/src/nativeMain/kotlin/NativeMain.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/p1/src/nativeMain/kotlin/commonMain.kt @@ -1,7 +1,10 @@ @file:Suppress("unused") import platform.posix.usleep +import dummy.dummyFunction fun nativeMain() { usleep(100) -} \ No newline at end of file +} + +fun nativeMainUsingCInterop() = dummyFunction() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/p1/src/nativeMainParent/kotlin/NativeMainParent.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/p1/src/nativeMainParent/kotlin/NativeMainParent.kt index a8e49d21f64..a41489c4343 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/p1/src/nativeMainParent/kotlin/NativeMainParent.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/p1/src/nativeMainParent/kotlin/NativeMainParent.kt @@ -1,7 +1,11 @@ @file:Suppress("unused") import platform.posix.usleep +import dummy.dummyFunction + fun commonMain() { usleep(100) -} \ No newline at end of file +} + +fun nativeMainParentUsingCInterop() = dummyFunction() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/p1/src/nativePlatformMain/kotlin/NativePlatformMain.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/p1/src/nativePlatformMain/kotlin/NativePlatformMain.kt index 66907b37b4f..1d35276cc5a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/p1/src/nativePlatformMain/kotlin/NativePlatformMain.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46248-singleNativeTargetPropagation/p1/src/nativePlatformMain/kotlin/NativePlatformMain.kt @@ -1,7 +1,10 @@ @file:Suppress("unused") import platform.posix.usleep +import dummy.dummyFunction fun main() { usleep(100) -} \ No newline at end of file +} + +fun nativePlatformMainUsingCInterop() = dummyFunction() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/build.gradle.kts new file mode 100644 index 00000000000..c5ccea02e21 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/build.gradle.kts @@ -0,0 +1,51 @@ + +import org.jetbrains.kotlin.com.intellij.openapi.util.SystemInfo.* +import org.jetbrains.kotlin.gradle.plugin.sources.DefaultKotlinSourceSet + +plugins { + kotlin("multiplatform") apply true +} + +repositories { + mavenLocal() + mavenCentral() +} + +kotlin { + val nativePlatform = when { + isMac -> macosX64("nativePlatform") + isLinux -> linuxX64("nativePlatform") + isWindows -> mingwX64("nativePlatform") + else -> throw IllegalStateException("Unsupported host") + } + + val commonMain by sourceSets.getting + val nativePlatformMain by sourceSets.getting + val nativeMain by sourceSets.creating + + nativeMain.dependsOn(commonMain) + nativePlatformMain.dependsOn(nativeMain) + + nativePlatform.compilations.getByName("main").cinterops.create("dummy") { + headers("libs/include/dummy.h") + compilerOpts.add("-Ilibs/include") + } +} + +fun createListDependenciesTask(sourceSetName: String) { + tasks.create("list${sourceSetName.capitalize()}Dependencies") { + val sourceSet = kotlin.sourceSets[sourceSetName] as DefaultKotlinSourceSet + val metadataConfiguration = project.configurations[sourceSet.intransitiveMetadataConfigurationName] + dependsOn(metadataConfiguration) + dependsOn("cinteropDummyNativePlatform") + doFirst { + metadataConfiguration.files.forEach { dependencyFile -> + logger.quiet("Dependency: $dependencyFile") + } + } + } +} + +createListDependenciesTask("nativePlatformMain") +createListDependenciesTask("nativeMain") +createListDependenciesTask("commonMain") \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/gradle.properties new file mode 100644 index 00000000000..6a760cb215f --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/gradle.properties @@ -0,0 +1,5 @@ +kotlin.mpp.enableGranularSourceSetsMetadata=true +kotlin.native.enableDependencyPropagation=false +kotlin.mpp.enableCInteropCommonization=true +kotlin.mpp.enableIntransitiveMetadataConfiguration=true +kotlin.mpp.enableCompatibilityMetadataVariant=false \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/libs/include/dummy.h b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/libs/include/dummy.h new file mode 100644 index 00000000000..8c2c1f0b6e0 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/libs/include/dummy.h @@ -0,0 +1 @@ +void dummyFunction(); \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/settings.gradle.kts new file mode 100644 index 00000000000..ecdece6ecfe --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/settings.gradle.kts @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + mavenLocal() + gradlePluginPortal() + } + val kotlin_version: String by settings + plugins { + kotlin("multiplatform").version(kotlin_version) + } +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/src/commonMain/kotlin/CommonMain.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/src/commonMain/kotlin/CommonMain.kt new file mode 100644 index 00000000000..f2ab4d8449e --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/src/commonMain/kotlin/CommonMain.kt @@ -0,0 +1,5 @@ +@file:Suppress("unused") + +import dummy.dummyFunction + +fun commonMain() = dummyFunction() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/src/nativeInterop/cinterop/dummy.def b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/src/nativeInterop/cinterop/dummy.def new file mode 100644 index 00000000000..e69de29bb2d diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/src/nativeMain/kotlin/commonMain.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/src/nativeMain/kotlin/commonMain.kt new file mode 100644 index 00000000000..8a44d6134d9 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/src/nativeMain/kotlin/commonMain.kt @@ -0,0 +1,5 @@ +@file:Suppress("unused") + +import dummy.dummyFunction + +fun nativeMain() = dummyFunction() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/src/nativePlatformMain/kotlin/NativePlatformMain.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/src/nativePlatformMain/kotlin/NativePlatformMain.kt new file mode 100644 index 00000000000..c7c9333a3b4 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-47523-singleNativeTargetPropagation-cinterop/src/nativePlatformMain/kotlin/NativePlatformMain.kt @@ -0,0 +1,5 @@ +@file:Suppress("unused") + +import dummy.dummyFunction + +fun nativePlatformMain() = dummyFunction() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/src/nativeMain/kotlin/NativeMain.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/src/nativeMain/kotlin/commonMain.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/src/nativeMain/kotlin/NativeMain.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/src/nativeMain/kotlin/commonMain.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeInteropUsingPosixApis/src/nativeMain/kotlin/NativeMain.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeInteropUsingPosixApis/src/nativeMain/kotlin/commonMain.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeInteropUsingPosixApis/src/nativeMain/kotlin/NativeMain.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeInteropUsingPosixApis/src/nativeMain/kotlin/commonMain.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeSQLiteAndCurlInterop/src/nativeMain/kotlin/NativeMain.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeSQLiteAndCurlInterop/src/nativeMain/kotlin/commonMain.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeSQLiteAndCurlInterop/src/nativeMain/kotlin/NativeMain.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeSQLiteAndCurlInterop/src/nativeMain/kotlin/commonMain.kt