Kotlin 2.2.0 support (#41)

Author: jeppeman

.gitignore

@@ -11,3 +11,4 @@
 .cxx
 local.properties
 .kotlin
+build

build.gradle.kts

@@ -46,8 +46,8 @@ allprojects {
     }
 
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) {
-        kotlinOptions {
-            jvmTarget = JvmTarget.JVM_11.target
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_11)
         }
     }
 

gradle/libs.versions.toml

@@ -1,9 +1,9 @@
 [versions]
-kotlin = '2.1.20'
-compose-ui = '1.7.8'
-google-ksp = '2.1.20-1.0.32' # https://mvnrepository.com/artifact/com.google.devtools.ksp/com.google.devtools.ksp.gradle.plugin?repo=central
+kotlin = '2.2.0'
+compose-ui = '1.8.3'
+google-ksp = '2.2.0-2.0.2' # https://mvnrepository.com/artifact/com.google.devtools.ksp/com.google.devtools.ksp.gradle.plugin?repo=central
 activity = '1.10.1'
-agp = '8.9.1'
+agp = '8.9.3'
 espresso = '3.6.1'
 mockk = '1.13.12'
 mockito = '4.8.1'
@@ -38,7 +38,7 @@ autoservice-annotations = { module = 'com.google.auto.service:auto-service-annot
 google-ksp = { module = 'com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin', version.ref = 'google-ksp' }
 
 # compile-testing = { module = 'com.github.tschuchortdev:kotlin-compile-testing', version = '1.5.0' }
-compile-testing = { module = 'dev.zacsweers.kctfork:core', version = '0.7.0' }
+compile-testing = { module = 'dev.zacsweers.kctfork:core', version = '0.7.1' }
 
 junit = { module = 'androidx.test.ext:junit', version = '1.1.3' }
 

mockposable/build.gradle.kts

@@ -46,8 +46,8 @@ allprojects {
     }
 
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) {
-        kotlinOptions {
-            jvmTarget = JvmTarget.JVM_11.target
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_11)
         }
     }
 

mockposable/gradle.properties

@@ -19,5 +19,4 @@ android.useAndroidX=true
 kotlin.code.style=official
 android.nonTransitiveRClass=true
 
-kotlin.js.compiler=ir
 kotlin.mpp.stability.nowarn=true

mockposable/mockposable-compiler/src/main/java/com/jeppeman/mockposable/compiler/IrUtils.kt

@@ -1,5 +1,8 @@
+@file:OptIn(DeprecatedForRemovalCompilerApi::class)
+
 package com.jeppeman.mockposable.compiler
 
+import org.jetbrains.kotlin.DeprecatedForRemovalCompilerApi
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.backend.common.lower.DeclarationIrBuilder
 import org.jetbrains.kotlin.ir.IrElement

mockposable/mockposable-compiler/src/main/java/com/jeppeman/mockposable/compiler/MockKIrGenerationExtension.kt

@@ -1,5 +1,8 @@
+@file:OptIn(DeprecatedForRemovalCompilerApi::class)
+
 package com.jeppeman.mockposable.compiler
 
+import org.jetbrains.kotlin.DeprecatedForRemovalCompilerApi
 import org.jetbrains.kotlin.backend.common.IrElementTransformerVoidWithContext
 import org.jetbrains.kotlin.backend.common.IrValidatorConfig
 import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
@@ -19,6 +22,7 @@ import org.jetbrains.kotlin.ir.expressions.IrFunctionExpression
 import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
 import org.jetbrains.kotlin.ir.types.classFqName
 import org.jetbrains.kotlin.ir.types.classOrNull
+import org.jetbrains.kotlin.ir.util.dump
 import org.jetbrains.kotlin.ir.util.dumpKotlinLike
 import org.jetbrains.kotlin.ir.util.fqNameWhenAvailable
 import org.jetbrains.kotlin.ir.util.getSimpleFunction
@@ -45,14 +49,18 @@ class MockKIrGenerationExtension(
             EveryComposableElementTransformer(logger, pluginContext),
             VerifyComposableElementTransformer(logger, pluginContext)
         )
+        val beforeTransform = moduleFragment.dump()
         transformers.forEach { transformer -> moduleFragment.transform(transformer, null) }
-        validateIr(messageCollector, IrVerificationMode.ERROR) {
-            performBasicIrValidation(
-                moduleFragment,
-                pluginContext.irBuiltIns,
-                "MockK transformation",
-                IrValidatorConfig(),
-            )
+        val afterTransform = moduleFragment.dump()
+        if (beforeTransform != afterTransform) {
+            validateIr(messageCollector, IrVerificationMode.ERROR) {
+                performBasicIrValidation(
+                    moduleFragment,
+                    pluginContext.irBuiltIns,
+                    "MockK transformation",
+                    IrValidatorConfig(),
+                )
+            }
         }
     }
 }

mockposable/mockposable-compiler/src/main/java/com/jeppeman/mockposable/compiler/MockitoIrGenerationExtension.kt

@@ -1,5 +1,8 @@
+@file:OptIn(DeprecatedForRemovalCompilerApi::class)
+
 package com.jeppeman.mockposable.compiler
 
+import org.jetbrains.kotlin.DeprecatedForRemovalCompilerApi
 import org.jetbrains.kotlin.backend.common.IrElementTransformerVoidWithContext
 import org.jetbrains.kotlin.backend.common.IrValidatorConfig
 import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension