Switch from ktlint to ktfmt (#4318)

Additionally upgrade google-java-format to latest version.

Author: vkryachko

appcheck/firebase-appcheck/ktx/src/androidTest/kotlin/com/google/firebase/appcheck/ktx/FirebaseAppCheckTests.kt

@@ -37,70 +37,70 @@ const val EXISTING_APP = "existing"
 
 @RunWith(AndroidJUnit4ClassRunner::class)
 abstract class BaseTestCase {
-    @Before
-    fun setUp() {
-        Firebase.initialize(
-                ApplicationProvider.getApplicationContext(),
-                FirebaseOptions.Builder()
-                        .setApplicationId(APP_ID)
-                        .setApiKey(API_KEY)
-                        .setProjectId("123")
-                        .build()
-        )
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
 
-        Firebase.initialize(
-                ApplicationProvider.getApplicationContext(),
-                FirebaseOptions.Builder()
-                        .setApplicationId(APP_ID)
-                        .setApiKey(API_KEY)
-                        .setProjectId("123")
-                        .build(),
-                EXISTING_APP
-        )
-    }
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
 
-    @After
-    fun cleanUp() {
-        FirebaseApp.clearInstancesForTest()
-    }
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
 }
 
 @RunWith(AndroidJUnit4ClassRunner::class)
 class FirebaseAppCheckTests : BaseTestCase() {
-    @Test
-    fun appCheck_default_callsDefaultGetInstance() {
-        assertThat(Firebase.appCheck).isSameInstanceAs(FirebaseAppCheck.getInstance())
-    }
+  @Test
+  fun appCheck_default_callsDefaultGetInstance() {
+    assertThat(Firebase.appCheck).isSameInstanceAs(FirebaseAppCheck.getInstance())
+  }
 
-    @Test
-    fun appCheck_with_custom_firebaseapp_calls_GetInstance() {
-        val app = Firebase.app(EXISTING_APP)
-        assertThat(Firebase.appCheck(app))
-            .isSameInstanceAs(FirebaseAppCheck.getInstance(app))
-    }
+  @Test
+  fun appCheck_with_custom_firebaseapp_calls_GetInstance() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.appCheck(app)).isSameInstanceAs(FirebaseAppCheck.getInstance(app))
+  }
 
-    @Test
-    fun appCheckToken_destructuring_declaration_works() {
-        val mockAppCheckToken = object : AppCheckToken() {
-            override fun getToken(): String = "randomToken"
+  @Test
+  fun appCheckToken_destructuring_declaration_works() {
+    val mockAppCheckToken =
+      object : AppCheckToken() {
+        override fun getToken(): String = "randomToken"
 
-            override fun getExpireTimeMillis(): Long = 23121997
-        }
+        override fun getExpireTimeMillis(): Long = 23121997
+      }
 
-        val (token, expiration) = mockAppCheckToken
+    val (token, expiration) = mockAppCheckToken
 
-        assertThat(token).isEqualTo(mockAppCheckToken.token)
-        assertThat(expiration).isEqualTo(mockAppCheckToken.expireTimeMillis)
-    }
+    assertThat(token).isEqualTo(mockAppCheckToken.token)
+    assertThat(expiration).isEqualTo(mockAppCheckToken.expireTimeMillis)
+  }
 }
 
 internal const val LIBRARY_NAME: String = "fire-app-check-ktx"
 
 @RunWith(AndroidJUnit4ClassRunner::class)
 class LibraryVersionTest : BaseTestCase() {
-    @Test
-    fun libraryRegistrationAtRuntime() {
-        val publisher = Firebase.app.get(UserAgentPublisher::class.java)
-        assertThat(publisher.userAgent).contains(LIBRARY_NAME)
-    }
+  @Test
+  fun libraryRegistrationAtRuntime() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+    assertThat(publisher.userAgent).contains(LIBRARY_NAME)
+  }
 }

appcheck/firebase-appcheck/ktx/src/main/kotlin/com/google/firebase/appcheck/ktx/FirebaseAppCheck.kt

@@ -25,7 +25,7 @@ import com.google.firebase.platforminfo.LibraryVersionComponent
 
 /** Returns the [FirebaseAppCheck] instance of the default [FirebaseApp]. */
 val Firebase.appCheck: FirebaseAppCheck
-    get() = FirebaseAppCheck.getInstance()
+  get() = FirebaseAppCheck.getInstance()
 
 /** Returns the [FirebaseAppCheck] instance of a given [FirebaseApp]. */
 fun Firebase.appCheck(app: FirebaseApp) = FirebaseAppCheck.getInstance(app)
@@ -48,6 +48,6 @@ internal const val LIBRARY_NAME: String = "fire-app-check-ktx"
 
 /** @suppress */
 class FirebaseAppCheckKtxRegistrar : ComponentRegistrar {
-    override fun getComponents(): List<Component<*>> =
-            listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
+  override fun getComponents(): List<Component<*>> =
+    listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
 }

build.gradle

@@ -39,7 +39,7 @@ buildscript {
         classpath 'net.ltgt.gradle:gradle-errorprone-plugin:1.3.0'
         classpath 'gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.9'
         classpath 'com.google.gms:google-services:4.3.3'
-        classpath 'org.jlleitschuh.gradle:ktlint-gradle:9.2.1'
+        classpath "com.ncorti.ktfmt.gradle:plugin:0.11.0"
     }
 }
 
@@ -87,7 +87,11 @@ configure(subprojects) {
         }
     }
 
-    apply plugin: "org.jlleitschuh.gradle.ktlint"
+    apply plugin: "com.ncorti.ktfmt.gradle"
+
+    ktfmt {
+        googleStyle()
+    }
 }
 
 task clean(type: Delete) {

buildSrc/build.gradle.kts

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 plugins {
-    id("org.jlleitschuh.gradle.ktlint") version "9.2.1"
+    id("com.ncorti.ktfmt.gradle") version "0.11.0"
     id("com.github.sherter.google-java-format") version "0.9"
     `kotlin-dsl`
 }
@@ -32,7 +32,11 @@ repositories {
 val perfPluginVersion = System.getenv("FIREBASE_PERF_PLUGIN_VERSION") ?: "1.4.1"
 
 googleJavaFormat {
-    toolVersion = "1.10.0"
+    toolVersion = "1.15.0"
+}
+
+ktfmt {
+    googleStyle()
 }
 
 dependencies {

buildSrc/src/main/java/com/google/firebase/gradle/NdkBinaryFixTask.kt

@@ -24,25 +24,22 @@ import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
 
 abstract class NdkBinaryFixTask : DefaultTask() {
-    @get:InputFile
-    abstract val inputFile: RegularFileProperty
+  @get:InputFile abstract val inputFile: RegularFileProperty
 
-    @get:OutputFile
-    val outputFile: File
-        get() = inputFile.get().asFile.let {
-            File(it.parentFile, "lib${it.name}.so")
-        }
+  @get:OutputFile
+  val outputFile: File
+    get() = inputFile.get().asFile.let { File(it.parentFile, "lib${it.name}.so") }
 
-    @get:Internal
-    val into: String
-        get() = "jni/${outputFile.parentFile.name}"
+  @get:Internal
+  val into: String
+    get() = "jni/${outputFile.parentFile.name}"
 
-    @TaskAction
-    fun run() {
-        Files.copy(
-            inputFile.get().asFile.toPath(),
-            outputFile.toPath(),
-            StandardCopyOption.REPLACE_EXISTING
-        )
-    }
+  @TaskAction
+  fun run() {
+    Files.copy(
+      inputFile.get().asFile.toPath(),
+      outputFile.toPath(),
+      StandardCopyOption.REPLACE_EXISTING
+    )
+  }
 }