Update dependencies

DRSchlaubi · DRSchlaubi · commit b2cded576162 · 2025-09-28T03:25:33.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,11 +19,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+        uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 22
+          java-version: 24
       - uses: gradle/actions/setup-gradle@v4
       - run: ./gradlew installBotDist
       - name: Install cosign
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:23-jre-alpine
+FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:24-jre-alpine
 
 WORKDIR /usr/app
 COPY plugin/build/install/bot-plugin .
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,11 +1,11 @@
-import org.jetbrains.kotlin.gradle.dsl.KotlinTopLevelExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinBaseExtension
 
 plugins {
     alias(libs.plugins.kotlin) apply false
     alias(libs.plugins.kotlin.serialization) apply false
 }
 allprojects {
-    version = "5.8.2"
+    version = "5.8.2v"
     group = "space.votebot"
 
     repositories {
@@ -15,8 +15,8 @@ allprojects {
 
 subprojects {
     afterEvaluate {
-        configure<KotlinTopLevelExtension> {
-            jvmToolchain(22)
+        configure<KotlinBaseExtension> {
+            jvmToolchain(24)
         }
     }
 }
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -24,4 +24,8 @@ kotlin {
             }
         }
     }
+
+    compilerOptions {
+        optIn.add("kotlin.time.ExperimentalTime")
+    }
 }
diff --git a/common/src/commonMain/kotlin/space/votebot/common/models/APIPoll.kt b/common/src/commonMain/kotlin/space/votebot/common/models/APIPoll.kt
@@ -1,6 +1,6 @@
 package space.votebot.common.models
 
-import kotlinx.datetime.Instant
+import kotlin.time.Instant
 import kotlinx.serialization.Serializable
 
 @Serializable
diff --git a/common/src/commonMain/kotlin/space/votebot/common/models/Poll.kt b/common/src/commonMain/kotlin/space/votebot/common/models/Poll.kt
@@ -1,6 +1,6 @@
 package space.votebot.common.models
 
-import kotlinx.datetime.Instant
+import kotlin.time.Instant
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import space.votebot.common.models.Poll.RenderableOption
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,14 +1,14 @@
 [versions]
-kotlin = "2.0.21"
-mikbot = "4.1.5"
-ktor = "3.0.1"
+kotlin = "2.2.20"
+mikbot = "5.0.1"
+ktor = "3.3.0"
 
 [libraries]
-kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.7.3" }
+kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.9.0" }
 ktor-client-okhttp = { group = "io.ktor", name = "ktor-client-okhttp", version.ref = "ktor" }
 ktor-client-content-negotiation = { group = "io.ktor", name = "ktor-client-content-negotiation", version.ref = "ktor" }
 ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" }
-kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version = "0.6.1" }
+kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version = "0.7.1" }
 
 mikbot-gdpr = { group = "dev.schlaubi", name = "mikbot-gdpr" }
 mikbot-kubernetes = { group = "dev.schlaubi", name = "mikbot-kubernetes" }
@@ -20,5 +20,5 @@ java-string-similarity = { group = "info.debatty", name = "java-string-similarit
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 mikbot = { id = "dev.schlaubi.mikbot.gradle-plugin", version.ref = "mikbot" }
-ksp = { id = "com.google.devtools.ksp", version = "2.0.21-1.0.26" }
-buildconfig = { id = "com.github.gmazzo.buildconfig", version = "5.5.0"}
+ksp = { id = "com.google.devtools.ksp", version = "2.2.20-2.0.3" }
+buildconfig = { id = "com.github.gmazzo.buildconfig", version = "5.6.8"}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
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/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -1,5 +1,4 @@
 import dev.schlaubi.mikbot.gradle.mikbot
-import java.io.ByteArrayOutputStream
 
 plugins {
     kotlin("jvm")
@@ -49,6 +48,20 @@ sourceSets {
     }
 }
 
+tasks {
+    afterEvaluate {
+        named("kspKotlin") {
+            dependsOn(generateBuildConfig)
+        }
+    }
+}
+
+kotlin {
+    compilerOptions {
+        optIn.add("kotlin.time.ExperimentalTime")
+    }
+}
+
 fun Project.getGitCommit(): String {
     return execCommand(arrayOf("git", "rev-parse", "--short", "HEAD"))
         ?: System.getenv("GITHUB_SHA") ?: "<unknown>"
@@ -60,13 +73,9 @@ fun Project.getGitBranch(): String {
 
 fun Project.execCommand(command: Array<String>): String? {
     return try {
-        ByteArrayOutputStream().use { out ->
-            exec {
-                commandLine(command.asIterable())
-                standardOutput = out
-            }
-            out.toString().trim()
-        }
+        providers.exec {
+            commandLine(command.asIterable())
+        }.standardOutput.asText.get().trim()
     } catch (e: Throwable) {
         logger.warn("An error occurred whilst executing a command", e)
         null
diff --git a/plugin/src/main/kotlin/space/votebot/commands/vote/create/AbstractCreateLogic.kt b/plugin/src/main/kotlin/space/votebot/commands/vote/create/AbstractCreateLogic.kt
@@ -16,7 +16,7 @@ import dev.kordex.core.i18n.types.Key
 import dev.schlaubi.mikbot.plugin.api.util.Confirmation
 import dev.schlaubi.mikbot.plugin.api.util.discordError
 import dev.schlaubi.mikbot.plugin.api.util.translate
-import kotlinx.datetime.Clock
+import kotlin.time.Clock
 import org.litote.kmongo.newId
 import space.votebot.common.models.Poll
 import space.votebot.common.models.merge
diff --git a/plugin/src/main/kotlin/space/votebot/commands/vote/create/CreateCommand.kt b/plugin/src/main/kotlin/space/votebot/commands/vote/create/CreateCommand.kt
@@ -25,7 +25,7 @@ import dev.kordex.core.utils.toDuration
 import dev.schlaubi.mikbot.plugin.api.util.discordError
 import dev.schlaubi.mikbot.plugin.api.util.kord
 import dev.schlaubi.mikbot.plugin.api.util.translate
-import kotlinx.datetime.Clock
+import kotlin.time.Clock
 import kotlinx.datetime.TimeZone
 import space.votebot.command.ChoiceEmojiMode
 import space.votebot.command.PollSettingsArgumentsMixin
diff --git a/plugin/src/main/kotlin/space/votebot/core/Renderer.kt b/plugin/src/main/kotlin/space/votebot/core/Renderer.kt
@@ -22,7 +22,7 @@ import dev.schlaubi.mikbot.plugin.api.util.embed
 import dev.schlaubi.stdx.coroutines.forEachParallel
 import dev.schlaubi.stdx.coroutines.localSuspendLazy
 import io.ktor.client.request.forms.*
-import kotlinx.datetime.Clock
+import kotlin.time.Clock
 import mu.KotlinLogging
 import space.votebot.common.models.Poll
 import space.votebot.common.models.VoteOption
diff --git a/plugin/src/main/kotlin/space/votebot/core/VoteExpirationExecutor.kt b/plugin/src/main/kotlin/space/votebot/core/VoteExpirationExecutor.kt
@@ -11,7 +11,7 @@ import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
-import kotlinx.datetime.Clock
+import kotlin.time.Clock
 import org.litote.kmongo.and
 import org.litote.kmongo.div
 import org.litote.kmongo.eq

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:23-jre-alpine`
	`1`	`+FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:24-jre-alpine`
`2`	`2`
`3`	`3`	`WORKDIR /usr/app`
`4`	`4`	`COPY plugin/build/install/bot-plugin .`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`		`-import org.jetbrains.kotlin.gradle.dsl.KotlinTopLevelExtension`
	`1`	`+import org.jetbrains.kotlin.gradle.dsl.KotlinBaseExtension`
`2`	`2`
`3`	`3`	`plugins {`
`4`	`4`	`alias(libs.plugins.kotlin) apply false`
`5`	`5`	`alias(libs.plugins.kotlin.serialization) apply false`
`6`	`6`	`}`
`7`	`7`	`allprojects {`
`8`		`- version = "5.8.2"`
	`8`	`+ version = "5.8.2v"`
`9`	`9`	`group = "space.votebot"`
`10`	`10`
`11`	`11`	`repositories {`
`@@ -15,8 +15,8 @@ allprojects {`
`15`	`15`
`16`	`16`	`subprojects {`
`17`	`17`	`afterEvaluate {`
`18`		`- configure<KotlinTopLevelExtension> {`
`19`		`- jvmToolchain(22)`
	`18`	`+ configure<KotlinBaseExtension> {`
	`19`	`+ jvmToolchain(24)`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,8 @@ kotlin {`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`}`
	`27`	`+`
	`28`	`+ compilerOptions {`
	`29`	`+ optIn.add("kotlin.time.ExperimentalTime")`
	`30`	`+ }`
`27`	`31`	`}`