From abd58445c9709a7588a430e6f5e7a5b917d25f5e Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Mon, 12 Dec 2022 10:20:12 +0100 Subject: [PATCH] [Gradle] Move test project from martinbonnin into /sample1 ^KT-52172 Verification Pending --- .../kotlin/gradle/mpp/MppCompositeBuildIT.kt | 12 ++++++------ .../consumerBuild/consumerA/build.gradle.kts | 0 .../src/commonMain/kotlin/ConsumerACommon.kt | 0 .../src/linuxX64Main/kotlin/ConsumerALinuxX64.kt | 0 .../src/nativeMain/kotlin/ConsumerANative.kt | 0 .../consumerBuild/settings.gradle.kts | 0 .../producerBuild/producerA/build.gradle.kts | 0 .../src/commonMain/kotlin/ProducerACommon.kt | 0 .../src/linuxX64Main/kotlin/ProducerALinuxX64.kt | 0 .../src/nativeMain/kotlin/ProducerANative.kt | 0 .../producerBuild/settings.gradle.kts | 0 .../{ => sample1}/build.gradle.kts | 0 .../{ => sample1}/included-build/build.gradle.kts | 0 .../included-build/included/build.gradle.kts | 0 .../included/src/commonMain/kotlin/included/Hello.kt | 0 .../included/src/jsMain/kotlin/included/sourceSet.kt | 0 .../src/jvmMain/kotlin/included/sourceSet.kt | 0 .../{ => sample1}/included-build/settings.gradle.kts | 0 .../{ => sample1}/settings.gradle.kts | 0 .../src/commonMain/kotlin/com/example/Main.kt | 0 .../src/commonTest/kotlin/com/example/MainTest.kt | 0 21 files changed, 6 insertions(+), 6 deletions(-) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/{simple => sample0}/consumerBuild/consumerA/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/{simple => sample0}/consumerBuild/consumerA/src/commonMain/kotlin/ConsumerACommon.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/{simple => sample0}/consumerBuild/consumerA/src/linuxX64Main/kotlin/ConsumerALinuxX64.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/{simple => sample0}/consumerBuild/consumerA/src/nativeMain/kotlin/ConsumerANative.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/{simple => sample0}/consumerBuild/settings.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/{simple => sample0}/producerBuild/producerA/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/{simple => sample0}/producerBuild/producerA/src/commonMain/kotlin/ProducerACommon.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/{simple => sample0}/producerBuild/producerA/src/linuxX64Main/kotlin/ProducerALinuxX64.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/{simple => sample0}/producerBuild/producerA/src/nativeMain/kotlin/ProducerANative.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/{simple => sample0}/producerBuild/settings.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/{ => sample1}/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/{ => sample1}/included-build/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/{ => sample1}/included-build/included/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/{ => sample1}/included-build/included/src/commonMain/kotlin/included/Hello.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/{ => sample1}/included-build/included/src/jsMain/kotlin/included/sourceSet.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/{ => sample1}/included-build/included/src/jvmMain/kotlin/included/sourceSet.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/{ => sample1}/included-build/settings.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/{ => sample1}/settings.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/{ => sample1}/src/commonMain/kotlin/com/example/Main.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/{ => sample1}/src/commonTest/kotlin/com/example/MainTest.kt (100%) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt index c165eb0707e..99ae4b0254f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt @@ -20,10 +20,10 @@ import kotlin.io.path.absolutePathString @DisplayName("Tests for multiplatform with composite builds") class MppCompositeBuildIT : KGPBaseTest() { @GradleTest - fun `test - simple composite build - ide dependencies`(gradleVersion: GradleVersion) { - val producer = project("mpp-composite-build/simple/producerBuild", gradleVersion) + fun `test - sample0 - ide dependencies`(gradleVersion: GradleVersion) { + val producer = project("mpp-composite-build/sample0/producerBuild", gradleVersion) - project("mpp-composite-build/simple/consumerBuild", gradleVersion) { + project("mpp-composite-build/sample0/consumerBuild", gradleVersion) { settingsGradleKts.toFile().replaceText("", producer.projectPath.absolutePathString()) resolveIdeDependencies(":consumerA") { dependencies -> dependencies["commonMain"].assertMatches( @@ -56,10 +56,10 @@ class MppCompositeBuildIT : KGPBaseTest() { } @GradleTest - fun `test - simple composite build - assemble`(gradleVersion: GradleVersion) { - val producer = project("mpp-composite-build/simple/producerBuild", gradleVersion) + fun `test - sample0 - assemble`(gradleVersion: GradleVersion) { + val producer = project("mpp-composite-build/sample0/producerBuild", gradleVersion) - project("mpp-composite-build/simple/consumerBuild", gradleVersion) { + project("mpp-composite-build/sample0/consumerBuild", gradleVersion) { settingsGradleKts.toFile().replaceText("", producer.projectPath.absolutePathString()) build("cleanNativeDistributionCommonization") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/simple/consumerBuild/consumerA/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample0/consumerBuild/consumerA/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/simple/consumerBuild/consumerA/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample0/consumerBuild/consumerA/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/simple/consumerBuild/consumerA/src/commonMain/kotlin/ConsumerACommon.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample0/consumerBuild/consumerA/src/commonMain/kotlin/ConsumerACommon.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/simple/consumerBuild/consumerA/src/commonMain/kotlin/ConsumerACommon.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample0/consumerBuild/consumerA/src/commonMain/kotlin/ConsumerACommon.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/simple/consumerBuild/consumerA/src/linuxX64Main/kotlin/ConsumerALinuxX64.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample0/consumerBuild/consumerA/src/linuxX64Main/kotlin/ConsumerALinuxX64.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/simple/consumerBuild/consumerA/src/linuxX64Main/kotlin/ConsumerALinuxX64.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample0/consumerBuild/consumerA/src/linuxX64Main/kotlin/ConsumerALinuxX64.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/simple/consumerBuild/consumerA/src/nativeMain/kotlin/ConsumerANative.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample0/consumerBuild/consumerA/src/nativeMain/kotlin/ConsumerANative.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/simple/consumerBuild/consumerA/src/nativeMain/kotlin/ConsumerANative.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample0/consumerBuild/consumerA/src/nativeMain/kotlin/ConsumerANative.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/simple/consumerBuild/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample0/consumerBuild/settings.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/simple/consumerBuild/settings.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample0/consumerBuild/settings.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/simple/producerBuild/producerA/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample0/producerBuild/producerA/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/simple/producerBuild/producerA/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample0/producerBuild/producerA/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/simple/producerBuild/producerA/src/commonMain/kotlin/ProducerACommon.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample0/producerBuild/producerA/src/commonMain/kotlin/ProducerACommon.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/simple/producerBuild/producerA/src/commonMain/kotlin/ProducerACommon.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample0/producerBuild/producerA/src/commonMain/kotlin/ProducerACommon.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/simple/producerBuild/producerA/src/linuxX64Main/kotlin/ProducerALinuxX64.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample0/producerBuild/producerA/src/linuxX64Main/kotlin/ProducerALinuxX64.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/simple/producerBuild/producerA/src/linuxX64Main/kotlin/ProducerALinuxX64.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample0/producerBuild/producerA/src/linuxX64Main/kotlin/ProducerALinuxX64.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/simple/producerBuild/producerA/src/nativeMain/kotlin/ProducerANative.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample0/producerBuild/producerA/src/nativeMain/kotlin/ProducerANative.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/simple/producerBuild/producerA/src/nativeMain/kotlin/ProducerANative.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample0/producerBuild/producerA/src/nativeMain/kotlin/ProducerANative.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/simple/producerBuild/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample0/producerBuild/settings.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/simple/producerBuild/settings.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample0/producerBuild/settings.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample1/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample1/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/included-build/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample1/included-build/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/included-build/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample1/included-build/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/included-build/included/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample1/included-build/included/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/included-build/included/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample1/included-build/included/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/included-build/included/src/commonMain/kotlin/included/Hello.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample1/included-build/included/src/commonMain/kotlin/included/Hello.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/included-build/included/src/commonMain/kotlin/included/Hello.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample1/included-build/included/src/commonMain/kotlin/included/Hello.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/included-build/included/src/jsMain/kotlin/included/sourceSet.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample1/included-build/included/src/jsMain/kotlin/included/sourceSet.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/included-build/included/src/jsMain/kotlin/included/sourceSet.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample1/included-build/included/src/jsMain/kotlin/included/sourceSet.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/included-build/included/src/jvmMain/kotlin/included/sourceSet.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample1/included-build/included/src/jvmMain/kotlin/included/sourceSet.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/included-build/included/src/jvmMain/kotlin/included/sourceSet.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample1/included-build/included/src/jvmMain/kotlin/included/sourceSet.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/included-build/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample1/included-build/settings.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/included-build/settings.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample1/included-build/settings.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample1/settings.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/settings.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample1/settings.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/src/commonMain/kotlin/com/example/Main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample1/src/commonMain/kotlin/com/example/Main.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/src/commonMain/kotlin/com/example/Main.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample1/src/commonMain/kotlin/com/example/Main.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/src/commonTest/kotlin/com/example/MainTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample1/src/commonTest/kotlin/com/example/MainTest.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/src/commonTest/kotlin/com/example/MainTest.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-composite-build/sample1/src/commonTest/kotlin/com/example/MainTest.kt