Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Kotlin 2.0 #792

Merged
merged 3 commits into from
Jul 25, 2024
Merged

Update to Kotlin 2.0 #792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35cf4d9
update to Kotlin 2.0
Jolanrensen Jul 25, 2024
21b052f
k2 fixes for symbol-processor tests
Jolanrensen Jul 25, 2024
4d02bc0
fixup! update to Kotlin 2.0
Jolanrensen Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion generator/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
kotlinCompilerVersion=1.9.22
kotlinCompilerVersion=2.0.0

# 1.15.0+ breaks with NoSuchMethodException: 'java.io.File com.squareup.kotlinpoet.FileSpec.writeTo(java.io.File)'
kotlinPoetVersion=1.14.2
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[versions]
ksp = "1.9.23-1.0.20"
ksp = "2.0.0-1.0.23"
kotlinJupyter = "0.12.0-139"

ktlint = "12.1.1"

# make sure to sync manually with :generator module
kotlin = "1.9.22"
kotlin = "2.0.0"
kotlinpoet = "1.16.0"
dokka = "1.9.10"

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

[libraries]
Expand Down
5 changes: 4 additions & 1 deletion ...bol-processor/src/test/kotlin/org/jetbrains/dataframe/ksp/runner/KotlinCompilationUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
@file:OptIn(ExperimentalCompilerApi::class)

package org.jetbrains.dataframe.ksp.runner

import com.tschuchort.compiletesting.KotlinCompilation
import com.tschuchort.compiletesting.SourceFile
import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
import org.jetbrains.kotlin.config.JvmTarget
import java.io.File
import java.io.OutputStream
Expand All @@ -22,7 +25,7 @@ internal object KotlinCompilationUtil {
compilation.sources = sources
// workaround for https://github.com/tschuchortdev/kotlin-compile-testing/issues/105
compilation.kotlincArguments += "-Xjava-source-roots=${javaSrcRoot.absolutePath}"
compilation.jvmDefault = "enable"
compilation.jvmDefault = "all"
compilation.jvmTarget = JvmTarget.JVM_1_8.description
compilation.inheritClassPath = false
compilation.verbose = false
Expand Down
3 changes: 3 additions & 0 deletions ...-processor/src/test/kotlin/org/jetbrains/dataframe/ksp/runner/KspCompilationTestRunner.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@file:OptIn(ExperimentalCompilerApi::class)

package org.jetbrains.dataframe.ksp.runner

import com.tschuchort.compiletesting.KotlinCompilation
Expand All @@ -6,6 +8,7 @@ import com.tschuchort.compiletesting.kspArgs
import com.tschuchort.compiletesting.kspSourcesDir
import com.tschuchort.compiletesting.symbolProcessorProviders
import org.jetbrains.dataframe.ksp.DataFrameSymbolProcessorProvider
import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
import java.io.ByteArrayOutputStream
import java.io.File
import java.nio.file.Paths
Expand Down
Loading