github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove trailing commas in android dependency version checking gradle plugin (#145718)

Browse Source 
Apparently old versions of kotlin (pre 1.4) don't allow trailing commas.

Example logs: https://logs.chromium.org/logs/flutter/buildbucket/cr-buildbucket/8752506486861217537/+/u/Run_package_tests/build_all_packages_for_Android_-_legacy_version/stdout
This commit is contained in:
Gray Mackall 2024-03-29 09:31:06 -07:00 committed by GitHub
parent 1a2f34ab5b
commit 85288818b5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
packages/flutter_tools/gradle/src/main/kotlin/dependency_version_checker.gradle.kts
View File

@ -115,7 +115,7 @@ class DependencyVersionChecker {
} else { } else {
project.logger.error( project.logger.error(
"Warning: unable to detect project AGP version. Skipping " + "Warning: unable to detect project AGP version. Skipping " +
"version checking. \nThis may be because you have applied AGP after the Flutter Gradle Plugin.", "version checking. \nThis may be because you have applied AGP after the Flutter Gradle Plugin."
) )
} }
@ -125,7 +125,7 @@ class DependencyVersionChecker {
} else { } else {
project.logger.error( project.logger.error(
"Warning: unable to detect project KGP version. Skipping " + "Warning: unable to detect project KGP version. Skipping " +
"version checking. \nThis may be because you have applied KGP after the Flutter Gradle Plugin.", "version checking. \nThis may be because you have applied KGP after the Flutter Gradle Plugin."
) )
} }
} }
@ -154,9 +154,9 @@ class DependencyVersionChecker {
agpVersion = agpVersion =
Version.fromString( Version.fromString(
project.plugins.getPlugin(agpPluginName)::class.java.classLoader.loadClass( project.plugins.getPlugin(agpPluginName)::class.java.classLoader.loadClass(
com.android.Version::class.java.name, com.android.Version::class.java.name
).fields.find { it.name == agpVersionFieldName }!! ).fields.find { it.name == agpVersionFieldName }!!
.get(null) as String, .get(null) as String
) )
} catch (ignored: ClassNotFoundException) { } catch (ignored: ClassNotFoundException) {
// Use deprecated Version class as it exists in older AGP (com.android.Version) does // Use deprecated Version class as it exists in older AGP (com.android.Version) does
@ -164,9 +164,9 @@ class DependencyVersionChecker {
agpVersion = agpVersion =
Version.fromString( Version.fromString(
project.plugins.getPlugin(agpPluginName)::class.java.classLoader.loadClass( project.plugins.getPlugin(agpPluginName)::class.java.classLoader.loadClass(
com.android.builder.model.Version::class.java.name, com.android.builder.model.Version::class.java.name
).fields.find { it.name == agpVersionFieldName }!! ).fields.find { it.name == agpVersionFieldName }!!
.get(null) as String, .get(null) as String
) )
} }
return agpVersion return agpVersion
@ -200,7 +200,7 @@ class DependencyVersionChecker {
dependencyName: String, dependencyName: String,
versionString: String, versionString: String,
errorVersion: String, errorVersion: String,
potentialFix: String, potentialFix: String
): String { ): String {
return "Error: Your project's $dependencyName version ($versionString) is lower " + return "Error: Your project's $dependencyName version ($versionString) is lower " +
"than Flutter's minimum supported version of $errorVersion. Please upgrade " + "than Flutter's minimum supported version of $errorVersion. Please upgrade " +
@ -213,7 +213,7 @@ class DependencyVersionChecker {
dependencyName: String, dependencyName: String,
versionString: String, versionString: String,
warnVersion: String, warnVersion: String,
potentialFix: String, potentialFix: String
): String { ): String {
return "Warning: Flutter support for your project's $dependencyName version " + return "Warning: Flutter support for your project's $dependencyName version " +
"($versionString) will soon be dropped. Please upgrade your $dependencyName " + "($versionString) will soon be dropped. Please upgrade your $dependencyName " +
@ -224,7 +224,7 @@ class DependencyVersionChecker {
fun checkGradleVersion( fun checkGradleVersion(
version: Version, version: Version,
project: Project, project: Project
) { ) {
if (version < errorGradleVersion) { if (version < errorGradleVersion) {
val errorMessage: String = val errorMessage: String =
@ -232,7 +232,7 @@ class DependencyVersionChecker {
GRADLE_NAME, GRADLE_NAME,
version.toString(), version.toString(),
errorGradleVersion.toString(), errorGradleVersion.toString(),
getPotentialGradleFix(project.getRootDir().getPath()), getPotentialGradleFix(project.getRootDir().getPath())
) )
throw GradleException(errorMessage) throw GradleException(errorMessage)
} else if (version < warnGradleVersion) { } else if (version < warnGradleVersion) {
@ -241,7 +241,7 @@ class DependencyVersionChecker {
GRADLE_NAME, GRADLE_NAME,
version.toString(), version.toString(),
warnGradleVersion.toString(), warnGradleVersion.toString(),
getPotentialGradleFix(project.getRootDir().getPath()), getPotentialGradleFix(project.getRootDir().getPath())
) )
project.logger.error(warnMessage) project.logger.error(warnMessage)
} }
@ -249,7 +249,7 @@ class DependencyVersionChecker {
fun checkJavaVersion( fun checkJavaVersion(
version: JavaVersion, version: JavaVersion,
project: Project, project: Project
) { ) {
if (version < errorJavaVersion) { if (version < errorJavaVersion) {
val errorMessage: String = val errorMessage: String =
@ -257,7 +257,7 @@ class DependencyVersionChecker {
JAVA_NAME, JAVA_NAME,
version.toString(), version.toString(),
errorJavaVersion.toString(), errorJavaVersion.toString(),
POTENTIAL_JAVA_FIX, POTENTIAL_JAVA_FIX
) )
throw GradleException(errorMessage) throw GradleException(errorMessage)
} else if (version < warnJavaVersion) { } else if (version < warnJavaVersion) {
@ -266,7 +266,7 @@ class DependencyVersionChecker {
JAVA_NAME, JAVA_NAME,
version.toString(), version.toString(),
warnJavaVersion.toString(), warnJavaVersion.toString(),
POTENTIAL_JAVA_FIX, POTENTIAL_JAVA_FIX
) )
project.logger.error(warnMessage) project.logger.error(warnMessage)
} }
@ -274,7 +274,7 @@ class DependencyVersionChecker {
fun checkAGPVersion( fun checkAGPVersion(
version: Version, version: Version,
project: Project, project: Project
) { ) {
if (version < errorAGPVersion) { if (version < errorAGPVersion) {
val errorMessage: String = val errorMessage: String =
@ -282,7 +282,7 @@ class DependencyVersionChecker {
AGP_NAME, AGP_NAME,
version.toString(), version.toString(),
errorAGPVersion.toString(), errorAGPVersion.toString(),
getPotentialAGPFix(project.getRootDir().getPath()), getPotentialAGPFix(project.getRootDir().getPath())
) )
throw GradleException(errorMessage) throw GradleException(errorMessage)
} else if (version < warnAGPVersion) { } else if (version < warnAGPVersion) {
@ -291,7 +291,7 @@ class DependencyVersionChecker {
AGP_NAME, AGP_NAME,
version.toString(), version.toString(),
warnAGPVersion.toString(), warnAGPVersion.toString(),
getPotentialAGPFix(project.getRootDir().getPath()), getPotentialAGPFix(project.getRootDir().getPath())
) )
project.logger.error(warnMessage) project.logger.error(warnMessage)
} }
@ -299,7 +299,7 @@ class DependencyVersionChecker {
fun checkKGPVersion( fun checkKGPVersion(
version: Version, version: Version,
project: Project, project: Project
) { ) {
if (version < errorKGPVersion) { if (version < errorKGPVersion) {
val errorMessage: String = val errorMessage: String =
@ -307,7 +307,7 @@ class DependencyVersionChecker {
KGP_NAME, KGP_NAME,
version.toString(), version.toString(),
errorKGPVersion.toString(), errorKGPVersion.toString(),
getPotentialKGPFix(project.getRootDir().getPath()), getPotentialKGPFix(project.getRootDir().getPath())
) )
throw GradleException(errorMessage) throw GradleException(errorMessage)
} else if (version < warnKGPVersion) { } else if (version < warnKGPVersion) {
@ -316,7 +316,7 @@ class DependencyVersionChecker {
KGP_NAME, KGP_NAME,
version.toString(), version.toString(),
warnKGPVersion.toString(), warnKGPVersion.toString(),
getPotentialKGPFix(project.getRootDir().getPath()), getPotentialKGPFix(project.getRootDir().getPath())
) )
project.logger.error(warnMessage) project.logger.error(warnMessage)
} }
@ -336,7 +336,7 @@ class Version(val major: Int, val minor: Int, val patch: Int) : Comparable<Versi
return Version( return Version(
major = convertedToNumbers.getOrElse(0, { 0 }), major = convertedToNumbers.getOrElse(0, { 0 }),
minor = convertedToNumbers.getOrElse(1, { 0 }), minor = convertedToNumbers.getOrElse(1, { 0 }),
patch = convertedToNumbers.getOrElse(2, { 0 }), patch = convertedToNumbers.getOrElse(2, { 0 })
) )
} }
} }