Skip to content

Commit 947a1ab

Browse files
Aleksandr PavlenkoAleksandr Pavlenko
authored andcommitted
Use built-in Kotlin helper for version validation
1 parent 2f7eb71 commit 947a1ab

2 files changed

Lines changed: 11 additions & 6 deletions

File tree

‎packages/flutter_tools/gradle/src/main/kotlin/DependencyVersionChecker.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,7 @@ object DependencyVersionChecker {
140140
}
141141

142142
val kgpVersion: Version? = VersionFetcher.getKGPVersion(project)
143-
val usesBuiltInKotlin =
144-
project.findProperty("android.builtInKotlin")?.toString()?.toBoolean() == true
143+
val usesBuiltInKotlin = FlutterPluginUtils.isBuiltInKotlinEnabled(project, agpVersion)
145144

146145
if (kgpVersion != null && !usesBuiltInKotlin) {
147146
checkKGPVersion(kgpVersion, project)

‎packages/flutter_tools/gradle/src/test/kotlin/DependencyVersionCheckerTest.kt‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ import org.gradle.api.Project
4141
import org.gradle.api.Task
4242
import org.gradle.api.logging.Logger
4343
import org.gradle.api.plugins.ExtraPropertiesExtension
44+
import org.gradle.api.provider.Provider
45+
import org.gradle.api.provider.ProviderFactory
4446
import org.gradle.api.tasks.TaskContainer
4547
import org.gradle.internal.extensions.core.extra
4648
import kotlin.test.Test
@@ -172,11 +174,11 @@ class DependencyVersionCheckerTest {
172174
}
173175

174176
@Test
175-
fun `AGP built-in Kotlin skips KGP min version enforcement`() {
177+
fun `AGP 9 built-in Kotlin skips KGP min version enforcement by default`() {
176178
val mockProject =
177179
MockProjectFactory.createMockProjectWithSpecifiedDependencyVersions(
178180
kgpVersion = "2.2.10",
179-
usesBuiltInKotlin = true
181+
builtInKotlinProperty = null
180182
)
181183

182184
val mockExtraPropertiesExtension = mockProject.extra
@@ -446,7 +448,7 @@ private object MockProjectFactory {
446448
gradleVersion: String = SUPPORTED_GRADLE_VERSION,
447449
agpVersion: AndroidPluginVersion = SUPPORTED_AGP_VERSION,
448450
kgpVersion: String = SUPPORTED_KGP_VERSION,
449-
usesBuiltInKotlin: Boolean = false,
451+
builtInKotlinProperty: String? = "false",
450452
minSdkVersions: List<MinSdkVersion> = listOf(SUPPORTED_SDK_VERSION)
451453
): Project {
452454
// Java
@@ -465,7 +467,11 @@ private object MockProjectFactory {
465467
// KGP
466468
every { mockProject.hasProperty(eq("kotlin_version")) } returns true
467469
every { mockProject.properties["kotlin_version"] } returns kgpVersion
468-
every { mockProject.findProperty("android.builtInKotlin") } returns usesBuiltInKotlin.toString()
470+
val mockBuiltInKotlinProperty = mockk<Provider<String>>()
471+
every { mockBuiltInKotlinProperty.orNull } returns builtInKotlinProperty
472+
val mockProviders = mockk<ProviderFactory>()
473+
every { mockProviders.gradleProperty("android.builtInKotlin") } returns mockBuiltInKotlinProperty
474+
every { mockProject.providers } returns mockProviders
469475

470476
// Logger
471477
val mockLogger = mockk<Logger>()

0 commit comments

Comments
 (0)