Merge pull request #75 from lupuuss/release-2.7.0

Release 2.7.0

Author: lupuuss

.github/workflows/publish.yml

@@ -0,0 +1,18 @@
+name: Publish Mokkery to staging
+on:
+  workflow_dispatch:
+jobs:
+  publish-staging:
+    runs-on: macos-latest
+    env:
+      ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USERNAME }}
+      ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
+      ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GPG_KEY }}
+      ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.GPG_PASSWORD }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+      - name: Gradle build
+        run: ./gradlew publishAllPublicationsToMavenCentralRepository

.github/workflows/tests.yml

@@ -1,13 +1,13 @@
 name: Tests Mokkery
 on:
   workflow_dispatch:
-  pull_request:
+  push:
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4

README.md

@@ -8,7 +8,7 @@
 </br>
 
 [![Gradle Plugin Portal Stable](https://img.shields.io/gradle-plugin-portal/v/dev.mokkery)](https://plugins.gradle.org/plugin/dev.mokkery)
-[![Kotlin](https://img.shields.io/badge/kotlin-2.1.0-blue.svg?logo=kotlin)](http://kotlinlang.org)
+[![Kotlin](https://img.shields.io/badge/kotlin-2.1.10-blue.svg?logo=kotlin)](http://kotlinlang.org)
 [![GitHub](https://img.shields.io/github/license/lupuuss/Mokkery)](https://github.com/lupuuss/Mokkery/blob/main/LICENSE)
 [![Docs](https://img.shields.io/static/v1?label=api&message=reference&labelColor=gray&color=blueviolet&logo=gitbook&logoColor=white)](https://mokkery.dev/api_reference)
 

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

@@ -14,7 +14,9 @@ loadLocalProperties()
 
 mavenPublishing {
     coordinates(project.group.toString(), project.name, project.version.toString())
-    signAllPublications()
+    if (gradle.startParameter.taskNames.any { it.contains("MavenCentral") }) {
+        signAllPublications()
+    }
     publishToMavenCentral(SonatypeHost.S01, automaticRelease = false)
     pom {
         name.set(project.name)

gradle.properties

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

gradle/libs.versions.toml

@@ -1,10 +1,10 @@
 [versions]
-kotlin = "2.1.0"
-kotlinx-coroutines = "1.9.0"
+kotlin = "2.1.10"
+kotlinx-coroutines = "1.10.1"
 buildconfig = "4.0.4"
-google-autoservice = "1.0.1"
-atomicfu = "0.26.0"
-dokka = "2.0.0-Beta"
+google-autoservice = "1.1.1"
+atomicfu = "0.27.0"
+dokka = "2.0.0"
 poko = "0.17.2"
 vanniktech-publish-plugin = "0.30.0"
 objensis = "3.4"

mokkery-coroutines/src/commonTest/kotlin/dev/mokkery/coroutines/Fakes.kt

@@ -8,10 +8,12 @@ internal fun fakeFunctionScope(
     returnType: KClass<*> = Unit::class,
     self: Any? = Unit,
     supers: Map<KClass<*>, (List<Any?>) -> Any?> = emptyMap(),
-    args: List<Any?> = emptyList()
+    args: List<Any?> = emptyList(),
+    classSupertypes: List<KClass<*>> = listOf(Unit::class)
 ) = FunctionScope(
     returnType = returnType,
     args = args,
     self = self,
-    supers = supers
+    supers = supers,
+    classSupertypes = classSupertypes
 )

mokkery-gradle/src/main/kotlin/dev/mokkery/gradle/MokkeryGradleExtension.kt

@@ -33,7 +33,8 @@ public interface MokkeryGradleExtension {
      */
     @Deprecated(
         "Scheduled to be removed. Due to https://youtrack.jetbrains.com/issue/KT-71283 it won't work in most cases. " +
-                "Also, this feature is a little bit hacky and probably not very useful."
+                "Also, this feature is a little bit hacky and probably not very useful.",
+        level = DeprecationLevel.ERROR
     )
     public val allowIndirectSuperCalls: Property<Boolean>
 

mokkery-gradle/src/main/kotlin/dev/mokkery/gradle/MokkeryGradlePlugin.kt

@@ -1,3 +1,5 @@
+@file:Suppress("DEPRECATION_ERROR")
+
 package dev.mokkery.gradle
 
 import dev.mokkery.MokkeryCompilerDefaults

mokkery-plugin/src/main/kotlin/dev/mokkery/plugin/core/Mokkery.kt

@@ -16,29 +16,34 @@ object Mokkery {
     val dev_mokkery_context by fqName
     val dev_mokkery_interceptor by fqName
     val dev_mokkery_internal by fqName
-    val dev_mokkery_internal_calls by fqName
     val dev_mokkery_internal_context by fqName
+    val dev_mokkery_internal_calls by fqName
     val dev_mokkery_internal_interceptor by fqName
     val dev_mokkery_matcher by fqName
 
     object Class {
 
         val MockMode by dev_mokkery.klass
+        val MokkeryScope by dev_mokkery.klass
         val MokkeryKind by dev_mokkery_internal_interceptor.klass
         val ArgMatchersScope by dev_mokkery_matcher.klass
         val MockMany2 by dev_mokkery.klass
         val MockMany3 by dev_mokkery.klass
         val MockMany4 by dev_mokkery.klass
         val MockMany5 by dev_mokkery.klass
 
+        val MokkerySuiteScope by dev_mokkery.klass
+
         val MokkeryCallInterceptor by dev_mokkery_interceptor.klass
         val MokkeryInstance by dev_mokkery_internal.klass
         val MokkeryMockInstance by dev_mokkery_internal.klass
 
         val CallArgument by dev_mokkery_context.klass
+        val SuiteName by dev_mokkery_internal_context.klass
 
         val TemplatingScope by dev_mokkery_internal_calls.klass
         val MokkeryInstanceLookup by dev_mokkery_internal.klass
+        val GlobalMokkeryScope by dev_mokkery_internal.klass
 
         fun mockMany(value: Int): ClassResolver {
             return mockManyMap[value] ?: error("Unsupported types number! Expected value: in ${2..5}; Actual value: $value")
@@ -55,22 +60,24 @@ object Mokkery {
     object Function {
         val autofillConstructor by dev_mokkery_internal.function
         val MokkeryMockInstance by dev_mokkery_internal.function
-        val generateMockId by dev_mokkery_internal.function
         val internalEvery by dev_mokkery_internal.function
         val internalEverySuspend by dev_mokkery_internal.function
         val internalVerify by dev_mokkery_internal.function
         val internalVerifySuspend by dev_mokkery_internal.function
         val callIgnoringClassCastException by dev_mokkery_internal.function
         val createMokkeryBlockingCallScope by dev_mokkery_internal.function
         val createMokkerySuspendCallScope by dev_mokkery_internal.function
+        val createMokkeryInstanceContext by dev_mokkery_internal.function
         val MokkeryMockInterceptor by dev_mokkery_internal_interceptor.function
         val TemplatingScope by dev_mokkery_internal_calls.function
+        val invokeMockInstantiationCallbacks by dev_mokkery_internal_context.function
+        val MokkerySuiteScope by dev_mokkery.function
     }
 
     object Property {
 
-        val GlobalMokkeryContext by dev_mokkery_internal_context.property
-        val mokkeryInstanceLookup by dev_mokkery_internal.property
+        val GlobalMokkeryInstanceLookup by dev_mokkery_internal.property
+        val mockId by dev_mokkery_internal.property
     }
 
     object Name {