Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ buildscript {
}

dependencies {
classpath 'com.jeppeman.mockposable:mockposable-gradle:0.17'
classpath 'com.jeppeman.mockposable:mockposable-gradle:0.18'
}
}

Expand Down
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
1 change: 1 addition & 0 deletions integration-tests/android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion mockposable/gradle.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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",
)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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",
)
}
}

Expand Down
Loading