Merge pull request #140 from lupuuss/release-3.4.0

Release 3.4.0

Author: lupuuss

.gitignore

@@ -3,13 +3,10 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
-/test-mokkery-gradle/local.properties
+/local.properties
 
 ### IntelliJ IDEA ###
-.idea/modules.xml
-.idea/jarRepositories.xml
-.idea/compiler.xml
-.idea/libraries/
+/.idea/
 *.iws
 *.iml
 *.ipr
@@ -42,6 +39,6 @@ bin/
 
 ### Mac OS ###
 .DS_Store
-/.idea/
-/test-mokkery-gradle/.idea/
-/local.properties
+
+### AI ###
+AGENTS.md

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.3.20-blue.svg?logo=kotlin)](http://kotlinlang.org)
+[![Kotlin](https://img.shields.io/badge/kotlin-2.4.0-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-multiplatform.gradle.kts

@@ -64,9 +64,7 @@ kotlin {
     androidNativeX86()
     androidNativeX64()
 
-    @OptIn(ExperimentalKotlinGradlePluginApi::class)
     compilerOptions {
         freeCompilerArgs.add("-Xexpect-actual-classes")
-        freeCompilerArgs.add("-Xcontext-parameters")
     }
 }

gradle.properties

@@ -7,5 +7,5 @@ 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.3.0
+version=3.4.0
 

gradle/libs.versions.toml

@@ -1,12 +1,12 @@
 [versions]
-kotlinMininumSupported = "2.3.0"
-kotlin = "2.3.20"
+kotlinMininumSupported = "2.4.0"
+kotlin = "2.4.0"
 kotlinx-coroutines = "1.10.2"
 buildconfig = "5.7.0"
 google-autoservice = "1.1.1"
 atomicfu = "0.31.0"
 dokka = "2.1.0"
-poko = "0.21.1"
+poko = "0.23.0"
 vanniktech-publish-plugin = "0.36.0"
 gradle-portal-publish = "2.0.0"
 

kotlin-js-store/yarn.lock

@@ -1761,7 +1761,16 @@ streamroller@^3.1.5:
     debug "^4.3.4"
     fs-extra "^8.1.0"
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -1779,7 +1788,14 @@ string-width@^5.0.1, string-width@^5.1.2:
     emoji-regex "^9.2.2"
     strip-ansi "^7.0.1"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -2011,7 +2027,16 @@ workerpool@^9.2.0:
   resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-9.3.3.tgz#e75281fe62e851afb21cdeef8fa85f6a62ec3583"
   integrity sha512-slxCaKbYjEdFT/o2rH9xS1hf4uRDch1w7Uo+apxhZ+sf/1d9e0ZVkn42kPNGP2dgjIx6YFvSevj0zHvbWe2jdw==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==

mokkery-core-plugin/build.gradle.kts

@@ -0,0 +1,19 @@
+plugins {
+    kotlin("jvm")
+    // no publishing - it's embedded into the plugin
+}
+
+kotlin.sourceSets.all {
+    languageSettings.apply {
+        optIn("org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi")
+        optIn("org.jetbrains.kotlin.ir.symbols.UnsafeDuringIrConstructionAPI")
+        optIn("dev.mokkery.annotations.InternalMokkeryApi")
+    }
+}
+
+dependencies {
+    compileOnly(libs.kotlin.compiler)
+    compileOnly(libs.kotlin.stdlib)
+    compileOnly(project(":mokkery-core"))
+    compileOnly(project(":mokkery-core-tooling"))
+}

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

@@ -0,0 +1,35 @@
+package dev.mokkery.plugin.core
+
+import dev.mokkery.internal.options.MokkeryOptionsContainer
+import org.jetbrains.kotlin.compiler.plugin.AbstractCliOption
+import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
+import org.jetbrains.kotlin.config.CompilerConfiguration
+
+abstract class BaseMokkeryCommandLineProcessor(
+    override val pluginId: String,
+    private val mokkeryOptions: MokkeryOptionsContainer,
+) : CommandLineProcessor {
+
+    override val pluginOptions: Collection<AbstractCliOption> = mokkeryOptions.map { it.cliOption }
+
+    override fun processOption(
+        option: AbstractCliOption,
+        value: String,
+        configuration: CompilerConfiguration
+    ) {
+        val option = mokkeryOptions[option.optionName] ?: error("Unknown $pluginId CLI option: ${option.optionName}")
+        val key = option.configurationKey
+        try {
+            val deserialized = option.type
+                .serializer
+                .deserialize(value)
+            configuration.add(key, deserialized)
+        } catch (e: Throwable) {
+            throw IllegalStateException(
+                "Could not deserialize value for $pluginId CLI option ${option.name} = <$value> Expected: ${option.type.description}",
+                e
+            )
+        }
+    }
+}
+

…/main/kotlin/dev/mokkery/plugin/Cache.kt …/kotlin/dev/mokkery/plugin/core/Cache.ktmokkery-plugin/src/main/kotlin/dev/mokkery/plugin/Cache.kt renamed to mokkery-core-plugin/src/main/kotlin/dev/mokkery/plugin/core/Cache.kt mokkery-plugin/src/main/kotlin/dev/mokkery/plugin/Cache.kt renamed to mokkery-core-plugin/src/main/kotlin/dev/mokkery/plugin/core/Cache.kt

@@ -1,4 +1,4 @@
-package dev.mokkery.plugin
+package dev.mokkery.plugin.core
 
 import dev.mokkery.context.MokkeryContext
 import dev.mokkery.context.require

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

@@ -0,0 +1,12 @@
+package dev.mokkery.plugin.core
+
+import dev.mokkery.internal.options.MokkeryOption
+import org.jetbrains.kotlin.config.CompilerConfiguration
+
+fun <T> CompilerConfiguration.getSingleOrDefault(option: MokkeryOption<T>): T {
+    require(!option.allowMultipleOccurrences) { "`getSingleOrDefault` is not supported for `allowMultipleOccurrences = true`" }
+    return get(option.configurationKey)
+        ?.singleOrNull()
+        ?: option.defaultValues.singleOrNull()
+        ?: error("No value for ${option.configurationKey}")
+}