Bump Kotlin to 2.2.0.

Author: bennyhuo

build.gradle.kts

@@ -1,8 +1,8 @@
 plugins {
-    kotlin("jvm") version "2.1.20" apply false
+    kotlin("jvm") version "2.2.0" apply false
     id("org.jetbrains.dokka") version "1.7.10" apply false
     id("com.github.gmazzo.buildconfig") version "2.1.0" apply false
-    id("com.vanniktech.maven.publish") version "0.22.0" apply false
+    id("com.vanniktech.maven.publish") version "0.31.0" apply false
 }
 
 subprojects {

gradle.properties

@@ -1,6 +1,6 @@
 kotlin.code.style=official
 
-VERSION_NAME=2.1.20-1.1.0
+VERSION_NAME=2.2.0-1.1.0
 
 GROUP=com.bennyhuo.kotlin
 
@@ -23,6 +23,6 @@ POM_DEVELOPER_URL=https://github.com/bennyhuo/
 
 KOTLIN_PLUGIN_ID=com.bennyhuo.kotlin.trimindent
 
-SONATYPE_HOST=S01
+SONATYPE_HOST=CENTRAL_PORTAL
 SONATYPE_AUTOMATIC_RELEASE=true
 RELEASE_SIGNING_ENABLED=true

sample/gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kotlin = "2.1.21"
+kotlin = "2.2.0"
 
 [libraries]
 

trimindent-compiler/build.gradle.kts

@@ -15,7 +15,7 @@ dependencies {
     compileOnly("com.google.auto.service:auto-service-annotations:1.0.1")
 
     testImplementation(kotlin("test-junit"))
-    testImplementation("com.bennyhuo.kotlin:kotlin-compile-testing-extensions:2.1.0-1.3.0")
+    testImplementation("com.bennyhuo.kotlin:kotlin-compile-testing-extensions:2.2.0-1.3.0")
 }
 
 kotlin {

trimindent-compiler/src/main/java/com/bennyhuo/kotlin/trimindent/compiler/IrUtils.kt

@@ -16,6 +16,8 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.contract
+import org.jetbrains.kotlin.DeprecatedForRemovalCompilerApi
+import org.jetbrains.kotlin.ir.expressions.IrMemberAccessExpression
 import org.jetbrains.kotlin.name.CallableId
 
 /**
@@ -31,15 +33,17 @@ fun IrStringConcatenation.copyWithNewValues(
 }
 
 internal fun IrCall.isTrimIndent(): Boolean {
-    return symbol.owner.name == Name.identifier("trimIndent")
-            && dispatchReceiver == null
-            && extensionReceiver?.type?.classFqName?.asString() == "kotlin.String"
-            && symbol.owner.getPackageFragment().packageFqName.asString() == "kotlin.text"
+    return symbol.owner.let {
+        it.name == Name.identifier("trimIndent")
+                && it.parameters.firstOrNull()?.type?.classFqName?.asString() == "kotlin.String"
+                && it.getPackageFragment().packageFqName.asString() == "kotlin.text"
+    }
+
 }
 
 fun IrPluginContext.prependIndent(): IrFunction {
     return referenceFunctions(CallableId(FqName("kotlin.text"), Name.identifier("prependIndent")))
         .singleOrNull {
-            it.owner.extensionReceiverParameter?.type?.classFqName?.asString() == "kotlin.String"
+            it.owner.parameters.firstOrNull()?.type?.classFqName?.asString() == "kotlin.String"
         }?.owner!!
 }

trimindent-compiler/src/main/java/com/bennyhuo/kotlin/trimindent/compiler/String.kt

@@ -1,5 +1,6 @@
 package com.bennyhuo.kotlin.trimindent.compiler
 
+import org.jetbrains.kotlin.DeprecatedForRemovalCompilerApi
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
 import org.jetbrains.kotlin.ir.expressions.IrConst
@@ -44,14 +45,12 @@ class IrExpressionElement(val irExpression: IrExpression) : IrStringElement {
             preIndentFunction.symbol as IrSimpleFunctionSymbol,
             0
         ).apply {
-            extensionReceiver = irExpression
-            putValueArgument(
-                0, IrConstImpl.string(
-                    irExpression.startOffset,
-                    irExpression.endOffset,
-                    pluginContext.irBuiltIns.stringType,
-                    indent
-                )
+            arguments[0] = irExpression
+            arguments[1] = IrConstImpl.string(
+                irExpression.startOffset,
+                irExpression.endOffset,
+                pluginContext.irBuiltIns.stringType,
+                indent
             )
         }
 

trimindent-compiler/src/main/java/com/bennyhuo/kotlin/trimindent/compiler/TrimIndentIrGenerator.kt

@@ -18,7 +18,7 @@ class TrimIndentIrGenerator : IrGenerationExtension {
         moduleFragment.transformChildrenVoid(object : IrElementTransformerVoid() {
             override fun visitCall(irCall: IrCall): IrExpression {
                 if (irCall.isTrimIndent()) {
-                    val extensionReceiver = irCall.extensionReceiver!!
+                    val extensionReceiver = irCall.arguments.first()
                     if (extensionReceiver is IrConst && extensionReceiver.kind == IrConstKind.String) {
                         val value = extensionReceiver.value as String
                         return super.visitExpression(extensionReceiver.copyWithNewValue(value.trimIndent()))