Skip to content

Commit

Permalink
Update Kotlin to 2.1.0-Beta2
Browse files Browse the repository at this point in the history
  • Loading branch information
lukellmann committed Oct 18, 2024
1 parent 6c7a852 commit 4582ffe
Show file tree
Hide file tree
Showing 9 changed files with 7 additions and 15 deletions.
2 changes: 0 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ plugins {

repositories {
mavenCentral()
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap")
mavenLocal()
}

group = Library.group
Expand Down
2 changes: 0 additions & 2 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ plugins {

repositories {
mavenCentral()
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap")
mavenLocal()
}

kotlin {
Expand Down
4 changes: 4 additions & 0 deletions buildSrc/src/main/kotlin/Compiler.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions buildSrc/src/main/kotlin/kord-internal-module.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ plugins {

repositories {
mavenCentral()
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap")
mavenLocal()
}

kotlin {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ plugins {

repositories {
mavenCentral()
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap")
mavenLocal()
}

kotlin {
Expand Down
2 changes: 0 additions & 2 deletions buildSrc/src/main/kotlin/kord-module.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ plugins {

repositories {
mavenCentral()
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap")
mavenLocal()
}

dependencies {
Expand Down
2 changes: 0 additions & 2 deletions buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ plugins {

repositories {
mavenCentral()
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap")
mavenLocal()
}

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion samples/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 4582ffe

Please sign in to comment.