From 47546ece2751f7bbcf512743b0b4aa50a8aa56a5 Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Wed, 6 Mar 2024 18:29:21 +0100 Subject: [PATCH] [tests] Adjust MppDiagnosticsIt after removing deprecated K/N targets (8/8) Tests were using deprecated targets to produce ERROR-diagnostics. Replace it with a different diagnostic (CommonMainOrTestWithDependsOnEdges) ^KT-64517 --- .../errorDiagnosticBuildFails/build.gradle.kts | 11 ++++++----- .../expectedOutput-assemble-cache-reused.txt | 2 +- .../expectedOutput-assemble.txt | 4 ++-- .../expectedOutput-clean.txt | 2 +- .../expectedOutput-commonize.txt | 2 +- .../expectedOutput-customTask.txt | 2 +- .../errorDiagnosticBuildFails/gradle.properties | 1 + .../brokenProjectA/build.gradle.kts | 12 +++++++----- .../expectedOutput-brokenA.txt | 4 ++-- .../expectedOutput-brokenB.txt | 2 +- .../expectedOutput-healthy.txt | 2 +- .../expectedOutput-root-with-continue.txt | 4 ++-- .../expectedOutput-root.txt | 4 ++-- .../suppressGradlePluginErrors/build.gradle.kts | 12 +++++++----- .../suppressGradlePluginErrors/gradle.properties | 6 ++++-- 15 files changed, 39 insertions(+), 31 deletions(-) create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/gradle.properties diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/build.gradle.kts index c9281fac85a..465297cdb97 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/build.gradle.kts @@ -8,12 +8,13 @@ repositories { } kotlin { - // Using deprecated target to provoke ERROR-diagnostic. If you came here because you removed - // that target entirely, just replace it with any other construction from KGP that provokes - // ERROR-diagnostic - @Suppress("DEPRECATION_ERROR") - linuxMips32() linuxX64() + mingwX64() + + sourceSets { + val myCustomSourceSet by creating + commonMain.get().dependsOn(myCustomSourceSet) + } } tasks.create("myTask") { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/expectedOutput-assemble-cache-reused.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/expectedOutput-assemble-cache-reused.txt index 3d91a71b6aa..a9b4fb6c079 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/expectedOutput-assemble-cache-reused.txt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/expectedOutput-assemble-cache-reused.txt @@ -1,3 +1,3 @@ > Task :checkKotlinGradlePluginConfigurationErrors FAILED -e: [DeprecatedKotlinNativeTargetsDiagnostic | ERROR] The following removed Kotlin/Native targets were used in the project: linuxMips32 +e: [CommonMainOrTestWithDependsOnDiagnostic | ERROR] commonMain can't declare dependsOn on other source sets #diagnostic-end diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/expectedOutput-assemble.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/expectedOutput-assemble.txt index d938232dd2e..b54e9b5822c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/expectedOutput-assemble.txt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/expectedOutput-assemble.txt @@ -1,8 +1,8 @@ > Configure project : -e: [DeprecatedKotlinNativeTargetsDiagnostic | ERROR] The following removed Kotlin/Native targets were used in the project: linuxMips32 +e: [CommonMainOrTestWithDependsOnDiagnostic | ERROR] commonMain can't declare dependsOn on other source sets #diagnostic-end > Task :checkKotlinGradlePluginConfigurationErrors FAILED -e: [DeprecatedKotlinNativeTargetsDiagnostic | ERROR] The following removed Kotlin/Native targets were used in the project: linuxMips32 +e: [CommonMainOrTestWithDependsOnDiagnostic | ERROR] commonMain can't declare dependsOn on other source sets #diagnostic-end diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/expectedOutput-clean.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/expectedOutput-clean.txt index b0f7951555c..50d940c3748 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/expectedOutput-clean.txt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/expectedOutput-clean.txt @@ -1,3 +1,3 @@ > Configure project : -e: [DeprecatedKotlinNativeTargetsDiagnostic | ERROR] The following removed Kotlin/Native targets were used in the project: linuxMips32 +e: [CommonMainOrTestWithDependsOnDiagnostic | ERROR] commonMain can't declare dependsOn on other source sets #diagnostic-end diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/expectedOutput-commonize.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/expectedOutput-commonize.txt index b0f7951555c..50d940c3748 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/expectedOutput-commonize.txt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/expectedOutput-commonize.txt @@ -1,3 +1,3 @@ > Configure project : -e: [DeprecatedKotlinNativeTargetsDiagnostic | ERROR] The following removed Kotlin/Native targets were used in the project: linuxMips32 +e: [CommonMainOrTestWithDependsOnDiagnostic | ERROR] commonMain can't declare dependsOn on other source sets #diagnostic-end diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/expectedOutput-customTask.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/expectedOutput-customTask.txt index b0f7951555c..50d940c3748 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/expectedOutput-customTask.txt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/expectedOutput-customTask.txt @@ -1,3 +1,3 @@ > Configure project : -e: [DeprecatedKotlinNativeTargetsDiagnostic | ERROR] The following removed Kotlin/Native targets were used in the project: linuxMips32 +e: [CommonMainOrTestWithDependsOnDiagnostic | ERROR] commonMain can't declare dependsOn on other source sets #diagnostic-end diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/gradle.properties new file mode 100644 index 00000000000..fd5048b39c4 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/gradle.properties @@ -0,0 +1 @@ +kotlin.mpp.applyDefaultHierarchyTemplate=false diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/brokenProjectA/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/brokenProjectA/build.gradle.kts index 6170bbf3053..8677022bfc8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/brokenProjectA/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/brokenProjectA/build.gradle.kts @@ -3,9 +3,11 @@ plugins { } kotlin { - // Using deprecated target to provoke ERROR-diagnostic. If you came here because you removed - // that target entirely, just replace it with any other construction from KGP that provokes - // ERROR-diagnostic - @Suppress("DEPRECATION_ERROR") - linuxMips32() + linuxX64() + jvm() + + sourceSets { + val myCustomSourceSet by creating + commonMain.get().dependsOn(myCustomSourceSet) + } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/expectedOutput-brokenA.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/expectedOutput-brokenA.txt index 5b6ad56548f..e6585dbaed8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/expectedOutput-brokenA.txt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/expectedOutput-brokenA.txt @@ -1,7 +1,7 @@ > Configure project : > Configure project :brokenProjectA -e: [DeprecatedKotlinNativeTargetsDiagnostic | ERROR] The following removed Kotlin/Native targets were used in the project: linuxMips32 +e: [CommonMainOrTestWithDependsOnDiagnostic | ERROR] commonMain can't declare dependsOn on other source sets #diagnostic-end @@ -13,5 +13,5 @@ e: [CommonMainOrTestWithDependsOnDiagnostic | ERROR] commonMain can't declare de > Configure project :healthyProject > Task :brokenProjectA:checkKotlinGradlePluginConfigurationErrors FAILED -e: [DeprecatedKotlinNativeTargetsDiagnostic | ERROR] The following removed Kotlin/Native targets were used in the project: linuxMips32 +e: [CommonMainOrTestWithDependsOnDiagnostic | ERROR] commonMain can't declare dependsOn on other source sets #diagnostic-end diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/expectedOutput-brokenB.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/expectedOutput-brokenB.txt index 7ed2261a3ab..0003c9767a3 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/expectedOutput-brokenB.txt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/expectedOutput-brokenB.txt @@ -1,7 +1,7 @@ > Configure project : > Configure project :brokenProjectA -e: [DeprecatedKotlinNativeTargetsDiagnostic | ERROR] The following removed Kotlin/Native targets were used in the project: linuxMips32 +e: [CommonMainOrTestWithDependsOnDiagnostic | ERROR] commonMain can't declare dependsOn on other source sets #diagnostic-end diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/expectedOutput-healthy.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/expectedOutput-healthy.txt index f5f9001448d..7a96bcb3712 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/expectedOutput-healthy.txt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/expectedOutput-healthy.txt @@ -1,7 +1,7 @@ > Configure project : > Configure project :brokenProjectA -e: [DeprecatedKotlinNativeTargetsDiagnostic | ERROR] The following removed Kotlin/Native targets were used in the project: linuxMips32 +e: [CommonMainOrTestWithDependsOnDiagnostic | ERROR] commonMain can't declare dependsOn on other source sets #diagnostic-end diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/expectedOutput-root-with-continue.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/expectedOutput-root-with-continue.txt index babfb523f55..de6040e5179 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/expectedOutput-root-with-continue.txt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/expectedOutput-root-with-continue.txt @@ -1,7 +1,7 @@ > Configure project : > Configure project :brokenProjectA -e: [DeprecatedKotlinNativeTargetsDiagnostic | ERROR] The following removed Kotlin/Native targets were used in the project: linuxMips32 +e: [CommonMainOrTestWithDependsOnDiagnostic | ERROR] commonMain can't declare dependsOn on other source sets #diagnostic-end @@ -13,7 +13,7 @@ e: [CommonMainOrTestWithDependsOnDiagnostic | ERROR] commonMain can't declare de > Configure project :healthyProject > Task :brokenProjectA:checkKotlinGradlePluginConfigurationErrors FAILED -e: [DeprecatedKotlinNativeTargetsDiagnostic | ERROR] The following removed Kotlin/Native targets were used in the project: linuxMips32 +e: [CommonMainOrTestWithDependsOnDiagnostic | ERROR] commonMain can't declare dependsOn on other source sets #diagnostic-end diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/expectedOutput-root.txt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/expectedOutput-root.txt index 5b6ad56548f..e6585dbaed8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/expectedOutput-root.txt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/expectedOutput-root.txt @@ -1,7 +1,7 @@ > Configure project : > Configure project :brokenProjectA -e: [DeprecatedKotlinNativeTargetsDiagnostic | ERROR] The following removed Kotlin/Native targets were used in the project: linuxMips32 +e: [CommonMainOrTestWithDependsOnDiagnostic | ERROR] commonMain can't declare dependsOn on other source sets #diagnostic-end @@ -13,5 +13,5 @@ e: [CommonMainOrTestWithDependsOnDiagnostic | ERROR] commonMain can't declare de > Configure project :healthyProject > Task :brokenProjectA:checkKotlinGradlePluginConfigurationErrors FAILED -e: [DeprecatedKotlinNativeTargetsDiagnostic | ERROR] The following removed Kotlin/Native targets were used in the project: linuxMips32 +e: [CommonMainOrTestWithDependsOnDiagnostic | ERROR] commonMain can't declare dependsOn on other source sets #diagnostic-end diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/suppressGradlePluginErrors/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/suppressGradlePluginErrors/build.gradle.kts index 9a2e4ff1fbd..63d2349391d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/suppressGradlePluginErrors/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/suppressGradlePluginErrors/build.gradle.kts @@ -8,11 +8,13 @@ repositories { } kotlin { - // Using deprecated target to provoke ERROR-diagnostic. If you came here because you removed - // that target entirely, just replace it with any other construction from KGP that provokes - // ERROR-diagnostic - @Suppress("DEPRECATION_ERROR") - linuxMips32() + linuxX64() + jvm() + + sourceSets { + val myCustomSourceSet by creating + commonMain.get().dependsOn(myCustomSourceSet) + } } tasks.create("myTask") { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/suppressGradlePluginErrors/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/suppressGradlePluginErrors/gradle.properties index 60275daf393..40702c66071 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/suppressGradlePluginErrors/gradle.properties +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/suppressGradlePluginErrors/gradle.properties @@ -1,3 +1,5 @@ -kotlin.internal.suppressGradlePluginErrors=DeprecatedKotlinNativeTargetsDiagnostic +kotlin.internal.suppressGradlePluginErrors=CommonMainOrTestWithDependsOnDiagnostic # Check that the warning about internal KGP properties is not suppressible -kotlin.suppressGradlePluginWarning=InternalKotlinGradlePluginPropertiesUsed \ No newline at end of file +kotlin.suppressGradlePluginWarning=InternalKotlinGradlePluginPropertiesUsed +# We use dependsOn to trigger error warning which in turns disables default hierarchy template application and noisy warnings +kotlin.mpp.applyDefaultHierarchyTemplate=false