Skip to content

Commit 73ba813

Browse files
authored
Merge pull request #792 from Kotlin/kotlin-2.0
Update to Kotlin 2.0
2 parents 765809d + 4d02bc0 commit 73ba813

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

generator/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
kotlinCompilerVersion=1.9.22
1+
kotlinCompilerVersion=2.0.0
22

33
# 1.15.0+ breaks with NoSuchMethodException: 'java.io.File com.squareup.kotlinpoet.FileSpec.writeTo(java.io.File)'
44
kotlinPoetVersion=1.14.2

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[versions]
2-
ksp = "1.9.23-1.0.20"
2+
ksp = "2.0.0-1.0.23"
33
kotlinJupyter = "0.12.0-139"
44

55
ktlint = "12.1.1"
66

77
# make sure to sync manually with :generator module
8-
kotlin = "1.9.22"
8+
kotlin = "2.0.0"
99
kotlinpoet = "1.16.0"
1010
dokka = "1.9.10"
1111

@@ -55,7 +55,7 @@ plugin-publish = "1.2.1"
5555
shadow = "8.1.1"
5656
android-gradle-api = "7.3.1" # Can't be updated to 7.4.0+ due to Java 8 compatibility
5757
ktor-server-netty = "2.3.8"
58-
kotlin-compile-testing = "1.5.0"
58+
kotlin-compile-testing = "1.6.0"
5959
duckdb = "0.10.0"
6060

6161
[libraries]

plugins/symbol-processor/src/test/kotlin/org/jetbrains/dataframe/ksp/runner/KotlinCompilationUtil.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1+
@file:OptIn(ExperimentalCompilerApi::class)
2+
13
package org.jetbrains.dataframe.ksp.runner
24

35
import com.tschuchort.compiletesting.KotlinCompilation
46
import com.tschuchort.compiletesting.SourceFile
7+
import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
58
import org.jetbrains.kotlin.config.JvmTarget
69
import java.io.File
710
import java.io.OutputStream
@@ -22,7 +25,7 @@ internal object KotlinCompilationUtil {
2225
compilation.sources = sources
2326
// workaround for https://github.com/tschuchortdev/kotlin-compile-testing/issues/105
2427
compilation.kotlincArguments += "-Xjava-source-roots=${javaSrcRoot.absolutePath}"
25-
compilation.jvmDefault = "enable"
28+
compilation.jvmDefault = "all"
2629
compilation.jvmTarget = JvmTarget.JVM_1_8.description
2730
compilation.inheritClassPath = false
2831
compilation.verbose = false

plugins/symbol-processor/src/test/kotlin/org/jetbrains/dataframe/ksp/runner/KspCompilationTestRunner.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@file:OptIn(ExperimentalCompilerApi::class)
2+
13
package org.jetbrains.dataframe.ksp.runner
24

35
import com.tschuchort.compiletesting.KotlinCompilation
@@ -6,6 +8,7 @@ import com.tschuchort.compiletesting.kspArgs
68
import com.tschuchort.compiletesting.kspSourcesDir
79
import com.tschuchort.compiletesting.symbolProcessorProviders
810
import org.jetbrains.dataframe.ksp.DataFrameSymbolProcessorProvider
11+
import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
912
import java.io.ByteArrayOutputStream
1013
import java.io.File
1114
import java.nio.file.Paths

0 commit comments

Comments
 (0)