From 5ffbaa1621c977593690a3ee319c8b41df6c188a Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Thu, 30 Nov 2023 12:45:48 +0100 Subject: [PATCH] [Gradle][MPP] Rename already existing tests for KLIB resolver --- .../mpp/KlibResolverInsideCompilerIT.kt | 39 +++++++++++-------- .../app/build.gradle.kts | 0 .../app/settings.gradle.kts | 0 .../app/src/commonMain/kotlin/app.kt | 0 .../liba-v1/build.gradle.kts | 0 .../liba-v1/settings.gradle.kts | 0 .../liba-v1/src/commonMain/kotlin/a.kt | 0 .../src/nativeInterop/cinterop/liba.def | 0 .../liba-v2/build.gradle.kts | 0 .../liba-v2/settings.gradle.kts | 0 .../liba-v2/src/commonMain/kotlin/a.kt | 0 .../src/nativeInterop/cinterop/liba.def | 0 .../libb/build.gradle.kts | 0 .../libb/settings.gradle.kts | 0 .../libb/src/commonMain/kotlin/b.kt | 0 .../libc/build.gradle.kts | 0 .../libc/settings.gradle.kts | 0 .../libc/src/commonMain/kotlin/c.kt | 0 .../app/build.gradle.kts | 0 .../app/settings.gradle.kts | 0 .../app/src/commonMain/kotlin/app.kt | 0 .../liba-v1/build.gradle.kts | 0 .../liba-v1/settings.gradle.kts | 0 .../liba-v1/src/commonMain/kotlin/a.kt | 0 .../liba-v2/build.gradle.kts | 0 .../liba-v2/settings.gradle.kts | 0 .../liba-v2/src/commonMain/kotlin/a.kt | 0 .../libb/build.gradle.kts | 0 .../libb/settings.gradle.kts | 0 .../libb/src/commonMain/kotlin/b.kt | 0 .../libc/build.gradle.kts | 0 .../libc/settings.gradle.kts | 0 .../libc/src/commonMain/kotlin/c.kt | 0 33 files changed, 23 insertions(+), 16 deletions(-) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{with-cinterop => no-concrete-dependency-versions-in-manifests-cinterop}/app/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{with-cinterop => no-concrete-dependency-versions-in-manifests-cinterop}/app/settings.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{with-cinterop => no-concrete-dependency-versions-in-manifests-cinterop}/app/src/commonMain/kotlin/app.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{with-cinterop => no-concrete-dependency-versions-in-manifests-cinterop}/liba-v1/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{with-cinterop => no-concrete-dependency-versions-in-manifests-cinterop}/liba-v1/settings.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{with-cinterop => no-concrete-dependency-versions-in-manifests-cinterop}/liba-v1/src/commonMain/kotlin/a.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{with-cinterop => no-concrete-dependency-versions-in-manifests-cinterop}/liba-v1/src/nativeInterop/cinterop/liba.def (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{with-cinterop => no-concrete-dependency-versions-in-manifests-cinterop}/liba-v2/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{with-cinterop => no-concrete-dependency-versions-in-manifests-cinterop}/liba-v2/settings.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{with-cinterop => no-concrete-dependency-versions-in-manifests-cinterop}/liba-v2/src/commonMain/kotlin/a.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{with-cinterop => no-concrete-dependency-versions-in-manifests-cinterop}/liba-v2/src/nativeInterop/cinterop/liba.def (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{with-cinterop => no-concrete-dependency-versions-in-manifests-cinterop}/libb/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{with-cinterop => no-concrete-dependency-versions-in-manifests-cinterop}/libb/settings.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{with-cinterop => no-concrete-dependency-versions-in-manifests-cinterop}/libb/src/commonMain/kotlin/b.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{with-cinterop => no-concrete-dependency-versions-in-manifests-cinterop}/libc/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{with-cinterop => no-concrete-dependency-versions-in-manifests-cinterop}/libc/settings.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{with-cinterop => no-concrete-dependency-versions-in-manifests-cinterop}/libc/src/commonMain/kotlin/c.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{without-cinterop => no-concrete-dependency-versions-in-manifests-non-cinterop}/app/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{without-cinterop => no-concrete-dependency-versions-in-manifests-non-cinterop}/app/settings.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{without-cinterop => no-concrete-dependency-versions-in-manifests-non-cinterop}/app/src/commonMain/kotlin/app.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{without-cinterop => no-concrete-dependency-versions-in-manifests-non-cinterop}/liba-v1/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{without-cinterop => no-concrete-dependency-versions-in-manifests-non-cinterop}/liba-v1/settings.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{without-cinterop => no-concrete-dependency-versions-in-manifests-non-cinterop}/liba-v1/src/commonMain/kotlin/a.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{without-cinterop => no-concrete-dependency-versions-in-manifests-non-cinterop}/liba-v2/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{without-cinterop => no-concrete-dependency-versions-in-manifests-non-cinterop}/liba-v2/settings.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{without-cinterop => no-concrete-dependency-versions-in-manifests-non-cinterop}/liba-v2/src/commonMain/kotlin/a.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{without-cinterop => no-concrete-dependency-versions-in-manifests-non-cinterop}/libb/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{without-cinterop => no-concrete-dependency-versions-in-manifests-non-cinterop}/libb/settings.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{without-cinterop => no-concrete-dependency-versions-in-manifests-non-cinterop}/libb/src/commonMain/kotlin/b.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{without-cinterop => no-concrete-dependency-versions-in-manifests-non-cinterop}/libc/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{without-cinterop => no-concrete-dependency-versions-in-manifests-non-cinterop}/libc/settings.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/{without-cinterop => no-concrete-dependency-versions-in-manifests-non-cinterop}/libc/src/commonMain/kotlin/c.kt (100%) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/KlibResolverInsideCompilerIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/KlibResolverInsideCompilerIT.kt index e1ae69d29aa..0a3735dfbb3 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/KlibResolverInsideCompilerIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/KlibResolverInsideCompilerIT.kt @@ -18,23 +18,23 @@ import java.nio.file.Path import kotlin.test.assertTrue import org.jetbrains.kotlin.konan.file.File as KFile -@NativeGradlePluginTests +@MppGradlePluginTests @DisplayName("Tests for KLIB resolver inside the Kotlin compiler") class KlibResolverInsideCompilerIT : KGPBaseTest() { - @DisplayName("Test resolver with C-interop KLIBs (KT-62515)") + @DisplayName("No concrete dependency versions in manifests of C-interop KLIBs (KT-62515)") @GradleTest - fun testResolverWithCInteropKlibs(gradleVersion: GradleVersion, @TempDir tempDir: Path) { - buildProjects( - baseDir = "mpp-klib-resolver-inside-compiler/with-cinterop", + fun testNoConcreteDependencyVersionsInManifestsOfCInteropKlibs(gradleVersion: GradleVersion, @TempDir tempDir: Path) { + buildProjectsForKT62515( + baseDir = "mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop", tempDir, gradleVersion ) } - @DisplayName("Test resolver without C-interop KLIBs (KT-62515)") + @DisplayName("No concrete dependency versions in manifests of non-C-interop KLIBs (KT-62515)") @GradleTest - fun testResolverWithoutCInteropKlibs(gradleVersion: GradleVersion, @TempDir tempDir: Path) { - buildProjects( - baseDir = "mpp-klib-resolver-inside-compiler/without-cinterop", + fun testNoConcreteDependencyVersionsInManifestsOfRegularKlibs(gradleVersion: GradleVersion, @TempDir tempDir: Path) { + buildProjectsForKT62515( + baseDir = "mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop", tempDir, gradleVersion ) } @@ -50,20 +50,27 @@ class KlibResolverInsideCompilerIT : KGPBaseTest() { projectName: String, gradleVersion: GradleVersion, localRepoDir: Path, - buildTask: String = "publish", + buildTask: String = "build", ) { project("$baseDir/$projectName", gradleVersion, localRepoDir = localRepoDir) { build(buildTask) } } - private fun buildProjects(baseDir: String, tempDir: Path, gradleVersion: GradleVersion) { + private fun buildAndPublishProject( + baseDir: String, + projectName: String, + gradleVersion: GradleVersion, + localRepoDir: Path + ) = buildProject(baseDir, projectName, gradleVersion, localRepoDir, buildTask = "publish") + + private fun buildProjectsForKT62515(baseDir: String, tempDir: Path, gradleVersion: GradleVersion) { val localRepoDir = createLocalRepo(tempDir) - buildProject(baseDir, "liba-v1", gradleVersion, localRepoDir) - buildProject(baseDir, "liba-v2", gradleVersion, localRepoDir) - buildProject(baseDir, "libb", gradleVersion, localRepoDir) - buildProject(baseDir, "libc", gradleVersion, localRepoDir) + buildAndPublishProject(baseDir, "liba-v1", gradleVersion, localRepoDir) + buildAndPublishProject(baseDir, "liba-v2", gradleVersion, localRepoDir) + buildAndPublishProject(baseDir, "libb", gradleVersion, localRepoDir) + buildAndPublishProject(baseDir, "libc", gradleVersion, localRepoDir) // Make sure there are no `dependency_version_=` properties with non-`unspecified` values in the manifest file: localRepoDir.toFile().walkTopDown().forEach { file -> @@ -90,6 +97,6 @@ class KlibResolverInsideCompilerIT : KGPBaseTest() { } } - buildProject(baseDir, "app", gradleVersion, localRepoDir, buildTask = "assemble") + buildProject(baseDir, "app", gradleVersion, localRepoDir) } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/app/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/app/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/app/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/app/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/app/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/app/settings.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/app/settings.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/app/settings.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/app/src/commonMain/kotlin/app.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/app/src/commonMain/kotlin/app.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/app/src/commonMain/kotlin/app.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/app/src/commonMain/kotlin/app.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/liba-v1/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/liba-v1/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/liba-v1/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/liba-v1/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/liba-v1/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/liba-v1/settings.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/liba-v1/settings.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/liba-v1/settings.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/liba-v1/src/commonMain/kotlin/a.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/liba-v1/src/commonMain/kotlin/a.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/liba-v1/src/commonMain/kotlin/a.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/liba-v1/src/commonMain/kotlin/a.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/liba-v1/src/nativeInterop/cinterop/liba.def b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/liba-v1/src/nativeInterop/cinterop/liba.def similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/liba-v1/src/nativeInterop/cinterop/liba.def rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/liba-v1/src/nativeInterop/cinterop/liba.def diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/liba-v2/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/liba-v2/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/liba-v2/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/liba-v2/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/liba-v2/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/liba-v2/settings.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/liba-v2/settings.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/liba-v2/settings.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/liba-v2/src/commonMain/kotlin/a.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/liba-v2/src/commonMain/kotlin/a.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/liba-v2/src/commonMain/kotlin/a.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/liba-v2/src/commonMain/kotlin/a.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/liba-v2/src/nativeInterop/cinterop/liba.def b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/liba-v2/src/nativeInterop/cinterop/liba.def similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/liba-v2/src/nativeInterop/cinterop/liba.def rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/liba-v2/src/nativeInterop/cinterop/liba.def diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/libb/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/libb/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/libb/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/libb/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/libb/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/libb/settings.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/libb/settings.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/libb/settings.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/libb/src/commonMain/kotlin/b.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/libb/src/commonMain/kotlin/b.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/libb/src/commonMain/kotlin/b.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/libb/src/commonMain/kotlin/b.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/libc/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/libc/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/libc/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/libc/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/libc/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/libc/settings.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/libc/settings.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/libc/settings.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/libc/src/commonMain/kotlin/c.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/libc/src/commonMain/kotlin/c.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/with-cinterop/libc/src/commonMain/kotlin/c.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-cinterop/libc/src/commonMain/kotlin/c.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/app/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/app/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/app/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/app/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/app/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/app/settings.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/app/settings.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/app/settings.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/app/src/commonMain/kotlin/app.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/app/src/commonMain/kotlin/app.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/app/src/commonMain/kotlin/app.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/app/src/commonMain/kotlin/app.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/liba-v1/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/liba-v1/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/liba-v1/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/liba-v1/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/liba-v1/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/liba-v1/settings.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/liba-v1/settings.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/liba-v1/settings.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/liba-v1/src/commonMain/kotlin/a.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/liba-v1/src/commonMain/kotlin/a.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/liba-v1/src/commonMain/kotlin/a.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/liba-v1/src/commonMain/kotlin/a.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/liba-v2/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/liba-v2/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/liba-v2/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/liba-v2/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/liba-v2/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/liba-v2/settings.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/liba-v2/settings.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/liba-v2/settings.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/liba-v2/src/commonMain/kotlin/a.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/liba-v2/src/commonMain/kotlin/a.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/liba-v2/src/commonMain/kotlin/a.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/liba-v2/src/commonMain/kotlin/a.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/libb/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/libb/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/libb/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/libb/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/libb/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/libb/settings.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/libb/settings.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/libb/settings.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/libb/src/commonMain/kotlin/b.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/libb/src/commonMain/kotlin/b.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/libb/src/commonMain/kotlin/b.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/libb/src/commonMain/kotlin/b.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/libc/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/libc/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/libc/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/libc/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/libc/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/libc/settings.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/libc/settings.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/libc/settings.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/libc/src/commonMain/kotlin/c.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/libc/src/commonMain/kotlin/c.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/without-cinterop/libc/src/commonMain/kotlin/c.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mpp-klib-resolver-inside-compiler/no-concrete-dependency-versions-in-manifests-non-cinterop/libc/src/commonMain/kotlin/c.kt