Merge pull request #117 from lupuuss/release-3.0.0

Release 3.0.0

Author: lupuuss

.gitignore

@@ -3,7 +3,7 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
-./test-mokkery/local.properties
+/test-mokkery-gradle/local.properties
 
 ### IntelliJ IDEA ###
 .idea/modules.xml
@@ -43,5 +43,5 @@ bin/
 ### Mac OS ###
 .DS_Store
 /.idea/
-/test-mokkery/.idea/
+/test-mokkery-gradle/.idea/
 /local.properties

build-mokkery/src/main/kotlin/Utils.kt

@@ -1,6 +1,12 @@
 
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.extra
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+import org.jetbrains.kotlin.gradle.plugin.SubpluginOption
+import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile
+import org.jetbrains.kotlin.gradle.tasks.CompilerPluginOptions
+import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile
 import java.util.Properties
 
 fun Project.loadLocalProperties() {
@@ -15,3 +21,24 @@ fun Project.loadLocalProperties() {
         }
     }
 }
+
+fun Project.configureCompilerPlugin(id: String, vararg options: SubpluginOption) {
+    val compilerOptions = CompilerPluginOptions().apply {
+        options.forEach {
+            addPluginArgument(id, it)
+        }
+    }
+    tasks.withType<AbstractKotlinCompile<*>> {
+        pluginOptions.add(compilerOptions)
+    }
+    tasks.withType<KotlinNativeCompile> {
+        compilerPluginOptions.addPluginArgument(compilerOptions)
+    }
+}
+
+fun KotlinMultiplatformExtension.optInMokkeryDelicateAndInternals() {
+    sourceSets.all {
+        languageSettings.optIn("dev.mokkery.annotations.DelicateMokkeryApi")
+        languageSettings.optIn("dev.mokkery.annotations.InternalMokkeryApi")
+    }
+}

build-mokkery/src/main/kotlin/mokkery-multiplatform.gradle.kts

@@ -2,14 +2,14 @@
 
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 
 
 plugins {
     kotlin("multiplatform")
 }
 
 kotlin {
-    explicitApi()
 
     @OptIn(ExperimentalKotlinGradlePluginApi::class)
     applyDefaultHierarchyTemplate {
@@ -68,12 +68,6 @@ kotlin {
     @OptIn(ExperimentalKotlinGradlePluginApi::class)
     compilerOptions {
         freeCompilerArgs.add("-Xexpect-actual-classes")
-    }
-
-    sourceSets {
-        all {
-            languageSettings.optIn("dev.mokkery.annotations.DelicateMokkeryApi")
-            languageSettings.optIn("dev.mokkery.annotations.InternalMokkeryApi")
-        }
+        freeCompilerArgs.add("-Xcontext-parameters")
     }
 }

gradle.properties

@@ -3,6 +3,6 @@ kotlin.code.style=official
 kotlin.suppressGradlePluginWarnings=IncorrectCompileOnlyDependencyWarning
 kotlin.native.ignoreDisabledTargets=true
 org.gradle.jvmargs=-Xmx3g
-version=2.10.2
+version=3.0.0
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true

gradle/libs.versions.toml

@@ -12,15 +12,18 @@ bytebuddy = "1.17.8"
 gradle-portal-publish = "2.0.0"
 agp = "8.12.3"
 dexmaker = "2.28.6"
+kctesting = "0.11.0"
 
 [plugins]
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 poko = { id = "dev.drewhamilton.poko", version.ref = "poko" }
 kotlinx-atomicfu = { id = "org.jetbrains.kotlinx.atomicfu", version.ref = "atomicfu" }
+kotlin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin" }
 gradle-portal-publish = { id = "com.gradle.plugin-publish", version.ref = "gradle-portal-publish" }
-agp-library = { id = "com.android.library"}
+agp-library = { id = "com.android.library" }
 
 [libraries]
+kctesting = { module = "dev.zacsweers.kctfork:core", version.ref = "kctesting" }
 kotlin-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 kotlin-dom-api-compat = { module = "org.jetbrains.kotlin:kotlin-dom-api-compat", version.ref = "kotlin" }

mokkery-core/build.gradle.kts

@@ -4,6 +4,11 @@ plugins {
     id("com.github.gmazzo.buildconfig")
 }
 
+kotlin {
+    explicitApi()
+    optInMokkeryDelicateAndInternals()
+}
+
 dependencies {
     commonMainCompileOnly(libs.kotlin.stdlib)
 

mokkery-core/src/commonMain/kotlin/dev/mokkery/annotations/Annotations.kt

@@ -16,3 +16,10 @@ public annotation class DelicateMokkeryApi
     level = RequiresOptIn.Level.ERROR, message = "This is an internal Mokkery API and it should not be used!"
 )
 public annotation class InternalMokkeryApi
+
+/**
+ * Marks parameter that accepts matchers.
+ */
+@Target(AnnotationTarget.VALUE_PARAMETER)
+@Retention(AnnotationRetention.BINARY)
+public annotation class Matcher

mokkery-coroutines/build.gradle.kts

@@ -4,6 +4,11 @@ plugins {
     alias(libs.plugins.poko)
 }
 
+kotlin {
+    explicitApi()
+    optInMokkeryDelicateAndInternals()
+}
+
 dependencies {
     commonMainApi(project(":mokkery-runtime"))
     commonMainApi(libs.kotlinx.coroutines.core)

mokkery-coroutines/src/commonMain/kotlin/dev/mokkery/coroutines/answering/Awaitable.kt

@@ -10,7 +10,6 @@ import dev.mokkery.coroutines.internal.answering.AwaitReceiveChannel
 import dev.mokkery.coroutines.internal.answering.AwaitSendChannel
 import dev.mokkery.MokkerySuspendCallScope
 import dev.mokkery.call
-import dev.mokkery.toFunctionScope
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.channels.ReceiveChannel
 import kotlinx.coroutines.channels.SendChannel
@@ -26,17 +25,7 @@ public interface Awaitable<out T> {
     /**
      * Suspends current function call until the awaited result is available.
      */
-    public suspend fun await(scope: MokkerySuspendCallScope): T {
-        @Suppress("DEPRECATION_ERROR")
-        return await(scope.toFunctionScope())
-    }
-
-    /**
-     * **DEPRECATED: Use [await] with [MokkerySuspendCallScope] instead!**
-     */
-    @Deprecated(AnswerDeprecationMessage, level = DeprecationLevel.ERROR)
-    @Suppress("DEPRECATION_ERROR")
-    public suspend fun await(scope: dev.mokkery.answering.FunctionScope): T = throw NotImplementedError()
+    public suspend fun await(scope: MokkerySuspendCallScope): T
 
     /**
      * Provides a description of the awaitable action.
@@ -108,5 +97,3 @@ public interface Awaitable<out T> {
         }
     }
 }
-
-internal const val AnswerDeprecationMessage = "Migrate to new `await` overload. Read `Answer` documentation for migration guide."

mokkery-gradle/build.gradle.kts

@@ -1,5 +1,9 @@
 @file:Suppress("UnstableApiUsage")
 
+import org.jetbrains.kotlin.konan.target.HostManager
+import org.jetbrains.kotlin.konan.target.KonanTarget
+
+
 plugins {
     kotlin("jvm")
     id("mokkery-publish")
@@ -18,6 +22,14 @@ kotlin {
     }
 }
 
+fun Test.dependsOnPublishToMavenLocalOf(project: String) {
+    dependsOn(project(project).tasks.named("publishToMavenLocal"))
+}
+
+fun Test.dependsOnPublishPublicationToMavenLocalOf(project: String, name: String) {
+    dependsOn(project(project).tasks.named("publish${name}PublicationToMavenLocal"))
+}
+
 val functionalTest by testing.suites.creating(JvmTestSuite::class) {
     val compilations = kotlin.target.compilations
     compilations.getByName("functionalTest").associateWith(compilations.getByName("main"))
@@ -27,14 +39,33 @@ val functionalTest by testing.suites.creating(JvmTestSuite::class) {
             testLogging.showStandardStreams = true
             mustRunAfter("test")
             listOf(
-                ":mokkery-runtime",
-                ":mokkery-plugin",
                 ":mokkery-core",
-                ":mokkery-gradle",
+                ":mokkery-runtime",
                 ":mokkery-coroutines"
             ).forEach {
-                dependsOn(project(it).tasks.named("publishToMavenLocal"))
+                if (it == ":mokkery-runtime") {
+                    dependsOnPublishPublicationToMavenLocalOf(it, "AndroidRelease")
+                }
+                dependsOnPublishPublicationToMavenLocalOf(it, "KotlinMultiplatform")
+                dependsOnPublishPublicationToMavenLocalOf(it, "Jvm")
+                dependsOnPublishPublicationToMavenLocalOf(it, "WasmJs")
+                dependsOnPublishPublicationToMavenLocalOf(it, "Js")
+                when (HostManager.host) {
+                    is KonanTarget.LINUX_X64 -> dependsOnPublishPublicationToMavenLocalOf(it, "LinuxX64")
+                    is KonanTarget.LINUX_ARM64 -> dependsOnPublishPublicationToMavenLocalOf(it, "LinuxArm64")
+                    is KonanTarget.MACOS_X64 -> {
+                        dependsOnPublishPublicationToMavenLocalOf(it, "MacosX64")
+                    }
+                    is KonanTarget.MACOS_ARM64 -> {
+                        dependsOnPublishPublicationToMavenLocalOf(it, "MacosArm64")
+                        dependsOnPublishPublicationToMavenLocalOf(it, "IosSimulatorArm64")
+                    }
+                    is KonanTarget.MINGW_X64 -> dependsOnPublishPublicationToMavenLocalOf(it, "MingwX64")
+                    else -> error("Unsupported target ${HostManager.host}")
+                }
             }
+            dependsOnPublishToMavenLocalOf(":mokkery-plugin")
+            dependsOnPublishToMavenLocalOf(":mokkery-gradle")
         }
     }
     dependencies {