From 4d95133a4b3f39948e12c37e8a37ba8a050f388b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 18:30:53 +0000 Subject: [PATCH 1/3] Bump kotlin from 1.9.24 to 2.0.0 Bumps `kotlin` from 1.9.24 to 2.0.0. Updates `org.jetbrains.kotlin:kotlin-test` from 1.9.24 to 2.0.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.24...v2.0.0) Updates `org.jetbrains.kotlin.multiplatform` from 1.9.24 to 2.0.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.24...v2.0.0) Updates `org.jetbrains.kotlin.plugin.serialization` from 1.9.24 to 2.0.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.24...v2.0.0) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-test dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.jetbrains.kotlin.multiplatform dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.jetbrains.kotlin.plugin.serialization dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3f6789c..af08383 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin = "1.9.24" +kotlin = "2.0.0" ktor = "2.3.11" [libraries] From 65be3c9160b0615c486beda9d1909f0731e93918 Mon Sep 17 00:00:00 2001 From: StefMa Date: Tue, 28 May 2024 14:12:15 +0200 Subject: [PATCH 2/3] Move jvmToolchain out of jvm target --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 76f951f..aed1db3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,8 +11,8 @@ repositories { } kotlin { + jvmToolchain(8) jvm { - jvmToolchain(8) withJava() testRuns.named("test") { executionTask.configure { From ac7b6448a4b565855759e5c9b0ec4e1a64797fb6 Mon Sep 17 00:00:00 2001 From: StefMa Date: Tue, 28 May 2024 14:12:48 +0200 Subject: [PATCH 3/3] Remove deprecated k2 property --- gradle.properties | 2 -- 1 file changed, 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index a566027..607dc64 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,5 +2,3 @@ kotlin.code.style=official org.gradle.parallel=true org.gradle.jvmargs=-Xmx6g org.gradle.caching=true - -kotlin.experimental.tryK2=true \ No newline at end of file