Skip to content

Commit a4d1684

Browse files
lupuusslupuuss
authored
Merge pull request #62 from lupuuss/release/2.6.0
Release/2.6.0
2 parents 49749fd + 2428114 commit a4d1684

21 files changed

Lines changed: 201 additions & 326 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</br>
99

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

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ kotlin.code.style=official
33
kotlin.suppressGradlePluginWarnings=IncorrectCompileOnlyDependencyWarning
44
kotlin.native.ignoreDisabledTargets=true
55
org.gradle.jvmargs=-Xmx3g
6-
version=2.5.1-SNAPSHOT
6+
version=2.6.0-SNAPSHOT
77
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

‎gradle/libs.versions.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[versions]
2-
kotlin = "2.0.21"
2+
kotlin = "2.1.0"
33
kotlinx-coroutines = "1.9.0"
44
buildconfig = "4.0.4"
55
google-autoservice = "1.0.1"
66
atomicfu = "0.26.0"
77
dokka = "2.0.0-Beta"
8-
poko = "0.17.0"
8+
poko = "0.17.2"
99
vanniktech-publish-plugin = "0.30.0"
1010
objensis = "3.4"
1111
bytebuddy = "1.14.19"

‎kotlin-js-store/yarn.lock‎

Lines changed: 22 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -87,33 +87,12 @@
8787
dependencies:
8888
"@types/node" "*"
8989

90-
"@types/eslint-scope@^3.7.3":
91-
version "3.7.4"
92-
resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16"
93-
integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==
94-
dependencies:
95-
"@types/eslint" "*"
96-
"@types/estree" "*"
97-
98-
"@types/eslint@*":
99-
version "8.44.0"
100-
resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.44.0.tgz#55818eabb376e2272f77fbf5c96c43137c3c1e53"
101-
integrity sha512-gsF+c/0XOguWgaOgvFs+xnnRqt9GwgTvIks36WpE6ueeI4KCEHHd8K/CKHqhOqrJKsYH8m27kRzQEvWXAwXUTw==
102-
dependencies:
103-
"@types/estree" "*"
104-
"@types/json-schema" "*"
105-
106-
"@types/estree@*":
107-
version "1.0.1"
108-
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194"
109-
integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==
110-
11190
"@types/estree@^1.0.5":
11291
version "1.0.5"
11392
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
11493
integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
11594

116-
"@types/json-schema@*", "@types/json-schema@^7.0.8":
95+
"@types/json-schema@^7.0.8":
11796
version "7.0.12"
11897
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
11998
integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
@@ -667,7 +646,7 @@ engine.io@~6.5.2:
667646
engine.io-parser "~5.2.1"
668647
ws "~8.11.0"
669648

670-
enhanced-resolve@^5.17.0:
649+
enhanced-resolve@^5.17.1:
671650
version "5.17.1"
672651
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
673652
integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
@@ -1113,10 +1092,10 @@ karma-webpack@5.0.1:
11131092
minimatch "^9.0.3"
11141093
webpack-merge "^4.1.5"
11151094

1116-
karma@6.4.3:
1117-
version "6.4.3"
1118-
resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.3.tgz#763e500f99597218bbb536de1a14acc4ceea7ce8"
1119-
integrity sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q==
1095+
karma@6.4.4:
1096+
version "6.4.4"
1097+
resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.4.tgz#dfa5a426cf5a8b53b43cd54ef0d0d09742351492"
1098+
integrity sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w==
11201099
dependencies:
11211100
"@colors/colors" "1.5.0"
11221101
body-parser "^1.19.0"
@@ -1148,6 +1127,13 @@ kind-of@^6.0.2:
11481127
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
11491128
integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
11501129

1130+
kotlin-web-helpers@2.0.0:
1131+
version "2.0.0"
1132+
resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-2.0.0.tgz#b112096b273c1e733e0b86560998235c09a19286"
1133+
integrity sha512-xkVGl60Ygn/zuLkDPx+oHj7jeLR7hCvoNF99nhwXMn8a3ApB4lLiC9pk4ol4NHPjyoCbvQctBqvzUcp8pkqyWw==
1134+
dependencies:
1135+
format-util "^1.0.5"
1136+
11511137
loader-runner@^4.2.0:
11521138
version "4.3.0"
11531139
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
@@ -1251,10 +1237,10 @@ mkdirp@^0.5.5:
12511237
dependencies:
12521238
minimist "^1.2.6"
12531239

1254-
mocha@10.7.0:
1255-
version "10.7.0"
1256-
resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.0.tgz#9e5cbed8fa9b37537a25bd1f7fb4f6fc45458b9a"
1257-
integrity sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA==
1240+
mocha@10.7.3:
1241+
version "10.7.3"
1242+
resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.3.tgz#ae32003cabbd52b59aece17846056a68eb4b0752"
1243+
integrity sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==
12581244
dependencies:
12591245
ansi-colors "^4.1.3"
12601246
browser-stdout "^1.3.1"
@@ -1843,12 +1829,11 @@ webpack-sources@^3.2.3:
18431829
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
18441830
integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
18451831

1846-
webpack@5.93.0:
1847-
version "5.93.0"
1848-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.93.0.tgz#2e89ec7035579bdfba9760d26c63ac5c3462a5e5"
1849-
integrity sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA==
1832+
webpack@5.94.0:
1833+
version "5.94.0"
1834+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f"
1835+
integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==
18501836
dependencies:
1851-
"@types/eslint-scope" "^3.7.3"
18521837
"@types/estree" "^1.0.5"
18531838
"@webassemblyjs/ast" "^1.12.1"
18541839
"@webassemblyjs/wasm-edit" "^1.12.1"
@@ -1857,7 +1842,7 @@ webpack@5.93.0:
18571842
acorn-import-attributes "^1.9.5"
18581843
browserslist "^4.21.10"
18591844
chrome-trace-event "^1.0.2"
1860-
enhanced-resolve "^5.17.0"
1845+
enhanced-resolve "^5.17.1"
18611846
es-module-lexer "^1.2.1"
18621847
eslint-scope "5.1.1"
18631848
events "^3.2.0"

‎mokkery-core/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildConfig {
1212
buildConfigField("String", "RUNTIME", str("mokkery-runtime"))
1313
buildConfigField("String", "PLUGIN_ID", str(rootProject.ext["pluginId"]))
1414
buildConfigField("String", "PLUGIN_ARTIFACT_ID", str(pluginProject.name))
15-
buildConfigField("String", "MINIMUM_KOTLIN_VERSION", str("2.0.0"))
15+
buildConfigField("String", "MINIMUM_KOTLIN_VERSION", str("2.1.0"))
1616
buildConfigField("String", "COMPILED_KOTLIN_VERSION", str(libs.versions.kotlin.get()))
1717
}
1818

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public class MokkeryGradlePlugin : KotlinCompilerPluginSupportPlugin {
9090
val currentKotlinVersion = kotlinToolingVersion.toKotlinVersion()
9191
val minimumKotlinVersion = KotlinVersion(MokkeryConfig.MINIMUM_KOTLIN_VERSION)
9292
if (currentKotlinVersion < minimumKotlinVersion) {
93-
error("Current Kotlin version must be at least ${MokkeryConfig.MINIMUM_KOTLIN_VERSION}, but is $currentKotlinVersion!")
93+
error("Current Kotlin version must be at least ${MokkeryConfig.MINIMUM_KOTLIN_VERSION}, but is $currentKotlinVersion! Downgrade Mokkery version or upgrade Kotlin version! Check https://mokkery.dev/docs/Setup#compatibility for compatibility guidelines!")
9494
}
9595
val compiledKotlinVersion = KotlinVersion(MokkeryConfig.COMPILED_KOTLIN_VERSION)
9696
val versionWarnings = project.findProperty("dev.mokkery.versionWarnings")

‎mokkery-plugin/src/main/kotlin/dev/mokkery/plugin/MessageCollectorUtils.kt‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,11 @@ package dev.mokkery.plugin
22

33
import dev.mokkery.MokkeryConfig
44
import dev.mokkery.plugin.ir.locationInFile
5-
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
65
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
76
import org.jetbrains.kotlin.cli.common.messages.MessageCollector
8-
import org.jetbrains.kotlin.config.CompilerConfiguration
9-
import org.jetbrains.kotlin.config.messageCollector
107
import org.jetbrains.kotlin.ir.declarations.IrFile
118
import org.jetbrains.kotlin.ir.expressions.IrExpression
129

13-
@Suppress("DEPRECATION")
14-
val CompilerConfiguration.messageCollectorCompat: MessageCollector get() = try {
15-
messageCollector
16-
} catch (e: NoSuchMethodError) {
17-
get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, MessageCollector.NONE)
18-
}
19-
2010
internal inline fun MessageCollector.log(message: () -> String) {
2111
report(CompilerMessageSeverity.LOGGING, "${MokkeryConfig.PLUGIN_ID}: ${message()}")
2212
}

‎mokkery-plugin/src/main/kotlin/dev/mokkery/plugin/core/TransformerScopeApi.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package dev.mokkery.plugin.core
22

3-
import dev.mokkery.plugin.messageCollectorCompat
43
import org.jetbrains.kotlin.backend.common.lower.DeclarationIrBuilder
4+
import org.jetbrains.kotlin.config.messageCollector
55
import org.jetbrains.kotlin.ir.builders.IrGeneratorContext
66
import org.jetbrains.kotlin.ir.declarations.IrClass
77
import org.jetbrains.kotlin.ir.declarations.IrProperty
88
import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
99
import org.jetbrains.kotlin.ir.expressions.IrCall
1010
import org.jetbrains.kotlin.ir.symbols.IrSymbol
1111

12-
val TransformerScope.messageCollector get() = compilerConfig.messageCollectorCompat
12+
val TransformerScope.messageCollector get() = compilerConfig.messageCollector
1313

1414
fun TransformerScope.getClass(resolver: ClassResolver): IrClass = classes.getOrPut(resolver) {
1515
resolver.resolve(pluginContext)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.fir.isPrimitiveType
2929
import org.jetbrains.kotlin.fir.moduleData
3030
import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
3131
import org.jetbrains.kotlin.fir.resolve.defaultType
32+
import org.jetbrains.kotlin.fir.resolve.toRegularClassSymbol
3233
import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
3334
import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
3435
import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol
@@ -40,7 +41,6 @@ import org.jetbrains.kotlin.fir.types.ConeTypeParameterType
4041
import org.jetbrains.kotlin.fir.types.FirTypeProjection
4142
import org.jetbrains.kotlin.fir.types.isSomeFunctionType
4243
import org.jetbrains.kotlin.fir.types.toConeTypeProjection
43-
import org.jetbrains.kotlin.fir.types.toRegularClassSymbol
4444
import org.jetbrains.kotlin.fir.types.type
4545
import org.jetbrains.kotlin.name.Name
4646
import org.jetbrains.kotlin.platform.isJs

‎mokkery-plugin/src/main/kotlin/dev/mokkery/plugin/diagnostics/MokkeryDiagnosticRendererFactory.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package dev.mokkery.plugin.diagnostics
22

33
import dev.mokkery.plugin.core.Mokkery.Errors
4-
import dev.mokkery.plugin.fir.renderTypeCompat
54
import org.jetbrains.kotlin.diagnostics.KtDiagnosticFactoryToRendererMap
65
import org.jetbrains.kotlin.diagnostics.rendering.BaseDiagnosticRendererFactory
76
import org.jetbrains.kotlin.diagnostics.rendering.CommonRenderers
@@ -11,7 +10,7 @@ import org.jetbrains.kotlin.fir.types.ConeKotlinType
1110

1211
class MokkeryDiagnosticRendererFactory : BaseDiagnosticRendererFactory() {
1312

14-
private val typeRenderer: DiagnosticParameterRenderer<ConeKotlinType> = FirDiagnosticRenderers.renderTypeCompat()
13+
private val typeRenderer: DiagnosticParameterRenderer<ConeKotlinType> = FirDiagnosticRenderers.RENDER_TYPE
1514

1615
override val MAP = KtDiagnosticFactoryToRendererMap("MokkeryDiagnostic").apply {
1716
put(

0 commit comments

Comments
 (0)