Merge pull request #1241 from kul3r4/fix-build

Update kotlin in Complications sample
android · Jan 13, 2025 · 971eb1d · 971eb1d
2 parents 23b7888 + da93555
commit 971eb1d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/Complications/build.gradle → Complications/build.gradle.kts b/Complications/build.gradle → Complications/build.gradle.kts
@@ -16,7 +16,7 @@
 
 buildscript {
     dependencies {
-        classpath libs.kotlin.gradle.plugin
+        classpath(libs.kotlin.gradle.plugin)
     }
 }
 
@@ -26,16 +26,20 @@ plugins {
 }
 
 subprojects {
-    apply plugin: "com.diffplug.spotless"
+    apply(plugin = "com.diffplug.spotless")
 
-    spotless {
+    configure<com.diffplug.gradle.spotless.SpotlessExtension> {
         kotlin {
-            target "**/*.kt"
-            targetExclude("$buildDir/**/*.kt")
+            target("**/*.kt")
             targetExclude("bin/**/*.kt")
 
-            ktlint("0.50.0")
-            licenseHeaderFile rootProject.file("../spotless/copyright.kt")
+            ktlint(libs.versions.ktlint.get())
+            licenseHeaderFile(rootProject.file("../spotless/copyright.kt"))
+        }
+
+        kotlinGradle {
+            target("*.gradle.kts")
+            ktlint()
         }
     }
 }
diff --git a/Complications/gradle/libs.versions.toml b/Complications/gradle/libs.versions.toml
@@ -2,8 +2,10 @@
 android-gradle-plugin = "8.8.0"
 androidx-wear-watchface = "1.2.1"
 
-org-jetbrains-kotlin = "1.9.25"
-org-jetbrains-kotlinx = "1.9.0"
+org-jetbrains-kotlin = "2.1.0"
+org-jetbrains-kotlinx = "1.10.1"
+
+ktlint = "0.50.0"
 
 [libraries]
 androidx-core-ktx = "androidx.core:core-ktx:1.15.0"