Skip to content

Commit

Permalink
Update Kotlin to 2.1.0 (#501)
Browse files Browse the repository at this point in the history
  • Loading branch information
mvicsokolova authored Jan 9, 2025
1 parent bad63e7 commit 3ec69bb
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/gradle-compatibility.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ kotlin {
@Suppress("DEPRECATION", "DEPRECATION_ERROR")
compilerOptions {
languageVersion = getOverridingKotlinLanguageVersion(project)?.let { KotlinVersion.fromVersion(it) }
?: KotlinVersion.KOTLIN_1_4
?: KotlinVersion.KOTLIN_1_6
apiVersion = getOverridingKotlinApiVersion(project)?.let { KotlinVersion.fromVersion(it) }
?: KotlinVersion.KOTLIN_1_4
?: KotlinVersion.KOTLIN_1_6
}
}
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
kotlin = "2.0.21"
kotlin-for-gradle-plugin = "2.0.21" # Kotlin 2.1 removes support for the used language version / api version: KT-60521
kotlin = "2.1.0"
kotlin-for-gradle-plugin = "2.1.0" # Kotlin 2.1 removes support for the used language version / api version: KT-60521
kotlinx-binaryCompatibilityValidator = "0.16.0"
asm = "9.7"
slf4j = "1.8.0-alpha2"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
##
## Copyright 2016-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
##
kotlin_version=2.0.21
kotlin_version=2.1.0
atomicfu_version=0.26.1-SNAPSHOT

org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=2g
2 changes: 1 addition & 1 deletion integration-testing/examples/jvm-sample/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
##
## Copyright 2016-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
##
kotlin_version=2.0.21
kotlin_version=2.1.0
atomicfu_version=0.26.1-SNAPSHOT

org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=2g
2 changes: 1 addition & 1 deletion integration-testing/examples/mpp-sample/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
##
## Copyright 2016-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
##
kotlin_version=2.0.21
kotlin_version=2.1.0
atomicfu_version=0.26.1-SNAPSHOT

org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=2g
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
junit = "4.13.2"
kotlin = "2.0.21"
kotlin = "2.1.0"
atomicfu = "0.26.1-SNAPSHOT"
ktor = "2.3.8"
logback = "1.5.0"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
kotlin_version=2.0.21
kotlin_version=2.1.0
atomicfu_version=0.26.1-SNAPSHOT

org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=2g
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
##
## Copyright 2016-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
##
kotlin_version=1.9.20
kotlin_version=2.1.0
atomicfu_version=0.26.1-SNAPSHOT

org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=2g
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
##
## Copyright 2016-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
##
kotlin_version=2.0.21
kotlin_version=2.1.0

org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=2g

0 comments on commit 3ec69bb

Please sign in to comment.