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

[mpp] Test that every deprecated pre-HMPP property triggers an Error

Browse Source 
Previously all these properties were put together, so only one
of them could have triggered the Error

#KT-59304 Verification Pending
This commit is contained in:
Stanislav Erokhin
2023-08-01 11:15:51 +02:00
committed by teamcity
parent fcd440fd9e
commit d99f8ac9b4
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppDiagnosticsIt.kt
+14 -16
View File
@@ -26,24 +26,22 @@ class MppDiagnosticsIt : KGPBaseTest() {
@GradleTest
fun testDeprecatedMppProperties(gradleVersion: GradleVersion) {
project("mppDeprecatedProperties", gradleVersion) {
checkDeprecatedProperties(isDeprecationExpected = false)
for (deprecatedProperty in this.deprecatedFlags) {
project("mppDeprecatedProperties", gradleVersion) {
checkDeprecatedProperties(isDeprecationExpected = false)
this.gradleProperties.appendText(
defaultFlags.entries.joinToString(
prefix = System.lineSeparator(),
postfix = System.lineSeparator(),
separator = System.lineSeparator(),
) { (prop, value) -> "$prop=$value" }
)
checkDeprecatedProperties(isDeprecationExpected = true)
this.gradleProperties.appendText(
"${deprecatedProperty.key}=${deprecatedProperty.value}${System.lineSeparator()}"
)
checkDeprecatedProperties(isDeprecationExpected = true)
// remove the MPP plugin from the top-level project and check the warnings are still reported in subproject
this.buildGradleKts.writeText("")
checkDeprecatedProperties(isDeprecationExpected = true)
// remove the MPP plugin from the top-level project and check the warnings are still reported in subproject
this.buildGradleKts.writeText("")
checkDeprecatedProperties(isDeprecationExpected = true)
this.gradleProperties.appendText("kotlin.internal.suppressGradlePluginErrors=PreHMPPFlagsError${System.lineSeparator()}")
checkDeprecatedProperties(isDeprecationExpected = false)
this.gradleProperties.appendText("kotlin.internal.suppressGradlePluginErrors=PreHMPPFlagsError${System.lineSeparator()}")
checkDeprecatedProperties(isDeprecationExpected = false)
}
}
}
@@ -202,7 +200,7 @@ class MppDiagnosticsIt : KGPBaseTest() {
}
}
private val defaultFlags: Map<String, String>
private val deprecatedFlags: Map<String, String>
get() = mapOf(
"kotlin.mpp.enableGranularSourceSetsMetadata" to "true",
"kotlin.mpp.enableCompatibilityMetadataVariant" to "false",