Skip to content

Use K2Compiler via JvmFirPipeline to support Kotlin v2 #6338

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

Closed
Crustack wants to merge 2 commits into from
Closed

Use K2Compiler via JvmFirPipeline to support Kotlin v2 #6338

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7abd4c2
Use K2Compiler via JvmFirPipeline to support Kotlin v2
Crustack Dec 13, 2025
bc429e3
Merge branch 'main' into feat/kotlin-v2
timtebeek Jan 14, 2026
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
4 changes: 4 additions & 0 deletions rewrite-core/src/main/java/org/openrewrite/Parser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@ public Input(Path path, Supplier<InputStream> source) {
this(path, FileAttributes.fromPath(path), source, false);
}

public Input(Path path, Supplier<InputStream> source, boolean synthetic) {
this(path, FileAttributes.fromPath(path), source, synthetic);
}

public Input(Path path, @Nullable FileAttributes fileAttributes, Supplier<InputStream> source) {
this(path, fileAttributes, source, false);
}
Expand Down
3 changes: 2 additions & 1 deletion rewrite-gradle/src/main/java/org/openrewrite/gradle/DependencyConstraintToRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,8 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
("\n" +
"configurations.all {\n" +
" resolutionStrategy.eachDependency { details ->}\n" +
"}").getBytes(StandardCharsets.UTF_8)))
"}").getBytes(StandardCharsets.UTF_8)),
true)
), null, ctx)
.map(K.CompilationUnit.class::cast)
.map(k -> (J.Block) k.getStatements().get(0))
Expand Down
3 changes: 2 additions & 1 deletion rewrite-gradle/src/main/java/org/openrewrite/gradle/UpgradeTransitiveDependencyVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,8 @@ private static Optional<JavaSourceFile> parseAsGradle(String snippet, boolean is
.computeIfAbsent(snippet, s -> GradleParser.builder().build().parseInputs(singleton(
new Parser.Input(
Paths.get("build.gradle" + (isKotlinDsl ? ".kts" : "")),
() -> new ByteArrayInputStream(snippet.getBytes(StandardCharsets.UTF_8))
() -> new ByteArrayInputStream(snippet.getBytes(StandardCharsets.UTF_8)),
true
)), null, ctx)
.findFirst()
.map(maybeCu -> {
Expand Down
4 changes: 2 additions & 2 deletions rewrite-gradle/src/main/java/org/openrewrite/gradle/internal/AddDependencyVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ private J.MethodInvocation dependenciesDeclaration(ExecutionContext ctx) {
J.MethodInvocation dependencies;
ctx.putMessage(ExecutionContext.REQUIRE_PRINT_EQUALS_INPUT, false);
if (isKotlinDsl) {
dependencies = (J.MethodInvocation) ((J.Block) GRADLE_PARSER.parseInputs(singletonList(new GradleParser.Input(Paths.get("build.gradle.kts"), () -> new ByteArrayInputStream(template.getBytes(StandardCharsets.UTF_8)))), null, ctx)
dependencies = (J.MethodInvocation) ((J.Block) GRADLE_PARSER.parseInputs(singletonList(new GradleParser.Input(Paths.get("build.gradle.kts"), () -> new ByteArrayInputStream(template.getBytes(StandardCharsets.UTF_8)), true)), null, ctx)
.findFirst()
.map(K.CompilationUnit.class::cast)
.orElseThrow(() -> new IllegalArgumentException("Could not parse as Gradle"))
Expand All @@ -367,7 +367,7 @@ private J.MethodInvocation dependencyDeclaration(J.Block body, ExecutionContext
J.MethodInvocation dependency;
ctx.putMessage(ExecutionContext.REQUIRE_PRINT_EQUALS_INPUT, false);
if (isKotlinDsl) {
dependency = (J.MethodInvocation) ((J.Block) GRADLE_PARSER.parseInputs(singletonList(new GradleParser.Input(Paths.get("build.gradle.kts"), () -> new ByteArrayInputStream(template.getBytes(StandardCharsets.UTF_8)))), null, ctx)
dependency = (J.MethodInvocation) ((J.Block) GRADLE_PARSER.parseInputs(singletonList(new GradleParser.Input(Paths.get("build.gradle.kts"), () -> new ByteArrayInputStream(template.getBytes(StandardCharsets.UTF_8)), true)), null, ctx)
.findFirst()
.map(K.CompilationUnit.class::cast)
.orElseThrow(() -> new IllegalArgumentException("Could not parse as Gradle"))
Expand Down
6 changes: 3 additions & 3 deletions rewrite-kotlin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
kotlin("jvm") version "2.2.21"
}

val kotlinVersion = "1.9.25"
val kotlinVersion = "2.2.21"

dependencies {
compileOnly(project(":rewrite-core"))
Expand Down Expand Up @@ -37,8 +37,8 @@ java {

tasks.withType<KotlinCompile>().configureEach {
compilerOptions {
apiVersion = KotlinVersion.KOTLIN_1_9
languageVersion = KotlinVersion.KOTLIN_1_9
apiVersion = KotlinVersion.KOTLIN_2_2
languageVersion = KotlinVersion.KOTLIN_2_2
jvmTarget.set(if (name.contains("Test")) JvmTarget.JVM_21 else JvmTarget.JVM_1_8)
}
}
Loading
⚡