Skip to content

Commit d778a65

Browse files
Update to Kotlin 2.4.0
Changes to scip-kotlinc: - -Xcontext-parameters argument isn't required anymore - FirAllModifierRenderer now takes an argument Ported from mozsearch/semanticdb-kotlinc@89427a5
1 parent 6e94365 commit d778a65

5 files changed

Lines changed: 5 additions & 9 deletions

File tree

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)