Skip to content

Commit ce9dba9

Browse files
reidbakerreidbaker
committed
Kotlin formatting and fixed missed compileTask rename
1 parent 2928f62 commit ce9dba9

File tree

6 files changed

+80
-87
lines changed

6 files changed

+80
-87
lines changed

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

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class FlutterPlugin : Plugin<Project> {
5858
resolveFlutterSdkProperty(flutterRootSystemVal)
5959
?: throw GradleException(
6060
"Flutter SDK not found. Define location with flutter.sdk in the " +
61-
"local.properties file or with a FLUTTER_ROOT environment variable.",
61+
"local.properties file or with a FLUTTER_ROOT environment variable."
6262
)
6363

6464
flutterRoot = project.file(flutterRootPath)
@@ -113,8 +113,8 @@ class FlutterPlugin : Plugin<Project> {
113113
"src",
114114
"main",
115115
"scripts",
116-
"native_plugin_loader.gradle.kts",
117-
),
116+
"native_plugin_loader.gradle.kts"
117+
)
118118
)
119119
}
120120

@@ -226,7 +226,7 @@ class FlutterPlugin : Plugin<Project> {
226226
project.logger.error(
227227
"Warning: Flutter was unable to detect project Gradle, Java, " +
228228
"AGP, and KGP versions. Skipping dependency version checking. Error was: " +
229-
e,
229+
e
230230
)
231231
} else {
232232
// If usesUnsupportedDependencyVersions is set, the exception was thrown by us
@@ -244,7 +244,7 @@ class FlutterPlugin : Plugin<Project> {
244244
"packages",
245245
"flutter_tools",
246246
"gradle",
247-
"flutter_proguard_rules.pro",
247+
"flutter_proguard_rules.pro"
248248
).toString()
249249
// TODO(gmackall): reconsider getting the android extension every time
250250
FlutterPluginUtils.getAndroidExtension(project).buildTypes {
@@ -273,7 +273,7 @@ class FlutterPlugin : Plugin<Project> {
273273
.getAndroidExtension(project)
274274
.getDefaultProguardFile("proguard-android-optimize.txt"),
275275
flutterProguardRules,
276-
"proguard-rules.pro",
276+
"proguard-rules.pro"
277277
)
278278
}
279279
}
@@ -308,7 +308,7 @@ class FlutterPlugin : Plugin<Project> {
308308
project!!,
309309
buildType,
310310
getPluginHandler(project!!),
311-
engineVersion!!,
311+
engineVersion!!
312312
)
313313
}
314314

@@ -323,7 +323,7 @@ class FlutterPlugin : Plugin<Project> {
323323
}
324324
return project?.findProperty(propertyName) as? String ?: localProperties!!.getProperty(
325325
propertyName,
326-
defaultValue,
326+
defaultValue
327327
)
328328
}
329329

@@ -374,7 +374,7 @@ class FlutterPlugin : Plugin<Project> {
374374
val assembleTask = variant.assembleProvider.get()
375375
if (!FlutterPluginUtils.shouldConfigureFlutterTask(
376376
projectToAddTasksTo,
377-
assembleTask,
377+
assembleTask
378378
)
379379
) {
380380
return@configureEach
@@ -436,8 +436,8 @@ class FlutterPlugin : Plugin<Project> {
436436
"${
437437
projectToAddTasksTo.layout.buildDirectory.dir("outputs/flutter-apk")
438438
.get()
439-
}",
440-
),
439+
}"
440+
)
441441
)
442442
rename { "$filename.apk" }
443443
}
@@ -457,15 +457,15 @@ class FlutterPlugin : Plugin<Project> {
457457
getPluginHandler(projectToAddTasksTo).configurePlugins(engineVersion!!)
458458
FlutterPluginUtils.detectLowCompileSdkVersionOrNdkVersion(
459459
projectToAddTasksTo,
460-
getPluginHandler(projectToAddTasksTo).getPluginList(),
460+
getPluginHandler(projectToAddTasksTo).getPluginList()
461461
)
462462
return
463463
}
464464
// Flutter host module project (Add-to-app).
465465
val hostAppProjectName: String? =
466466
if (projectToAddTasksTo.rootProject.hasProperty("flutter.hostAppProjectName")) {
467467
projectToAddTasksTo.rootProject.property(
468-
"flutter.hostAppProjectName",
468+
"flutter.hostAppProjectName"
469469
) as? String
470470
} else {
471471
"app"
@@ -520,7 +520,7 @@ class FlutterPlugin : Plugin<Project> {
520520
copyFlutterAssetsTask = copyFlutterAssetsTask ?: addFlutterDeps(
521521
libraryVariant,
522522
flutterPlugin,
523-
targetPlatforms,
523+
targetPlatforms
524524
)
525525
// TODO(gmackall): Migrate to AGPs variant api.
526526
// https://github.com/flutter/flutter/issues/166550
@@ -536,7 +536,7 @@ class FlutterPlugin : Plugin<Project> {
536536
getPluginHandler(projectToAddTasksTo).configurePlugins(engineVersion!!)
537537
FlutterPluginUtils.detectLowCompileSdkVersionOrNdkVersion(
538538
projectToAddTasksTo,
539-
getPluginHandler(projectToAddTasksTo).getPluginList(),
539+
getPluginHandler(projectToAddTasksTo).getPluginList()
540540
)
541541
}
542542

@@ -564,7 +564,7 @@ class FlutterPlugin : Plugin<Project> {
564564
*/
565565
private fun findTaskOrNull(
566566
project: Project,
567-
taskName: String,
567+
taskName: String
568568
): Task? =
569569
try {
570570
project.tasks.named(taskName).get()
@@ -577,7 +577,7 @@ class FlutterPlugin : Plugin<Project> {
577577
private fun addFlutterDeps(
578578
@Suppress("DEPRECATION") variant: com.android.build.gradle.api.BaseVariant,
579579
flutterPlugin: FlutterPlugin,
580-
targetPlatforms: List<String>,
580+
targetPlatforms: List<String>
581581
): Task {
582582
// Shorthand
583583
val project: Project = flutterPlugin.project!!
@@ -640,12 +640,12 @@ class FlutterPlugin : Plugin<Project> {
640640
val packageAssets: Task? =
641641
findTaskOrNull(
642642
project,
643-
"package${FlutterPluginUtils.capitalize(variant.name)}Assets",
643+
"package${FlutterPluginUtils.capitalize(variant.name)}Assets"
644644
)
645645
val cleanPackageAssets: Task? =
646646
findTaskOrNull(
647647
project,
648-
"cleanPackage${FlutterPluginUtils.capitalize(variant.name)}Assets",
648+
"cleanPackage${FlutterPluginUtils.capitalize(variant.name)}Assets"
649649
)
650650

651651
val isUsedAsSubproject: Boolean =
@@ -658,8 +658,8 @@ class FlutterPlugin : Plugin<Project> {
658658
listOf(
659659
"compile",
660660
FLUTTER_BUILD_PREFIX,
661-
variant.name,
662-
),
661+
variant.name
662+
)
663663
)
664664
// The task provider below will shadow a lot of the variable names, so provide this reference
665665
// to access them within that scope.
@@ -689,7 +689,7 @@ class FlutterPlugin : Plugin<Project> {
689689
sourceDir = FlutterPluginUtils.getFlutterSourceDirectory(project)
690690
intermediateDir =
691691
project.file(
692-
project.layout.buildDirectory.dir("${FlutterPluginConstants.INTERMEDIATES_DIR}/flutter/${variant.name}/"),
692+
project.layout.buildDirectory.dir("${FlutterPluginConstants.INTERMEDIATES_DIR}/flutter/${variant.name}/")
693693
)
694694
frontendServerStarterPath = frontendServerStarterPathValue
695695
extraFrontEndOptions = extraFrontEndOptionsValue
@@ -707,12 +707,12 @@ class FlutterPlugin : Plugin<Project> {
707707
val flutterCompileTask: FlutterTask = compileTaskProvider.get()
708708
val libJar: File =
709709
project.file(
710-
project.layout.buildDirectory.dir("${FlutterPluginConstants.INTERMEDIATES_DIR}/flutter/${variant.name}/libs.jar"),
710+
project.layout.buildDirectory.dir("${FlutterPluginConstants.INTERMEDIATES_DIR}/flutter/${variant.name}/libs.jar")
711711
)
712712
val packJniLibsTaskProvider: TaskProvider<Jar> =
713713
project.tasks.register(
714714
"packJniLibs${FLUTTER_BUILD_PREFIX}${FlutterPluginUtils.capitalize(variant.name)}",
715-
Jar::class.java,
715+
Jar::class.java
716716
) {
717717
destinationDirectory.set(libJar.parentFile)
718718
archiveFileName.set(libJar.name)
@@ -742,12 +742,12 @@ class FlutterPlugin : Plugin<Project> {
742742
variant.name,
743743
project.files({
744744
packJniLibsTask
745-
}),
745+
})
746746
)
747747
val copyFlutterAssetsTaskProvider: TaskProvider<Copy> =
748748
project.tasks.register(
749749
"copyFlutterAssets${FlutterPluginUtils.capitalize(variant.name)}",
750-
Copy::class.java,
750+
Copy::class.java
751751
) {
752752
dependsOn(compileTask)
753753
with(compileTask.assets)
@@ -801,7 +801,7 @@ class FlutterPlugin : Plugin<Project> {
801801
listOf(
802802
"compress${FlutterPluginUtils.capitalize(variant.name)}Assets",
803803
"bundle${FlutterPluginUtils.capitalize(variant.name)}Aar",
804-
"bundle${FlutterPluginUtils.capitalize(variant.name)}LocalLintAar",
804+
"bundle${FlutterPluginUtils.capitalize(variant.name)}LocalLintAar"
805805
)
806806
tasksToCheck.forEach { taskTocheck ->
807807
try {
@@ -829,7 +829,7 @@ class FlutterPlugin : Plugin<Project> {
829829

830830
private fun maybeAddAndroidStudioNativeConfiguration(
831831
plugins: PluginContainer,
832-
dependencies: DependencyHandler,
832+
dependencies: DependencyHandler
833833
) {
834834
if (shouldAddAndroidStudioNativeConfiguration(plugins)) {
835835
dependencies.add("compileOnly", "io.flutter:flutter_embedding_debug:$engineVersion")

0 commit comments

Comments
 (0)