Kotlin 2.3.0 support (#49)

jeppeman · web-flow · commit bd9252b5dfb8 · 2025-12-17T18:43:04.000Z
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ buildscript {
     }
     
     dependencies {
-         classpath 'com.jeppeman.mockposable:mockposable-gradle:0.15'
+         classpath 'com.jeppeman.mockposable:mockposable-gradle:0.16'
     }
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,61 +1,60 @@
 [versions]
-kotlin = '2.2.20'
-compose-ui = '1.8.3'
-google-ksp = '2.2.20-2.0.3' # https://mvnrepository.com/artifact/com.google.devtools.ksp/com.google.devtools.ksp.gradle.plugin?repo=central
-activity = '1.10.1'
-agp = '8.9.3'
-espresso = '3.6.1'
-mockk = '1.13.12'
-mockito = '4.8.1'
+kotlin = '2.3.0'
+compose-ui = '1.10.0'
+google-ksp = '2.3.3' # https://mvnrepository.com/artifact/com.google.devtools.ksp/com.google.devtools.ksp.gradle.plugin?repo=central
+activity = '1.12.1'
+agp = '8.11.2'
+espresso = '3.7.0'
+mockk = '1.14.7'
 
 [libraries]
 kotlin-gradle = { module = 'org.jetbrains.kotlin:kotlin-gradle-plugin', version.ref = 'kotlin' }
 kotlin-compiler = { module = 'org.jetbrains.kotlin:kotlin-compiler-embeddable', version.ref = 'kotlin' }
 
 androidx-activity = { module = 'androidx.activity:activity', version.ref = 'activity' }
-androidx-appcompat = { module = 'androidx.appcompat:appcompat', version = '1.7.0' }
+androidx-appcompat = { module = 'androidx.appcompat:appcompat', version = '1.7.1' }
 androidx-activity-compose = { module = 'androidx.activity:activity-compose', version.ref = 'activity' }
-androidx-lifecycle-viewmodel-compose = { module = 'androidx.lifecycle:lifecycle-viewmodel-compose', version = '2.8.7' }
-androidx-test-runner = { module = 'androidx.test:runner', version = '1.6.2'}
+androidx-lifecycle-viewmodel-compose = { module = 'androidx.lifecycle:lifecycle-viewmodel-compose', version = '2.10.0' }
+androidx-test-runner = { module = 'androidx.test:runner', version = '1.7.0' }
 androidx-test-espresso-core = { module = 'androidx.test.espresso:espresso-core', version.ref = 'espresso' }
 androidx-test-annotation = { module = 'androidx.test:annotation', version = '1.0.1' }
-androidx-fragment-testing = { module = 'androidx.fragment:fragment-testing', version = '1.8.6' }
+androidx-fragment-testing = { module = 'androidx.fragment:fragment-testing', version = '1.8.9' }
 
 compose-compiler = { module = 'org.jetbrains.kotlin:kotlin-compose-compiler-plugin-embeddable', version.ref = 'kotlin' }
 compose-compiler-gradle = { module = 'org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin', version.ref = 'kotlin' }
-compose-runtime = { module = 'org.jetbrains.compose.runtime:runtime', version = '1.6.11' }
+compose-runtime = { module = 'org.jetbrains.compose.runtime:runtime', version = '1.9.3' }
 compose-ui = { module = 'androidx.compose.ui:ui', version.ref = 'compose-ui' }
-compose-material = { module = 'androidx.compose.material:material', version = '1.7.8' }
-compose-foundation = { module = 'androidx.compose.foundation:foundation', version = '1.7.8' }
+compose-material = { module = 'androidx.compose.material:material', version = '1.10.0' }
+compose-foundation = { module = 'androidx.compose.foundation:foundation', version = '1.10.0' }
 compose-ui-test-junit4 = { module = 'androidx.compose.ui:ui-test-junit4', version.ref = 'compose-ui' }
 compose-ui-test-manifest = { module = 'androidx.compose.ui:ui-test-manifest', version.ref = 'compose-ui' }
 
 android-gradle = { module = 'com.android.tools.build:gradle', version.ref = 'agp' }
 
-autoservice-ksp = { module = 'dev.zacsweers.autoservice:auto-service-ksp', version = '1.0.0' }
+autoservice-ksp = { module = 'dev.zacsweers.autoservice:auto-service-ksp', version = '1.2.0' }
 autoservice-annotations = { module = 'com.google.auto.service:auto-service-annotations', version = '1.1.1' }
 
 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.1' }
+compile-testing = { module = 'dev.zacsweers.kctfork:core', version = '0.12.0' }
 
 junit = { module = 'androidx.test.ext:junit', version = '1.1.3' }
 
-robolectric = { module = 'org.robolectric:robolectric', version = '4.13' }
+robolectric = { module = 'org.robolectric:robolectric', version = '4.16' }
 
-molecule = { module = 'app.cash.molecule:molecule-runtime', version = '2.0.0' }
+molecule = { module = 'app.cash.molecule:molecule-runtime', version = '2.2.0' }
 
 hamcrest = { module = 'org.hamcrest:hamcrest', version = '2.2' }
 
 mockk-core = { module = 'io.mockk:mockk', version.ref = 'mockk' }
 mockk-android = { module = 'io.mockk:mockk-android', version.ref = 'mockk' }
 
-mockito-kotlin = { module = 'org.mockito.kotlin:mockito-kotlin', version = '5.4.0' }
-mockito-inline = { module = 'org.mockito:mockito-inline', version.ref = 'mockito' }
-mockito-android = { module = 'org.mockito:mockito-android', version.ref = 'mockito' }
+mockito-kotlin = { module = 'org.mockito.kotlin:mockito-kotlin', version = '6.1.0' }
+mockito-inline = { module = 'org.mockito:mockito-inline', version = '5.2.0' }
+mockito-android = { module = 'org.mockito:mockito-android', version = '5.21.0' }
 
-paparazzi = { module = 'app.cash.paparazzi:paparazzi-gradle-plugin', version = '1.3.5' }
+paparazzi = { module = 'app.cash.paparazzi:paparazzi-gradle-plugin', version = '2.0.0-alpha02' }
 
 [plugins]
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Oct 18 11:21:10 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/integration-tests/android/build.gradle.kts b/integration-tests/android/build.gradle.kts
@@ -15,12 +15,12 @@ mockposable {
 }
 
 android {
-    compileSdk = 35
+    compileSdk = 36
     namespace = "com.jeppeman.mockposable.integrationtests.android"
 
     defaultConfig {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        minSdk = 21
+        minSdk = 23
         val taskNames = project.gradle
             .startParameter
             .taskNames
diff --git a/integration-tests/android/src/test/kotlin/com/jeppeman/mockposable/integrationtests/android/SnapshotTest.kt b/integration-tests/android/src/test/kotlin/com/jeppeman/mockposable/integrationtests/android/SnapshotTest.kt
@@ -33,7 +33,7 @@ class SnapshotTest {
         deviceConfig = DeviceConfig.PIXEL_5,
         theme = "Theme.Material",
         environment = detectEnvironment().copy(
-            compileSdkVersion = 35
+            compileSdkVersion = 36
         )
     )
 
diff --git a/mockposable/gradle.properties b/mockposable/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=0.16-SNAPSHOT
+VERSION_NAME=0.17-SNAPSHOT
 GROUP=com.jeppeman.mockposable
 
 POM_DESCRIPTION=A tool that enables stubbing and verification of @Composable-annotated functions
diff --git a/mockposable/mockposable-compiler/src/main/java/com/jeppeman/mockposable/compiler/MockKIrGenerationExtension.kt b/mockposable/mockposable-compiler/src/main/java/com/jeppeman/mockposable/compiler/MockKIrGenerationExtension.kt
@@ -4,10 +4,8 @@ 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
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
-import org.jetbrains.kotlin.backend.common.validateIr
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.cli.common.messages.toLogger
 import org.jetbrains.kotlin.config.IrVerificationMode
@@ -26,6 +24,8 @@ 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
+import org.jetbrains.kotlin.ir.validation.IrValidatorConfig
+import org.jetbrains.kotlin.ir.validation.validateIr
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.util.Logger
 
@@ -53,14 +53,14 @@ class MockKIrGenerationExtension(
         transformers.forEach { transformer -> moduleFragment.transform(transformer, null) }
         val afterTransform = moduleFragment.dump()
         if (beforeTransform != afterTransform) {
-            validateIr(messageCollector, IrVerificationMode.ERROR) {
-                performBasicIrValidation(
-                    moduleFragment,
-                    pluginContext.irBuiltIns,
-                    "MockK transformation",
-                    IrValidatorConfig(),
-                )
-            }
+            validateIr(
+                element = moduleFragment,
+                irBuiltIns = pluginContext.irBuiltIns,
+                validatorConfig = IrValidatorConfig(),
+                messageCollector = messageCollector,
+                mode = IrVerificationMode.ERROR,
+                phaseName = "MockK transformation",
+            )
         }
     }
 }
diff --git a/mockposable/mockposable-compiler/src/main/java/com/jeppeman/mockposable/compiler/MockitoIrGenerationExtension.kt b/mockposable/mockposable-compiler/src/main/java/com/jeppeman/mockposable/compiler/MockitoIrGenerationExtension.kt
@@ -4,10 +4,8 @@ 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
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
-import org.jetbrains.kotlin.backend.common.validateIr
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.cli.common.messages.toLogger
 import org.jetbrains.kotlin.config.IrVerificationMode
@@ -17,7 +15,10 @@ import org.jetbrains.kotlin.ir.expressions.IrCall
 import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.expressions.IrFunctionExpression
 import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
+import org.jetbrains.kotlin.ir.util.dump
 import org.jetbrains.kotlin.ir.util.fqNameWhenAvailable
+import org.jetbrains.kotlin.ir.validation.IrValidatorConfig
+import org.jetbrains.kotlin.ir.validation.validateIr
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.util.Logger
 
@@ -41,13 +42,17 @@ class MockitoIrGenerationExtension(
             OnComposableElementTransformer(logger, pluginContext),
             MockitoVerifyComposableElementTransformer(logger, pluginContext)
         )
+        val beforeTransform = moduleFragment.dump()
         transformers.forEach { transformer -> moduleFragment.transform(transformer, null) }
-        validateIr(messageCollector, IrVerificationMode.ERROR) {
-            performBasicIrValidation(
-                moduleFragment,
-                pluginContext.irBuiltIns,
-                "Mockito transformation",
-                IrValidatorConfig(),
+        val afterTransform = moduleFragment.dump()
+        if (beforeTransform != afterTransform) {
+            validateIr(
+                element = moduleFragment,
+                irBuiltIns = pluginContext.irBuiltIns,
+                validatorConfig = IrValidatorConfig(),
+                messageCollector = messageCollector,
+                mode = IrVerificationMode.ERROR,
+                phaseName = "Mockito transformation",
             )
         }
     }
diff --git a/mockposable/mockposable-compiler/src/main/java/com/jeppeman/mockposable/compiler/MockposableCommandLineProcessor.kt b/mockposable/mockposable-compiler/src/main/java/com/jeppeman/mockposable/compiler/MockposableCommandLineProcessor.kt
@@ -9,14 +9,15 @@ import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.config.CompilerConfigurationKey
 
 private const val ARG_NAME_MOCK_PLUGINS = "plugins"
+const val MOCKPOSABLE_PLUGIN_ID = "com.jeppeman.mockposable"
 
 val KEY_MOCK_PLUGINS = CompilerConfigurationKey<String>(ARG_NAME_MOCK_PLUGINS)
 
 @OptIn(ExperimentalCompilerApi::class)
 @Suppress("unused") // Invoked by the compiler
 @AutoService(CommandLineProcessor::class)
 class MockposableCommandLineProcessor : CommandLineProcessor {
-    override val pluginId: String = "com.jeppeman.mockposable"
+    override val pluginId: String = MOCKPOSABLE_PLUGIN_ID
 
     override val pluginOptions: Collection<AbstractCliOption> = listOf(
         CliOption(ARG_NAME_MOCK_PLUGINS, "String", "", required = true)
diff --git a/mockposable/mockposable-compiler/src/main/java/com/jeppeman/mockposable/compiler/MockposablePlugin.kt b/mockposable/mockposable-compiler/src/main/java/com/jeppeman/mockposable/compiler/MockposablePlugin.kt
@@ -6,24 +6,19 @@ import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSourceLocation
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
-import org.jetbrains.kotlin.cli.common.messages.toLogger
-import org.jetbrains.kotlin.com.intellij.mock.MockProject
-import org.jetbrains.kotlin.com.intellij.openapi.extensions.LoadingOrder
-import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
+import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar
 import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
 import org.jetbrains.kotlin.config.CompilerConfiguration
 
 @OptIn(ExperimentalCompilerApi::class)
 @Suppress("unused") // Invoked by kotlinc
-@AutoService(ComponentRegistrar::class)
-class MockposablePlugin : ComponentRegistrar {
+@AutoService(CompilerPluginRegistrar::class)
+class MockposablePlugin : CompilerPluginRegistrar() {
+    override val pluginId: String = MOCKPOSABLE_PLUGIN_ID
     override val supportsK2: Boolean
         get() = true
 
-    override fun registerProjectComponents(
-        project: MockProject,
-        configuration: CompilerConfiguration
-    ) {
+    override fun ExtensionStorage.registerExtensions(configuration: CompilerConfiguration) {
         val plugins = configuration.get(KEY_MOCK_PLUGINS, "").split(";")
         val messageCollector = MockposableMessageCollector(
             configuration.get(
@@ -36,7 +31,7 @@ class MockposablePlugin : ComponentRegistrar {
             // No extra transformations needed for compose-ui
             if (extension == "compose-ui") continue
 
-            project.registerIrLast(
+            IrGenerationExtension.registerExtension(
                 when (extension) {
                     "mockito" -> MockitoIrGenerationExtension(messageCollector)
                     "mockk" -> MockKIrGenerationExtension(messageCollector)
@@ -47,11 +42,6 @@ class MockposablePlugin : ComponentRegistrar {
     }
 }
 
-private fun MockProject.registerIrLast(extension: IrGenerationExtension) {
-    extensionArea.getExtensionPoint(IrGenerationExtension.extensionPointName)
-        .registerExtension(extension, LoadingOrder.LAST, this)
-}
-
 private class MockposableMessageCollector(
     private val proxy: MessageCollector
 ) : MessageCollector by proxy {
diff --git a/mockposable/mockposable-compiler/src/test/java/com/jeppeman/mockposable/compiler/MockposableCompilerTest.kt b/mockposable/mockposable-compiler/src/test/java/com/jeppeman/mockposable/compiler/MockposableCompilerTest.kt
@@ -92,12 +92,11 @@ fun compile(
     val mockposableCommandLineProcessor = MockposableCommandLineProcessor()
     val composeCommandLineProcessor = ComposeCommandLineProcessor()
     return KotlinCompilation().apply {
-        languageVersion = "2.0"
         sources = sourceFiles
         jvmTarget = JvmTarget.JVM_21.description
+        verbose = true
         commandLineProcessors = listOf(mockposableCommandLineProcessor, composeCommandLineProcessor)
-        componentRegistrars = listOf(MockposablePlugin())
-        compilerPluginRegistrars = listOf(ComposePluginRegistrar())
+        compilerPluginRegistrars = listOf(ComposePluginRegistrar(), MockposablePlugin())
         pluginOptions = listOf(
             PluginOption(
                 pluginId = mockposableCommandLineProcessor.pluginId,
@@ -115,4 +114,4 @@ fun compile(
     vararg plugins: String
 ): CompilationResult {
     return compile(listOf(sourceFile), *plugins)
-}
+}
diff --git a/mockposable/mockposable-gradle/src/main/java/com/jeppeman/mockposable/gradle/MockposableSubPlugin.kt b/mockposable/mockposable-gradle/src/main/java/com/jeppeman/mockposable/gradle/MockposableSubPlugin.kt
@@ -3,7 +3,6 @@ package com.jeppeman.mockposable.gradle
 import org.gradle.api.Project
 import org.gradle.api.provider.Provider
 import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradleSubplugin
-import org.jetbrains.kotlin.gradle.model.ComposeCompiler
 import org.jetbrains.kotlin.gradle.plugin.*
 
 @Suppress("unused") // Invoked by gradle
@@ -61,6 +60,12 @@ class MockposableSubPlugin : KotlinCompilerPluginSupportPlugin {
             .dependencies
             .add(project.dependencies.create(COMPOSE_RUNTIME_COORDINATES))
 
+        kotlinCompilation.compileTaskProvider.configure {
+            it.compilerOptions.freeCompilerArgs.add(
+                "-Xcompiler-plugin-order=${COMPOSE_COMPILER_PLUGIN_ID}>${PLUGIN_ID}",
+            )
+        }
+
         project.plugins.apply(ComposeCompilerGradleSubplugin::class.java)
 
         return project.provider {
@@ -73,7 +78,7 @@ class MockposableSubPlugin : KotlinCompilerPluginSupportPlugin {
         }
     }
 
-    override fun getCompilerPluginId(): String = "com.jeppeman.mockposable"
+    override fun getCompilerPluginId(): String = PLUGIN_ID
 
     override fun getPluginArtifact(): SubpluginArtifact = SubpluginArtifact(
         groupId = "com.jeppeman.mockposable",
@@ -84,6 +89,11 @@ class MockposableSubPlugin : KotlinCompilerPluginSupportPlugin {
     override fun isApplicable(
         kotlinCompilation: KotlinCompilation<*>
     ): Boolean = true
+
+    companion object {
+        private const val PLUGIN_ID = "com.jeppeman.mockposable"
+        private const val COMPOSE_COMPILER_PLUGIN_ID = "androidx.compose.compiler.plugins.kotlin"
+    }
 }
 
 private val mockPluginDependencyMap: Map<String, Map<String, List<String>>> = mapOf(
diff --git a/mockposable/mockposable-runtime/mockposable-runtime-composeui/build.gradle.kts b/mockposable/mockposable-runtime/mockposable-runtime-composeui/build.gradle.kts
@@ -16,7 +16,7 @@ plugins {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 36
     namespace = "com.jeppeman.mockposable.composeui"
 
     buildFeatures {

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ buildscript {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`dependencies {`
`36`		`- classpath 'com.jeppeman.mockposable:mockposable-gradle:0.15'`
	`36`	`+ classpath 'com.jeppeman.mockposable:mockposable-gradle:0.16'`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class SnapshotTest {`
`33`	`33`	`deviceConfig = DeviceConfig.PIXEL_5,`
`34`	`34`	`theme = "Theme.Material",`
`35`	`35`	`environment = detectEnvironment().copy(`
`36`		`- compileSdkVersion = 35`
	`36`	`+ compileSdkVersion = 36`
`37`	`37`	`)`
`38`	`38`	`)`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-VERSION_NAME=0.16-SNAPSHOT`
	`1`	`+VERSION_NAME=0.17-SNAPSHOT`
`2`	`2`	`GROUP=com.jeppeman.mockposable`
`3`	`3`
`4`	`4`	`POM_DESCRIPTION=A tool that enables stubbing and verification of @Composable-annotated functions`