diff --git a/README.md b/README.md index d65b53d..770003b 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ buildscript { } dependencies { - classpath 'com.jeppeman.mockposable:mockposable-gradle:0.17' + classpath 'com.jeppeman.mockposable:mockposable-gradle:0.18' } } diff --git a/build.gradle.kts b/build.gradle.kts index 3ebcf15..a30ed40 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,6 +20,7 @@ buildscript { plugins { kotlin("jvm") version libs.versions.kotlin.get() apply false alias(libs.plugins.compose.compiler) apply false + alias(libs.plugins.kotlin.parcelize) apply false } allprojects { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7e3e01e..26ce938 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -58,3 +58,4 @@ paparazzi = { module = 'app.cash.paparazzi:paparazzi-gradle-plugin', version = ' [plugins] compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } +kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } diff --git a/integration-tests/android/build.gradle.kts b/integration-tests/android/build.gradle.kts index 2b43787..0ddf105 100644 --- a/integration-tests/android/build.gradle.kts +++ b/integration-tests/android/build.gradle.kts @@ -5,6 +5,7 @@ import com.jeppeman.mockposable.gradle.COMPOSE_UI plugins { id("com.android.library") alias(libs.plugins.compose.compiler) + alias(libs.plugins.kotlin.parcelize) id("com.jeppeman.mockposable") // id("app.cash.paparazzi") } diff --git a/integration-tests/android/src/main/kotlin/com/jeppeman/mockposable/integrationtests/android/ParcelizeTest.kt b/integration-tests/android/src/main/kotlin/com/jeppeman/mockposable/integrationtests/android/ParcelizeTest.kt new file mode 100644 index 0000000..2326b11 --- /dev/null +++ b/integration-tests/android/src/main/kotlin/com/jeppeman/mockposable/integrationtests/android/ParcelizeTest.kt @@ -0,0 +1,7 @@ +package com.jeppeman.mockposable.integrationtests.android + +import android.os.Parcelable +import kotlinx.parcelize.Parcelize + +@Parcelize +data class ParcelizeTest(val dummy: Int) : Parcelable \ No newline at end of file diff --git a/mockposable/gradle.properties b/mockposable/gradle.properties index 499e9a8..3fcff6f 100644 --- a/mockposable/gradle.properties +++ b/mockposable/gradle.properties @@ -1,4 +1,4 @@ -VERSION_NAME=0.18-SNAPSHOT +VERSION_NAME=0.19-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 index a072e7f..3975657 100644 --- 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 @@ -18,7 +18,6 @@ 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 @@ -47,19 +46,15 @@ class MockKIrGenerationExtension( EveryComposableElementTransformer(logger, pluginContext), VerifyComposableElementTransformer(logger, pluginContext) ) - val beforeTransform = moduleFragment.dump() transformers.forEach { transformer -> moduleFragment.transform(transformer, null) } - val afterTransform = moduleFragment.dump() - if (beforeTransform != afterTransform) { - validateIr( - element = moduleFragment, - irBuiltIns = pluginContext.irBuiltIns, - validatorConfig = IrValidatorConfig(), - messageCollector = messageCollector, - mode = IrVerificationMode.ERROR, - phaseName = "MockK transformation", - ) - } + 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 index bb151df..221e8b5 100644 --- 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 @@ -14,7 +14,6 @@ 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 @@ -41,19 +40,15 @@ class MockitoIrGenerationExtension( OnComposableElementTransformer(logger, pluginContext), MockitoVerifyComposableElementTransformer(logger, pluginContext) ) - val beforeTransform = moduleFragment.dump() transformers.forEach { transformer -> moduleFragment.transform(transformer, null) } - val afterTransform = moduleFragment.dump() - if (beforeTransform != afterTransform) { - validateIr( - element = moduleFragment, - irBuiltIns = pluginContext.irBuiltIns, - validatorConfig = IrValidatorConfig(), - messageCollector = messageCollector, - mode = IrVerificationMode.ERROR, - phaseName = "Mockito transformation", - ) - } + validateIr( + element = moduleFragment, + irBuiltIns = pluginContext.irBuiltIns, + validatorConfig = IrValidatorConfig(), + messageCollector = messageCollector, + mode = IrVerificationMode.ERROR, + phaseName = "Mockito transformation", + ) } }