From 465a8afde7e748ab3e1aa63308775e181d81bda9 Mon Sep 17 00:00:00 2001 From: Luca Kellermann Date: Fri, 6 Sep 2024 18:09:26 +0200 Subject: [PATCH] Update Kotlin to 2.1.0-dev-6359 KSP doesn't have a published version that works with Kotlin 2.1.0-dev-6359 yet, so I used a locally built KSP published to the local Maven repository. --- build.gradle.kts | 1 + buildSrc/build.gradle.kts | 1 + buildSrc/src/main/kotlin/kord-internal-module.gradle.kts | 1 + .../main/kotlin/kord-internal-multiplatform-module.gradle.kts | 1 + buildSrc/src/main/kotlin/kord-module.gradle.kts | 1 + buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts | 1 + gradle/libs.versions.toml | 4 ++-- 7 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index e72d15f1ba3..fa2b8190fc1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,6 +5,7 @@ plugins { repositories { mavenCentral() maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap") + mavenLocal() } group = Library.group diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 631f977d0fd..95e5b79cce5 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -5,6 +5,7 @@ plugins { repositories { mavenCentral() maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap") + mavenLocal() } kotlin { diff --git a/buildSrc/src/main/kotlin/kord-internal-module.gradle.kts b/buildSrc/src/main/kotlin/kord-internal-module.gradle.kts index 81f4357d1e5..2aa4a34aea4 100644 --- a/buildSrc/src/main/kotlin/kord-internal-module.gradle.kts +++ b/buildSrc/src/main/kotlin/kord-internal-module.gradle.kts @@ -5,6 +5,7 @@ plugins { repositories { mavenCentral() maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap") + mavenLocal() } kotlin { diff --git a/buildSrc/src/main/kotlin/kord-internal-multiplatform-module.gradle.kts b/buildSrc/src/main/kotlin/kord-internal-multiplatform-module.gradle.kts index 426bd56fe43..aa7f14c7e7f 100644 --- a/buildSrc/src/main/kotlin/kord-internal-multiplatform-module.gradle.kts +++ b/buildSrc/src/main/kotlin/kord-internal-multiplatform-module.gradle.kts @@ -7,6 +7,7 @@ plugins { repositories { mavenCentral() maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap") + mavenLocal() } kotlin { diff --git a/buildSrc/src/main/kotlin/kord-module.gradle.kts b/buildSrc/src/main/kotlin/kord-module.gradle.kts index 5a7af1281e7..4a3901d4953 100644 --- a/buildSrc/src/main/kotlin/kord-module.gradle.kts +++ b/buildSrc/src/main/kotlin/kord-module.gradle.kts @@ -13,6 +13,7 @@ plugins { repositories { mavenCentral() maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap") + mavenLocal() } dependencies { diff --git a/buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts b/buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts index 64971d9cbed..395a0a09e38 100644 --- a/buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts +++ b/buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts @@ -14,6 +14,7 @@ plugins { repositories { mavenCentral() maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap") + mavenLocal() } dependencies { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8b0f5f035a2..7e4e3c23a31 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] # api dependencies -kotlin = "2.1.0-dev-5721" # https://github.com/JetBrains/kotlin +kotlin = "2.1.0-dev-6359" # https://github.com/JetBrains/kotlin ktor = "2.3.12" # https://github.com/ktorio/ktor kotlinx-coroutines = "1.8.1" # https://github.com/Kotlin/kotlinx.coroutines kotlinx-serialization = "1.7.2" # https://github.com/Kotlin/kotlinx.serialization @@ -18,7 +18,7 @@ stately = "2.1.0" # https://github.com/touchlab/Stately fastZlib = "2.0.1" # https://github.com/timotejroiko/fast-zlib # code generation -ksp = "2.0.20-1.0.24" # https://github.com/google/ksp +ksp = "2.0.255-SNAPSHOT" # https://github.com/google/ksp kotlinpoet = "1.18.1" # https://github.com/square/kotlinpoet # tests