Code formatting & cleanup - broken out from AGP 9 update PR (#482)

* Code cleanup: formatting and expression body conversions

Apply ktlint/kotlinter formatting fixes:
- Multi-line chain formatting for readability
- Convert block body functions to expression body syntax
- Add trailing commas to constructor parameters
- Reformat when expressions with braces
- Reformat block comments to inline comments

* Lint fixes - converting runAndFail() functions from block body to expression body syntax

Author: inktomi

fladle-plugin/src/main/java/com/osacky/flank/gradle/FladleConfig.kt

@@ -51,13 +51,11 @@ interface FladleConfig {
   @get:Input
   val testTargets: ListProperty<String>
 
+  // The maximum number of shards. Value will be overwritten by [maxTestShards] if both used in configuration
   @Deprecated(
     message = "testShards is deprecated. Use maxTestShards instead",
     replaceWith = ReplaceWith("maxTestShards"),
   )
-  /**
-   * The maximum number of shards. Value will be overwritten by [maxTestShards] if both used in configuration
-   */
   @get:Input
   @get:Optional
   val testShards: Property<Int>
@@ -473,7 +471,8 @@ interface FladleConfig {
 
   @Internal
   fun getPresentProperties() =
-    this::class.memberProperties
+    this::class
+      .memberProperties
       .filter {
         when (val prop = it.call(this)) {
           is Property<*> -> prop.isPresent

fladle-plugin/src/main/java/com/osacky/flank/gradle/FladlePluginDelegate.kt

@@ -24,7 +24,10 @@ class FladlePluginDelegate {
 
     target.tasks.register("flankAuth", FlankJavaExec::class.java) {
       doFirst {
-        target.layout.fladleDir.get().asFile.mkdirs()
+        target.layout.fladleDir
+          .get()
+          .asFile
+          .mkdirs()
       }
       classpath = project.fladleConfig
       args = listOf("auth", "login")
@@ -34,7 +37,6 @@ class FladlePluginDelegate {
   }
 
   private fun checkMinimumGradleVersion() {
-    // Gradle 4.9 is required because we use the lazy task configuration API.
     if (GRADLE_MIN_VERSION > GradleVersion.current()) {
       throw GradleException("Fladle requires at minimum version $GRADLE_MIN_VERSION. Detected version ${GradleVersion.current()}.")
     }
@@ -102,15 +104,34 @@ class FladlePluginDelegate {
       group = TASK_GROUP
       dependsOn(writeConfigProps)
       doLast {
-        println(writeConfigProps.get().fladleConfigFile.get().asFile.readText())
+        println(
+          writeConfigProps
+            .get()
+            .fladleConfigFile
+            .get()
+            .asFile
+            .readText(),
+        )
       }
     }
 
     register("flankDoctor$name", FlankJavaExec::class.java) {
       if (useDefaultDir) setUpWorkingDir(configName)
       description = "Finds problems with the current configuration."
       classpath = project.fladleConfig
-      args = listOf("firebase", "test", "android", "doctor", "-c", writeConfigProps.get().fladleConfigFile.get().asFile.absolutePath)
+      args =
+        listOf(
+          "firebase",
+          "test",
+          "android",
+          "doctor",
+          "-c",
+          writeConfigProps
+            .get()
+            .fladleConfigFile
+            .get()
+            .asFile.absolutePath,
+        )
       dependsOn(writeConfigProps)
     }
 
@@ -122,13 +143,30 @@ class FladlePluginDelegate {
       args =
         if (project.hasProperty("dumpShards")) {
           listOf(
-            "firebase", "test", "android", "run", "-c",
-            writeConfigProps.get().fladleConfigFile.get().asFile.absolutePath, "--dump-shards",
+            "firebase",
+            "test",
+            "android",
+            "run",
+            "-c",
+            writeConfigProps
+              .get()
+              .fladleConfigFile
+              .get()
+              .asFile.absolutePath,
+            "--dump-shards",
           )
         } else {
           listOf(
-            "firebase", "test", "android", "run", "-c",
-            writeConfigProps.get().fladleConfigFile.get().asFile.absolutePath,
+            "firebase",
+            "test",
+            "android",
+            "run",
+            "-c",
+            writeConfigProps
+              .get()
+              .fladleConfigFile
+              .get()
+              .asFile.absolutePath,
           )
         }
       if (config.serviceAccountCredentials.isPresent) {

fladle-plugin/src/main/java/com/osacky/flank/gradle/FlankExecutionTask.kt

@@ -22,7 +22,12 @@ open class FlankExecutionTask
 
     private fun checkFilesExist(base: FladleConfig) {
       if (base.serviceAccountCredentials.isPresent) {
-        check(base.serviceAccountCredentials.get().asFile.exists()) {
+        check(
+          base.serviceAccountCredentials
+            .get()
+            .asFile
+            .exists(),
+        ) {
           "serviceAccountCredential file doesn't exist ${base.serviceAccountCredentials.get()}"
         }
       }

fladle-plugin/src/main/java/com/osacky/flank/gradle/FlankGradleExtension.kt

@@ -16,7 +16,9 @@ import javax.inject.Inject
 
 open class FlankGradleExtension
   @Inject
-  constructor(objects: ObjectFactory) : FladleConfig {
+  constructor(
+    objects: ObjectFactory,
+  ) : FladleConfig {
     companion object {
       const val FLANK_VERSION = "23.10.1"
     }

fladle-plugin/src/main/java/com/osacky/flank/gradle/FlankJavaExec.kt

@@ -10,7 +10,9 @@ import javax.inject.Inject
 )
 open class FlankJavaExec
   @Inject
-  constructor(projectLayout: ProjectLayout) : JavaExec() {
+  constructor(
+    projectLayout: ProjectLayout,
+  ) : JavaExec() {
     init {
       group = FladlePluginDelegate.TASK_GROUP
       mainClass.set("ftl.Main")

fladle-plugin/src/main/java/com/osacky/flank/gradle/FulladleModuleExtension.kt

@@ -9,7 +9,9 @@ import javax.inject.Inject
 
 open class FulladleModuleExtension
   @Inject
-  constructor(objects: ObjectFactory) {
+  constructor(
+    objects: ObjectFactory,
+  ) {
     /**
      * When set to false, Fulladle will not automatically add this module to additionalTestApks.
      *

fladle-plugin/src/main/java/com/osacky/flank/gradle/FulladlePlugin.kt

@@ -23,18 +23,12 @@ class FulladlePlugin : Plugin<Project> {
     val fulladleConfigureTask =
       root.tasks.register("configureFulladle") {
         var modulesEnabled = false
-        /**
-         * we will first configure all app modules
-         * then configure all library modules
-         * we force this order of configuration because
-         * app modules are better candidates to become
-         * root level test/app APKs, since they produce
-         * app APKs
-         * if no app module had tests or was enabled
-         * we will choose a library module to become
-         * a root level module, in which case we will
-         * have to check if it has its debugApk set
-         */
+        // We first configure all app modules, then configure all library modules.
+        // We force this order because app modules are better candidates to become
+        // root level test/app APKs, since they produce app APKs.
+        // If no app module had tests or was enabled, we will choose a library module
+        // to become a root level module, in which case we will have to check if it
+        // has its debugApk set.
         doLast {
           // first configure all app modules
           root.subprojects {

fladle-plugin/src/main/java/com/osacky/flank/gradle/RequiredDeviceKeyMissingException.kt

@@ -1,3 +1,5 @@
 package com.osacky.flank.gradle
 
-data class RequiredDeviceKeyMissingException(val key: String) : Exception("Device should have '$key' key set to a value.")
+data class RequiredDeviceKeyMissingException(
+  val key: String,
+) : Exception("Device should have '$key' key set to a value.")

fladle-plugin/src/main/java/com/osacky/flank/gradle/SanityConfigValidation.kt

@@ -6,16 +6,22 @@ import java.lang.IllegalArgumentException
 
 fun checkIfSanityAndValidateConfigs(config: FladleConfig) =
   when (config) {
-    is FlankGradleExtension ->
+    is FlankGradleExtension -> {
       config.checkAndValidateConfig { option, name ->
         "Incorrect [$name] configuration. [$option] can't be used together with sanityRobo."
       }
-    is FladleConfigImpl ->
+    }
+
+    is FladleConfigImpl -> {
       config.checkAndValidateConfig(config.name) { option, name ->
         "Incorrect [$name] configuration. [$option] can't be used together with sanityRobo. " +
           "To configure sanityRobo, add clearPropertiesForSanityRobo() to the [$name] configuration"
       }
-    else -> throw IllegalArgumentException("Unexpected configuration when validating parameters. Did not expect: $config.")
+    }
+
+    else -> {
+      throw IllegalArgumentException("Unexpected configuration when validating parameters. Did not expect: $config.")
+    }
   }
 
 private fun FladleConfig.checkAndValidateConfig(

fladle-plugin/src/main/java/com/osacky/flank/gradle/YamlConfigWriterTask.kt

@@ -38,21 +38,18 @@ open class YamlConfigWriterTask
 
     @get:Input
     val additionalTestApks: ListProperty<String> =
-      objects.listProperty(String::class.java)
+      objects
+        .listProperty(String::class.java)
         .convention(config.additionalTestApks)
 
     @OutputFile
     val fladleConfigFile: Provider<RegularFile> = fladleDir.map { it.file("flank.yml") }
 
     @Internal
-    override fun getDescription(): String {
-      return "Writes a flank.yml file based on the current FlankGradleExtension configuration."
-    }
+    override fun getDescription(): String = "Writes a flank.yml file based on the current FlankGradleExtension configuration."
 
     @Internal
-    override fun getGroup(): String {
-      return FladlePluginDelegate.TASK_GROUP
-    }
+    override fun getGroup(): String = FladlePluginDelegate.TASK_GROUP
 
     @TaskAction
     fun writeFile() {