Add support for Kotlin 2.x

rewrite-kotlin/build.gradle.kts

@@ -1,11 +1,11 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("org.openrewrite.build.language-library")
-    kotlin("jvm") version "1.9.25"
+    kotlin("jvm") version "2.2.0"
 }
 
-val kotlinVersion = "1.9.25"
+val kotlinVersion = "2.2.0"
 
 dependencies {
     compileOnly(project(":rewrite-core"))
@@ -17,6 +17,7 @@ dependencies {
     implementation(kotlin("compiler-embeddable"))
     implementation(kotlin("stdlib"))
 
+
     testImplementation("org.junit-pioneer:junit-pioneer:latest.release")
     testImplementation(project(":rewrite-test"))
     testRuntimeOnly(project(":rewrite-java-21"))
@@ -28,6 +29,8 @@ dependencies {
     testImplementation("com.google.testing.compile:compile-testing:0.+")
 }
 
-tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions.jvmTarget = if (name.contains("Test")) "21" else "1.8"
+kotlin {
+    compilerOptions {
+        jvmTarget.set(if (name.contains("Test")) JvmTarget.JVM_21 else JvmTarget.JVM_1_8)
+    }
 }

rewrite-kotlin/src/main/java/org/openrewrite/kotlin/internal/PsiTreePrinter.java

@@ -17,7 +17,7 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import org.jetbrains.kotlin.KtFakeSourceElement;
+import org.jetbrains.kotlin.KtFakePsiSourceElement;
 import org.jetbrains.kotlin.KtRealPsiSourceElement;
 import org.jetbrains.kotlin.KtSourceElement;
 import org.jetbrains.kotlin.com.intellij.openapi.util.TextRange;
@@ -29,7 +29,6 @@
 import org.jetbrains.kotlin.fir.declarations.FirProperty;
 import org.jetbrains.kotlin.fir.expressions.*;
 import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference;
-import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag;
 import org.jetbrains.kotlin.fir.types.*;
 import org.jetbrains.kotlin.fir.visitors.FirDefaultVisitor;
 import org.jetbrains.kotlin.ir.IrElement;
@@ -489,7 +488,7 @@ public static String printFirElement(FirElement firElement) {
 
             if (source instanceof KtRealPsiSourceElement) {
                 sb.append("Real ");
-            } else if (source instanceof KtFakeSourceElement) {
+            } else if (source instanceof KtFakePsiSourceElement) {
                 sb.append("Fake ");
             } else {
                 sb.append(source.getClass().getSimpleName());
@@ -548,7 +547,7 @@ private static String printConeKotlinType(ConeTypeProjection coneKotlinType) {
             return ((FirProperty) firElement).getName().toString();
         } else if (firElement instanceof FirResolvedTypeRef) {
             FirResolvedTypeRef resolvedTypeRef = (FirResolvedTypeRef) firElement;
-            ConeKotlinType coneKotlinType = resolvedTypeRef.getType();
+            ConeKotlinType coneKotlinType = resolvedTypeRef.getConeType();
             return printConeKotlinType(coneKotlinType);
         } else if (firElement instanceof FirResolvedNamedReference) {
             return ((FirResolvedNamedReference) firElement).getName().toString();
@@ -578,8 +577,8 @@ private static String printConeKotlinType(ConeTypeProjection coneKotlinType) {
                 }
                 return sb.toString();
             }
-        } else if (firElement instanceof FirConstExpression) {
-            Object value = ((FirConstExpression<?>) firElement).getValue();
+        } else if (firElement instanceof FirLiteralExpression) {
+            Object value = ((FirLiteralExpression) firElement).getValue();
             return value != null ? value.toString() : null;
             // return ((FirConstExpression<?>) firElement).getKind().toString();
         } else if (firElement instanceof FirWhenBranch) {

rewrite-kotlin/src/main/kotlin/org/openrewrite/kotlin/KotlinIrTypeMapping.kt

@@ -15,12 +15,12 @@
  */
 package org.openrewrite.kotlin
 
+import org.jetbrains.kotlin.DeprecatedForRemovalCompilerApi
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.DescriptorVisibility
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.fir.lazy.Fir2IrLazyConstructor
 import org.jetbrains.kotlin.fir.lazy.Fir2IrLazySimpleFunction
-import org.jetbrains.kotlin.ir.backend.js.utils.valueArguments
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrConstructorImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrFunctionImpl
@@ -95,7 +95,7 @@ class KotlinIrTypeMapping(private val typeCache: JavaTypeCache) : JavaTypeMappin
                 return type(baseType.type)
             }
 
-            is IrConst<*> -> {
+            is IrConst -> {
                 return primitive(baseType)
             }
 
@@ -352,6 +352,7 @@ class KotlinIrTypeMapping(private val typeCache: JavaTypeCache) : JavaTypeMappin
         return methodDeclarationType(function, signature)
     }
 
+    @OptIn(DeprecatedForRemovalCompilerApi::class)
     private fun methodDeclarationType(function: IrFunction, signature: String): JavaType.Method {
         val paramNames: MutableList<String>? =
             if (function.valueParameters.isEmpty()) null else ArrayList(function.valueParameters.size)
@@ -424,8 +425,9 @@ class KotlinIrTypeMapping(private val typeCache: JavaTypeCache) : JavaTypeMappin
         }
     }
 
+    @OptIn(DeprecatedForRemovalCompilerApi::class)
     fun methodInvocationType(type: IrCall, signature: String): JavaType.Method {
-        val paramNames: MutableList<String> = ArrayList(type.valueArguments.size)
+        val paramNames: MutableList<String> = ArrayList(type.valueArgumentsCount)
 
         for (v in type.symbol.owner.valueParameters) {
             paramNames.add(v.name.asString())
@@ -450,12 +452,13 @@ class KotlinIrTypeMapping(private val typeCache: JavaTypeCache) : JavaTypeMappin
         }
         val returnType = type(type.symbol.owner.returnType)
         val paramTypes: MutableList<JavaType>? =
-            if (type.valueArguments.isNotEmpty() || type.extensionReceiver != null) ArrayList(type.valueArguments.size + (if (type.extensionReceiver != null) 1 else 0))
+            if (type.valueArgumentsCount > 0 || type.extensionReceiver != null) ArrayList(type.valueArgumentsCount + (if (type.extensionReceiver != null) 1 else 0))
             else null
         if (type.extensionReceiver != null) {
             paramTypes!!.add(type(type.extensionReceiver!!.type))
         }
-        for (param: IrExpression? in type.valueArguments) {
+        for (i in 0 until type.valueArgumentsCount) {
+            val param: IrExpression? = type.getValueArgument(i)
             if (param != null) {
                 paramTypes!!.add(type(param.type))
             }
@@ -468,8 +471,9 @@ class KotlinIrTypeMapping(private val typeCache: JavaTypeCache) : JavaTypeMappin
         return method
     }
 
+    @OptIn(DeprecatedForRemovalCompilerApi::class)
     fun methodInvocationType(type: IrConstructorCall, signature: String): JavaType.Method {
-        val paramNames: MutableList<String> = ArrayList(type.valueArguments.size)
+        val paramNames: MutableList<String> = ArrayList(type.valueArgumentsCount)
 
         for (v in type.symbol.owner.valueParameters) {
             paramNames.add(v.name.asString())
@@ -494,12 +498,14 @@ class KotlinIrTypeMapping(private val typeCache: JavaTypeCache) : JavaTypeMappin
         }
         val returnType = declaringType
         val paramTypes: MutableList<JavaType>? =
-            if (type.valueArguments.isNotEmpty() || type.extensionReceiver != null) ArrayList(type.valueArguments.size + (if (type.extensionReceiver != null) 1 else 0))
+            if (type.valueArgumentsCount > 0 || type.extensionReceiver != null) ArrayList(type.valueArgumentsCount + (if (type.extensionReceiver != null) 1 else 0))
             else null
         if (type.extensionReceiver != null) {
             paramTypes!!.add(type(type.extensionReceiver!!.type))
         }
-        for (param: IrExpression? in type.valueArguments) {
+                for (i in 0 until type.valueArgumentsCount) {
+            val param: IrExpression? = type.getValueArgument(i)
+
             if (param != null) {
                 paramTypes!!.add(type(param.type))
             }
@@ -536,7 +542,7 @@ class KotlinIrTypeMapping(private val typeCache: JavaTypeCache) : JavaTypeMappin
 
     fun primitive(type: Any?): JavaType.Primitive {
         return when (type) {
-            is IrConst<*> -> {
+            is IrConst -> {
                 when (type.kind) {
                     IrConstKind.Int -> JavaType.Primitive.Int
                     IrConstKind.Boolean -> JavaType.Primitive.Boolean
@@ -720,10 +726,12 @@ class KotlinIrTypeMapping(private val typeCache: JavaTypeCache) : JavaTypeMappin
         return true
     }
 
+    @OptIn(DeprecatedForRemovalCompilerApi::class)
     private fun isSourceRetention(annotation: IrConstructorCall): Boolean {
         val sig = signatureBuilder.classSignature(annotation.type)
         if (sig == "kotlin.annotation.Retention" || sig == "java.lang.annotation") {
-            for (args in annotation.valueArguments) {
+            for (i in 0.. annotation.valueArgumentsCount) {
+                val args = annotation.getValueArgument(i)
                 if (args is IrDeclarationReference && args.symbol.owner is IrDeclarationWithName) {
                     return (args.symbol.owner as IrDeclarationWithName).name.asString() == "SOURCE"
                 }

rewrite-kotlin/src/main/kotlin/org/openrewrite/kotlin/KotlinTypeIrSignatureBuilder.kt

@@ -15,10 +15,10 @@
  */
 package org.openrewrite.kotlin
 
+import org.jetbrains.kotlin.DeprecatedForRemovalCompilerApi
 import org.jetbrains.kotlin.fir.lazy.Fir2IrLazyClass
 import org.jetbrains.kotlin.fir.lazy.Fir2IrLazyConstructor
 import org.jetbrains.kotlin.fir.lazy.Fir2IrLazySimpleFunction
-import org.jetbrains.kotlin.ir.backend.js.utils.valueArguments
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.symbols.IrClassifierSymbol
@@ -63,7 +63,7 @@ class KotlinTypeIrSignatureBuilder : JavaTypeSignatureBuilder {
                 return signature(baseType.type)
             }
 
-            is IrConst<*> -> {
+            is IrConst -> {
                 return primitiveSignature(baseType)
             }
 
@@ -265,7 +265,7 @@ class KotlinTypeIrSignatureBuilder : JavaTypeSignatureBuilder {
 
     override fun primitiveSignature(type: Any): String {
         return when (type) {
-            is IrConst<*> -> type.type.classFqName!!.asString()
+            is IrConst -> type.type.classFqName!!.asString()
             else -> {
                 throw UnsupportedOperationException("Unsupported primitive type" + type.javaClass)
             }
@@ -329,6 +329,7 @@ class KotlinTypeIrSignatureBuilder : JavaTypeSignatureBuilder {
         return signature.toString()
     }
 
+    @OptIn(DeprecatedForRemovalCompilerApi::class)
     private fun methodArgumentSignature(function: IrFunction): String {
         val genericArgumentTypes = StringJoiner(",", "[", "]")
         if (function.extensionReceiverParameter != null) {
@@ -361,12 +362,14 @@ class KotlinTypeIrSignatureBuilder : JavaTypeSignatureBuilder {
         return signature.toString()
     }
 
+    @OptIn(DeprecatedForRemovalCompilerApi::class)
     private fun methodArgumentSignature(function: IrFunctionAccessExpression): String {
         val genericArgumentTypes = StringJoiner(",", "[", "]")
         if (function.extensionReceiver != null) {
             genericArgumentTypes.add(signature(function.extensionReceiver!!.type))
         }
-        for (param: IrExpression? in function.valueArguments) {
+        for(i in 0..<function.valueArgumentsCount) {
+            val param = function.getValueArgument(i)
             if (param != null) {
                 genericArgumentTypes.add(signature(param.type))
             }