From 4582ffe43789c9c7845f4b6d96821612a8e28ac5 Mon Sep 17 00:00:00 2001 From: Luca Kellermann Date: Fri, 18 Oct 2024 21:19:49 +0200 Subject: [PATCH] Update Kotlin to 2.1.0-Beta2 --- build.gradle.kts | 2 -- buildSrc/build.gradle.kts | 2 -- buildSrc/src/main/kotlin/Compiler.kt | 4 ++++ buildSrc/src/main/kotlin/kord-internal-module.gradle.kts | 2 -- .../main/kotlin/kord-internal-multiplatform-module.gradle.kts | 2 -- buildSrc/src/main/kotlin/kord-module.gradle.kts | 2 -- buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts | 2 -- gradle/libs.versions.toml | 4 ++-- samples/build.gradle.kts | 2 +- 9 files changed, 7 insertions(+), 15 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 082c3aab359..52f11df7127 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,8 +4,6 @@ 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 95e5b79cce5..260920e5258 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -4,8 +4,6 @@ plugins { repositories { mavenCentral() - maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap") - mavenLocal() } kotlin { diff --git a/buildSrc/src/main/kotlin/Compiler.kt b/buildSrc/src/main/kotlin/Compiler.kt index 6caa6484fc3..7a7b67e468e 100644 --- a/buildSrc/src/main/kotlin/Compiler.kt +++ b/buildSrc/src/main/kotlin/Compiler.kt @@ -17,7 +17,11 @@ val kordOptIns = listOf( internal fun KotlinCommonCompilerOptions.applyKordCommonCompilerOptions() { allWarningsAsErrors = true progressiveMode = true + extraWarnings = true freeCompilerArgs.add("-Xexpect-actual-classes") + + // https://youtrack.jetbrains.com/issue/KT-72040 / https://youtrack.jetbrains.com/issue/KT-72041 + freeCompilerArgs.add("-Xsuppress-warning=UNUSED_ANONYMOUS_PARAMETER") } internal const val KORD_JVM_TARGET = 8 diff --git a/buildSrc/src/main/kotlin/kord-internal-module.gradle.kts b/buildSrc/src/main/kotlin/kord-internal-module.gradle.kts index 49fabff4004..ad9b04bb4d1 100644 --- a/buildSrc/src/main/kotlin/kord-internal-module.gradle.kts +++ b/buildSrc/src/main/kotlin/kord-internal-module.gradle.kts @@ -4,8 +4,6 @@ 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 b56ecdbf7ab..bb4ea6b78e1 100644 --- a/buildSrc/src/main/kotlin/kord-internal-multiplatform-module.gradle.kts +++ b/buildSrc/src/main/kotlin/kord-internal-multiplatform-module.gradle.kts @@ -4,8 +4,6 @@ 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 a5088fc3b0e..37397688ec0 100644 --- a/buildSrc/src/main/kotlin/kord-module.gradle.kts +++ b/buildSrc/src/main/kotlin/kord-module.gradle.kts @@ -10,8 +10,6 @@ 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 03849bca475..e63c1a27743 100644 --- a/buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts +++ b/buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts @@ -11,8 +11,6 @@ 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 e9975bd292d..68eaf00fdb6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] # api dependencies -kotlin = "2.1.0-dev-7621" # https://github.com/JetBrains/kotlin +kotlin = "2.1.0-Beta2" # https://github.com/JetBrains/kotlin ktor = "3.0.0" # https://github.com/ktorio/ktor kotlinx-coroutines = "1.9.0" # https://github.com/Kotlin/kotlinx.coroutines kotlinx-serialization = "1.7.3" # 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.255-SNAPSHOT" # https://github.com/google/ksp +ksp = "2.1.0-Beta2-1.0.25" # https://github.com/google/ksp kotlinpoet = "1.18.1" # https://github.com/square/kotlinpoet # tests diff --git a/samples/build.gradle.kts b/samples/build.gradle.kts index aedcd84ff81..b32208da9d0 100644 --- a/samples/build.gradle.kts +++ b/samples/build.gradle.kts @@ -12,7 +12,7 @@ kotlin { dependencies { implementation(projects.core) - // these are required for whatever reason for Kotlin 2.1.0-dev-5441 + // these have been required for whatever reason since Kotlin 2.1.0-dev-5441 implementation(projects.common) implementation(projects.rest) implementation(projects.gateway)