[mpp] Test that every deprecated pre-HMPP property triggers an Error
Previously all these properties were put together, so only one
of them could have triggered the Error
#KT-59304 Verification Pending
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppDiagnosticsIt.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppDiagnosticsIt.kt
index 403706f..b0deb86 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppDiagnosticsIt.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppDiagnosticsIt.kt
@@ -26,24 +26,22 @@
@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)
+ }
}
}
@@ -179,7 +177,7 @@
}
}
- private val defaultFlags: Map<String, String>
+ private val deprecatedFlags: Map<String, String>
get() = mapOf(
"kotlin.mpp.enableGranularSourceSetsMetadata" to "true",
"kotlin.mpp.enableCompatibilityMetadataVariant" to "false",
