Bump dependencies

LiveTL · May 18, 2024 · 6b3a932 · 6b3a932
1 parent 23eb6ad
commit 6b3a932
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 36 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -2,11 +2,12 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     alias(libs.plugins.android.application)
-    id("com.mikepenz.aboutlibraries.plugin")
+    alias(libs.plugins.aboutLibraries)
     kotlin("android")
     kotlin("plugin.serialization")
     id("dagger.hilt.android.plugin")
     alias(libs.plugins.ksp)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.kotlinter)
 }
 
@@ -66,18 +67,18 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
         isCoreLibraryDesugaringEnabled = true
     }
+}
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
     }
+}
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.version.get()
-    }
+kotlin {
+    jvmToolchain(17)
 }
 
 dependencies {
@@ -148,15 +149,16 @@ tasks {
 
     withType<KotlinCompile> {
         // See https://kotlinlang.org/docs/reference/experimental.html#experimental-status-of-experimental-api-markers
-        kotlinOptions.freeCompilerArgs += listOf(
-            "-opt-in=kotlin.Experimental",
-            "-opt-in=kotlin.RequiresOptIn",
-            "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-            "-opt-in=kotlinx.serialization.ExperimentalSerializationApi",
-            "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi",
-            "-opt-in=androidx.compose.material.ExperimentalMaterialApi",
-            "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
-            "-opt-in=com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi",
-        )
+        compilerOptions {
+            freeCompilerArgs.addAll(
+                "-opt-in=kotlin.RequiresOptIn",
+                "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
+                "-opt-in=kotlinx.serialization.ExperimentalSerializationApi",
+                "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi",
+                "-opt-in=androidx.compose.material.ExperimentalMaterialApi",
+                "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
+                "-opt-in=com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi",
+            )
+        }
     }
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,6 @@
 buildscript {
     dependencies {
         classpath(libs.hilt.gradle)
-        classpath(libs.aboutLibraries.gradle)
     }
 }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,43 +1,43 @@
 [versions]
-aboutlib_version = "11.1.0"
+aboutlib_version = "11.1.4"
 coil_version = "2.6.0"
-compose_compiler_version = "1.5.10"
-coroutines_version = "1.8.0"
-hilt_version = "2.51"
-kotlin_version = "1.9.22"
-ktor_version = "2.3.2"
+coroutines_version = "1.8.1"
+hilt_version = "2.51.1"
+kotlin_version = "2.0.0-RC3"
+ktor_version = "2.3.11"
 
 [plugins]
-android-application = { id = "com.android.application", version = "8.3.0" }
+android-application = { id = "com.android.application", version = "8.4.0" }
 
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin_version" }
+kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin_version" }
 serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin_version" }
-ksp = { id = "com.google.devtools.ksp", version = "1.9.22-1.0.18" }
+ksp = { id = "com.google.devtools.ksp", version = "2.0.0-RC3-1.0.20" }
 
-kotlinter = { id = "org.jmailen.kotlinter", version = "4.1.0" }
+aboutLibraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "aboutlib_version" }
+kotlinter = { id = "org.jmailen.kotlinter", version = "4.3.0" }
 
 [libraries]
-aboutLibraries-gradle = { module = "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin", version.ref = "aboutlib_version" }
 aboutLibraries-compose = { module = "com.mikepenz:aboutlibraries-compose-m3", version.ref = "aboutlib_version" }
 
-androidx-core = "androidx.core:core-ktx:1.12.0"
+androidx-core = "androidx.core:core-ktx:1.13.1"
 
 coil-core = { module = "io.coil-kt:coil", version.ref = "coil_version" }
 coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil_version" }
 
-compose-bom = { module = "dev.chrisbanes.compose:compose-bom", version = "2024.02.00-alpha02" }
+compose-bom = { module = "dev.chrisbanes.compose:compose-bom", version = "2024.05.00-alpha02" }
 compose-material = { module = "androidx.compose.material:material" }
 compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
 compose-material3 = { module = "androidx.compose.material3:material3" }
 compose-ui = { module = "androidx.compose.ui:ui" }
 compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling-preview" }
 compose-ui-tooling-debug = { module = "androidx.compose.ui:ui-tooling" }
 compose-ui-util = { module = "androidx.compose.ui:ui-util" }
-compose-activity = { module = "androidx.activity:activity-compose", version = "1.8.2" }
+compose-activity = { module = "androidx.activity:activity-compose", version = "1.9.0" }
 compose-lintchecks = { module = "com.slack.lint.compose:compose-lint-checks", version = "1.3.1" }
 
-navigation-compose = "androidx.navigation:navigation-compose:2.7.7"
-navigation-accompanist = "com.google.accompanist:accompanist-navigation-material:0.35.0-alpha"
+navigation-compose = "androidx.navigation:navigation-compose:2.8.0-beta01"
+navigation-accompanist = "com.google.accompanist:accompanist-navigation-material:0.35.1-alpha"
 
 coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines_version" }
 coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines_version" }
@@ -57,7 +57,7 @@ ktor-logging = { module = "io.ktor:ktor-client-android", version.ref = "ktor_ver
 preferences-androidx = { module = "androidx.preference:preference-ktx", version = "1.2.1" }
 preferences-flow = { module = "com.github.tfcporciuncula:flow-preferences", version = "1.4.0" }
 
-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.6.3" }
+serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.7.0-RC" }
 
 [bundles]
 coil = ["coil-core", "coil-compose"]

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 #Sat Mar 02 10:55:25 EST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME