Merge pull request #92 from lupuuss/release-2.9.0

Release 2.9.0

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

gradle.properties

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

gradle/libs.versions.toml

@@ -1,11 +1,11 @@
 [versions]
-kotlin = "2.1.21"
+kotlin = "2.2.0"
 kotlinx-coroutines = "1.10.2"
 buildconfig = "4.0.4"
 google-autoservice = "1.1.1"
 atomicfu = "0.27.0"
 dokka = "2.0.0"
-poko = "0.18.5"
+poko = "0.18.7"
 vanniktech-publish-plugin = "0.32.0"
 objensis = "3.4"
 bytebuddy = "1.14.19"

kotlin-js-store/wasm/yarn.lock

@@ -1732,11 +1732,6 @@ type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
-[email protected]:
-  version "5.5.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba"
-  integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==
-
 ua-parser-js@^0.7.30:
   version "0.7.35"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.35.tgz#8bda4827be4f0b1dda91699a29499575a1f1d307"

kotlin-js-store/yarn.lock

@@ -12,7 +12,7 @@ buildConfig {
     buildConfigField("String", "RUNTIME", str("mokkery-runtime"))
     buildConfigField("String", "PLUGIN_ID", str(rootProject.ext["pluginId"]))
     buildConfigField("String", "PLUGIN_ARTIFACT_ID", str(pluginProject.name))
-    buildConfigField("String", "MINIMUM_KOTLIN_VERSION", str("2.1.20"))
+    buildConfigField("String", "MINIMUM_KOTLIN_VERSION", str("2.2.0"))
     buildConfigField("String", "COMPILED_KOTLIN_VERSION", str(libs.versions.kotlin.get()))
 }
 

mokkery-core/build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
     kotlin("kapt")
 }
 
+kotlin.compilerOptions.freeCompilerArgs.add("-Xcontext-parameters")
 
 kotlin.sourceSets.all {
     languageSettings.apply {

mokkery-plugin/build.gradle.kts

@@ -3,7 +3,7 @@ package dev.mokkery.plugin.diagnostics
 import dev.mokkery.plugin.core.MembersValidationMode
 import dev.mokkery.plugin.core.Mokkery.Callable
 import dev.mokkery.plugin.core.validationMode
-import dev.mokkery.plugin.fir.constructors
+import dev.mokkery.plugin.fir.declaredMembers
 import org.jetbrains.kotlin.AbstractKtSourceElement
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.descriptors.ClassKind
@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.analysis.checkers.MppCheckerKind
 import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
 import org.jetbrains.kotlin.fir.analysis.checkers.expression.FirFunctionCallChecker
+import org.jetbrains.kotlin.fir.declarations.constructors
 import org.jetbrains.kotlin.fir.declarations.utils.isFinal
 import org.jetbrains.kotlin.fir.declarations.utils.isInline
 import org.jetbrains.kotlin.fir.declarations.utils.isInterface
@@ -60,7 +61,8 @@ class MokkeryCallsChecker(
 
     private val validationMode = configuration.validationMode
 
-    override fun check(expression: FirFunctionCall, context: CheckerContext, reporter: DiagnosticReporter) {
+    context(context: CheckerContext, reporter: DiagnosticReporter)
+    override fun check(expression: FirFunctionCall) {
         val callee = expression.calleeReference as? FirResolvedNamedReference ?: return
         val symbol = callee.resolvedSymbol as? FirNamedFunctionSymbol ?: return
         val scope = MokkeryScopedCallsChecker(
@@ -210,7 +212,7 @@ private class MokkeryScopedCallsChecker(
         source: AbstractKtSourceElement?,
         classSymbol: FirRegularClassSymbol
     ): Boolean {
-        val constructors = classSymbol.constructors
+        val constructors = classSymbol.constructors(session)
         if (constructors.none { it.visibility.isPublicAPI }) {
             reporter.reportOn(
                 source = source,
@@ -225,9 +227,9 @@ private class MokkeryScopedCallsChecker(
             .resolvedSuperTypes
             .asSequence()
             .mapNotNull { it.toRegularClassSymbol(session) }
-            .flatMap { it.declarationSymbols }
+            .flatMap { it.declaredMembers(session) }
         val allDeclarationSymbols = classSymbol
-            .declarationSymbols
+            .declaredMembers(session)
             .asSequence()
             .plus(inheritedSymbols)
         val finalDeclarations = allDeclarationSymbols

mokkery-plugin/src/main/kotlin/dev/mokkery/plugin/diagnostics/MokkeryCallsChecker.kt

@@ -1,6 +1,11 @@
 package dev.mokkery.plugin.fir
 
-import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol
+import org.jetbrains.kotlin.fir.FirSession
+import org.jetbrains.kotlin.fir.declarations.declaredFunctions
+import org.jetbrains.kotlin.fir.declarations.declaredProperties
+import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
 
-val FirRegularClassSymbol.constructors get() = declarationSymbols.filterIsInstance<FirConstructorSymbol>()
+fun FirRegularClassSymbol.declaredMembers(session: FirSession): List<FirBasedSymbol<*>> {
+    return declaredFunctions(session) + declaredProperties(session)
+}

mokkery-plugin/src/main/kotlin/dev/mokkery/plugin/fir/Utils.kt

@@ -1,3 +1,3 @@
-kotlinVersion=2.1.20
-mokkeryVersion=2.8.0
+kotlinVersion=2.2.0
+mokkeryVersion=2.9.0
 org.gradle.jvmargs=-Xmx1g