Skip to content

Commit 8528881

Browse files
authored
Remove trailing commas in android dependency version checking gradle plugin (#145718)
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
1 parent 1a2f34a commit 8528881

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

packages/flutter_tools/gradle/src/main/kotlin/dependency_version_checker.gradle.kts

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class DependencyVersionChecker {
115115
} else {
116116
project.logger.error(
117117
"Warning: unable to detect project AGP version. Skipping " +
118-
"version checking. \nThis may be because you have applied AGP after the Flutter Gradle Plugin.",
118+
"version checking. \nThis may be because you have applied AGP after the Flutter Gradle Plugin."
119119
)
120120
}
121121

@@ -125,7 +125,7 @@ class DependencyVersionChecker {
125125
} else {
126126
project.logger.error(
127127
"Warning: unable to detect project KGP version. Skipping " +
128-
"version checking. \nThis may be because you have applied KGP after the Flutter Gradle Plugin.",
128+
"version checking. \nThis may be because you have applied KGP after the Flutter Gradle Plugin."
129129
)
130130
}
131131
}
@@ -154,19 +154,19 @@ class DependencyVersionChecker {
154154
agpVersion =
155155
Version.fromString(
156156
project.plugins.getPlugin(agpPluginName)::class.java.classLoader.loadClass(
157-
com.android.Version::class.java.name,
157+
com.android.Version::class.java.name
158158
).fields.find { it.name == agpVersionFieldName }!!
159-
.get(null) as String,
159+
.get(null) as String
160160
)
161161
} catch (ignored: ClassNotFoundException) {
162162
// Use deprecated Version class as it exists in older AGP (com.android.Version) does
163163
// not exist in those versions.
164164
agpVersion =
165165
Version.fromString(
166166
project.plugins.getPlugin(agpPluginName)::class.java.classLoader.loadClass(
167-
com.android.builder.model.Version::class.java.name,
167+
com.android.builder.model.Version::class.java.name
168168
).fields.find { it.name == agpVersionFieldName }!!
169-
.get(null) as String,
169+
.get(null) as String
170170
)
171171
}
172172
return agpVersion
@@ -200,7 +200,7 @@ class DependencyVersionChecker {
200200
dependencyName: String,
201201
versionString: String,
202202
errorVersion: String,
203-
potentialFix: String,
203+
potentialFix: String
204204
): String {
205205
return "Error: Your project's $dependencyName version ($versionString) is lower " +
206206
"than Flutter's minimum supported version of $errorVersion. Please upgrade " +
@@ -213,7 +213,7 @@ class DependencyVersionChecker {
213213
dependencyName: String,
214214
versionString: String,
215215
warnVersion: String,
216-
potentialFix: String,
216+
potentialFix: String
217217
): String {
218218
return "Warning: Flutter support for your project's $dependencyName version " +
219219
"($versionString) will soon be dropped. Please upgrade your $dependencyName " +
@@ -224,15 +224,15 @@ class DependencyVersionChecker {
224224

225225
fun checkGradleVersion(
226226
version: Version,
227-
project: Project,
227+
project: Project
228228
) {
229229
if (version < errorGradleVersion) {
230230
val errorMessage: String =
231231
getErrorMessage(
232232
GRADLE_NAME,
233233
version.toString(),
234234
errorGradleVersion.toString(),
235-
getPotentialGradleFix(project.getRootDir().getPath()),
235+
getPotentialGradleFix(project.getRootDir().getPath())
236236
)
237237
throw GradleException(errorMessage)
238238
} else if (version < warnGradleVersion) {
@@ -241,23 +241,23 @@ class DependencyVersionChecker {
241241
GRADLE_NAME,
242242
version.toString(),
243243
warnGradleVersion.toString(),
244-
getPotentialGradleFix(project.getRootDir().getPath()),
244+
getPotentialGradleFix(project.getRootDir().getPath())
245245
)
246246
project.logger.error(warnMessage)
247247
}
248248
}
249249

250250
fun checkJavaVersion(
251251
version: JavaVersion,
252-
project: Project,
252+
project: Project
253253
) {
254254
if (version < errorJavaVersion) {
255255
val errorMessage: String =
256256
getErrorMessage(
257257
JAVA_NAME,
258258
version.toString(),
259259
errorJavaVersion.toString(),
260-
POTENTIAL_JAVA_FIX,
260+
POTENTIAL_JAVA_FIX
261261
)
262262
throw GradleException(errorMessage)
263263
} else if (version < warnJavaVersion) {
@@ -266,23 +266,23 @@ class DependencyVersionChecker {
266266
JAVA_NAME,
267267
version.toString(),
268268
warnJavaVersion.toString(),
269-
POTENTIAL_JAVA_FIX,
269+
POTENTIAL_JAVA_FIX
270270
)
271271
project.logger.error(warnMessage)
272272
}
273273
}
274274

275275
fun checkAGPVersion(
276276
version: Version,
277-
project: Project,
277+
project: Project
278278
) {
279279
if (version < errorAGPVersion) {
280280
val errorMessage: String =
281281
getErrorMessage(
282282
AGP_NAME,
283283
version.toString(),
284284
errorAGPVersion.toString(),
285-
getPotentialAGPFix(project.getRootDir().getPath()),
285+
getPotentialAGPFix(project.getRootDir().getPath())
286286
)
287287
throw GradleException(errorMessage)
288288
} else if (version < warnAGPVersion) {
@@ -291,23 +291,23 @@ class DependencyVersionChecker {
291291
AGP_NAME,
292292
version.toString(),
293293
warnAGPVersion.toString(),
294-
getPotentialAGPFix(project.getRootDir().getPath()),
294+
getPotentialAGPFix(project.getRootDir().getPath())
295295
)
296296
project.logger.error(warnMessage)
297297
}
298298
}
299299

300300
fun checkKGPVersion(
301301
version: Version,
302-
project: Project,
302+
project: Project
303303
) {
304304
if (version < errorKGPVersion) {
305305
val errorMessage: String =
306306
getErrorMessage(
307307
KGP_NAME,
308308
version.toString(),
309309
errorKGPVersion.toString(),
310-
getPotentialKGPFix(project.getRootDir().getPath()),
310+
getPotentialKGPFix(project.getRootDir().getPath())
311311
)
312312
throw GradleException(errorMessage)
313313
} else if (version < warnKGPVersion) {
@@ -316,7 +316,7 @@ class DependencyVersionChecker {
316316
KGP_NAME,
317317
version.toString(),
318318
warnKGPVersion.toString(),
319-
getPotentialKGPFix(project.getRootDir().getPath()),
319+
getPotentialKGPFix(project.getRootDir().getPath())
320320
)
321321
project.logger.error(warnMessage)
322322
}
@@ -336,7 +336,7 @@ class Version(val major: Int, val minor: Int, val patch: Int) : Comparable<Versi
336336
return Version(
337337
major = convertedToNumbers.getOrElse(0, { 0 }),
338338
minor = convertedToNumbers.getOrElse(1, { 0 }),
339-
patch = convertedToNumbers.getOrElse(2, { 0 }),
339+
patch = convertedToNumbers.getOrElse(2, { 0 })
340340
)
341341
}
342342
}

0 commit comments

Comments
 (0)