Merge pull request #143 from lupuuss/release-3.4.2

lupuuss · web-flow · commit e9e8e618d4e0 · 2026-06-26T00:00:23.000+02:00
Release 3.4.2
diff --git a/build-mokkery/src/main/kotlin/MokkeryAttributes.kt b/build-mokkery/src/main/kotlin/MokkeryAttributes.kt
@@ -1,5 +1,7 @@
 object MokkeryAttributes {
 
+    const val PluginId = "dev.mokkery"
+
     const val GitBase = "github.com/lupuuss/Mokkery"
     const val GitHttpsUrl = "https://$GitBase"
     const val GitVscUrl = "${GitHttpsUrl}.git"
diff --git a/build-mokkery/src/main/kotlin/Utils.kt b/build-mokkery/src/main/kotlin/Utils.kt
@@ -11,8 +11,9 @@ import org.jetbrains.kotlin.gradle.tasks.CompilerPluginOptions
 import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile
 import java.util.*
 
+@Suppress("UnstableApiUsage")
 fun Project.loadLocalProperties() {
-    val secretPropsFile = rootProject.file("local.properties")
+    val secretPropsFile = project.isolated.rootProject.projectDirectory.file("local.properties").asFile
     if (secretPropsFile.exists()) {
         secretPropsFile.reader().use {
             Properties().apply {
diff --git a/build-mokkery/src/main/kotlin/mokkery-base.gradle.kts b/build-mokkery/src/main/kotlin/mokkery-base.gradle.kts
@@ -0,0 +1,22 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+val javaVersion = JavaVersion.VERSION_1_8
+
+tasks.withType<JavaCompile>().configureEach {
+    sourceCompatibility = javaVersion.toString()
+    targetCompatibility = javaVersion.toString()
+}
+tasks.withType<KotlinCompile>().configureEach {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.fromTarget(javaVersion.toString()))
+        freeCompilerArgs.add("-Xjdk-release=$javaVersion")
+    }
+}
+
+listOf("org.jetbrains.kotlin.multiplatform", "org.jetbrains.kotlin.jvm").forEach { pluginId ->
+    plugins.withId(pluginId) {
+        extensions.getByType<KotlinProjectExtension>().jvmToolchain(17)
+    }
+}
diff --git a/build-mokkery/src/main/kotlin/mokkery-jvm.gradle.kts b/build-mokkery/src/main/kotlin/mokkery-jvm.gradle.kts
@@ -0,0 +1,4 @@
+plugins {
+    kotlin("jvm")
+    id("mokkery-base")
+}
diff --git a/build-mokkery/src/main/kotlin/mokkery-multiplatform.gradle.kts b/build-mokkery/src/main/kotlin/mokkery-multiplatform.gradle.kts
@@ -6,6 +6,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
     kotlin("multiplatform")
+    id("mokkery-base")
 }
 
 kotlin {
diff --git a/build-mokkery/src/main/kotlin/mokkery-publish.gradle.kts b/build-mokkery/src/main/kotlin/mokkery-publish.gradle.kts
@@ -1,3 +1,5 @@
+@file:Suppress("UnstableApiUsage")
+
 import MokkeryAttributes.GitConnectionUrl
 import MokkeryAttributes.GitDevConnectionUrl
 import MokkeryAttributes.GitHttpsUrl
@@ -16,7 +18,7 @@ loadLocalProperties()
 
 dokka.dokkaSourceSets.configureEach {
     sourceLink {
-        localDirectory = rootDir
+        localDirectory = project.isolated.rootProject.projectDirectory.asFile
         remoteUrl = URI("${GitHttpsUrl}/tree/master")
         remoteLineSuffix ="#L"
     }
@@ -25,10 +27,7 @@ dokka.dokkaSourceSets.configureEach {
 publishing.repositories {
     maven {
         name = "testing"
-        url = rootProject.layout
-            .buildDirectory
-            .dir("testing-repository")
-            .let(::uri)
+        url = uri(project.isolated.rootProject.projectDirectory.dir("build/testing-repository").asFile)
     }
 }
 
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,8 +1,4 @@
 
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     alias(libs.plugins.dokka)
 }
@@ -22,35 +18,6 @@ buildscript {
     }
 }
 
-rootProject.group = "dev.mokkery"
-
-rootProject.ext["pluginId"] = "dev.mokkery"
-
-allprojects {
-    group = rootProject.group
-    version = rootProject.version
-    afterEvaluate {
-        extensions
-            .findByType<KotlinProjectExtension>()
-            ?.jvmToolchain(17)
-        val javaVersion = JavaVersion.VERSION_1_8
-        tasks
-            .withType<JavaCompile>()
-            .configureEach {
-                sourceCompatibility = javaVersion.toString()
-                targetCompatibility = javaVersion.toString()
-            }
-        tasks
-            .withType<KotlinCompile>()
-            .configureEach {
-                compilerOptions {
-                    jvmTarget.set(JvmTarget.fromTarget(javaVersion.toString()))
-                    freeCompilerArgs.add("-Xjdk-release=$javaVersion")
-                }
-            }
-    }
-}
-
 dokka {
     moduleName.set("Mokkery")
     moduleVersion.set(rootProject.version.toString().replace("-SNAPSHOT", "", ignoreCase = true))
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,6 @@
+group=dev.mokkery
+version=3.4.2
+
 kotlin.code.style=official
 # atomicfu warnings
 kotlin.suppressGradlePluginWarnings=IncorrectCompileOnlyDependencyWarning
@@ -7,5 +10,3 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
 org.gradle.parallel=true
 kotlin.js.stdlib.dom.api.included=false
-version=3.4.1
-
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ buildconfig = "5.7.0"
 google-autoservice = "1.1.1"
 atomicfu = "0.31.0"
 dokka = "2.1.0"
-poko = "0.23.0"
+poko = "0.23.1"
 vanniktech-publish-plugin = "0.36.0"
 gradle-portal-publish = "2.0.0"
 
diff --git a/mokkery-core-plugin/build.gradle.kts b/mokkery-core-plugin/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm")
+    id("mokkery-jvm")
     // no publishing - it's embedded into the plugin
 }
 
diff --git a/mokkery-core-tooling/build.gradle.kts b/mokkery-core-tooling/build.gradle.kts
@@ -1,9 +1,9 @@
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
-    kotlin("jvm")
-    id("com.github.gmazzo.buildconfig")
+    id("mokkery-jvm")
     id("mokkery-publish")
+    id("com.github.gmazzo.buildconfig")
     alias(libs.plugins.poko)
 }
 
@@ -23,10 +23,10 @@ dependencies {
 buildConfig {
     val pluginProject = project(":mokkery-plugin")
     packageName("dev.mokkery.internal")
-    buildConfigField("String", "GROUP", str(rootProject.group))
-    buildConfigField("String", "VERSION", str(rootProject.version))
+    buildConfigField("String", "GROUP", str(project.group))
+    buildConfigField("String", "VERSION", str(project.version))
     buildConfigField("String", "RUNTIME", str("mokkery-runtime"))
-    buildConfigField("String", "PLUGIN_ID", str(rootProject.ext["pluginId"]))
+    buildConfigField("String", "PLUGIN_ID", str(MokkeryAttributes.PluginId))
     buildConfigField("String", "PLUGIN_ARTIFACT_ID", str(pluginProject.name))
     buildConfigField("String", "MINIMUM_KOTLIN_VERSION", str(libs.versions.kotlinMininumSupported.get()))
     buildConfigField("String", "COMPILED_KOTLIN_VERSION", str(libs.versions.kotlin.get()))
diff --git a/mokkery-core/src/commonMain/kotlin/dev/mokkery/verify/VerifyMode.kt b/mokkery-core/src/commonMain/kotlin/dev/mokkery/verify/VerifyMode.kt
@@ -22,17 +22,17 @@ public sealed class VerifyMode {
         /**
          * Verifies that given calls occurred in exact same order and there is no more calls.
          */
-        public val exhaustiveOrder: VerifyMode = VerifyModeInternals.ExhaustiveOrder
+        public val exhaustiveOrder: VerifyMode get() = VerifyModeInternals.ExhaustiveOrder
 
         /**
          * Verifies that each function call occurred at least once in any order and there is no more calls.
          */
-        public val exhaustive: VerifyMode = VerifyModeInternals.Exhaustive
+        public val exhaustive: VerifyMode get() = VerifyModeInternals.Exhaustive
 
         /**
          * Verifies that each function call occurred at least once in any order. It allows unverified calls.
          */
-        public val soft: VerifyMode = VerifyModeInternals.Soft(atLeast = 1, atMost = Int.MAX_VALUE)
+        public val soft: VerifyMode get() = VerifyModeInternals.Soft(atLeast = 1, atMost = Int.MAX_VALUE)
 
         /**
          * Verifies that each function call occurred at least [n] times. It allows unverified calls.
@@ -63,30 +63,50 @@ public object VerifyModeInternals {
      * Verify mode used by [VerifyMode.not].
      */
     @InternalMokkeryApi
-    public object Not : VerifyMode()
+    public object Not : VerifyMode() {
+
+        override fun toString(): String = "not"
+    }
 
     /**
      * Verify mode used by [VerifyMode.order]
      */
     @InternalMokkeryApi
-    public object Order : VerifyMode()
+    public object Order : VerifyMode() {
+
+        override fun toString(): String = "order"
+    }
 
     /**
      * Verify mode used by [VerifyMode.exhaustiveOrder]
      */
     @InternalMokkeryApi
-    public object ExhaustiveOrder : VerifyMode()
+    public object ExhaustiveOrder : VerifyMode() {
+
+        override fun toString(): String = "exhaustiveOrder"
+    }
 
     /**
      * Verify mode used by [VerifyMode.exhaustive]
      */
     @InternalMokkeryApi
-    public object Exhaustive : VerifyMode()
+    public object Exhaustive : VerifyMode() {
+        override fun toString(): String = "VerifyMode.exhaustive"
+    }
 
     /**
      * Verify mode used by [VerifyMode.soft], [VerifyMode.atLeast], [VerifyMode.atMost], [VerifyMode.exactly], [VerifyMode.inRange]
      */
     @InternalMokkeryApi
-    public data class Soft(val atLeast: Int, val atMost: Int) : VerifyMode()
+    public data class Soft(val atLeast: Int, val atMost: Int) : VerifyMode() {
+
+        override fun toString(): String = when {
+            atLeast == atMost -> "exactly(${atMost})"
+            atLeast == 1 && atMost == Int.MAX_VALUE -> "soft"
+            atMost == Int.MAX_VALUE -> "atLeast(${atLeast})"
+            atLeast == 1 -> "atMost(${atMost})"
+            else -> "inRange(${atLeast}..${atMost})"
+        }
+    }
 
 }
diff --git a/mokkery-gradle/build.gradle.kts b/mokkery-gradle/build.gradle.kts
@@ -5,9 +5,9 @@ import org.jetbrains.kotlin.konan.target.HostManager
 import org.jetbrains.kotlin.konan.target.KonanTarget
 
 plugins {
-    kotlin("jvm")
-    id("com.github.gmazzo.buildconfig")
+    id("mokkery-jvm")
     id("mokkery-publish")
+    id("com.github.gmazzo.buildconfig")
     alias(libs.plugins.gradle.portal.publish)
 }
 
@@ -64,8 +64,8 @@ gradlePlugin {
     website.set(MokkeryAttributes.WebsiteUrl)
     vcsUrl.set(MokkeryAttributes.GitVscUrl)
     plugins {
-        create(rootProject.name) {
-            id = rootProject.extra["pluginId"] as String
+        create("mokkery") {
+            id = MokkeryAttributes.PluginId
             displayName = MokkeryAttributes.DisplayName
             description = MokkeryAttributes.Description
             version = project.version
diff --git a/mokkery-gradle/src/main/kotlin/dev/mokkery/gradle/BaseMokkeryGradlePlugin.kt b/mokkery-gradle/src/main/kotlin/dev/mokkery/gradle/BaseMokkeryGradlePlugin.kt
@@ -44,7 +44,9 @@ public abstract class BaseMokkeryGradlePlugin: KotlinCompilerPluginSupportPlugin
             .getOrNull()
             ?: return run {
                 val unsupportedCompilationWarning = project
-                    .findProperty("dev.mokkery.unsupportedCompilationWarnings")
+                    .providers
+                    .gradleProperty("dev.mokkery.unsupportedCompilationWarnings")
+                    .orNull
                     .toString()
                     .toBooleanStrictOrNull()
                     ?: true
diff --git a/mokkery-gradle/src/main/kotlin/dev/mokkery/gradle/MokkeryGradlePlugin.kt b/mokkery-gradle/src/main/kotlin/dev/mokkery/gradle/MokkeryGradlePlugin.kt
@@ -75,7 +75,10 @@ public class MokkeryGradlePlugin : BaseMokkeryGradlePlugin() {
             error("Current Kotlin version must be at least ${MokkeryConfig.MINIMUM_KOTLIN_VERSION}, but is $currentKotlinVersion! Downgrade Mokkery version or upgrade Kotlin version! Check https://mokkery.dev/docs/Setup#compatibility for compatibility guidelines!")
         }
         val compiledKotlinVersion = KotlinVersion(MokkeryConfig.COMPILED_KOTLIN_VERSION)
-        val versionWarnings = project.findProperty("dev.mokkery.versionWarnings")
+        val versionWarnings = project
+            .providers
+            .gradleProperty("dev.mokkery.versionWarnings")
+            .orNull
             .toString()
             .toBooleanStrictOrNull()
             ?: true
diff --git a/mokkery-plugin/build.gradle.kts b/mokkery-plugin/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    kotlin("jvm")
     kotlin("kapt")
+    id("mokkery-jvm")
     id("mokkery-publish")
 }
 
diff --git a/mokkery-plugin/src/main/kotlin/dev/mokkery/plugin/ir/IrBuilder.kt b/mokkery-plugin/src/main/kotlin/dev/mokkery/plugin/ir/IrBuilder.kt
@@ -72,6 +72,16 @@ fun IrBuilder.irGetEnumEntry(
     symbol = irClass.getEnumEntry(name).symbol
 )
 
+fun IrBuilder.irGetEnumEntry(
+    irClass: IrClass,
+    enum: Enum<*>
+): IrGetEnumValue = IrGetEnumValueImpl(
+    startOffset = startOffset,
+    endOffset = endOffset,
+    type = irClass.defaultType,
+    symbol = irClass.getEnumEntry(enum.name).symbol
+)
+
 fun IrBuilder.irCallConstructor(
     constructor: IrConstructor,
     typeArguments: List<IrType> = emptyList(),
diff --git a/mokkery-plugin/src/main/kotlin/dev/mokkery/plugin/ir/transformer/MokkeryRootTransformer.kt b/mokkery-plugin/src/main/kotlin/dev/mokkery/plugin/ir/transformer/MokkeryRootTransformer.kt
@@ -35,9 +35,6 @@ class MokkeryRootTransformer(pluginScope: IrMokkeryPluginScope) : CoreTransforme
 
     override fun visitClassNew(declaration: IrClass): IrStatement {
         declaration.transformChildrenVoid()
-        if (!declaration.isClass) return declaration
-        val mokkerySuiteScopeClass = referenced(MokkeryIr.Class.MokkerySuiteScope)
-        if (declaration.superTypes.none { it.getClass() == mokkerySuiteScopeClass }) return declaration
         declaration.overrideMokkerySuiteScopeIfNotOverridden()
         return declaration
     }
diff --git a/mokkery-plugin/src/main/kotlin/dev/mokkery/plugin/ir/transformer/mock/BuildMockJsFunction.kt b/mokkery-plugin/src/main/kotlin/dev/mokkery/plugin/ir/transformer/mock/BuildMockJsFunction.kt
@@ -91,7 +91,7 @@ fun buildMockJsFunction(
                     IrMokkeryKind.Spy -> irNull()
                     IrMokkeryKind.Mock -> expression
                         .arguments[regularMockParams[0]!!]
-                        ?: irGetEnumEntry(mockModeClass, configuration.defaultMockMode.toString())
+                        ?: irGetEnumEntry(mockModeClass, configuration.defaultMockMode)
                 }
                 arguments[6] = if (kind == IrMokkeryKind.Spy) expression.arguments[regularMockParams[0]!!]!! else irNull()
             })
diff --git a/mokkery-plugin/src/main/kotlin/dev/mokkery/plugin/ir/transformer/mock/ReplaceWithMock.kt b/mokkery-plugin/src/main/kotlin/dev/mokkery/plugin/ir/transformer/mock/ReplaceWithMock.kt
@@ -85,7 +85,7 @@ private fun IrBuilderWithScope.irMockConstructorCall(
         ?: irGetMokkeryScopeGlobal()
     arguments[1] = originalCall.arguments[regularParams[0]] ?: irGetEnumEntry(
         referenced(MokkeryIr.Class.MockMode),
-        configuration.defaultMockMode.toString()
+        configuration.defaultMockMode
     )
     arguments[2] = originalCall.arguments[regularParams[1]] ?: irNull()
     val anyType = irBuiltIns.anyType
diff --git a/mokkery-plugin/src/main/kotlin/dev/mokkery/plugin/ir/transformer/suite/OverrideMokkerySuiteScope.kt b/mokkery-plugin/src/main/kotlin/dev/mokkery/plugin/ir/transformer/suite/OverrideMokkerySuiteScope.kt
@@ -14,14 +14,18 @@ import org.jetbrains.kotlin.ir.builders.irGet
 import org.jetbrains.kotlin.ir.builders.irSetField
 import org.jetbrains.kotlin.ir.builders.irString
 import org.jetbrains.kotlin.ir.declarations.IrClass
+import org.jetbrains.kotlin.ir.types.getClass
+import org.jetbrains.kotlin.ir.util.isClass
 import org.jetbrains.kotlin.ir.util.kotlinFqName
 import org.jetbrains.kotlin.ir.util.primaryConstructor
 import org.jetbrains.kotlin.ir.util.statements
 
 context(scope: TransformerScope)
 fun IrClass.overrideMokkerySuiteScopeIfNotOverridden() {
-    val irClass = this
+    if (!isClass) return
     val mokkerySuiteScopeClass = referenced(MokkeryIr.Class.MokkerySuiteScope)
+    if (superTypes.none { it.getClass() == mokkerySuiteScopeClass }) return
+    val irClass = this
     val suiteNameClass = referenced(MokkeryIr.Class.SuiteName)
     val property = irClass.requirePropertyOwner("mokkeryContext")
     if (!property.isFakeOverride) return
diff --git a/mokkery-plugin/src/main/kotlin/dev/mokkery/plugin/ir/transformer/templating/ReplaceWithTemplating.kt b/mokkery-plugin/src/main/kotlin/dev/mokkery/plugin/ir/transformer/templating/ReplaceWithTemplating.kt
@@ -94,7 +94,8 @@ private fun replaceWithInternalEvery(
     irBlock {
         +irCall(toBeReplacedWith) {
             val templatingArgument = originalCall.arguments[0]
-            arguments[0] = when (templatingArgument) {
+            arguments[0] = irGetMokkeryScopeGlobal()
+            arguments[1] = when (templatingArgument) {
                 is IrFunctionExpression -> irTemplatingLambdaFor(templatingArgument, matchersCompiler)
                 is IrFunctionReference -> irTemplatingLambdaFor(templatingArgument, originalCall)
                 else -> error("Unsupported templating argument!")
diff --git a/mokkery-runtime/src/commonMain/kotlin/dev/mokkery/MokkeryScope.kt b/mokkery-runtime/src/commonMain/kotlin/dev/mokkery/MokkeryScope.kt
diff --git a/mokkery-runtime/src/commonMain/kotlin/dev/mokkery/debug/Debug.kt b/mokkery-runtime/src/commonMain/kotlin/dev/mokkery/debug/Debug.kt
diff --git a/mokkery-runtime/src/commonMain/kotlin/dev/mokkery/internal/Every.kt b/mokkery-runtime/src/commonMain/kotlin/dev/mokkery/internal/Every.kt
diff --git a/mokkery-runtime/src/commonMain/kotlin/dev/mokkery/internal/templating/RunTemplate.kt b/mokkery-runtime/src/commonMain/kotlin/dev/mokkery/internal/templating/RunTemplate.kt
diff --git a/test-mokkery-compiler/build.gradle.kts b/test-mokkery-compiler/build.gradle.kts
diff --git a/test-mokkery/build.gradle.kts b/test-mokkery/build.gradle.kts
diff --git a/test-mokkery/src/commonTest/kotlin/dev/mokkery/test/debug/MokkeryDebugStringTest.kt b/test-mokkery/src/commonTest/kotlin/dev/mokkery/test/debug/MokkeryDebugStringTest.kt
diff --git a/test-mokkery/src/jvmTest/kotlin/dev/mokkery/test/VerifyModeInitDeadlockTest.kt b/test-mokkery/src/jvmTest/kotlin/dev/mokkery/test/VerifyModeInitDeadlockTest.kt
diff --git a/website/docs/Setup.mdx b/website/docs/Setup.mdx
diff --git a/website/src/versions.js b/website/src/versions.js

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl`
`6`	`6`
`7`	`7`	`plugins {`
`8`	`8`	`kotlin("multiplatform")`
	`9`	`+ id("mokkery-base")`
`9`	`10`	`}`
`10`	`11`
`11`	`12`	`kotlin {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- kotlin("jvm")`
	`2`	`+ id("mokkery-jvm")`
`3`	`3`	`// no publishing - it's embedded into the plugin`
`4`	`4`	`}`
`5`	`5`