Skip to content

Commit 71a1589

Browse files
ForteScarletForteScarlet
authored
Merge pull request #109 from ForteScarlet/kt-2220-rel
Upgrade Kotlin to 2.2.20
2 parents 19b8740 + 17ec6dd commit 71a1589

File tree

8 files changed

+82
-94
lines changed

8 files changed

+82
-94
lines changed

‎buildSrc/src/main/kotlin/IProject.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ object IProject : ProjectDetail() {
1010
const val HOMEPAGE = "https://github.com/ForteScarlet/kotlin-suspend-transform-compiler-plugin"
1111

1212
// Remember the libs.versions.toml!
13-
val ktVersion = "2.2.20-Beta1"
13+
val ktVersion = "2.2.20"
1414
val pluginVersion = "0.13.1"
1515

1616
override val version: String = "$ktVersion-$pluginVersion"

‎compiler/suspend-transform-plugin/src/main/kotlin/love/forte/plugin/suspendtrans/fir/SuspendTransformFirTransformer.kt‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ class SuspendTransformFirTransformer(
165165
}
166166

167167
private val cache: FirCache<FirCacheKey, Map<Name, Map<FirNamedFunctionSymbol, SyntheticFunData>>?, Nothing?> =
168-
session.firCachesFactory.createCache { cacheKey, c ->
168+
session.firCachesFactory.createCache { cacheKey, _ ->
169169
val (symbol, scope) = cacheKey
170170
initScopeSymbol()
171171
val transformerFunctionMap = initTransformerFunctionSymbolMap(symbol, scope)
@@ -212,7 +212,7 @@ class SuspendTransformFirTransformer(
212212
): List<FirValueParameter> {
213213
return map { vp ->
214214
buildValueParameterCopy(vp) {
215-
symbol = FirValueParameterSymbol(vp.symbol.name)
215+
symbol = FirValueParameterSymbol()
216216
containingDeclarationSymbol = newContainingDeclarationSymbol
217217

218218
val copiedConeType = vp.returnTypeRef.coneTypeOrNull
@@ -701,7 +701,7 @@ class SuspendTransformFirTransformer(
701701
val (functionAnnotations, propertyAnnotations, includeToOriginal) =
702702
copyAnnotations(original, funData)
703703

704-
val pSymbol = FirPropertySymbol(callableId)
704+
val pSymbol = FirRegularPropertySymbol(callableId)
705705

706706
// val pKey = SuspendTransformPluginKey(
707707
// data = SuspendTransformUserDataFir(
@@ -754,7 +754,6 @@ class SuspendTransformFirTransformer(
754754
)
755755

756756
isVar = false
757-
isLocal = false
758757
// Copy return type
759758
returnTypeRef = resolvedReturnType
760759
deprecationsProvider = UnresolvedDeprecationProvider //original.deprecationsProvider
@@ -1219,7 +1218,7 @@ class SuspendTransformFirTransformer(
12191218
// it.declarationSymbols.filterIsInstance<FirPropertySymbol>()
12201219
}
12211220
.filter { !it.isFinal }
1222-
.filter { it.callableId.callableName == functionName }
1221+
.filter { it.callableId?.callableName == functionName }
12231222
// overridable receiver parameter.
12241223
.filter {
12251224
thisReceiverTypeRef sameAs it.resolvedReceiverTypeRef
@@ -1348,16 +1347,20 @@ class SuspendTransformFirTransformer(
13481347
}
13491348

13501349
is ConeCapturedType -> {
1351-
// val lowerType = projection.lowerType?.let { lowerType ->
1352-
// findCopied(lowerType)
1353-
// }?.toConeType()
1354-
1355-
val lowerType = projection.lowerType?.copyWithTypeParameters(parameters)
1350+
val constructorLowerType = projection.constructor.lowerType?.copyWithTypeParameters(parameters)
13561351

1357-
if (lowerType == null) {
1358-
projection.copy(lowerType = lowerType)
1359-
} else {
1352+
if (constructorLowerType == null) {
13601353
null
1354+
} else {
1355+
projection.copy(
1356+
constructor = ConeCapturedTypeConstructor(
1357+
projection = projection.constructor.projection,
1358+
lowerType = constructorLowerType,
1359+
captureStatus = projection.constructor.captureStatus,
1360+
supertypes = projection.constructor.supertypes,
1361+
typeParameterMarker = projection.constructor.typeParameterMarker,
1362+
)
1363+
)
13611364
}
13621365
}
13631366

‎compiler/suspend-transform-plugin/src/main/kotlin/love/forte/plugin/suspendtrans/ir/SuspendTransformTransformer.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ class SuspendTransformTransformer(
348348
private fun IrFunction.reportLocation(): CompilerMessageSourceLocation? {
349349
return when (val sourceLocation =
350350
// getSourceLocation(runCatching { fileEntry }.getOrNull())) {
351-
getSourceLocation(declaration = symbol, file = file)) {
351+
getSourceLocation(declaration = symbol, fileEntry = runCatching { fileEntry }.getOrNull())) {
352352

353353
is SourceLocation.WithFileAndLineNumberInformation ->
354354
CompilerMessageLocation.create(

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kotlinx-coroutines = "1.8.0"
33
kotlinx-serialization = "1.7.1"
44
google-auto-service = "1.0.1"
55
# Remember the `IProject.ktVersion`!
6-
kotlin = "2.2.20-Beta1"
6+
kotlin = "2.2.20"
77

88
# https://www.jetbrains.com/help/kotlin-multiplatform-dev/multiplatform-publish-libraries.html#configure-the-project
99
# https://github.com/vanniktech/gradle-maven-publish-plugin

‎kotlin-js-store/wasm/yarn.lock‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎kotlin-js-store/yarn.lock‎

Lines changed: 60 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,12 @@
110110
"@types/estree" "*"
111111
"@types/json-schema" "*"
112112

113-
"@types/estree@*", "@types/estree@^1.0.6":
113+
"@types/estree@*", "@types/estree@^1.0.8":
114114
version "1.0.8"
115115
resolved "http://mirrors.cloud.tencent.com/npm/@types/estree/-/estree-1.0.8.tgz#958b91c991b1867ced318bedea0e215ee050726e"
116116
integrity sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==
117117

118-
"@types/json-schema@*", "@types/json-schema@^7.0.9":
118+
"@types/json-schema@*", "@types/json-schema@^7.0.15", "@types/json-schema@^7.0.9":
119119
version "7.0.15"
120120
resolved "http://mirrors.cloud.tencent.com/npm/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
121121
integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
@@ -281,7 +281,12 @@ accepts@~1.3.4:
281281
mime-types "~2.1.34"
282282
negotiator "0.6.3"
283283

284-
acorn@^8.14.0:
284+
acorn-import-phases@^1.0.3:
285+
version "1.0.4"
286+
resolved "https://registry.npmmirror.com/acorn-import-phases/-/acorn-import-phases-1.0.4.tgz#16eb850ba99a056cb7cbfe872ffb8972e18c8bd7"
287+
integrity sha512-wKmbr/DDiIXzEOiWrTTUcDm24kQ2vGfZQvM2fwg2vXqR5uW6aapr7ObPtj1th32b9u90/Pf4AItvdTh42fBmVQ==
288+
289+
acorn@^8.14.0, acorn@^8.15.0:
285290
version "8.15.0"
286291
resolved "http://mirrors.cloud.tencent.com/npm/acorn/-/acorn-8.15.0.tgz#a360898bc415edaac46c8241f6383975b930b816"
287292
integrity sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==
@@ -310,11 +315,6 @@ ajv@^8.0.0, ajv@^8.9.0:
310315
json-schema-traverse "^1.0.0"
311316
require-from-string "^2.0.2"
312317

313-
ansi-colors@^4.1.3:
314-
version "4.1.3"
315-
resolved "https://registry.npmmirror.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b"
316-
integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==
317-
318318
ansi-regex@^5.0.1:
319319
version "5.0.1"
320320
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
@@ -472,20 +472,12 @@ chokidar@^3.5.1:
472472
optionalDependencies:
473473
fsevents "~2.3.2"
474474

475-
chokidar@^3.5.3:
476-
version "3.6.0"
477-
resolved "https://registry.npmmirror.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
478-
integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
475+
chokidar@^4.0.1:
476+
version "4.0.3"
477+
resolved "https://registry.npmmirror.com/chokidar/-/chokidar-4.0.3.tgz#7be37a4c03c9aee1ecfe862a4a23b2c70c205d30"
478+
integrity sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==
479479
dependencies:
480-
anymatch "~3.1.2"
481-
braces "~3.0.2"
482-
glob-parent "~5.1.2"
483-
is-binary-path "~2.1.0"
484-
is-glob "~4.0.1"
485-
normalize-path "~3.0.0"
486-
readdirp "~3.6.0"
487-
optionalDependencies:
488-
fsevents "~2.3.2"
480+
readdirp "^4.0.1"
489481

490482
chrome-trace-event@^1.0.2:
491483
version "1.0.3"
@@ -657,10 +649,10 @@ di@^0.0.1:
657649
resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
658650
integrity sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA==
659651

660-
diff@^5.2.0:
661-
version "5.2.0"
662-
resolved "https://registry.npmmirror.com/diff/-/diff-5.2.0.tgz#26ded047cd1179b78b9537d5ef725503ce1ae531"
663-
integrity sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==
652+
diff@^7.0.0:
653+
version "7.0.0"
654+
resolved "https://registry.npmmirror.com/diff/-/diff-7.0.0.tgz#3fb34d387cd76d803f6eebea67b921dab0182a9a"
655+
integrity sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==
664656

665657
dom-serialize@^2.2.1:
666658
version "2.2.1"
@@ -723,10 +715,10 @@ engine.io@~6.5.2:
723715
engine.io-parser "~5.2.1"
724716
ws "~8.11.0"
725717

726-
enhanced-resolve@^5.17.1:
727-
version "5.17.1"
728-
resolved "https://mirrors.cloud.tencent.com/npm/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
729-
integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
718+
enhanced-resolve@^5.17.2:
719+
version "5.18.3"
720+
resolved "https://registry.npmmirror.com/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz#9b5f4c5c076b8787c78fe540392ce76a88855b44"
721+
integrity sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==
730722
dependencies:
731723
graceful-fs "^4.2.4"
732724
tapable "^2.2.0"
@@ -1241,10 +1233,10 @@ kind-of@^6.0.2:
12411233
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
12421234
integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
12431235

1244-
kotlin-web-helpers@2.0.0:
1245-
version "2.0.0"
1246-
resolved "https://registry.npmmirror.com/kotlin-web-helpers/-/kotlin-web-helpers-2.0.0.tgz#b112096b273c1e733e0b86560998235c09a19286"
1247-
integrity sha512-xkVGl60Ygn/zuLkDPx+oHj7jeLR7hCvoNF99nhwXMn8a3ApB4lLiC9pk4ol4NHPjyoCbvQctBqvzUcp8pkqyWw==
1236+
kotlin-web-helpers@2.1.0:
1237+
version "2.1.0"
1238+
resolved "https://registry.npmmirror.com/kotlin-web-helpers/-/kotlin-web-helpers-2.1.0.tgz#6cd4b0f0dc3baea163929c8638155b8d19c55a74"
1239+
integrity sha512-NAJhiNB84tnvJ5EQx7iER3GWw7rsTZkX9HVHZpe7E3dDBD/dhTzqgSwNU3MfQjniy2rB04bP24WM9Z32ntUWRg==
12481240
dependencies:
12491241
format-util "^1.0.5"
12501242

@@ -1330,21 +1322,14 @@ minimatch@^3.0.4, minimatch@^3.1.1:
13301322
dependencies:
13311323
brace-expansion "^1.1.7"
13321324

1333-
minimatch@^5.1.6:
1334-
version "5.1.6"
1335-
resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
1336-
integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
1337-
dependencies:
1338-
brace-expansion "^2.0.1"
1339-
13401325
minimatch@^9.0.3:
13411326
version "9.0.4"
13421327
resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51"
13431328
integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==
13441329
dependencies:
13451330
brace-expansion "^2.0.1"
13461331

1347-
minimatch@^9.0.4:
1332+
minimatch@^9.0.4, minimatch@^9.0.5:
13481333
version "9.0.5"
13491334
resolved "http://mirrors.cloud.tencent.com/npm/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
13501335
integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
@@ -1368,28 +1353,28 @@ mkdirp@^0.5.5:
13681353
dependencies:
13691354
minimist "^1.2.6"
13701355

1371-
mocha@11.1.0:
1372-
version "11.1.0"
1373-
resolved "http://mirrors.cloud.tencent.com/npm/mocha/-/mocha-11.1.0.tgz#20d7c6ac4d6d6bcb60a8aa47971fca74c65c3c66"
1374-
integrity sha512-8uJR5RTC2NgpY3GrYcgpZrsEd9zKbPDpob1RezyR2upGHRQtHWofmzTMzTMSV6dru3tj5Ukt0+Vnq1qhFEEwAg==
1356+
mocha@11.7.1:
1357+
version "11.7.1"
1358+
resolved "https://registry.npmmirror.com/mocha/-/mocha-11.7.1.tgz#91948fecd624fb4bd154ed260b7e1ad3910d7c7a"
1359+
integrity sha512-5EK+Cty6KheMS/YLPPMJC64g5V61gIR25KsRItHw6x4hEKT6Njp1n9LOlH4gpevuwMVS66SXaBBpg+RWZkza4A==
13751360
dependencies:
1376-
ansi-colors "^4.1.3"
13771361
browser-stdout "^1.3.1"
1378-
chokidar "^3.5.3"
1362+
chokidar "^4.0.1"
13791363
debug "^4.3.5"
1380-
diff "^5.2.0"
1364+
diff "^7.0.0"
13811365
escape-string-regexp "^4.0.0"
13821366
find-up "^5.0.0"
13831367
glob "^10.4.5"
13841368
he "^1.2.0"
13851369
js-yaml "^4.1.0"
13861370
log-symbols "^4.1.0"
1387-
minimatch "^5.1.6"
1371+
minimatch "^9.0.5"
13881372
ms "^2.1.3"
1373+
picocolors "^1.1.1"
13891374
serialize-javascript "^6.0.2"
13901375
strip-json-comments "^3.1.1"
13911376
supports-color "^8.1.1"
1392-
workerpool "^6.5.1"
1377+
workerpool "^9.2.0"
13931378
yargs "^17.7.2"
13941379
yargs-parser "^21.1.1"
13951380
yargs-unparser "^2.0.0"
@@ -1582,6 +1567,11 @@ [email protected]:
15821567
iconv-lite "0.4.24"
15831568
unpipe "1.0.0"
15841569

1570+
readdirp@^4.0.1:
1571+
version "4.1.2"
1572+
resolved "https://registry.npmmirror.com/readdirp/-/readdirp-4.1.2.tgz#eb85801435fbf2a7ee58f19e0921b068fc69948d"
1573+
integrity sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==
1574+
15851575
readdirp@~3.6.0:
15861576
version "3.6.0"
15871577
resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
@@ -1654,7 +1644,7 @@ safe-buffer@^5.1.0:
16541644
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
16551645
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
16561646

1657-
schema-utils@^4.3.0:
1647+
schema-utils@^4.3.0, schema-utils@^4.3.2:
16581648
version "4.3.2"
16591649
resolved "http://mirrors.cloud.tencent.com/npm/schema-utils/-/schema-utils-4.3.2.tgz#0c10878bf4a73fd2b1dfd14b9462b26788c806ae"
16601650
integrity sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==
@@ -2003,25 +1993,27 @@ webpack-merge@^6.0.1:
20031993
flat "^5.0.2"
20041994
wildcard "^2.0.1"
20051995

2006-
webpack-sources@^3.2.3:
2007-
version "3.2.3"
2008-
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
2009-
integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
1996+
webpack-sources@^3.3.3:
1997+
version "3.3.3"
1998+
resolved "https://registry.npmmirror.com/webpack-sources/-/webpack-sources-3.3.3.tgz#d4bf7f9909675d7a070ff14d0ef2a4f3c982c723"
1999+
integrity sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg==
20102000

2011-
webpack@5.98.0:
2012-
version "5.98.0"
2013-
resolved "http://mirrors.cloud.tencent.com/npm/webpack/-/webpack-5.98.0.tgz#44ae19a8f2ba97537978246072fb89d10d1fbd17"
2014-
integrity sha512-UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==
2001+
webpack@5.100.2:
2002+
version "5.100.2"
2003+
resolved "https://registry.npmmirror.com/webpack/-/webpack-5.100.2.tgz#e2341facf9f7de1d702147c91bcb65b693adf9e8"
2004+
integrity sha512-QaNKAvGCDRh3wW1dsDjeMdDXwZm2vqq3zn6Pvq4rHOEOGSaUMgOOjG2Y9ZbIGzpfkJk9ZYTHpDqgDfeBDcnLaw==
20152005
dependencies:
20162006
"@types/eslint-scope" "^3.7.7"
2017-
"@types/estree" "^1.0.6"
2007+
"@types/estree" "^1.0.8"
2008+
"@types/json-schema" "^7.0.15"
20182009
"@webassemblyjs/ast" "^1.14.1"
20192010
"@webassemblyjs/wasm-edit" "^1.14.1"
20202011
"@webassemblyjs/wasm-parser" "^1.14.1"
2021-
acorn "^8.14.0"
2012+
acorn "^8.15.0"
2013+
acorn-import-phases "^1.0.3"
20222014
browserslist "^4.24.0"
20232015
chrome-trace-event "^1.0.2"
2024-
enhanced-resolve "^5.17.1"
2016+
enhanced-resolve "^5.17.2"
20252017
es-module-lexer "^1.2.1"
20262018
eslint-scope "5.1.1"
20272019
events "^3.2.0"
@@ -2031,11 +2023,11 @@ [email protected]:
20312023
loader-runner "^4.2.0"
20322024
mime-types "^2.1.27"
20332025
neo-async "^2.6.2"
2034-
schema-utils "^4.3.0"
2026+
schema-utils "^4.3.2"
20352027
tapable "^2.1.1"
20362028
terser-webpack-plugin "^5.3.11"
20372029
watchpack "^2.4.1"
2038-
webpack-sources "^3.2.3"
2030+
webpack-sources "^3.3.3"
20392031

20402032
which@^1.2.1:
20412033
version "1.3.1"
@@ -2056,10 +2048,10 @@ wildcard@^2.0.1:
20562048
resolved "http://mirrors.cloud.tencent.com/npm/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67"
20572049
integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==
20582050

2059-
workerpool@^6.5.1:
2060-
version "6.5.1"
2061-
resolved "https://registry.npmmirror.com/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544"
2062-
integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==
2051+
workerpool@^9.2.0:
2052+
version "9.3.4"
2053+
resolved "https://registry.npmmirror.com/workerpool/-/workerpool-9.3.4.tgz#f6c92395b2141afd78e2a889e80cb338fe9fca41"
2054+
integrity sha512-TmPRQYYSAnnDiEB0P/Ytip7bFGvqnSU6I2BcuSw7Hx+JSg/DsUi5ebYfc8GYaSdpuvOcEs6dXxPurOYpe9QFwg==
20632055

20642056
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
20652057
version "7.0.0"

‎plugins/suspend-transform-plugin-gradle/build.gradle.kts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import love.forte.gradle.common.publication.configure.configPublishMaven
33
import love.forte.gradle.common.publication.configure.publishingExtension
44
import love.forte.gradle.common.publication.configure.setupPom
55
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
6-
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
76
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
87
import utils.isMainPublishable
98

@@ -12,11 +11,9 @@ plugins {
1211
kotlin("jvm")
1312
id("suspend-transform.dokka-module")
1413
id("com.github.gmazzo.buildconfig")
15-
// `java-gradle-plugin`
16-
signing
17-
`maven-publish`
14+
id("suspend-transform.maven-publish")
1815
id("com.gradle.plugin-publish")
19-
// id("suspend-transform.jvm-maven-publish")
16+
signing
2017
}
2118

2219
//setup(IProject)

‎tests/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
plugins {
2-
id("love.forte.plugin.suspend-transform") version "2.2.20-Beta1-0.13.1" apply false
2+
id("love.forte.plugin.suspend-transform") version "2.2.20-0.13.1" apply false
33
}

0 commit comments

Comments
 (0)