Merge branch 'add-ktfmt-gradle-plugin-and-44'

5 files changed, 40 insertions, 1 deletions

diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index 8fa2df4dbe..b690ad4e79 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -3,6 +3,7 @@ import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 plugins {
     id(Dependencies.Plugin.dependencyCheckId) version Versions.Plugin.dependencyCheck apply false
     id(Dependencies.Plugin.gradleVersionsId) version Versions.Plugin.gradleVersions
+    id(Dependencies.Plugin.ktfmtId) version Versions.Plugin.ktfmt apply false
 }
 
 buildscript {
@@ -28,6 +29,7 @@ buildscript {
 
 allprojects {
     apply(plugin = Dependencies.Plugin.dependencyCheckId)
+    apply(plugin = Dependencies.Plugin.ktfmtId)
 
     repositories {
         google()
@@ -38,6 +40,10 @@ allprojects {
         failBuildOnCVSS = 0F // All severity levels
         suppressionFile = "${rootProject.projectDir}/config/dependency-check-suppression.xml"
     }
+
+    configure<com.ncorti.ktfmt.gradle.KtfmtExtension> {
+        kotlinLangStyle()
+    }
 }
 
 tasks.withType<DependencyUpdatesTask> {
diff --git a/android/buildSrc/src/main/kotlin/Dependencies.kt b/android/buildSrc/src/main/kotlin/Dependencies.kt
index 9832268b5e..4a99bbc0bc 100644
--- a/android/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/android/buildSrc/src/main/kotlin/Dependencies.kt
@@ -110,5 +110,6 @@ object Dependencies {
             "org.owasp:dependency-check-gradle:${Versions.Plugin.dependencyCheck}"
         const val dependencyCheckId = "org.owasp.dependencycheck"
         const val gradleVersionsId = "com.github.ben-manes.versions"
+        const val ktfmtId = "com.ncorti.ktfmt.gradle"
     }
 }
diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt
index e8bbceed96..35bc19d1bb 100644
--- a/android/buildSrc/src/main/kotlin/Versions.kt
+++ b/android/buildSrc/src/main/kotlin/Versions.kt
@@ -53,5 +53,6 @@ object Versions {
         const val playPublisher = "3.7.0"
         const val dependencyCheck = "7.4.4"
         const val gradleVersions = "0.44.0"
+        const val ktfmt = "0.11.0"
     }
 }
diff --git a/android/gradle/verification-metadata.xml b/android/gradle/verification-metadata.xml
index c1771f0b4b..f684f65b10 100644
--- a/android/gradle/verification-metadata.xml
+++ b/android/gradle/verification-metadata.xml
@@ -1294,6 +1294,11 @@
             <sha256 value="5d4d632cfbebfe0a7644501cc303570b691406181bee65e9916b921c767d7c72" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.facebook" name="ktfmt" version="0.41">
+         <artifact name="ktfmt-0.41.jar">
+            <sha256 value="b7e332c0cbd51b48c6def3c2b7d2eb8700d34f4dca1675e98f244c8180db45cb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.fasterxml.jackson.core" name="jackson-annotations" version="2.14.1">
          <artifact name="jackson-annotations-2.14.1.jar">
             <sha256 value="d255b4b863ff8ec714a8f96fa55c34621d43dbb82b82d3f57476496a4c09e1e7" origin="Generated by Gradle"/>
@@ -1513,6 +1518,11 @@
             <sha256 value="3f8c088b4dd04a9858721f2e162508c94db0dd86f961e306ee63ef2eda871bf7" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.googlejavaformat" name="google-java-format" version="1.8">
+         <artifact name="google-java-format-1.8.jar">
+            <sha256 value="4e12b232d7f65cb1dcfffe0b44f97f20977288162dcdec9df09255f298003b98" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.guava" name="failureaccess" version="1.0.1">
          <artifact name="failureaccess-1.0.1.jar">
             <sha256 value="a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26" origin="Generated by Gradle"/>
@@ -1666,6 +1676,14 @@
             <sha256 value="f5475e63e7e89e5db62223489aec7a56bd303543772077a17c2cb54c19ca3a20" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.ncorti.ktfmt.gradle" name="plugin" version="0.11.0">
+         <artifact name="plugin-0.11.0.jar">
+            <sha256 value="ff52a386656af5363b2050b16f0a617a182b79c4af282d13fc8536b07e2123f3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="plugin-0.11.0.module">
+            <sha256 value="fe1e1e197b4838052394677a35c1478f2a26460e5c7622868fbd83908f96a0a0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.squareup" name="javapoet" version="1.10.0">
          <artifact name="javapoet-1.10.0.jar">
             <sha256 value="20ef4b82e43ff7c652281a21313cf3b941092467add3fa73509c26f6969efdab" origin="Generated by Gradle"/>
@@ -1958,6 +1976,11 @@
             <sha256 value="eb08b570e408d4646705e70a949614d439ea2b11455f1652ab0330de8954dab9" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.github.java-diff-utils" name="java-diff-utils" version="4.12">
+         <artifact name="java-diff-utils-4.12.jar">
+            <sha256 value="9990a2039778f6b4cc94790141c2868864eacee0620c6c459451121a901cd5b5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.github.x-stream" name="mxparser" version="1.2.2">
          <artifact name="mxparser-1.2.2.jar">
             <sha256 value="aeeee23a3303d811bca8790ea7f25b534314861c03cff36dafdcc2180969eb97" origin="Generated by Gradle"/>
@@ -2932,6 +2955,14 @@
             <sha256 value="1da0d306c995945e1f807240ef64b5cd2dd5ac58612afb1a8596143d10b7ded5" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-test" version="1.6.10">
+         <artifact name="kotlin-test-1.6.10.jar">
+            <sha256 value="b891453cafbf961532d2ba0fb8969e40b0f7c168c9a2fc6a8cdf7c1b0577a36a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-test-1.6.10.module">
+            <sha256 value="0408c2443d253dc0836517a84d81e788adc8dbcb6024af3f4629ce70a2ff632b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-test" version="1.7.20">
          <artifact name="kotlin-test-1.7.20.jar">
             <sha256 value="57f82549c1ff9cb0cd40eebffad9342bbec4d868269bee3fcdd109be91581f5c" origin="Generated by Gradle"/>
diff --git a/android/scripts/update-lockfile.sh b/android/scripts/update-lockfile.sh
index 9cbf81c92c..09769197d4 100755
--- a/android/scripts/update-lockfile.sh
+++ b/android/scripts/update-lockfile.sh
@@ -16,4 +16,4 @@ android_container_image_name=$(cat "../../building/android-container-image.txt")
 podman run --rm -it \
     -v ../..:/build:Z \
     "$android_container_image_name" \
-    android/gradlew -q -p android -M sha256 assemble assembleAndroidTest
+    bash -c 'android/gradlew -q -p android -M sha256 assemble assembleAndroidTest'