azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[tests] Adjust MppDiagnosticsIt after removing deprecated K/N targets (8/8)

Browse Source 
Tests were using deprecated targets to produce ERROR-diagnostics.
Replace it with a different diagnostic
(CommonMainOrTestWithDependsOnEdges)

^KT-64517
This commit is contained in:
Dmitry Savvinov
2024-03-06 18:29:21 +01:00
committed by Space Team
parent 9e8be97fbb
commit 47546ece27
15 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/build.gradle.kts
+6 -5
View File
@@ -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") {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/expectedOutput-assemble-cache-reused.txt
+1 -1
View File
@@ -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
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/expectedOutput-assemble.txt
+2 -2
View File
@@ -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
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/expectedOutput-clean.txt
+1 -1
View File
@@ -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
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/expectedOutput-commonize.txt
+1 -1
View File
@@ -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
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/expectedOutput-customTask.txt
+1 -1
View File
@@ -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
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorDiagnosticBuildFails/gradle.properties
+1
View File
@@ -0,0 +1 @@
kotlin.mpp.applyDefaultHierarchyTemplate=false
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/brokenProjectA/build.gradle.kts
+7 -5
View File
@@ -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)
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/expectedOutput-brokenA.txt
+2 -2
View File
@@ -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
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/expectedOutput-brokenB.txt
+1 -1
View File
@@ -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
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/expectedOutput-healthy.txt
+1 -1
View File
@@ -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
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/expectedOutput-root-with-continue.txt
+2 -2
View File
@@ -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
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/errorsFailOnlyRelevantProjects/expectedOutput-root.txt
+2 -2
View File
@@ -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
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/suppressGradlePluginErrors/build.gradle.kts
+7 -5
View File
@@ -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") {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/suppressGradlePluginErrors/gradle.properties
+4 -2
View File
@@ -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
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