[Gradle][MPP] Increase .toString() readability for KotlinAndroidSourceSetLayoutChecker.Diagnostic

KT-53709
This commit is contained in:
Sebastian Sellmair
2022-08-25 12:15:28 +02:00
committed by Space
parent 5a447a823f
commit d4bded85cd
4 changed files with 9 additions and 7 deletions
@@ -24,12 +24,12 @@ internal object MultiplatformLayoutV1PromoteV2Checker : KotlinAndroidSourceSetLa
if (target.project.kotlinPropertiesProvider.ignoreMppAndroidSourceSetLayoutVersion) return
runCatching {
if (MultiplatformLayoutV2AgpRequirementChecker.isAgpRequirementMet()) {
diagnosticReporter.warning(PromoteV2LayoutDiagnostic())
diagnosticReporter.warning(PromoteV2LayoutDiagnostic)
}
}
}
class PromoteV2LayoutDiagnostic : KotlinAndroidSourceSetLayoutChecker.Diagnostic {
object PromoteV2LayoutDiagnostic : KotlinAndroidSourceSetLayoutChecker.Diagnostic {
override val message: String
get() = """
${multiplatformAndroidSourceSetLayoutV1.name} is deprecated. Use ${multiplatformAndroidSourceSetLayoutV2.name} instead.
@@ -39,5 +39,7 @@ internal object MultiplatformLayoutV1PromoteV2Checker : KotlinAndroidSourceSetLa
To suppress this warning: put the following in your gradle.properties:
${PropertyNames.KOTLIN_MPP_ANDROID_SOURCE_SET_LAYOUT_VERSION_1_NO_WARN}=true
""".trimIndent()
override fun toString(): String = "PromoteV2LayoutDiagnostic"
}
}
@@ -28,7 +28,7 @@ internal object MultiplatformLayoutV2AgpRequirementChecker : KotlinAndroidSource
return compareVersionNumbers(Version.ANDROID_GRADLE_PLUGIN_VERSION, AGP_VERSION_MIN) >= 0
}
internal class AgpRequirementNotMetDiagnostic(
internal data class AgpRequirementNotMetDiagnostic(
val requiredMinAgpVersion: String,
val currentAgpVersion: String
) : KotlinAndroidSourceSetLayoutChecker.Diagnostic {
@@ -31,9 +31,9 @@ internal object MultiplatformLayoutV2AndroidStyleSourceDirUsageChecker : KotlinA
}
}
class AndroidStyleSourceDirUsageDiagnostic(
private val androidStyleSourceDirInUse: File,
private val kotlinStyleSourceDirToUse: File
data class AndroidStyleSourceDirUsageDiagnostic(
val androidStyleSourceDirInUse: File,
val kotlinStyleSourceDirToUse: File
) : KotlinAndroidSourceSetLayoutChecker.Diagnostic {
override val message: String
get() = """
@@ -45,7 +45,7 @@ internal object MultiplatformLayoutV2MultiplatformLayoutV1StyleSourceDirUsageChe
}
}
class V1StyleSourceDirUsageDiagnostic(
data class V1StyleSourceDirUsageDiagnostic(
private val layout: KotlinAndroidSourceSetLayout,
private val v1StyleSourceDirInUse: File,
private val v2StyleSourceDirToUse: File