From 2ab73f286a51e497f1f90da6bd91093c782e6c7f Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Wed, 26 Jul 2023 14:33:01 +0200 Subject: [PATCH] [mpp] Add test: pre-hmpp dependencies not reported in test source sets Test source sets do not participate in the metadata compilations by default, so the check misses them. This commit just encodes this behavior into tests, without actually addressing it KT-60724 --- .../kotlin/gradle/mpp/PreHmppDependenciesDeprecationIT.kt | 4 ++-- .../build.gradle.kts | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/preHmppDependenciesDeprecation/{noWarningsInPlatformSpecificSourceSets => noWarningsInPlatformSpecificSourceSetsOrTests}/build.gradle.kts (70%) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/PreHmppDependenciesDeprecationIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/PreHmppDependenciesDeprecationIT.kt index f37c122ae26..4fe162b8043 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/PreHmppDependenciesDeprecationIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/PreHmppDependenciesDeprecationIT.kt @@ -71,9 +71,9 @@ class PreHmppDependenciesDeprecationIT : KGPBaseTest() { } @GradleTest - fun testNoWarningsInPlatformSpecificSourceSets(gradleVersion: GradleVersion, @TempDir tempDir: Path) { + fun testNoWarningsInPlatformSpecificSourceSetsOrTests(gradleVersion: GradleVersion, @TempDir tempDir: Path) { publishLibrary("preHmppLibrary", gradleVersion, tempDir) - checkDiagnostics(gradleVersion, "noWarningsInPlatformSpecificSourceSets", tempDir) + checkDiagnostics(gradleVersion, "noWarningsInPlatformSpecificSourceSetsOrTests", tempDir) } private fun checkDiagnostics( diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/preHmppDependenciesDeprecation/noWarningsInPlatformSpecificSourceSets/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/preHmppDependenciesDeprecation/noWarningsInPlatformSpecificSourceSetsOrTests/build.gradle.kts similarity index 70% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/preHmppDependenciesDeprecation/noWarningsInPlatformSpecificSourceSets/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/preHmppDependenciesDeprecation/noWarningsInPlatformSpecificSourceSetsOrTests/build.gradle.kts index 80cb0939615..b155788baf1 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/preHmppDependenciesDeprecation/noWarningsInPlatformSpecificSourceSets/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/preHmppDependenciesDeprecation/noWarningsInPlatformSpecificSourceSetsOrTests/build.gradle.kts @@ -18,4 +18,9 @@ kotlin { implementation("org.jetbrains.kotlin.tests:preHmppLibrary:0.1") } } + + // see KT-60724 + sourceSets.getByName("commonTest").dependencies { + implementation("org.jetbrains.kotlin.tests:preHmppLibrary:0.1") + } }