From aea89047b6e05a157187b56656fe726a8b1e9e2b Mon Sep 17 00:00:00 2001
From: Rebecca Franks <riggaroo@google.com>
Date: Fri, 20 Jun 2025 15:23:49 +0100
Subject: [PATCH 1/2] Remove the need to have separate spotless config

---
 .github/workflows/build_and_test.yml |  2 +-
 .run/spotlessApply.run.xml           |  1 -
 build.gradle.kts                     | 32 ++++++++++++++++++++++++++++
 gradle/libs.versions.toml            |  2 ++
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 6866d8f4..c991d1ad 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -40,7 +40,7 @@ jobs:
         run: chmod +x gradlew
 
       - name: Apply Spotless
-        run: ./gradlew spotlessApply --init-script gradle/init.gradle.kts --no-configuration-cache
+        run: ./gradlew spotlessApply
 
       - name: Commit Spotless changes
         uses: stefanzweifel/git-auto-commit-action@v5
diff --git a/.run/spotlessApply.run.xml b/.run/spotlessApply.run.xml
index c9e02b96..02cbc78f 100644
--- a/.run/spotlessApply.run.xml
+++ b/.run/spotlessApply.run.xml
@@ -19,7 +19,6 @@
             <option name="executionName" />
             <option name="externalProjectPath" value="$PROJECT_DIR$" />
             <option name="externalSystemIdString" value="GRADLE" />
-            <option name="scriptParameters" value="--init-script=gradle/init.gradle.kts" />
             <option name="taskDescriptions">
                 <list />
             </option>
diff --git a/build.gradle.kts b/build.gradle.kts
index 72b0e280..65f14420 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,4 +11,36 @@ plugins {
     alias(libs.plugins.crashlytics) apply false
     alias(libs.plugins.android.test) apply false
     alias(libs.plugins.baselineprofile) apply false
+    alias(libs.plugins.spotless) apply false
+}
+
+val ktlintVersion = "1.5.0"
+
+subprojects {
+    apply(plugin = "com.diffplug.spotless")
+    extensions.configure<com.diffplug.gradle.spotless.SpotlessExtension> {
+        kotlin {
+            target("**/*.kt")
+            targetExclude("**/build/**/*.kt")
+            ktlint(ktlintVersion).editorConfigOverride(
+                mapOf(
+                    "android" to "true",
+                    "ktlint_standard_property-naming" to "disabled"
+                ),
+            )
+            licenseHeaderFile(rootProject.file("spotless/copyright.kt"))
+        }
+        format("kts") {
+            target("**/*.kts")
+            targetExclude("**/build/**/*.kts")
+            // Look for the first line that doesn't have a block comment (assumed to be the license)
+            licenseHeaderFile(rootProject.file("spotless/copyright.kts"), "(^(?![\\/ ]\\*).*$)")
+        }
+        format("xml") {
+            target("**/*.xml")
+            targetExclude("**/build/**/*.xml")
+            // Look for the first XML tag that isn't a comment (<!--) or the xml declaration (<?xml)
+            licenseHeaderFile(rootProject.file("spotless/copyright.xml"), "(<[^!?])")
+        }
+    }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bb677d9d..c0437730 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -49,6 +49,7 @@ poseDetection = "18.0.0-beta5"
 profileinstaller = "1.4.1"
 retrofit = "2.11.0"
 robolectric = "4.14.1"
+spotless = "7.0.2"
 startup = "1.2.0"
 runner = "1.6.2"
 uiTextGoogleFonts = "1.8.0"
@@ -142,3 +143,4 @@ serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref
 android-test = { id = "com.android.test", version.ref = "agp" }
 baselineprofile = { id = "androidx.baselineprofile", version.ref = "baselineprofile" }
 composeScreenshot = { id = "com.android.compose.screenshot", version = "0.0.1-alpha09" }
+spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
\ No newline at end of file

From 4b1c0d53501143d9194199d6f4a49782c6dd00a0 Mon Sep 17 00:00:00 2001
From: Rebecca Franks <riggaroo@google.com>
Date: Fri, 20 Jun 2025 16:49:28 +0100
Subject: [PATCH 2/2] Remove the need to have separate spotless config

---
 build.gradle.kts          | 5 ++---
 gradle/libs.versions.toml | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 65f14420..97047974 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,7 +14,6 @@ plugins {
     alias(libs.plugins.spotless) apply false
 }
 
-val ktlintVersion = "1.5.0"
 
 subprojects {
     apply(plugin = "com.diffplug.spotless")
@@ -22,7 +21,7 @@ subprojects {
         kotlin {
             target("**/*.kt")
             targetExclude("**/build/**/*.kt")
-            ktlint(ktlintVersion).editorConfigOverride(
+            ktlint(libs.versions.ktlint.get()).editorConfigOverride(
                 mapOf(
                     "android" to "true",
                     "ktlint_standard_property-naming" to "disabled"
@@ -30,7 +29,7 @@ subprojects {
             )
             licenseHeaderFile(rootProject.file("spotless/copyright.kt"))
         }
-        format("kts") {
+        kotlinGradle {
             target("**/*.kts")
             targetExclude("**/build/**/*.kts")
             // Look for the first line that doesn't have a block comment (assumed to be the license)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c0437730..cfc0f5f5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -38,6 +38,7 @@ ksp = "2.1.20-1.0.32"
 kotlinxCoroutines = "1.10.2"
 kotlinxSerialization = "2.1.20"
 kotlinxSerializationJson = "1.8.1"
+ktlint = "1.5.0"
 lifecycleRuntimeKtx = "2.8.7"
 lifecycleViewmodelNavigation3 = "1.0.0-SNAPSHOT"
 loggingInterceptor = "5.0.0-alpha.14"