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

[Gradle] KT-48818 Fix mpp13XFlagsSetByPlugin setter

Browse Source 
Use mpp13XFlagsSetByPlugin to prevent false-positive "GranularMetadataTrueHasNoEffect" warning

#KT-48818 Fixed
This commit is contained in:
Anton Lakotka
2021-10-21 23:28:51 +02:00
committed by Space
parent 1057f24a69
commit dbe134e8b2
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt
+1 -1
View File
@@ -145,7 +145,7 @@ internal class PropertiesProvider private constructor(private val project: Proje
var mpp13XFlagsSetByPlugin: Boolean var mpp13XFlagsSetByPlugin: Boolean
get() = booleanProperty("kotlin.internal.mpp.13X.flags.setByPlugin") ?: false get() = booleanProperty("kotlin.internal.mpp.13X.flags.setByPlugin") ?: false
set(value) { project.extensions.extraProperties.set("kotlin.internal.mpp.13X.flags.setByPlugin") { "$value" } } set(value) { project.extensions.extraProperties.set("kotlin.internal.mpp.13X.flags.setByPlugin", "$value") }
val mppHierarchicalStructureByDefault: Boolean val mppHierarchicalStructureByDefault: Boolean
get() = booleanProperty(KOTLIN_MPP_HIERARCHICAL_STRUCTURE_BY_DEFAULT) ?: false get() = booleanProperty(KOTLIN_MPP_HIERARCHICAL_STRUCTURE_BY_DEFAULT) ?: false
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/internal/hierarchicalStructureMigrationHandling.kt
+7 -6
View File
@@ -14,11 +14,12 @@ import org.jetbrains.kotlin.gradle.utils.SingleWarningPerBuild
import org.jetbrains.kotlin.gradle.utils.getOrPut import org.jetbrains.kotlin.gradle.utils.getOrPut
internal fun handleHierarchicalStructureFlagsMigration(project: Project) { internal fun handleHierarchicalStructureFlagsMigration(project: Project) {
if (project.rootProject === project) { SingleActionPerProject.run(project.rootProject, "handleHierarchicalStructureFlagsMigration - rootProject") {
SingleActionPerProject.run(project.rootProject, "handleHierarchicalStructureFlagsMigration - rootProject") { doHandleHierarchicalStructureFlagsMigration(project.rootProject)
doHandleHierarchicalStructureFlagsMigration(project.rootProject) }
}
} else { // rootProject will be handled with the SingleActionPerProject above
if (project.rootProject !== project) {
doHandleHierarchicalStructureFlagsMigration(project) doHandleHierarchicalStructureFlagsMigration(project)
} }
} }
@@ -41,7 +42,7 @@ private fun PropertiesProvider.checkHmppFeatureFlagsForConsistency(project: Proj
if (hierarchicalStructureSupport) { if (hierarchicalStructureSupport) {
if (project === project.rootProject) { if (project === project.rootProject) {
when (enableGranularSourceSetsMetadata) { when (enableGranularSourceSetsMetadata) {
true -> warnGranularMetadataTrueHasNoEffect(project) true -> if (!mpp13XFlagsSetByPlugin) warnGranularMetadataTrueHasNoEffect(project)
false -> errorGranularMetadataFalseUnsupported() false -> errorGranularMetadataFalseUnsupported()
null -> Unit null -> Unit
} }