Merge pull request #116 from lupuuss/release-2.10.2

Release 2.10.2

Author: lupuuss

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.2.20-blue.svg?logo=kotlin)](http://kotlinlang.org)
+[![Kotlin](https://img.shields.io/badge/kotlin-2.2.21-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/Utils.kt

@@ -1,8 +1,7 @@
 
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.extra
-import org.jetbrains.dokka.gradle.DokkaTaskPartial
-import java.util.*
+import java.util.Properties
 
 fun Project.loadLocalProperties() {
     val secretPropsFile = rootProject.file("local.properties")

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

@@ -3,7 +3,6 @@ import MokkeryAttributes.GitDevConnectionUrl
 import MokkeryAttributes.GitHttpsUrl
 import MokkeryAttributes.GitIssuesUrl
 import MokkeryAttributes.WebsiteUrl
-import com.vanniktech.maven.publish.SonatypeHost
 import java.net.URI
 
 plugins {
@@ -26,7 +25,7 @@ mavenPublishing {
     if (gradle.startParameter.taskNames.any { it.contains("MavenCentral") }) {
         signAllPublications()
     }
-    publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, automaticRelease = false)
+    publishToMavenCentral(automaticRelease = false)
     pom {
         name.set(project.name)
         description.set(MokkeryAttributes.Description)

build.gradle.kts

@@ -1,5 +1,4 @@
 
-import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -31,9 +30,6 @@ rootProject.ext["pluginId"] = "dev.mokkery"
 allprojects {
     group = rootProject.group
     version = rootProject.version
-    tasks.withType<DokkaTask> {
-        onlyIf { "SNAPSHOT" !in version.toString() }
-    }
     afterEvaluate {
         extensions
             .findByType<KotlinProjectExtension>()

gradle.properties

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

gradle/libs.versions.toml

@@ -1,16 +1,16 @@
 [versions]
-kotlin = "2.2.20"
+kotlin = "2.2.21"
 kotlinx-coroutines = "1.10.2"
-buildconfig = "4.0.4"
+buildconfig = "5.7.0"
 google-autoservice = "1.1.1"
-atomicfu = "0.27.0"
-dokka = "2.0.0"
+atomicfu = "0.29.0"
+dokka = "2.1.0"
 poko = "0.19.3"
-vanniktech-publish-plugin = "0.32.0"
+vanniktech-publish-plugin = "0.34.0"
 objensis = "3.4"
-bytebuddy = "1.14.19"
-gradle-portal-publish = "1.2.1"
-agp = "8.11.0"
+bytebuddy = "1.17.8"
+gradle-portal-publish = "2.0.0"
+agp = "8.12.3"
 dexmaker = "2.28.6"
 
 [plugins]

mokkery-runtime/src/commonMain/kotlin/dev/mokkery/MokkerySuiteScope.kt

@@ -1,11 +1,9 @@
 package dev.mokkery
 
 import dev.mokkery.context.MokkeryContext
-import dev.mokkery.context.require
 import dev.mokkery.internal.GlobalMokkeryScope
 import dev.mokkery.internal.MokkerySuiteScopeNotImplementedException
 import dev.mokkery.internal.context.MocksRegistry
-import dev.mokkery.internal.utils.instances
 
 /**
  * A scope for a test suite that uses Mokkery mocks. It enables automation and strict exhaustiveness checks.

mokkery-runtime/src/commonMain/kotlin/dev/mokkery/internal/utils/MocksCollection.kt

@@ -4,6 +4,7 @@ package dev.mokkery.internal.utils
 
 import dev.mokkery.internal.MockId
 import dev.mokkery.internal.MokkeryInstanceScope
+import dev.mokkery.internal.context.mockSpec
 import dev.mokkery.internal.mockId
 import dev.mokkery.internal.requireInstanceScope
 
@@ -37,7 +38,7 @@ internal inline fun MocksCollection.getScope(id: MockId): MokkeryInstanceScope =
     ?: mokkeryRuntimeError("Failed to find mock with $id!")
 
 internal val MocksCollection.instances: List<Any>
-    get() = scopes.map(MokkeryInstanceScope::requireInstanceScope)
+    get() = scopes.map { it.mockSpec.thisRef }
 
 internal operator fun MocksCollection.plus(other: MocksCollection): MocksCollection = MutableMocksCollection(scopes + other.scopes)
 

test-mokkery/gradle.properties

@@ -1,3 +1,3 @@
 kotlinVersion=2.2.0
-mokkeryVersion=2.10.1
+mokkeryVersion=2.10.2
 org.gradle.jvmargs=-Xmx1g

test-mokkery/src/commonTest/kotlin/dev/mokkery/test/MokkerySuiteScopeGenerationTest.kt

@@ -43,7 +43,8 @@ class MokkerySuiteScopeGenerationTest : MokkerySuiteScope {
 
     @Test
     fun testContainsAllMocks() {
-        val expectedMocks = listOf(mockA, mockB)
+        val mockC = mock<(Int) -> Int>()
+        val expectedMocks = listOf(mockA, mockB, mockC)
         assertEquals(expectedMocks, mocks)
     }