diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/resources/MultiplatformResourcesConsumptionIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/resources/MultiplatformResourcesConsumptionIT.kt index 2fff30ff093..5be25dbdab3 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/resources/MultiplatformResourcesConsumptionIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/resources/MultiplatformResourcesConsumptionIT.kt @@ -66,6 +66,12 @@ class MultiplatformResourcesConsumptionIT : KGPBaseTest() { } preparePublishedDependencies(gradleVersion, providedJdk, androidVersion, sharedRepo) + buildGradleKts.setDependencies( + """ + implementation("test:publishedA:+") + implementation(project(":projectA")) + """.trimIndent() + ) // Gradle 7.4.2 doesn't pick up sharedRepo from build.gradle.kts and Gradle 8.5 doesn't pick it up from settings.gradle.kts buildGradleKts.setUpRepositoriesInBuildGradleKts(sharedRepo) settingsGradleKts.setUpRepositoriesInSettingGradleKts(sharedRepo) @@ -100,42 +106,42 @@ class MultiplatformResourcesConsumptionIT : KGPBaseTest() { } } + data class Project( + val name: String, + val dependsOn: String?, + val hasResources: Boolean, + ) + + private val dependencies: List = listOf( + Project("A", dependsOn = "B", hasResources = false), + Project("B", dependsOn = "C", hasResources = true), + Project("C", dependsOn = "D", hasResources = false), + Project("D", dependsOn = null, hasResources = true), + ) + private fun prepareProjectDependencies( gradleVersion: GradleVersion, providedJdk: JdkVersions.ProvidedJdk, publicationRepository: Path, ): List { - val projectWithoutResources = project( - "multiplatformResources/consumption/dependency", - gradleVersion, - buildJdk = providedJdk.location, - projectPathAdditionalSuffix = "projectWithoutResources", - ) { - buildGradleKts.replaceText("", "implementation(project(\":projectWithResources\"))") - buildGradleKts.replaceText("", "false") - buildGradleKts.setUpRepositoriesInBuildGradleKts(publicationRepository) + val projectPaths = mutableListOf() + dependencies.forEach { dependencyProject -> + projectPaths.add( + project( + "multiplatformResources/consumption/dependency", + gradleVersion, + buildJdk = providedJdk.location, + projectPathAdditionalSuffix = "project${dependencyProject.name}", + ) { + buildGradleKts.setDependencies( + dependencyProject.dependsOn?.let { "implementation(project(\":project${it}\"))" } ?: "" + ) + buildGradleKts.enableResourcesPublication(dependencyProject.hasResources) + buildGradleKts.setUpRepositoriesInBuildGradleKts(publicationRepository) + }.projectPath + ) } - val projectWithResources = project( - "multiplatformResources/consumption/dependency", - gradleVersion, - buildJdk = providedJdk.location, - projectPathAdditionalSuffix = "projectWithResources", - ) { - buildGradleKts.replaceText("", "implementation(project(\":projectWithResourcesTransitive\"))") - buildGradleKts.replaceText("", "true") - buildGradleKts.setUpRepositoriesInBuildGradleKts(publicationRepository) - } - val projectWithResourcesTransitive = project( - "multiplatformResources/consumption/dependency", - gradleVersion, - buildJdk = providedJdk.location, - projectPathAdditionalSuffix = "projectWithResourcesTransitive", - ) { - buildGradleKts.replaceText("", "") - buildGradleKts.replaceText("", "true") - buildGradleKts.setUpRepositoriesInBuildGradleKts(publicationRepository) - } - return listOf(projectWithoutResources, projectWithResources, projectWithResourcesTransitive).map { it.projectPath } + return projectPaths } private fun preparePublishedDependencies( @@ -144,43 +150,26 @@ class MultiplatformResourcesConsumptionIT : KGPBaseTest() { androidVersion: String, publicationRepository: Path, ) { - val publishedWithoutResources = project( - "multiplatformResources/consumption/dependency", - gradleVersion, - buildJdk = providedJdk.location, - projectPathAdditionalSuffix = "publishedWithoutResources", - localRepoDir = publicationRepository, - ) { - buildGradleKts.replaceText("", "implementation(\"test:publishedWithResources:+\")") - buildGradleKts.replaceText("", "false") - buildGradleKts.setUpPublishing(publicationRepository) - buildGradleKts.setUpRepositoriesInBuildGradleKts(publicationRepository) + val projectToPublish = mutableListOf() + dependencies.forEach { dependencyProject -> + projectToPublish.add( + project( + "multiplatformResources/consumption/dependency", + gradleVersion, + buildJdk = providedJdk.location, + projectPathAdditionalSuffix = "published${dependencyProject.name}", + localRepoDir = publicationRepository, + ) { + buildGradleKts.setDependencies( + dependencyProject.dependsOn?.let { "implementation(\"test:published${it}:+\")" } ?: "" + ) + buildGradleKts.enableResourcesPublication(dependencyProject.hasResources) + buildGradleKts.setUpPublishing(publicationRepository) + buildGradleKts.setUpRepositoriesInBuildGradleKts(publicationRepository) + } + ) } - val publishedWithResources = project( - "multiplatformResources/consumption/dependency", - gradleVersion, - buildJdk = providedJdk.location, - projectPathAdditionalSuffix = "publishedWithResources", - localRepoDir = publicationRepository, - ) { - buildGradleKts.replaceText("", "implementation(\"test:publishedWithResourcesTransitive:+\")") - buildGradleKts.replaceText("", "true") - buildGradleKts.setUpPublishing(publicationRepository) - buildGradleKts.setUpRepositoriesInBuildGradleKts(publicationRepository) - } - val publishedWithResourcesTransitive = project( - "multiplatformResources/consumption/dependency", - gradleVersion, - buildJdk = providedJdk.location, - projectPathAdditionalSuffix = "publishedWithResourcesTransitive", - localRepoDir = publicationRepository, - ) { - buildGradleKts.replaceText("", "") - buildGradleKts.replaceText("", "true") - buildGradleKts.setUpPublishing(publicationRepository) - buildGradleKts.setUpRepositoriesInBuildGradleKts(publicationRepository) - } - listOf(publishedWithResourcesTransitive, publishedWithResources, publishedWithoutResources).forEach { + projectToPublish.reversed().forEach { it.buildWithAGPVersion( ":publishAllPublicationsToMavenRepository", androidVersion = androidVersion, @@ -189,6 +178,9 @@ class MultiplatformResourcesConsumptionIT : KGPBaseTest() { } } + private fun Path.setDependencies(dependencies: String) = replaceText("", dependencies) + private fun Path.enableResourcesPublication(publish: Boolean) = replaceText("", if (publish) "true" else "false") + private fun Path.setUpRepositoriesInBuildGradleKts(publicationRepository: Path) = append(repositories(publicationRepository)) private fun Path.setUpRepositoriesInSettingGradleKts(publicationRepository: Path) = append( """ diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/build.gradle.kts index 3532eddd074..f5e45338060 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/build.gradle.kts @@ -33,8 +33,7 @@ kotlin { sourceSets.commonMain { dependencies { - implementation("test:publishedWithoutResources:+") - implementation(project(":projectWithoutResources")) + } } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/projectWithResources/inCommon b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/projectB/inCommon similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/projectWithResources/inCommon rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/projectB/inCommon diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/projectWithResources/onlyInIOSArm64 b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/projectB/onlyInIOSArm64 similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/projectWithResources/onlyInIOSArm64 rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/projectB/onlyInIOSArm64 diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/projectWithResourcesTransitive/inCommon b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/projectD/inCommon similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/projectWithResourcesTransitive/inCommon rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/projectD/inCommon diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/projectWithResourcesTransitive/onlyInIOSArm64 b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/projectD/onlyInIOSArm64 similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/projectWithResourcesTransitive/onlyInIOSArm64 rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/projectD/onlyInIOSArm64 diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/publishedWithResources/inCommon b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/publishedB/inCommon similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/publishedWithResources/inCommon rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/publishedB/inCommon diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/publishedWithResources/onlyInIOSArm64 b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/publishedB/onlyInIOSArm64 similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/publishedWithResources/onlyInIOSArm64 rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/publishedB/onlyInIOSArm64 diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/publishedWithResourcesTransitive/inCommon b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/publishedD/inCommon similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/publishedWithResourcesTransitive/inCommon rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/publishedD/inCommon diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/publishedWithResourcesTransitive/onlyInIOSArm64 b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/publishedD/onlyInIOSArm64 similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/publishedWithResourcesTransitive/onlyInIOSArm64 rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/iosArm64/embed/publishedD/onlyInIOSArm64 diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/projectWithResources/inCommon b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/projectB/inCommon similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/projectWithResources/inCommon rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/projectB/inCommon diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/projectWithResources/onlyInJs b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/projectB/onlyInJs similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/projectWithResources/onlyInJs rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/projectB/onlyInJs diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/projectWithResourcesTransitive/inCommon b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/projectD/inCommon similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/projectWithResourcesTransitive/inCommon rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/projectD/inCommon diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/projectWithResourcesTransitive/onlyInJs b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/projectD/onlyInJs similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/projectWithResourcesTransitive/onlyInJs rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/projectD/onlyInJs diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/publishedWithResources/inCommon b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/publishedB/inCommon similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/publishedWithResources/inCommon rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/publishedB/inCommon diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/publishedWithResources/onlyInJs b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/publishedB/onlyInJs similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/publishedWithResources/onlyInJs rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/publishedB/onlyInJs diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/publishedWithResourcesTransitive/inCommon b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/publishedD/inCommon similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/publishedWithResourcesTransitive/inCommon rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/publishedD/inCommon diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/publishedWithResourcesTransitive/onlyInJs b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/publishedD/onlyInJs similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/publishedWithResourcesTransitive/onlyInJs rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/publishedD/onlyInJs diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/projectWithResources/inCommon b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/projectB/inCommon similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/projectWithResources/inCommon rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/projectB/inCommon diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/projectWithResources/onlyInLinuxX64 b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/projectB/onlyInLinuxX64 similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/projectWithResources/onlyInLinuxX64 rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/projectB/onlyInLinuxX64 diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/projectWithResourcesTransitive/inCommon b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/projectD/inCommon similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/projectWithResourcesTransitive/inCommon rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/projectD/inCommon diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/projectWithResourcesTransitive/onlyInLinuxX64 b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/projectD/onlyInLinuxX64 similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/projectWithResourcesTransitive/onlyInLinuxX64 rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/projectD/onlyInLinuxX64 diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/publishedWithResources/inCommon b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/publishedB/inCommon similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/publishedWithResources/inCommon rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/publishedB/inCommon diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/publishedWithResources/onlyInLinuxX64 b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/publishedB/onlyInLinuxX64 similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/publishedWithResources/onlyInLinuxX64 rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/publishedB/onlyInLinuxX64 diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/publishedWithResourcesTransitive/inCommon b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/publishedD/inCommon similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/publishedWithResourcesTransitive/inCommon rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/publishedD/inCommon diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/publishedWithResourcesTransitive/onlyInLinuxX64 b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/publishedD/onlyInLinuxX64 similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/publishedWithResourcesTransitive/onlyInLinuxX64 rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/linuxX64/embed/publishedD/onlyInLinuxX64 diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/projectWithResources/inCommon b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/projectB/inCommon similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/projectWithResources/inCommon rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/projectB/inCommon diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/projectWithResources/onlyInWasmJs b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/projectB/onlyInWasmJs similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/projectWithResources/onlyInWasmJs rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/projectB/onlyInWasmJs diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/projectWithResourcesTransitive/inCommon b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/projectD/inCommon similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/projectWithResourcesTransitive/inCommon rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/projectD/inCommon diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/projectWithResourcesTransitive/onlyInWasmJs b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/projectD/onlyInWasmJs similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/projectWithResourcesTransitive/onlyInWasmJs rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/projectD/onlyInWasmJs diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/publishedWithResources/inCommon b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/publishedB/inCommon similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/publishedWithResources/inCommon rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/publishedB/inCommon diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/publishedWithResources/onlyInWasmJs b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/publishedB/onlyInWasmJs similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/publishedWithResources/onlyInWasmJs rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/publishedB/onlyInWasmJs diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/publishedWithResourcesTransitive/inCommon b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/publishedD/inCommon similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/publishedWithResourcesTransitive/inCommon rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/publishedD/inCommon diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/publishedWithResourcesTransitive/onlyInWasmJs b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/publishedD/onlyInWasmJs similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/publishedWithResourcesTransitive/onlyInWasmJs rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmJs/embed/publishedD/onlyInWasmJs diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/projectWithResources/inCommon b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/projectB/inCommon similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/projectWithResources/inCommon rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/projectB/inCommon diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/projectWithResources/onlyInWasmWasi b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/projectB/onlyInWasmWasi similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/projectWithResources/onlyInWasmWasi rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/projectB/onlyInWasmWasi diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/projectWithResourcesTransitive/inCommon b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/projectD/inCommon similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/projectWithResourcesTransitive/inCommon rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/projectD/inCommon diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/projectWithResourcesTransitive/onlyInWasmWasi b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/projectD/onlyInWasmWasi similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/projectWithResourcesTransitive/onlyInWasmWasi rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/projectD/onlyInWasmWasi diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/publishedWithResources/inCommon b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/publishedB/inCommon similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/publishedWithResources/inCommon rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/publishedB/inCommon diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/publishedWithResources/onlyInWasmWasi b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/publishedB/onlyInWasmWasi similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/publishedWithResources/onlyInWasmWasi rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/publishedB/onlyInWasmWasi diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/publishedWithResourcesTransitive/inCommon b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/publishedD/inCommon similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/publishedWithResourcesTransitive/inCommon rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/publishedD/inCommon diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/publishedWithResourcesTransitive/onlyInWasmWasi b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/publishedD/onlyInWasmWasi similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/publishedWithResourcesTransitive/onlyInWasmWasi rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/wasmWasi/embed/publishedD/onlyInWasmWasi