Updated dependencies and gradle

Author: JetpackDuba

build.gradle.kts

@@ -1,10 +1,9 @@
 import org.gradle.jvm.tasks.Jar
 import org.jetbrains.compose.ExperimentalComposeLibrary
-import org.jetbrains.compose.compose
 import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag
 import java.io.FileOutputStream
 import java.nio.file.Files
-import org.jetbrains.compose.reload.ComposeHotRun
+import org.jetbrains.compose.reload.gradle.ComposeHotRun
 
 plugins {
     alias(libs.plugins.kotlin.jvm)
@@ -78,7 +77,6 @@ dependencies {
     implementation(libs.slf4j.api)
     implementation(libs.slf4j.reload4j)
 
-    implementation(libs.datastore.core)
     implementation(libs.bouncycastle)
 
     implementation(libs.ktor.client)
@@ -130,10 +128,6 @@ tasks.withType<JavaExec> {
     })
 }
 
-//https://github.com/JetBrains/compose-hot-reload
-composeCompiler {
-    featureFlags.add(ComposeFeatureFlag.OptimizeNonSkippingGroups)
-}
 tasks.withType<ComposeHotRun>().configureEach {
     mainClass.set("com.jetpackduba.gitnuro.MainKt")
 }
@@ -169,7 +163,7 @@ compose.desktop {
 }
 
 
-task("fatJarLinux", type = Jar::class) {
+tasks.register("fatJarLinux", type = Jar::class) {
     val archSuffix = if (isLinuxAarch64) {
         "arm_aarch64"
     } else {
@@ -195,7 +189,7 @@ task("fatJarLinux", type = Jar::class) {
     with(tasks.jar.get() as CopySpec)
 }
 
-task("rust_build") {
+tasks.register("rust_build") {
     buildRust()
 }
 
@@ -213,20 +207,20 @@ tasks.getByName("compileTestKotlin").doLast {
     generateKotlinFromRs()
 }
 
-task("tasksList") {
+tasks.register("tasksList") {
     println("Tasks")
     tasks.forEach {
         println("- ${it.name}")
     }
 }
 
-task("rustTasks") {
+tasks.register("rustTasks") {
     buildRust()
     copyRustBuild()
     generateKotlinFromRs()
 }
 
-task("rust_copyBuild") {
+tasks.register("rust_copyBuild") {
     copyRustBuild()
 }
 
@@ -248,44 +242,44 @@ fun generateKotlinFromRs() {
         outDir,
     )
 
-    exec {
+    providers.exec {
         println("Generating Kotlin source files")
 
         workingDir = File(project.projectDir, "rs")
         commandLine = command
-    }
+    }.result.get()
 }
 
 fun buildRust() {
-    exec {
-        println("Build rs called")
-        val binary = if (currentOs() == OS.LINUX && useCross) {
-            "cross"
-        } else {
-            "cargo"
-        }
+    println("Build rs called")
+    val binary = if (currentOs() == OS.LINUX && useCross) {
+        "cross"
+    } else {
+        "cargo"
+    }
 
-        val params = mutableListOf(
-            binary, "build",
-        )
+    val params = mutableListOf(
+        binary, "build",
+    )
 
-        if (isRustRelease) {
-            params.add("--release")
-        }
+    if (isRustRelease) {
+        params.add("--release")
+    }
 
-        if (currentOs() == OS.LINUX && useCross) {
-            if (isLinuxAarch64) {
-                params.add("--target=$linuxArmTarget")
-            } else {
-                params.add("--target=$linuxX64Target")
-            }
-        } else if (currentOs() == OS.MAC) {
-            params.add("--target=x86_64-apple-darwin")
+    if (currentOs() == OS.LINUX && useCross) {
+        if (isLinuxAarch64) {
+            params.add("--target=$linuxArmTarget")
+        } else {
+            params.add("--target=$linuxX64Target")
         }
+    } else if (currentOs() == OS.MAC) {
+        params.add("--target=x86_64-apple-darwin")
+    }
 
+    providers.exec {
         workingDir = File(project.projectDir, "rs")
         commandLine = params
-    }
+    }.result.get()
 }
 
 fun copyRustBuild() {

gradle/libs.versions.toml

@@ -1,20 +1,20 @@
 [versions]
 
-kotlin = "2.1.21"
-compose = "1.8.1"
-hotReload = "1.0.0-alpha09"
-ksp = "2.1.21-2.0.1"
+kotlin = "2.2.0"
+compose = "1.8.3"
+compose-plugin = "1.8.2"
+hotReload = "1.0.0-beta04"
+ksp = "2.2.0-2.0.2"
 jgit = "7.3.0.202506031305-r"
-dagger = "2.56.2"
-kotlinx-serialization = "1.5.0"
+dagger = "2.57"
+kotlinx-serialization = "1.9.0"
 junit-bom = "5.9.0"
 junit-jupiter = "5.9.2"
 mockk = "1.13.4"
-kotlin-logging = "5.0.1"
-slf4j = "2.0.7"
-datastore = "1.1.7"
-bouncycastle = "1.78.1"
-ktor = "3.0.3"
+kotlin-logging = "7.0.7"
+slf4j = "2.0.17"
+bouncycastle = "1.81"
+ktor = "3.2.2"
 
 
 [libraries]
@@ -38,8 +38,6 @@ kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging-jvm", versi
 slf4j-api = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" }
 slf4j-reload4j = { group = "org.slf4j", name = "slf4j-reload4j", version.ref = "slf4j" }
 
-datastore-core = { group = "androidx.datastore", name = "datastore-preferences-core", version.ref = "datastore" }
-
 bouncycastle = { group = "org.bouncycastle", name = "bcpg-jdk18on", version.ref = "bouncycastle" }
 
 ktor-client = { group = "io.ktor", name = "ktor-client", version.ref = "ktor" }
@@ -54,6 +52,6 @@ ktor-client-logging = { group = "io.ktor", name = "ktor-client-logging", version
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-compose = { id = "org.jetbrains.compose", version.ref = "compose" }
+compose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
 hotReload = { id = "org.jetbrains.compose.hot-reload", version.ref = "hotReload" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists