From 3a418bfe66e7d06568c79c797f573ea8077c46ef Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Tue, 29 Nov 2022 10:19:07 +0100 Subject: [PATCH] [Gradle, Test] Move `mpp-sources-publication` test data --- .../jetbrains/kotlin/gradle/HierarchicalMppIT.kt | 2 +- .../{ => producer}/build.gradle.kts | 0 .../producer/settings.gradle.kts | 14 ++++++++++++++ .../src/commonJvmMain/kotlin/commonJvmMain.kt | 0 .../src/commonJvmTest/kotlin/commonJvmTest.kt | 0 .../{ => producer}/src/commonMain/kotlin/Common.kt | 0 .../{ => producer}/src/commonTest/kotlin/common.kt | 0 .../src/iosArm64Main/kotlin/IosArm64.kt | 0 .../src/iosArm64Test/kotlin/iosArm64Test.kt | 0 .../{ => producer}/src/iosMain/kotlin/Ios.kt | 0 .../{ => producer}/src/iosTest/kotlin/iosTest.kt | 0 .../{ => producer}/src/iosX64Main/kotlin/IosX64.kt | 0 .../src/iosX64Test/kotlin/iosX64Test.kt | 0 .../{ => producer}/src/jvm2Main/kotlin/jvm2Main.kt | 0 .../{ => producer}/src/jvm2Test/kotlin/jvm2Test.kt | 0 .../{ => producer}/src/jvmMain/kotlin/Jvm.kt | 0 .../{ => producer}/src/jvmTest/kotlin/jvmTest.kt | 0 .../src/linuxArm64Main/kotlin/linuxArm64Main.kt | 0 .../src/linuxArm64Test/kotlin/linuxArm64Test.kt | 0 .../src/linuxMain/kotlin/linuxMain.kt | 0 .../src/linuxTest/kotlin/linuxTest.kt | 0 .../src/linuxX64Main/kotlin/linuxX64Main.kt | 0 .../src/linuxX64Test/kotlin/LinuxX64Text.kt | 0 23 files changed, 15 insertions(+), 1 deletion(-) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/{ => producer}/build.gradle.kts (100%) create mode 100755 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/settings.gradle.kts rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/{ => producer}/src/commonJvmMain/kotlin/commonJvmMain.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/{ => producer}/src/commonJvmTest/kotlin/commonJvmTest.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/{ => producer}/src/commonMain/kotlin/Common.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/{ => producer}/src/commonTest/kotlin/common.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/{ => producer}/src/iosArm64Main/kotlin/IosArm64.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/{ => producer}/src/iosArm64Test/kotlin/iosArm64Test.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/{ => producer}/src/iosMain/kotlin/Ios.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/{ => producer}/src/iosTest/kotlin/iosTest.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/{ => producer}/src/iosX64Main/kotlin/IosX64.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/{ => producer}/src/iosX64Test/kotlin/iosX64Test.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/{ => producer}/src/jvm2Main/kotlin/jvm2Main.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/{ => producer}/src/jvm2Test/kotlin/jvm2Test.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/{ => producer}/src/jvmMain/kotlin/Jvm.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/{ => producer}/src/jvmTest/kotlin/jvmTest.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/{ => producer}/src/linuxArm64Main/kotlin/linuxArm64Main.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/{ => producer}/src/linuxArm64Test/kotlin/linuxArm64Test.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/{ => producer}/src/linuxMain/kotlin/linuxMain.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/{ => producer}/src/linuxTest/kotlin/linuxTest.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/{ => producer}/src/linuxX64Main/kotlin/linuxX64Main.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/{ => producer}/src/linuxX64Test/kotlin/LinuxX64Text.kt (100%) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt index e8cfcb3b4ad..b5c4754d50b 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt @@ -729,7 +729,7 @@ class HierarchicalMppIT : KGPBaseTest() { @DisplayName("Test sources publication of a multiplatform library") fun testSourcesPublication(gradleVersion: GradleVersion, @TempDir tempDir: Path) { project( - "mpp-sources-publication", + "mpp-sources-publication/producer", gradleVersion = gradleVersion, localRepoDir = tempDir ).run { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/settings.gradle.kts new file mode 100755 index 00000000000..d6c2165e907 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/settings.gradle.kts @@ -0,0 +1,14 @@ +pluginManagement { + repositories { + mavenLocal() + gradlePluginPortal() + } + plugins { + val kotlin_version: String by settings + val test_fixes_version: String by settings + kotlin("multiplatform").version(kotlin_version) + id("org.jetbrains.kotlin.test.fixes.android") version test_fixes_version + } +} + +rootProject.name = "lib" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/commonJvmMain/kotlin/commonJvmMain.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/commonJvmMain/kotlin/commonJvmMain.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/commonJvmMain/kotlin/commonJvmMain.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/commonJvmMain/kotlin/commonJvmMain.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/commonJvmTest/kotlin/commonJvmTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/commonJvmTest/kotlin/commonJvmTest.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/commonJvmTest/kotlin/commonJvmTest.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/commonJvmTest/kotlin/commonJvmTest.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/commonMain/kotlin/Common.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/commonMain/kotlin/Common.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/commonMain/kotlin/Common.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/commonMain/kotlin/Common.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/commonTest/kotlin/common.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/commonTest/kotlin/common.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/commonTest/kotlin/common.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/commonTest/kotlin/common.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/iosArm64Main/kotlin/IosArm64.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/iosArm64Main/kotlin/IosArm64.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/iosArm64Main/kotlin/IosArm64.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/iosArm64Main/kotlin/IosArm64.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/iosArm64Test/kotlin/iosArm64Test.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/iosArm64Test/kotlin/iosArm64Test.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/iosArm64Test/kotlin/iosArm64Test.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/iosArm64Test/kotlin/iosArm64Test.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/iosMain/kotlin/Ios.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/iosMain/kotlin/Ios.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/iosMain/kotlin/Ios.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/iosMain/kotlin/Ios.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/iosTest/kotlin/iosTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/iosTest/kotlin/iosTest.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/iosTest/kotlin/iosTest.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/iosTest/kotlin/iosTest.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/iosX64Main/kotlin/IosX64.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/iosX64Main/kotlin/IosX64.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/iosX64Main/kotlin/IosX64.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/iosX64Main/kotlin/IosX64.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/iosX64Test/kotlin/iosX64Test.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/iosX64Test/kotlin/iosX64Test.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/iosX64Test/kotlin/iosX64Test.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/iosX64Test/kotlin/iosX64Test.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/jvm2Main/kotlin/jvm2Main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/jvm2Main/kotlin/jvm2Main.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/jvm2Main/kotlin/jvm2Main.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/jvm2Main/kotlin/jvm2Main.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/jvm2Test/kotlin/jvm2Test.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/jvm2Test/kotlin/jvm2Test.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/jvm2Test/kotlin/jvm2Test.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/jvm2Test/kotlin/jvm2Test.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/jvmMain/kotlin/Jvm.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/jvmMain/kotlin/Jvm.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/jvmMain/kotlin/Jvm.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/jvmMain/kotlin/Jvm.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/jvmTest/kotlin/jvmTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/jvmTest/kotlin/jvmTest.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/jvmTest/kotlin/jvmTest.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/jvmTest/kotlin/jvmTest.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/linuxArm64Main/kotlin/linuxArm64Main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/linuxArm64Main/kotlin/linuxArm64Main.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/linuxArm64Main/kotlin/linuxArm64Main.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/linuxArm64Main/kotlin/linuxArm64Main.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/linuxArm64Test/kotlin/linuxArm64Test.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/linuxArm64Test/kotlin/linuxArm64Test.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/linuxArm64Test/kotlin/linuxArm64Test.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/linuxArm64Test/kotlin/linuxArm64Test.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/linuxMain/kotlin/linuxMain.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/linuxMain/kotlin/linuxMain.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/linuxMain/kotlin/linuxMain.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/linuxMain/kotlin/linuxMain.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/linuxTest/kotlin/linuxTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/linuxTest/kotlin/linuxTest.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/linuxTest/kotlin/linuxTest.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/linuxTest/kotlin/linuxTest.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/linuxX64Main/kotlin/linuxX64Main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/linuxX64Main/kotlin/linuxX64Main.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/linuxX64Main/kotlin/linuxX64Main.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/linuxX64Main/kotlin/linuxX64Main.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/linuxX64Test/kotlin/LinuxX64Text.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/linuxX64Test/kotlin/LinuxX64Text.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/src/linuxX64Test/kotlin/LinuxX64Text.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-sources-publication/producer/src/linuxX64Test/kotlin/LinuxX64Text.kt