Skip to content

Commit a269bdb

Browse files
Update to Kotlin 2.4.0
Changes to scip-kotlinc: - -Xcontext-parameters argument isn't required anymore - FirAllModifierRenderer now takes an argument This also replaces the Kotlin test repos with repos using Kotlin 2.4.0. Ported from mozsearch/semanticdb-kotlinc@89427a5
1 parent e940c18 commit a269bdb

6 files changed

Lines changed: 19 additions & 23 deletions

File tree

‎.github/workflows/repos.yaml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -98,33 +98,33 @@ jobs:
9898
bazel_version: ""
9999
covers: Gradle, Java project target 21, Java 21 runtime
100100

101-
- name: gradle-kotlin-okio
102-
repository: square/okio
103-
ref: parent-3.16.0
101+
- name: gradle-kotlin-kotlinpoet
102+
repository: square/kotlinpoet
103+
ref: 0182a25089ee1f4f2378568b497f82a8ebc3017d
104104
directory: .
105105
build_tool: gradle
106-
build_command: "-Dkjs=false -Dkwasm=false :okio:compileKotlinJvm"
106+
build_command: "-Dkjs=false -Dkwasm=false compileKotlinJvm"
107107
java: 17
108108
bazel_version: ""
109-
covers: Gradle, Kotlin, Kotlin 2.2.0
109+
covers: Gradle, Kotlin, Kotlin 2.4.0
110110

111-
- name: gradle-kotlin-flowext
112-
repository: hoc081098/FlowExt
113-
ref: 7341f3853d670af0283258f57643a68ed273f8ac
111+
- name: gradle-kotlin-kotlinconf-app
112+
repository: JetBrains/kotlinconf-app
113+
ref: b5b0c8b4bb4476a59673dd857b598ef586100f52
114114
directory: .
115115
build_tool: gradle
116116
build_command: "compileKotlinJvm"
117-
java: 17
117+
java: 25
118118
bazel_version: ""
119119
expected_language: kotlin
120-
covers: Gradle, Kotlin multiplatform JVM target, Kotlin 2.2.0, Java 17 runtime
120+
covers: Gradle, Kotlin multiplatform JVM target, Kotlin 2.4.0, Java 25 runtime
121121

122-
- name: gradle-mixed-okio-jmh
123-
repository: square/okio
124-
ref: parent-3.16.0
122+
- name: gradle-mixed-kotlinpoet
123+
repository: square/kotlinpoet
124+
ref: 0182a25089ee1f4f2378568b497f82a8ebc3017d
125125
directory: .
126126
build_tool: gradle
127-
build_command: "-Dkjs=false -Dkwasm=false :okio:jvm:jmh:jmhClasses"
127+
build_command: "-Dkjs=false -Dkwasm=false compileKotlinJvm compileJava"
128128
java: 21
129129
bazel_version: ""
130130
covers: Gradle, mixed Java/Kotlin, Java 21 runtime

‎gradle/libs.versions.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
clikt = "5.1.0"
33
gradle-api = "8.11.1"
44
junit-jupiter = "5.11.4"
5-
kctfork = "0.12.1"
5+
kctfork = "0.13.0"
66
kotest = "6.2.1"
7-
kotlin = "2.3.20"
7+
kotlin = "2.4.0"
88
kotlinx-serialization = "1.11.0"
99
lombok = "1.18.46"
1010
maven-plugin-annotations = "3.15.2"

‎scip-java/src/test/resources/fixtures/gradle/kotlin-jvm-toolchains/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id 'java'
3-
id 'org.jetbrains.kotlin.jvm' version '2.3.20'
3+
id 'org.jetbrains.kotlin.jvm' version '2.4.0'
44
}
55
java {
66
toolchain {

‎scip-java/src/test/resources/fixtures/gradle/kotlin2/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'org.jetbrains.kotlin.jvm' version '2.3.20'
2+
id 'org.jetbrains.kotlin.jvm' version '2.4.0'
33
}
44
kotlin {
55
jvmToolchain(17)

‎scip-kotlinc/build.gradle.kts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ dependencies {
2424
testImplementation(libs.kctfork.core)
2525
}
2626

27-
tasks.withType<KotlinCompile>().configureEach {
28-
compilerOptions.freeCompilerArgs.add("-Xcontext-parameters")
29-
}
30-
3127
tasks.named<Test>("test") {
3228
maxHeapSize = "2g"
3329
}

‎scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/ScipTextDocumentBuilder.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ class ScipTextDocumentBuilder(
154154
bodyRenderer = null,
155155
propertyAccessorRenderer = null,
156156
callArgumentsRenderer = FirCallNoArgumentsRenderer(),
157-
modifierRenderer = FirAllModifierRenderer(),
157+
modifierRenderer = FirAllModifierRenderer(FirModifierRenderer.StaticPolicy.Default),
158158
callableSignatureRenderer = FirCallableSignatureRendererForReadability(),
159159
declarationRenderer = FirDeclarationRenderer("local "),
160160
)

0 commit comments

Comments
 (0)