Remaining updates

DRSchlaubi · Apr 29, 2024 · 3fe094c · 3fe094c
1 parent 97ee1fc
commit 3fe094c
Show file tree

Hide file tree

Showing 12 changed files with 672 additions and 464 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/android/build.gradle.kts b/app/android/build.gradle.kts
@@ -75,7 +75,7 @@ android {
 
     kotlin {
         compilerOptions {
-            jvmTarget = JvmTarget.JVM_20
+            jvmTarget = JvmTarget.JVM_22
         }
     }
 }
diff --git a/app/android/shared/build.gradle.kts b/app/android/shared/build.gradle.kts
@@ -1,3 +1,5 @@
+import com.android.build.gradle.internal.lint.AndroidLintAnalysisTask
+import com.android.build.gradle.internal.lint.AndroidLintTask
 import com.google.protobuf.gradle.id
 import dev.schlaubi.tonbrett.gradle.sdkInt
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
@@ -42,14 +44,8 @@ protobuf {
     }
 }
 
-
-//tasks {
-//    afterEvaluate {
-//        named("compileDebugJavaWithJavac") {
-//            dependsOn("generateReleaseProto")
-//        }
-//        named("compileDebugKotlin") {
-//            dependsOn("generateReleaseProto")
-//        }
-//    }
-//}
+tasks {
+    withType<AndroidLintAnalysisTask>().configureEach {
+        enabled = false
+    }
+}
diff --git a/app/desktop/uwp_helper/Cargo.lock b/app/desktop/uwp_helper/Cargo.lock
diff --git a/app/web/build.gradle.kts b/app/web/build.gradle.kts
@@ -14,10 +14,12 @@ kotlin {
         browser()
         binaries.executable()
         compilations.all {
-            compilerOptions.configure {
-                freeCompilerArgs.addAll(
-                    "-Xir-per-module", "-Xir-property-lazy-initialization"
-                )
+            compileTaskProvider.configure {
+                compilerOptions {
+                    freeCompilerArgs.addAll(
+                        "-Xir-per-module", "-Xir-property-lazy-initialization"
+                    )
+                }
             }
         }
     }

diff --git a/buildSrc/src/main/kotlin/multiplatform-module.gradle.kts b/buildSrc/src/main/kotlin/multiplatform-module.gradle.kts
@@ -1,4 +1,5 @@
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     kotlin("multiplatform")
@@ -23,8 +24,10 @@ kotlin {
 
     androidTarget {
         compilations.all {
-            kotlinOptions {
-                jvmTarget = "21"
+            compileTaskProvider.configure {
+                compilerOptions {
+                    jvmTarget = JvmTarget.JVM_22
+                }
             }
         }
     }
@@ -38,8 +41,10 @@ kotlin {
 
     targets.all {
         compilations.all {
-            compilerOptions.configure {
-                freeCompilerArgs.add("-Xexpect-actual-classes")
+            compileTaskProvider.configure {
+                compilerOptions {
+                    freeCompilerArgs.add("-Xexpect-actual-classes")
+                }
             }
         }
     }    

diff --git a/gradle.properties b/gradle.properties
@@ -3,11 +3,11 @@ org.jetbrains.compose.experimental.jscanvas.enabled=true
 org.gradle.jvmargs=-Xmx2G
 kotlin.js.ir.output.granularity=whole-program
 kotlin.mpp.androidSourceSetLayoutVersion=2
+kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
 android.useAndroidX=true
 org.jetbrains.compose.experimental.uikit.enabled=true
 kotlin.native.ignoreIncorrectDependencies=true
 kotlin.native.ignoreDisabledTargets=true
-#kotlin.experimental.tryK2=true
 
 # https://docs.gradle.org/current/userguide/upgrading_version_8.html#xml_parsing_now_requires_recent_parsers
 systemProp.javax.xml.parsers.SAXParserFactory=com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,21 +1,21 @@
 [versions]
-kotlin = "2.0.0-Beta4"
-ktor = "2.3.9"
+kotlin = "2.0.0-RC1"
+ktor = "2.3.10"
 kmongo = "4.11.0"
 kord = "0.13.1"
-mikbot = "3.29.0"
-ksp = "2.0.0-Beta4-1.0.17"
-kordex = "1.7.1-SNAPSHOT"
-android = "8.2.2"
-compose = "1.6.1"
-compose-wear = "1.3.0"
-lyricist = "1.6.2"
+mikbot = "3.30.1"
+ksp = "2.0.0-RC1-1.0.20"
+kordex = "1.8.0-SNAPSHOT"
+android = "8.3.2"
+compose = "1.6.10-dev1608"
+compose-wear = "1.3.1"
+lyricist = "1.7.0"
 google-play = "2.1.0"
 coroutines = "1.8.0"
 play-services-wearable = "18.1.0"
-horologist = "0.6.4"
-protobuf = "4.26.0"
-compose-compiler = "1.5.11-dev-k2.0.0-Beta4-21f5e479a96"
+horologist = "0.6.9"
+protobuf = "4.26.1"
+compose-compiler = "1.5.13-dev-k2.0.0-RC1-50f08dfa4b4"
 coil = "3.0.0-alpha06"
 
 [libraries]
@@ -50,9 +50,9 @@ ktor-sse = { group = "io.ktor", name = "ktor-sse", version.ref = "ktor" }
 ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" }
 
 mikbot-ktor = { group = "dev.schlaubi", name = "mikbot-ktor", version.ref = "mikbot" }
-mikbot-music = { group = "dev.schlaubi", name = "mikbot-music-player", version = "3.5.15-SNAPSHOT" }
+mikbot-music = { group = "dev.schlaubi", name = "mikbot-music-player", version = "3.5.18-SNAPSHOT" }
 
-kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "6.0.3" }
+kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "6.0.4" }
 
 lyricist = { group = "cafe.adriel.lyricist", name = "lyricist", version.ref = "lyricist" }
 lyricist-processor = { group = "cafe.adriel.lyricist", name = "lyricist-processor", version.ref = "lyricist" }
@@ -61,9 +61,9 @@ logback = { group = "ch.qos.logback", name = "logback-classic", version = "1.5.3
 
 kvault = { group = "com.liftric", name = "kvault", version = "1.12.0" }
 
-androidx-activity = { group = "androidx.activity", name = "activity-compose", version = "1.8.2" }
+androidx-activity = { group = "androidx.activity", name = "activity-compose", version = "1.9.0" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.6.1" }
-androidx-core = { group = "androidx.core", name = "core-ktx", version = "1.12.0" }
+androidx-core = { group = "androidx.core", name = "core-ktx", version = "1.13.0" }
 androidx-browser = { group = "androidx.browser", name = "browser", version = "1.8.0" }
 mdc-android = { group = "com.google.android.material", name = "material", version = "1.11.0" }
 google-play = { group = "com.google.android.play", name = "app-update", version.ref = "google-play" }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-8.7-20240126001219+0000-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-rc-1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.