Upgrade android deps

InkApplications · Jun 19, 2024 · e3774d8 · e3774d8
1 parent ef75edd
commit e3774d8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/buildSrc/src/main/kotlin/library.gradle.kts b/buildSrc/src/main/kotlin/library.gradle.kts
@@ -6,13 +6,8 @@ plugins {
 }
 
 kotlin {
-    jvm {
-        compilations.all {
-            compilerOptions.configure {
-                jvmTarget.set(JvmTarget.JVM_1_8)
-            }
-        }
-    }
+    jvmToolchain(11)
+    jvm()
 
     linuxX64()
     linuxArm64()

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,15 +1,15 @@
 [versions]
 kotlin = "2.0.0"
 ktor = "2.3.11"
-core-ktx = "1.9.0"
-lifecycle-runtime-ktx = "2.6.1"
+core-ktx = "1.13.1"
+lifecycle-runtime-ktx = "2.8.2"
 activity-compose = "1.7.0"
-compose-bom = "2023.03.00"
+compose-bom = "2024.06.00"
 regolith = "1.6.0"
 ink-ui = "0.3.3"
 
 [libraries.android-gradle]
-version = "8.1.2"
+version = "8.5.0"
 module = "com.android.tools.build:gradle"
 
 [libraries.kotlin-gradle]
@@ -89,7 +89,7 @@ name = "ui-graphics"
 module = "androidx.compose.foundation:foundation"
 
 [libraries.androidx-appcompat]
-version = "1.6.1"
+version = "1.7.0"
 module = "androidx.appcompat:appcompat"
 
 [libraries.ktor-server-core]

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Oct 12 17:12:16 CDT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists