From 574564b3c5b3a9189bed59d66875509acea26f41 Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Sun, 20 Oct 2024 20:45:28 +0800 Subject: [PATCH 01/23] Use and debug "com.huanshankeji.team:gradle-plugins:0.6.1-SNAPSHOT" The corresponding commit: https://github.com/huanshankeji/gradle-common/commit/adc4c6893545a667e01e684d6d44e9153bb0e231 --- buildSrc/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index bf8774c..4a2e47e 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -18,5 +18,5 @@ dependencies { // With Kotlin 2.0.20, a "Could not parse POM" build error occurs in the JVM projects of some dependent projects. implementation(kotlin("gradle-plugin", "2.0.10")) implementation("com.huanshankeji:common-gradle-dependencies:0.8.0-20241016") // don't use a snapshot version in a main branch - implementation("com.huanshankeji.team:gradle-plugins:0.6.0") // don't use a snapshot version in a main branch + implementation("com.huanshankeji.team:gradle-plugins:0.6.1-SNAPSHOT") // don't use a snapshot version in a main branch } From 13845280240117e5095196b482ccbb5e8c0137bf Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Thu, 7 Nov 2024 16:46:29 +0800 Subject: [PATCH 02/23] Use the new `com.huanshankeji.team.dokka.github-dokka-convention` plugin The corresponding commit: https://github.com/huanshankeji/gradle-common/commit/9e60c15fa54e02722c9b409eed68e75fabec4e66 --- buildSrc/build.gradle.kts | 2 +- .../src/main/kotlin/common-conventions.gradle.kts | 3 +-- .../src/main/kotlin/dokka-convention.gradle.kts | 13 +------------ buildSrc/src/main/kotlin/version.gradle.kts | 3 +++ 4 files changed, 6 insertions(+), 15 deletions(-) create mode 100644 buildSrc/src/main/kotlin/version.gradle.kts diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index a862211..507988e 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -18,6 +18,6 @@ dependencies { // With Kotlin 2.0.20, a "Could not parse POM" build error occurs in the JVM projects of some dependent projects. implementation(kotlin("gradle-plugin", "2.0.10")) implementation("com.huanshankeji:common-gradle-dependencies:0.8.0-20241016") // don't use a snapshot version in a main branch - implementation("com.huanshankeji.team:gradle-plugins:0.6.1-SNAPSHOT") // don't use a snapshot version in a main branch + implementation("com.huanshankeji.team:gradle-plugins:0.7.0-SNAPSHOT") // TODO don't use a snapshot version in a main branch implementation("org.jetbrains.dokka:dokka-gradle-plugin:2.0.0-Beta") } diff --git a/buildSrc/src/main/kotlin/common-conventions.gradle.kts b/buildSrc/src/main/kotlin/common-conventions.gradle.kts index 4d9114e..f28cfc1 100644 --- a/buildSrc/src/main/kotlin/common-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/common-conventions.gradle.kts @@ -5,11 +5,10 @@ plugins { id("com.huanshankeji.team.with-group") id("maven-central") id("com.huanshankeji.team.default-github-packages-maven-publish") + id("version") id("dokka-convention") } -version = projectVersion - afterEvaluate { publishing.publications.withType { pomForTeamDefaultOpenSource( diff --git a/buildSrc/src/main/kotlin/dokka-convention.gradle.kts b/buildSrc/src/main/kotlin/dokka-convention.gradle.kts index d214a55..e3c4746 100644 --- a/buildSrc/src/main/kotlin/dokka-convention.gradle.kts +++ b/buildSrc/src/main/kotlin/dokka-convention.gradle.kts @@ -1,22 +1,11 @@ plugins { - id("org.jetbrains.dokka") + id("com.huanshankeji.team.dokka.github-dokka-convention") } dokka { //moduleName.set("Huanshankeji Kotlin Common") dokkaSourceSets.all { //includes.from("README.md") - sourceLink { - //localDirectory.set(file("src/main/kotlin")) - remoteUrl( - "https://github.com/huanshankeji/kotlin-common/tree/v${version}/${ - with(project) { - name.removePrefix(parent!!.name + '-') - } - }" - ) - remoteLineSuffix.set("#L") - } /*pluginsConfiguration.html { footerMessage.set("(c) Yongshun Ye") }*/ diff --git a/buildSrc/src/main/kotlin/version.gradle.kts b/buildSrc/src/main/kotlin/version.gradle.kts new file mode 100644 index 0000000..ad0ecbd --- /dev/null +++ b/buildSrc/src/main/kotlin/version.gradle.kts @@ -0,0 +1,3 @@ +// extracted into a separate script so the version can be set before `dokka-convention` + +version = projectVersion From 6ce9852219cb817c886658626feafd753718684d Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Thu, 7 Nov 2024 17:58:54 +0800 Subject: [PATCH 03/23] Debug the changes in the `com.huanshankeji.team.dokka.github-dokka-convention` plugin The corresponding commit: https://github.com/huanshankeji/gradle-common/commit/fac56e49fb61077287a041596ab21e2f8d2c98d7 From 642c2c9d0e2122c3ae5e227f9d9f12560392824f Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Thu, 14 Nov 2024 18:38:05 +0800 Subject: [PATCH 04/23] Bump Arrow to v2.0.0-beta.1 --- buildSrc/src/main/kotlin/VersionsAndDependencies.kt | 2 +- core/src/commonMain/kotlin/com/huanshankeji/InternalApi.kt | 4 ++++ .../src/main/kotlin/com/huanshankeji/exposed/Statements.kt | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 core/src/commonMain/kotlin/com/huanshankeji/InternalApi.kt diff --git a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt index 5c1775c..88b80a2 100644 --- a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt +++ b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt @@ -4,7 +4,7 @@ import com.huanshankeji.CommonVersions val projectVersion = "0.6.0-SNAPSHOT" -val commonVersions = CommonVersions(arrow = "2.0.0-alpha.4") // for Wasm JS +val commonVersions = CommonVersions(arrow = "2.0.0-beta.1") // for Wasm JS val commonDependencies = CommonDependencies(commonVersions) val commonGradleClasspathDependencies = CommonGradleClasspathDependencies(commonVersions) diff --git a/core/src/commonMain/kotlin/com/huanshankeji/InternalApi.kt b/core/src/commonMain/kotlin/com/huanshankeji/InternalApi.kt new file mode 100644 index 0000000..1698bd2 --- /dev/null +++ b/core/src/commonMain/kotlin/com/huanshankeji/InternalApi.kt @@ -0,0 +1,4 @@ +package com.huanshankeji + +@RequiresOptIn("This API is internal in Huanshankeji Kotlin Common and should not be used. It may be changed or removed in the future without notice.") +annotation class InternalApi \ No newline at end of file diff --git a/exposed/src/main/kotlin/com/huanshankeji/exposed/Statements.kt b/exposed/src/main/kotlin/com/huanshankeji/exposed/Statements.kt index d32e687..bddcfe7 100644 --- a/exposed/src/main/kotlin/com/huanshankeji/exposed/Statements.kt +++ b/exposed/src/main/kotlin/com/huanshankeji/exposed/Statements.kt @@ -1,9 +1,13 @@ +@file:OptIn(InternalApi::class) + package com.huanshankeji.exposed +import com.huanshankeji.InternalApi import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.sql.statements.* -private const val SELECT_DSL_DEPRECATION_MESSAGE = +@InternalApi +const val SELECT_DSL_DEPRECATION_MESSAGE = "As part of Exposed SELECT DSL design changes, this will be removed in future releases." // The select queries are not executed eagerly so just use them directly. From e072f5cd383c61d093dbf0e81683007a5557c2f0 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Fri, 29 Nov 2024 17:46:04 +0800 Subject: [PATCH 05/23] Bump our Gradle plugins to the stable version of v0.7.0 --- buildSrc/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 507988e..cab0d18 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -18,6 +18,6 @@ dependencies { // With Kotlin 2.0.20, a "Could not parse POM" build error occurs in the JVM projects of some dependent projects. implementation(kotlin("gradle-plugin", "2.0.10")) implementation("com.huanshankeji:common-gradle-dependencies:0.8.0-20241016") // don't use a snapshot version in a main branch - implementation("com.huanshankeji.team:gradle-plugins:0.7.0-SNAPSHOT") // TODO don't use a snapshot version in a main branch + implementation("com.huanshankeji.team:gradle-plugins:0.7.0") // don't use a snapshot version in a main branch implementation("org.jetbrains.dokka:dokka-gradle-plugin:2.0.0-Beta") } From 477978d0eb23eb0917b414f52633ff01aee01f94 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Fri, 29 Nov 2024 19:09:29 +0800 Subject: [PATCH 06/23] Add change log for v0.6.0 and deprecate `PgPoolOptions.setUpConventionally` --- CHANGELOG.md | 17 +++++++++++++++++ .../vertx/pgclient/PgPoolOptions.kt | 1 + 2 files changed, 18 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ddae077..21f7ffb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ # Change log +## v0.6.0 / 2024-11-29 + +* add conversion functions to convert Vert.x `Buffer`s to kotlinx-io `RawSink`s and `Sink`s and Okio `Sink`s and `BufferedSink`s + + The `Source` conversion functions are not provided because Vert.x `Buffer` doesn't provide reading methods with a reader index. + +* adapt to the [Exposed SELECT DSL design changes](https://github.com/JetBrains/Exposed/pull/1916) and bump Exposed to v0.56.0 + + The old `deleteWhereStatement` that conflicts with the new one is removed, causing a source and binary incompatible change. + +* add API documentation generated by Dokka hosted at +* add CODE_OF_CONDUCT.md and CONTRIBUTING.md +* use the Kotlin binary compatibility validator +* add some experimental plus operators for nullable functions/lambdas +* add some common functions for Exposed and Vert.x SQL Client such as `jdbcUrl`, `ClientBuilder<*>.withCoConnectHandler`, and `SqlConnectOptions.setUpConventionally` +* add a `CoroutineAutoCloseable` interface like `AutoCloseable` and its version of the `use` extension function + ## v0.5.1 / 2024-10-19 * enable the iOS targets for the "coroutines" module, which was disabled due to a compiler bug diff --git a/vertx/src/main/kotlin/com/huanshankeji/vertx/pgclient/PgPoolOptions.kt b/vertx/src/main/kotlin/com/huanshankeji/vertx/pgclient/PgPoolOptions.kt index 31975a9..dbdb889 100644 --- a/vertx/src/main/kotlin/com/huanshankeji/vertx/pgclient/PgPoolOptions.kt +++ b/vertx/src/main/kotlin/com/huanshankeji/vertx/pgclient/PgPoolOptions.kt @@ -5,6 +5,7 @@ import io.vertx.pgclient.impl.PgPoolOptions /** * Optimized for throughput. */ +@Deprecated("This function causes `withTransaction` not to work.", ReplaceWith("")) fun PgPoolOptions.setUpConventionally() { isPipelined = true } From 42d926ae769530c32f4b2dc8e4beddadff3488dd Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Sun, 1 Dec 2024 19:42:20 +0800 Subject: [PATCH 07/23] Bump Kotlin to 2.1.0 --- buildSrc/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index cab0d18..794cb8d 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -16,7 +16,7 @@ repositories { dependencies { // With Kotlin 2.0.20, a "Could not parse POM" build error occurs in the JVM projects of some dependent projects. - implementation(kotlin("gradle-plugin", "2.0.10")) + implementation(kotlin("gradle-plugin", "2.1.0")) implementation("com.huanshankeji:common-gradle-dependencies:0.8.0-20241016") // don't use a snapshot version in a main branch implementation("com.huanshankeji.team:gradle-plugins:0.7.0") // don't use a snapshot version in a main branch implementation("org.jetbrains.dokka:dokka-gradle-plugin:2.0.0-Beta") From 6bebf69571e7d3f7f025940ea3cffc0987ccc4d2 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Sun, 1 Dec 2024 20:02:00 +0800 Subject: [PATCH 08/23] Run `kotlinUpgradeYarnLock` --- kotlin-js-store/yarn.lock | 275 +++++++++++++++++++------------------- 1 file changed, 135 insertions(+), 140 deletions(-) diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock index 382ecf7..a9ef7d1 100644 --- a/kotlin-js-store/yarn.lock +++ b/kotlin-js-store/yarn.lock @@ -85,33 +85,12 @@ resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080" integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw== -"@types/eslint-scope@^3.7.3": - version "3.7.4" - resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16" - integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA== - dependencies: - "@types/eslint" "*" - "@types/estree" "*" - -"@types/eslint@*": - version "8.4.2" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.2.tgz#48f2ac58ab9c631cb68845c3d956b28f79fad575" - integrity sha512-Z1nseZON+GEnFjJc04sv4NSALGjhFwy6K0HXt7qsn5ArfAKtb63dXNJHf+1YW6IpOIYRBGUbu3GwJdj8DGnCjA== - dependencies: - "@types/estree" "*" - "@types/json-schema" "*" - -"@types/estree@*": - version "0.0.51" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" - integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== - "@types/estree@^1.0.5": version "1.0.5" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4" integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw== -"@types/json-schema@*", "@types/json-schema@^7.0.8": +"@types/json-schema@^7.0.8": version "7.0.11" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== @@ -275,10 +254,10 @@ accepts@~1.3.4: mime-types "~2.1.34" negotiator "0.6.3" -acorn-import-assertions@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac" - integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA== +acorn-import-attributes@^1.9.5: + version "1.9.5" + resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef" + integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ== acorn@^8.7.1: version "8.8.1" @@ -305,10 +284,10 @@ ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ansi-colors@4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" - integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== +ansi-colors@^4.1.3: + version "4.1.3" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b" + integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw== ansi-regex@^5.0.1: version "5.0.1" @@ -398,7 +377,7 @@ braces@^3.0.2, braces@~3.0.2: dependencies: fill-range "^7.0.1" -browser-stdout@1.3.1: +browser-stdout@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== @@ -449,7 +428,7 @@ chalk@^4.1.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chokidar@3.5.3, chokidar@^3.5.1: +chokidar@^3.5.1: version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -464,6 +443,21 @@ chokidar@3.5.3, chokidar@^3.5.1: optionalDependencies: fsevents "~2.3.2" +chokidar@^3.5.3: + version "3.6.0" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b" + integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw== + dependencies: + anymatch "~3.1.2" + braces "~3.0.2" + glob-parent "~5.1.2" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.6.0" + optionalDependencies: + fsevents "~2.3.2" + chrome-trace-event@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" @@ -573,13 +567,20 @@ debug@2.6.9: dependencies: ms "2.0.0" -debug@4.3.4, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2, debug@~4.3.4: +debug@^4.3.4, debug@~4.3.1, debug@~4.3.2, debug@~4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" +debug@^4.3.5: + version "4.3.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52" + integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ== + dependencies: + ms "^2.1.3" + decamelize@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837" @@ -600,10 +601,10 @@ di@^0.0.1: resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c" integrity sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw= -diff@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b" - integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== +diff@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/diff/-/diff-5.2.0.tgz#26ded047cd1179b78b9537d5ef725503ce1ae531" + integrity sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A== dom-serialize@^2.2.1: version "2.2.1" @@ -656,10 +657,10 @@ engine.io@~6.5.2: engine.io-parser "~5.2.1" ws "~8.11.0" -enhanced-resolve@^5.16.0: - version "5.16.1" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.16.1.tgz#e8bc63d51b826d6f1cbc0a150ecb5a8b0c62e567" - integrity sha512-4U5pNsuDl0EhuZpq46M5xPslstkviJuhrdobaRDBk2Jy2KO37FDAJl4lb2KlNabxT0m4MTK2UHNrsAcphE8nyw== +enhanced-resolve@^5.17.1: + version "5.17.1" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15" + integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -694,7 +695,7 @@ escape-html@~1.0.3: resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= -escape-string-regexp@4.0.0: +escape-string-regexp@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== @@ -774,14 +775,6 @@ finalhandler@1.1.2: statuses "~1.5.0" unpipe "~1.0.0" -find-up@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" - integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== - dependencies: - locate-path "^6.0.0" - path-exists "^4.0.0" - find-up@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" @@ -790,6 +783,14 @@ find-up@^4.0.0: locate-path "^5.0.0" path-exists "^4.0.0" +find-up@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== + dependencies: + locate-path "^6.0.0" + path-exists "^4.0.0" + flat@^5.0.2: version "5.0.2" resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" @@ -865,17 +866,6 @@ glob-to-regexp@^0.4.1: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== -glob@8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" - integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^5.0.1" - once "^1.3.0" - glob@^7.1.3, glob@^7.1.7: version "7.2.2" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.2.tgz#29deb38e1ef90f132d5958abe9c3ee8e87f3c318" @@ -888,6 +878,17 @@ glob@^7.1.3, glob@^7.1.7: once "^1.3.0" path-is-absolute "^1.0.0" +glob@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" + integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^5.0.1" + once "^1.3.0" + graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6: version "4.2.10" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" @@ -922,7 +923,7 @@ hasown@^2.0.0: dependencies: function-bind "^1.1.2" -he@1.2.0: +he@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== @@ -1064,7 +1065,7 @@ jest-worker@^27.4.5: merge-stream "^2.0.0" supports-color "^8.0.0" -js-yaml@4.1.0: +js-yaml@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== @@ -1118,10 +1119,10 @@ karma-webpack@5.0.1: minimatch "^9.0.3" webpack-merge "^4.1.5" -karma@6.4.3: - version "6.4.3" - resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.3.tgz#763e500f99597218bbb536de1a14acc4ceea7ce8" - integrity sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q== +karma@6.4.4: + version "6.4.4" + resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.4.tgz#dfa5a426cf5a8b53b43cd54ef0d0d09742351492" + integrity sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w== dependencies: "@colors/colors" "1.5.0" body-parser "^1.19.0" @@ -1153,6 +1154,13 @@ kind-of@^6.0.2: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== +kotlin-web-helpers@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-2.0.0.tgz#b112096b273c1e733e0b86560998235c09a19286" + integrity sha512-xkVGl60Ygn/zuLkDPx+oHj7jeLR7hCvoNF99nhwXMn8a3ApB4lLiC9pk4ol4NHPjyoCbvQctBqvzUcp8pkqyWw== + dependencies: + format-util "^1.0.5" + loader-runner@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" @@ -1177,7 +1185,7 @@ lodash@^4.17.15, lodash@^4.17.21, lodash@^4.17.4: resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -log-symbols@4.1.0: +log-symbols@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== @@ -1223,13 +1231,6 @@ mime@^2.5.2: resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== -minimatch@5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b" - integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g== - dependencies: - brace-expansion "^2.0.1" - minimatch@^3.0.4, minimatch@^3.1.1: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" @@ -1237,7 +1238,7 @@ minimatch@^3.0.4, minimatch@^3.1.1: dependencies: brace-expansion "^1.1.7" -minimatch@^5.0.1: +minimatch@^5.0.1, minimatch@^5.1.6: version "5.1.6" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== @@ -1263,31 +1264,31 @@ mkdirp@^0.5.5: dependencies: minimist "^1.2.6" -mocha@10.3.0: - version "10.3.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.3.0.tgz#0e185c49e6dccf582035c05fa91084a4ff6e3fe9" - integrity sha512-uF2XJs+7xSLsrmIvn37i/wnc91nw7XjOQB8ccyx5aEgdnohr7n+rEiZP23WkCYHjilR6+EboEnbq/ZQDz4LSbg== - dependencies: - ansi-colors "4.1.1" - browser-stdout "1.3.1" - chokidar "3.5.3" - debug "4.3.4" - diff "5.0.0" - escape-string-regexp "4.0.0" - find-up "5.0.0" - glob "8.1.0" - he "1.2.0" - js-yaml "4.1.0" - log-symbols "4.1.0" - minimatch "5.0.1" - ms "2.1.3" - serialize-javascript "6.0.0" - strip-json-comments "3.1.1" - supports-color "8.1.1" - workerpool "6.2.1" - yargs "16.2.0" - yargs-parser "20.2.4" - yargs-unparser "2.0.0" +mocha@10.7.3: + version "10.7.3" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.3.tgz#ae32003cabbd52b59aece17846056a68eb4b0752" + integrity sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A== + dependencies: + ansi-colors "^4.1.3" + browser-stdout "^1.3.1" + chokidar "^3.5.3" + debug "^4.3.5" + diff "^5.2.0" + escape-string-regexp "^4.0.0" + find-up "^5.0.0" + glob "^8.1.0" + he "^1.2.0" + js-yaml "^4.1.0" + log-symbols "^4.1.0" + minimatch "^5.1.6" + ms "^2.1.3" + serialize-javascript "^6.0.2" + strip-json-comments "^3.1.1" + supports-color "^8.1.1" + workerpool "^6.5.1" + yargs "^16.2.0" + yargs-parser "^20.2.9" + yargs-unparser "^2.0.0" ms@2.0.0: version "2.0.0" @@ -1299,7 +1300,7 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@2.1.3: +ms@^2.1.3: version "2.1.3" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== @@ -1559,13 +1560,6 @@ schema-utils@^3.2.0: ajv "^6.12.5" ajv-keywords "^3.5.2" -serialize-javascript@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" - integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== - dependencies: - randombytes "^2.1.0" - serialize-javascript@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" @@ -1573,6 +1567,13 @@ serialize-javascript@^6.0.1: dependencies: randombytes "^2.1.0" +serialize-javascript@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2" + integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g== + dependencies: + randombytes "^2.1.0" + setprototypeof@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" @@ -1696,18 +1697,11 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1: dependencies: ansi-regex "^5.0.1" -strip-json-comments@3.1.1: +strip-json-comments@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== -supports-color@8.1.1, supports-color@^8.0.0: - version "8.1.1" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== - dependencies: - has-flag "^4.0.0" - supports-color@^7.1.0: version "7.2.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" @@ -1715,6 +1709,13 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" +supports-color@^8.0.0, supports-color@^8.1.1: + version "8.1.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + supports-preserve-symlinks-flag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" @@ -1773,10 +1774,10 @@ type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" -typescript@5.4.3: - version "5.4.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.3.tgz#5c6fedd4c87bee01cd7a528a30145521f8e0feff" - integrity sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg== +typescript@5.5.4: + 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.31" @@ -1870,21 +1871,20 @@ webpack-sources@^3.2.3: resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack@5.91.0: - version "5.91.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.91.0.tgz#ffa92c1c618d18c878f06892bbdc3373c71a01d9" - integrity sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw== +webpack@5.94.0: + version "5.94.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f" + integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg== dependencies: - "@types/eslint-scope" "^3.7.3" "@types/estree" "^1.0.5" "@webassemblyjs/ast" "^1.12.1" "@webassemblyjs/wasm-edit" "^1.12.1" "@webassemblyjs/wasm-parser" "^1.12.1" acorn "^8.7.1" - acorn-import-assertions "^1.9.0" + acorn-import-attributes "^1.9.5" browserslist "^4.21.10" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.16.0" + enhanced-resolve "^5.17.1" es-module-lexer "^1.2.1" eslint-scope "5.1.1" events "^3.2.0" @@ -1919,10 +1919,10 @@ wildcard@^2.0.0: resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== -workerpool@6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343" - integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== +workerpool@^6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544" + integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA== wrap-ansi@^7.0.0: version "7.0.0" @@ -1948,17 +1948,12 @@ y18n@^5.0.5: resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== -yargs-parser@20.2.4: - version "20.2.4" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" - integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== - -yargs-parser@^20.2.2: +yargs-parser@^20.2.2, yargs-parser@^20.2.9: version "20.2.9" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== -yargs-unparser@2.0.0: +yargs-unparser@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb" integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA== @@ -1968,7 +1963,7 @@ yargs-unparser@2.0.0: flat "^5.0.2" is-plain-obj "^2.1.0" -yargs@16.2.0, yargs@^16.1.1: +yargs@^16.1.1, yargs@^16.2.0: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== From 4c1a5de5a529940f8b78246889d23f1bc15a4864 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Mon, 2 Dec 2024 15:58:22 +0800 Subject: [PATCH 09/23] Bump the Gradle wrapper to the latest version of v8.11.1 which depends on Kotlin 2.0.20 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 79eb9d0..c1d5e01 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 91e7bb0e4c2f0c62ea0d3311b76fe326d598e9c0 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Mon, 2 Dec 2024 17:47:56 +0800 Subject: [PATCH 10/23] Make the project version explicit --- buildSrc/src/main/kotlin/VersionsAndDependencies.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt index 09b620e..9135f3b 100644 --- a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt +++ b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt @@ -2,7 +2,7 @@ import com.huanshankeji.CommonDependencies import com.huanshankeji.CommonGradleClasspathDependencies import com.huanshankeji.CommonVersions -val projectVersion = "0.6.0-SNAPSHOT" +val projectVersion = "0.6.0-kotlin-2.1.0-SNAPSHOT" val commonVersions = CommonVersions(arrow = "2.0.0-alpha.4" /* for Wasm JS*/, exposed = "0.56.0") val commonDependencies = CommonDependencies(commonVersions) From 5c23386b4962b55615cba357ae051c08e314e87a Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Mon, 2 Dec 2024 18:26:53 +0800 Subject: [PATCH 11/23] Bump our dependencies the latest snapshots using Kotlin 2.1.0 --- buildSrc/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 794cb8d..c2ff274 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -18,6 +18,6 @@ dependencies { // With Kotlin 2.0.20, a "Could not parse POM" build error occurs in the JVM projects of some dependent projects. implementation(kotlin("gradle-plugin", "2.1.0")) implementation("com.huanshankeji:common-gradle-dependencies:0.8.0-20241016") // don't use a snapshot version in a main branch - implementation("com.huanshankeji.team:gradle-plugins:0.7.0") // don't use a snapshot version in a main branch + implementation("com.huanshankeji.team:gradle-plugins:0.7.1-kotlin-2.1.0-SNAPSHOT") // TODO don't use a snapshot version in a main branch implementation("org.jetbrains.dokka:dokka-gradle-plugin:2.0.0-Beta") } From 50f49b83c4ae24a56bfad60e99ece6fbea581aad Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Mon, 2 Dec 2024 18:30:22 +0800 Subject: [PATCH 12/23] Bump the project version --- buildSrc/src/main/kotlin/VersionsAndDependencies.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt index 09b620e..fbafeee 100644 --- a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt +++ b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt @@ -2,7 +2,7 @@ import com.huanshankeji.CommonDependencies import com.huanshankeji.CommonGradleClasspathDependencies import com.huanshankeji.CommonVersions -val projectVersion = "0.6.0-SNAPSHOT" +val projectVersion = "0.6.1-SNAPSHOT" val commonVersions = CommonVersions(arrow = "2.0.0-alpha.4" /* for Wasm JS*/, exposed = "0.56.0") val commonDependencies = CommonDependencies(commonVersions) From 206d6df14bfe37efc67fd069ad7050218ff4cdd3 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Wed, 4 Dec 2024 00:56:42 +0800 Subject: [PATCH 13/23] Bump our Gradle plugins to the latest stable version and remove the explicit "kotlin-2.1.0" in the project version --- buildSrc/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/VersionsAndDependencies.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index c2ff274..2ec3da5 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -18,6 +18,6 @@ dependencies { // With Kotlin 2.0.20, a "Could not parse POM" build error occurs in the JVM projects of some dependent projects. implementation(kotlin("gradle-plugin", "2.1.0")) implementation("com.huanshankeji:common-gradle-dependencies:0.8.0-20241016") // don't use a snapshot version in a main branch - implementation("com.huanshankeji.team:gradle-plugins:0.7.1-kotlin-2.1.0-SNAPSHOT") // TODO don't use a snapshot version in a main branch + implementation("com.huanshankeji.team:gradle-plugins:0.8.0") // don't use a snapshot version in a main branch implementation("org.jetbrains.dokka:dokka-gradle-plugin:2.0.0-Beta") } diff --git a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt index d1eb48b..fbafeee 100644 --- a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt +++ b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt @@ -2,7 +2,7 @@ import com.huanshankeji.CommonDependencies import com.huanshankeji.CommonGradleClasspathDependencies import com.huanshankeji.CommonVersions -val projectVersion = "0.6.1-kotlin-2.1.0-SNAPSHOT" +val projectVersion = "0.6.1-SNAPSHOT" val commonVersions = CommonVersions(arrow = "2.0.0-alpha.4" /* for Wasm JS*/, exposed = "0.56.0") val commonDependencies = CommonDependencies(commonVersions) From f22a94309589ceedb5b1e9f661dc71ea97912d9d Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Wed, 4 Dec 2024 03:09:51 +0800 Subject: [PATCH 14/23] Exclude the unneeded subprojects in API validation, remove their "api" directories, and run `apiDump` and `check` to verify it works --- build.gradle.kts | 6 + .../kotlin-common-serialization-benchmark.api | 231 --------------- ...in-common-serialization-benchmark.klib.api | 275 ------------------ ...ommon-serialization-benchmark-jvm-only.api | 16 - ...in-common-vertx-with-context-receivers.api | 5 - 5 files changed, 6 insertions(+), 527 deletions(-) delete mode 100644 serialization/benchmark/api/kotlin-common-serialization-benchmark.api delete mode 100644 serialization/benchmark/api/kotlin-common-serialization-benchmark.klib.api delete mode 100644 serialization/benchmark/jvm-only/api/kotlin-common-serialization-benchmark-jvm-only.api delete mode 100644 vertx/with-context-receivers/api/kotlin-common-vertx-with-context-receivers.api diff --git a/build.gradle.kts b/build.gradle.kts index fd4ed1c..320e774 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -33,4 +33,10 @@ apiValidation { klib { enabled = true } + + ignoredProjects += "kotlin-common".let { + "$it-serialization-benchmark".let { + listOf(it, "$it-jvm-only") + } + "$it-vertx-with-context-receivers" + } } diff --git a/serialization/benchmark/api/kotlin-common-serialization-benchmark.api b/serialization/benchmark/api/kotlin-common-serialization-benchmark.api deleted file mode 100644 index 1867db6..0000000 --- a/serialization/benchmark/api/kotlin-common-serialization-benchmark.api +++ /dev/null @@ -1,231 +0,0 @@ -public abstract class com/huanshankeji/kotlinx/serialization/benchmark/BaseBenchmark { - public fun ()V -} - -public final class com/huanshankeji/kotlinx/serialization/benchmark/DataAndSerializersKt { - public static final fun getMaxDefaultLongWrapperDataSerializationConfig ()Lcom/huanshankeji/kotlinx/serialization/benchmark/DataSerializationConfig; - public static final fun getMaxFixedLongWrapperDataSerializationConfig ()Lcom/huanshankeji/kotlinx/serialization/benchmark/DataSerializationConfig; - public static final fun getMaxLongWrapperDataSerializationConfig ()Lcom/huanshankeji/kotlinx/serialization/benchmark/DataSerializationConfig; - public static final fun getTestDataOfNothing ()Lcom/huanshankeji/kotlinx/serialization/benchmark/TestData; - public static final fun getTestDataOfNothingDataSerializationConfig ()Lcom/huanshankeji/kotlinx/serialization/benchmark/DataSerializationConfig; - public static final fun getTestDataOfNothingSerializer ()Lkotlinx/serialization/SerializationStrategy; - public static final fun getZeroDefaultLongWrapperDataSerializationConfig ()Lcom/huanshankeji/kotlinx/serialization/benchmark/DataSerializationConfig; - public static final fun getZeroFixedLongWrapperDataSerializationConfig ()Lcom/huanshankeji/kotlinx/serialization/benchmark/DataSerializationConfig; - public static final fun getZeroLongWrapperDataSerializationConfig ()Lcom/huanshankeji/kotlinx/serialization/benchmark/DataSerializationConfig; -} - -public final class com/huanshankeji/kotlinx/serialization/benchmark/DataSerializationConfig { - public fun (Lkotlin/reflect/KType;Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V - public final fun getData ()Ljava/lang/Object; - public final fun getKType ()Lkotlin/reflect/KType; - public final fun getSerializer ()Lkotlinx/serialization/SerializationStrategy; -} - -public final class com/huanshankeji/kotlinx/serialization/benchmark/DefaultLongWrapper { - public static final field Companion Lcom/huanshankeji/kotlinx/serialization/benchmark/DefaultLongWrapper$Companion; - public fun (J)V - public final fun getValue ()J -} - -public synthetic class com/huanshankeji/kotlinx/serialization/benchmark/DefaultLongWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer { - public static final field INSTANCE Lcom/huanshankeji/kotlinx/serialization/benchmark/DefaultLongWrapper$$serializer; - public final fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/huanshankeji/kotlinx/serialization/benchmark/DefaultLongWrapper; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/huanshankeji/kotlinx/serialization/benchmark/DefaultLongWrapper;)V - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V - public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; -} - -public final class com/huanshankeji/kotlinx/serialization/benchmark/DefaultLongWrapper$Companion { - public final fun serializer ()Lkotlinx/serialization/KSerializer; -} - -public class com/huanshankeji/kotlinx/serialization/benchmark/DifferentDataBenchmark : com/huanshankeji/kotlinx/serialization/benchmark/BaseBenchmark { - public field paramEnum Lcom/huanshankeji/kotlinx/serialization/benchmark/DifferentDataParamEnum; - public fun ()V - public fun getParamEnum ()Lcom/huanshankeji/kotlinx/serialization/benchmark/DifferentDataParamEnum; - public fun serializeToJsonWithSerializerFromKType ()Ljava/lang/String; - public fun serializeToJsonWithStaticSerializer ()Ljava/lang/String; - public fun serializeToProtobufWithSerializerFromKType ()[B - public fun serializeToProtobufWithStaticSerializer ()[B - public fun setParamEnum (Lcom/huanshankeji/kotlinx/serialization/benchmark/DifferentDataParamEnum;)V -} - -public final class com/huanshankeji/kotlinx/serialization/benchmark/DifferentDataParamEnum : java/lang/Enum, com/huanshankeji/kotlinx/serialization/benchmark/IParamEnum { - public static final field MaxLongWrapper Lcom/huanshankeji/kotlinx/serialization/benchmark/DifferentDataParamEnum; - public static final field StringWrapper Lcom/huanshankeji/kotlinx/serialization/benchmark/DifferentDataParamEnum; - public static final field TestDataWithNothing Lcom/huanshankeji/kotlinx/serialization/benchmark/DifferentDataParamEnum; - public static final field WrapperOfString Lcom/huanshankeji/kotlinx/serialization/benchmark/DifferentDataParamEnum; - public static final field WrapperOfZeroInt Lcom/huanshankeji/kotlinx/serialization/benchmark/DifferentDataParamEnum; - public static final field WrapperOfZeroLong Lcom/huanshankeji/kotlinx/serialization/benchmark/DifferentDataParamEnum; - public static final field ZeroIntWrapper Lcom/huanshankeji/kotlinx/serialization/benchmark/DifferentDataParamEnum; - public static final field ZeroLongWrapper Lcom/huanshankeji/kotlinx/serialization/benchmark/DifferentDataParamEnum; - public fun getDataSerializationConfig ()Lcom/huanshankeji/kotlinx/serialization/benchmark/DataSerializationConfig; - public static fun getEntries ()Lkotlin/enums/EnumEntries; - public static fun valueOf (Ljava/lang/String;)Lcom/huanshankeji/kotlinx/serialization/benchmark/DifferentDataParamEnum; - public static fun values ()[Lcom/huanshankeji/kotlinx/serialization/benchmark/DifferentDataParamEnum; -} - -public final class com/huanshankeji/kotlinx/serialization/benchmark/FixedLongWrapper { - public static final field Companion Lcom/huanshankeji/kotlinx/serialization/benchmark/FixedLongWrapper$Companion; - public fun (J)V - public final fun getValue ()J -} - -public synthetic class com/huanshankeji/kotlinx/serialization/benchmark/FixedLongWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer { - public static final field INSTANCE Lcom/huanshankeji/kotlinx/serialization/benchmark/FixedLongWrapper$$serializer; - public final fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/huanshankeji/kotlinx/serialization/benchmark/FixedLongWrapper; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/huanshankeji/kotlinx/serialization/benchmark/FixedLongWrapper;)V - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V - public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; -} - -public final class com/huanshankeji/kotlinx/serialization/benchmark/FixedLongWrapper$Companion { - public final fun serializer ()Lkotlinx/serialization/KSerializer; -} - -public abstract interface class com/huanshankeji/kotlinx/serialization/benchmark/IParamEnum { - public abstract fun getDataSerializationConfig ()Lcom/huanshankeji/kotlinx/serialization/benchmark/DataSerializationConfig; -} - -public final class com/huanshankeji/kotlinx/serialization/benchmark/IntWrapper { - public static final field Companion Lcom/huanshankeji/kotlinx/serialization/benchmark/IntWrapper$Companion; - public fun (I)V - public final fun getValue ()I -} - -public synthetic class com/huanshankeji/kotlinx/serialization/benchmark/IntWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer { - public static final field INSTANCE Lcom/huanshankeji/kotlinx/serialization/benchmark/IntWrapper$$serializer; - public final fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/huanshankeji/kotlinx/serialization/benchmark/IntWrapper; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/huanshankeji/kotlinx/serialization/benchmark/IntWrapper;)V - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V - public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; -} - -public final class com/huanshankeji/kotlinx/serialization/benchmark/IntWrapper$Companion { - public final fun serializer ()Lkotlinx/serialization/KSerializer; -} - -public final class com/huanshankeji/kotlinx/serialization/benchmark/LongWrapper { - public static final field Companion Lcom/huanshankeji/kotlinx/serialization/benchmark/LongWrapper$Companion; - public fun (J)V - public final fun getValue ()J -} - -public synthetic class com/huanshankeji/kotlinx/serialization/benchmark/LongWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer { - public static final field INSTANCE Lcom/huanshankeji/kotlinx/serialization/benchmark/LongWrapper$$serializer; - public final fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/huanshankeji/kotlinx/serialization/benchmark/LongWrapper; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/huanshankeji/kotlinx/serialization/benchmark/LongWrapper;)V - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V - public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; -} - -public final class com/huanshankeji/kotlinx/serialization/benchmark/LongWrapper$Companion { - public final fun serializer ()Lkotlinx/serialization/KSerializer; -} - -public final class com/huanshankeji/kotlinx/serialization/benchmark/StringWrapper { - public static final field Companion Lcom/huanshankeji/kotlinx/serialization/benchmark/StringWrapper$Companion; - public fun (Ljava/lang/String;)V - public final fun getValue ()Ljava/lang/String; -} - -public synthetic class com/huanshankeji/kotlinx/serialization/benchmark/StringWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer { - public static final field INSTANCE Lcom/huanshankeji/kotlinx/serialization/benchmark/StringWrapper$$serializer; - public final fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/huanshankeji/kotlinx/serialization/benchmark/StringWrapper; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/huanshankeji/kotlinx/serialization/benchmark/StringWrapper;)V - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V - public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; -} - -public final class com/huanshankeji/kotlinx/serialization/benchmark/StringWrapper$Companion { - public final fun serializer ()Lkotlinx/serialization/KSerializer; -} - -public final class com/huanshankeji/kotlinx/serialization/benchmark/TestData { - public static final field Companion Lcom/huanshankeji/kotlinx/serialization/benchmark/TestData$Companion; - public fun (Ljava/lang/String;Ljava/lang/Object;)V - public final fun getProperty1 ()Ljava/lang/String; - public final fun getProperty2 ()Ljava/lang/Object; -} - -public synthetic class com/huanshankeji/kotlinx/serialization/benchmark/TestData$$serializer : kotlinx/serialization/internal/GeneratedSerializer { - public fun (Lkotlinx/serialization/KSerializer;)V - public final fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/huanshankeji/kotlinx/serialization/benchmark/TestData; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/huanshankeji/kotlinx/serialization/benchmark/TestData;)V - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V - public final fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; -} - -public final class com/huanshankeji/kotlinx/serialization/benchmark/TestData$Companion { - public final fun serializer (Lkotlinx/serialization/KSerializer;)Lkotlinx/serialization/KSerializer; -} - -public class com/huanshankeji/kotlinx/serialization/benchmark/TestDataBenchmark : com/huanshankeji/kotlinx/serialization/benchmark/BaseBenchmark { - public fun ()V - public fun serializeToJson ()Ljava/lang/String; - public fun serializeToJsonWithStaticSerializer ()Ljava/lang/String; - public fun serializeToProtobuf ()[B - public fun serializeToProtobufWithNothingWorkaround ()[B - public fun serializeToProtobufWithStaticSerializer ()[B -} - -public final class com/huanshankeji/kotlinx/serialization/benchmark/Wrapper { - public static final field Companion Lcom/huanshankeji/kotlinx/serialization/benchmark/Wrapper$Companion; - public fun (Ljava/lang/Object;)V - public final fun getValue ()Ljava/lang/Object; -} - -public synthetic class com/huanshankeji/kotlinx/serialization/benchmark/Wrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer { - public fun (Lkotlinx/serialization/KSerializer;)V - public final fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/huanshankeji/kotlinx/serialization/benchmark/Wrapper; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/huanshankeji/kotlinx/serialization/benchmark/Wrapper;)V - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V - public final fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; -} - -public final class com/huanshankeji/kotlinx/serialization/benchmark/Wrapper$Companion { - public final fun serializer (Lkotlinx/serialization/KSerializer;)Lkotlinx/serialization/KSerializer; -} - -public class com/huanshankeji/kotlinx/serialization/benchmark/protobuf/ProtoBufBenchmark : com/huanshankeji/kotlinx/serialization/benchmark/BaseBenchmark { - public field paramEnum Lcom/huanshankeji/kotlinx/serialization/benchmark/protobuf/ProtoBufBenchmark$ParamEnum; - public fun ()V - public fun getParamEnum ()Lcom/huanshankeji/kotlinx/serialization/benchmark/protobuf/ProtoBufBenchmark$ParamEnum; - public fun serialize ()[B - public fun setParamEnum (Lcom/huanshankeji/kotlinx/serialization/benchmark/protobuf/ProtoBufBenchmark$ParamEnum;)V -} - -public final class com/huanshankeji/kotlinx/serialization/benchmark/protobuf/ProtoBufBenchmark$ParamEnum : java/lang/Enum, com/huanshankeji/kotlinx/serialization/benchmark/IParamEnum { - public static final field MaxDefaultLongWrapper Lcom/huanshankeji/kotlinx/serialization/benchmark/protobuf/ProtoBufBenchmark$ParamEnum; - public static final field MaxFixedLongWrapper Lcom/huanshankeji/kotlinx/serialization/benchmark/protobuf/ProtoBufBenchmark$ParamEnum; - public static final field MaxLongWrapper Lcom/huanshankeji/kotlinx/serialization/benchmark/protobuf/ProtoBufBenchmark$ParamEnum; - public static final field ZeroDefaultLongWrapper Lcom/huanshankeji/kotlinx/serialization/benchmark/protobuf/ProtoBufBenchmark$ParamEnum; - public static final field ZeroFixedLongWrapper Lcom/huanshankeji/kotlinx/serialization/benchmark/protobuf/ProtoBufBenchmark$ParamEnum; - public static final field ZeroLongWrapper Lcom/huanshankeji/kotlinx/serialization/benchmark/protobuf/ProtoBufBenchmark$ParamEnum; - public fun getDataSerializationConfig ()Lcom/huanshankeji/kotlinx/serialization/benchmark/DataSerializationConfig; - public static fun getEntries ()Lkotlin/enums/EnumEntries; - public static fun valueOf (Ljava/lang/String;)Lcom/huanshankeji/kotlinx/serialization/benchmark/protobuf/ProtoBufBenchmark$ParamEnum; - public static fun values ()[Lcom/huanshankeji/kotlinx/serialization/benchmark/protobuf/ProtoBufBenchmark$ParamEnum; -} - diff --git a/serialization/benchmark/api/kotlin-common-serialization-benchmark.klib.api b/serialization/benchmark/api/kotlin-common-serialization-benchmark.klib.api deleted file mode 100644 index d63a6df..0000000 --- a/serialization/benchmark/api/kotlin-common-serialization-benchmark.klib.api +++ /dev/null @@ -1,275 +0,0 @@ -// Klib ABI Dump -// Targets: [js] -// Rendering settings: -// - Signature version: 2 -// - Show manifest properties: true -// - Show declarations: true - -// Library unique name: -final enum class com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataParamEnum : com.huanshankeji.kotlinx.serialization.benchmark/IParamEnum, kotlin/Enum { // com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataParamEnum|null[0] - enum entry MaxLongWrapper // com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataParamEnum.MaxLongWrapper|null[0] - enum entry StringWrapper // com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataParamEnum.StringWrapper|null[0] - enum entry TestDataWithNothing // com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataParamEnum.TestDataWithNothing|null[0] - enum entry WrapperOfString // com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataParamEnum.WrapperOfString|null[0] - enum entry WrapperOfZeroInt // com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataParamEnum.WrapperOfZeroInt|null[0] - enum entry WrapperOfZeroLong // com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataParamEnum.WrapperOfZeroLong|null[0] - enum entry ZeroIntWrapper // com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataParamEnum.ZeroIntWrapper|null[0] - enum entry ZeroLongWrapper // com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataParamEnum.ZeroLongWrapper|null[0] - - final val dataSerializationConfig // com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataParamEnum.dataSerializationConfig|{}dataSerializationConfig[0] - final fun (): com.huanshankeji.kotlinx.serialization.benchmark/DataSerializationConfig<*> // com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataParamEnum.dataSerializationConfig.|(){}[0] - final val entries // com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataParamEnum.entries|#static{}entries[0] - final fun (): kotlin.enums/EnumEntries // com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataParamEnum.entries.|#static(){}[0] - - final fun valueOf(kotlin/String): com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataParamEnum // com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataParamEnum.valueOf|valueOf#static(kotlin.String){}[0] - final fun values(): kotlin/Array // com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataParamEnum.values|values#static(){}[0] -} - -abstract interface com.huanshankeji.kotlinx.serialization.benchmark/IParamEnum { // com.huanshankeji.kotlinx.serialization.benchmark/IParamEnum|null[0] - abstract val dataSerializationConfig // com.huanshankeji.kotlinx.serialization.benchmark/IParamEnum.dataSerializationConfig|{}dataSerializationConfig[0] - abstract fun (): com.huanshankeji.kotlinx.serialization.benchmark/DataSerializationConfig<*> // com.huanshankeji.kotlinx.serialization.benchmark/IParamEnum.dataSerializationConfig.|(){}[0] -} - -abstract class com.huanshankeji.kotlinx.serialization.benchmark/BaseBenchmark { // com.huanshankeji.kotlinx.serialization.benchmark/BaseBenchmark|null[0] - constructor () // com.huanshankeji.kotlinx.serialization.benchmark/BaseBenchmark.|(){}[0] -} - -final class <#A: kotlin/Any> com.huanshankeji.kotlinx.serialization.benchmark/TestData { // com.huanshankeji.kotlinx.serialization.benchmark/TestData|null[0] - constructor (kotlin/String, #A?) // com.huanshankeji.kotlinx.serialization.benchmark/TestData.|(kotlin.String;1:0?){}[0] - - final val property1 // com.huanshankeji.kotlinx.serialization.benchmark/TestData.property1|{}property1[0] - final fun (): kotlin/String // com.huanshankeji.kotlinx.serialization.benchmark/TestData.property1.|(){}[0] - final val property2 // com.huanshankeji.kotlinx.serialization.benchmark/TestData.property2|{}property2[0] - final fun (): #A? // com.huanshankeji.kotlinx.serialization.benchmark/TestData.property2.|(){}[0] - - final class <#A1: kotlin/Any?> $serializer : kotlinx.serialization.internal/GeneratedSerializer> { // com.huanshankeji.kotlinx.serialization.benchmark/TestData.$serializer|null[0] - constructor (kotlinx.serialization/KSerializer<#A1>) // com.huanshankeji.kotlinx.serialization.benchmark/TestData.$serializer.|(kotlinx.serialization.KSerializer<1:0>){}[0] - - final val descriptor // com.huanshankeji.kotlinx.serialization.benchmark/TestData.$serializer.descriptor|{}descriptor[0] - final fun (): kotlinx.serialization.descriptors/SerialDescriptor // com.huanshankeji.kotlinx.serialization.benchmark/TestData.$serializer.descriptor.|(){}[0] - final val typeSerial0 // com.huanshankeji.kotlinx.serialization.benchmark/TestData.$serializer.typeSerial0|{}typeSerial0[0] - - final fun childSerializers(): kotlin/Array> // com.huanshankeji.kotlinx.serialization.benchmark/TestData.$serializer.childSerializers|childSerializers(){}[0] - final fun deserialize(kotlinx.serialization.encoding/Decoder): com.huanshankeji.kotlinx.serialization.benchmark/TestData<#A1> // com.huanshankeji.kotlinx.serialization.benchmark/TestData.$serializer.deserialize|deserialize(kotlinx.serialization.encoding.Decoder){}[0] - final fun serialize(kotlinx.serialization.encoding/Encoder, com.huanshankeji.kotlinx.serialization.benchmark/TestData<#A1>) // com.huanshankeji.kotlinx.serialization.benchmark/TestData.$serializer.serialize|serialize(kotlinx.serialization.encoding.Encoder;com.huanshankeji.kotlinx.serialization.benchmark.TestData<1:0>){}[0] - final fun typeParametersSerializers(): kotlin/Array> // com.huanshankeji.kotlinx.serialization.benchmark/TestData.$serializer.typeParametersSerializers|typeParametersSerializers(){}[0] - } - - final object Companion : kotlinx.serialization.internal/SerializerFactory { // com.huanshankeji.kotlinx.serialization.benchmark/TestData.Companion|null[0] - final val $cachedDescriptor // com.huanshankeji.kotlinx.serialization.benchmark/TestData.Companion.$cachedDescriptor|{}$cachedDescriptor[0] - final fun (): kotlinx.serialization.descriptors/SerialDescriptor // com.huanshankeji.kotlinx.serialization.benchmark/TestData.Companion.$cachedDescriptor.|(){}[0] - - final fun <#A2: kotlin/Any?> serializer(kotlinx.serialization/KSerializer<#A2>): kotlinx.serialization/KSerializer> // com.huanshankeji.kotlinx.serialization.benchmark/TestData.Companion.serializer|serializer(kotlinx.serialization.KSerializer<0:0>){0§}[0] - final fun serializer(kotlin/Array>...): kotlinx.serialization/KSerializer<*> // com.huanshankeji.kotlinx.serialization.benchmark/TestData.Companion.serializer|serializer(kotlin.Array>...){}[0] - } -} - -final class <#A: kotlin/Any> com.huanshankeji.kotlinx.serialization.benchmark/Wrapper { // com.huanshankeji.kotlinx.serialization.benchmark/Wrapper|null[0] - constructor (#A) // com.huanshankeji.kotlinx.serialization.benchmark/Wrapper.|(1:0){}[0] - - final val value // com.huanshankeji.kotlinx.serialization.benchmark/Wrapper.value|{}value[0] - final fun (): #A // com.huanshankeji.kotlinx.serialization.benchmark/Wrapper.value.|(){}[0] - - final class <#A1: kotlin/Any?> $serializer : kotlinx.serialization.internal/GeneratedSerializer> { // com.huanshankeji.kotlinx.serialization.benchmark/Wrapper.$serializer|null[0] - constructor (kotlinx.serialization/KSerializer<#A1>) // com.huanshankeji.kotlinx.serialization.benchmark/Wrapper.$serializer.|(kotlinx.serialization.KSerializer<1:0>){}[0] - - final val descriptor // com.huanshankeji.kotlinx.serialization.benchmark/Wrapper.$serializer.descriptor|{}descriptor[0] - final fun (): kotlinx.serialization.descriptors/SerialDescriptor // com.huanshankeji.kotlinx.serialization.benchmark/Wrapper.$serializer.descriptor.|(){}[0] - final val typeSerial0 // com.huanshankeji.kotlinx.serialization.benchmark/Wrapper.$serializer.typeSerial0|{}typeSerial0[0] - - final fun childSerializers(): kotlin/Array> // com.huanshankeji.kotlinx.serialization.benchmark/Wrapper.$serializer.childSerializers|childSerializers(){}[0] - final fun deserialize(kotlinx.serialization.encoding/Decoder): com.huanshankeji.kotlinx.serialization.benchmark/Wrapper<#A1> // com.huanshankeji.kotlinx.serialization.benchmark/Wrapper.$serializer.deserialize|deserialize(kotlinx.serialization.encoding.Decoder){}[0] - final fun serialize(kotlinx.serialization.encoding/Encoder, com.huanshankeji.kotlinx.serialization.benchmark/Wrapper<#A1>) // com.huanshankeji.kotlinx.serialization.benchmark/Wrapper.$serializer.serialize|serialize(kotlinx.serialization.encoding.Encoder;com.huanshankeji.kotlinx.serialization.benchmark.Wrapper<1:0>){}[0] - final fun typeParametersSerializers(): kotlin/Array> // com.huanshankeji.kotlinx.serialization.benchmark/Wrapper.$serializer.typeParametersSerializers|typeParametersSerializers(){}[0] - } - - final object Companion : kotlinx.serialization.internal/SerializerFactory { // com.huanshankeji.kotlinx.serialization.benchmark/Wrapper.Companion|null[0] - final val $cachedDescriptor // com.huanshankeji.kotlinx.serialization.benchmark/Wrapper.Companion.$cachedDescriptor|{}$cachedDescriptor[0] - final fun (): kotlinx.serialization.descriptors/SerialDescriptor // com.huanshankeji.kotlinx.serialization.benchmark/Wrapper.Companion.$cachedDescriptor.|(){}[0] - - final fun <#A2: kotlin/Any?> serializer(kotlinx.serialization/KSerializer<#A2>): kotlinx.serialization/KSerializer> // com.huanshankeji.kotlinx.serialization.benchmark/Wrapper.Companion.serializer|serializer(kotlinx.serialization.KSerializer<0:0>){0§}[0] - final fun serializer(kotlin/Array>...): kotlinx.serialization/KSerializer<*> // com.huanshankeji.kotlinx.serialization.benchmark/Wrapper.Companion.serializer|serializer(kotlin.Array>...){}[0] - } -} - -final class <#A: kotlin/Any?> com.huanshankeji.kotlinx.serialization.benchmark/DataSerializationConfig { // com.huanshankeji.kotlinx.serialization.benchmark/DataSerializationConfig|null[0] - constructor (kotlin.reflect/KType, kotlinx.serialization/SerializationStrategy<#A>, #A) // com.huanshankeji.kotlinx.serialization.benchmark/DataSerializationConfig.|(kotlin.reflect.KType;kotlinx.serialization.SerializationStrategy<1:0>;1:0){}[0] - - final val data // com.huanshankeji.kotlinx.serialization.benchmark/DataSerializationConfig.data|{}data[0] - final fun (): #A // com.huanshankeji.kotlinx.serialization.benchmark/DataSerializationConfig.data.|(){}[0] - final val kType // com.huanshankeji.kotlinx.serialization.benchmark/DataSerializationConfig.kType|{}kType[0] - final fun (): kotlin.reflect/KType // com.huanshankeji.kotlinx.serialization.benchmark/DataSerializationConfig.kType.|(){}[0] - final val serializer // com.huanshankeji.kotlinx.serialization.benchmark/DataSerializationConfig.serializer|{}serializer[0] - final fun (): kotlinx.serialization/SerializationStrategy<#A> // com.huanshankeji.kotlinx.serialization.benchmark/DataSerializationConfig.serializer.|(){}[0] -} - -final class com.huanshankeji.kotlinx.serialization.benchmark.protobuf/ProtoBufBenchmark : com.huanshankeji.kotlinx.serialization.benchmark/BaseBenchmark { // com.huanshankeji.kotlinx.serialization.benchmark.protobuf/ProtoBufBenchmark|null[0] - constructor () // com.huanshankeji.kotlinx.serialization.benchmark.protobuf/ProtoBufBenchmark.|(){}[0] - - final var paramEnum // com.huanshankeji.kotlinx.serialization.benchmark.protobuf/ProtoBufBenchmark.paramEnum|{}paramEnum[0] - final fun (): com.huanshankeji.kotlinx.serialization.benchmark.protobuf/ProtoBufBenchmark.ParamEnum // com.huanshankeji.kotlinx.serialization.benchmark.protobuf/ProtoBufBenchmark.paramEnum.|(){}[0] - final fun (com.huanshankeji.kotlinx.serialization.benchmark.protobuf/ProtoBufBenchmark.ParamEnum) // com.huanshankeji.kotlinx.serialization.benchmark.protobuf/ProtoBufBenchmark.paramEnum.|(com.huanshankeji.kotlinx.serialization.benchmark.protobuf.ProtoBufBenchmark.ParamEnum){}[0] - - final fun serialize(): kotlin/ByteArray // com.huanshankeji.kotlinx.serialization.benchmark.protobuf/ProtoBufBenchmark.serialize|serialize(){}[0] - - final enum class ParamEnum : com.huanshankeji.kotlinx.serialization.benchmark/IParamEnum, kotlin/Enum { // com.huanshankeji.kotlinx.serialization.benchmark.protobuf/ProtoBufBenchmark.ParamEnum|null[0] - enum entry MaxDefaultLongWrapper // com.huanshankeji.kotlinx.serialization.benchmark.protobuf/ProtoBufBenchmark.ParamEnum.MaxDefaultLongWrapper|null[0] - enum entry MaxFixedLongWrapper // com.huanshankeji.kotlinx.serialization.benchmark.protobuf/ProtoBufBenchmark.ParamEnum.MaxFixedLongWrapper|null[0] - enum entry MaxLongWrapper // com.huanshankeji.kotlinx.serialization.benchmark.protobuf/ProtoBufBenchmark.ParamEnum.MaxLongWrapper|null[0] - enum entry ZeroDefaultLongWrapper // com.huanshankeji.kotlinx.serialization.benchmark.protobuf/ProtoBufBenchmark.ParamEnum.ZeroDefaultLongWrapper|null[0] - enum entry ZeroFixedLongWrapper // com.huanshankeji.kotlinx.serialization.benchmark.protobuf/ProtoBufBenchmark.ParamEnum.ZeroFixedLongWrapper|null[0] - enum entry ZeroLongWrapper // com.huanshankeji.kotlinx.serialization.benchmark.protobuf/ProtoBufBenchmark.ParamEnum.ZeroLongWrapper|null[0] - - final val dataSerializationConfig // com.huanshankeji.kotlinx.serialization.benchmark.protobuf/ProtoBufBenchmark.ParamEnum.dataSerializationConfig|{}dataSerializationConfig[0] - final fun (): com.huanshankeji.kotlinx.serialization.benchmark/DataSerializationConfig<*> // com.huanshankeji.kotlinx.serialization.benchmark.protobuf/ProtoBufBenchmark.ParamEnum.dataSerializationConfig.|(){}[0] - final val entries // com.huanshankeji.kotlinx.serialization.benchmark.protobuf/ProtoBufBenchmark.ParamEnum.entries|#static{}entries[0] - final fun (): kotlin.enums/EnumEntries // com.huanshankeji.kotlinx.serialization.benchmark.protobuf/ProtoBufBenchmark.ParamEnum.entries.|#static(){}[0] - - final fun valueOf(kotlin/String): com.huanshankeji.kotlinx.serialization.benchmark.protobuf/ProtoBufBenchmark.ParamEnum // com.huanshankeji.kotlinx.serialization.benchmark.protobuf/ProtoBufBenchmark.ParamEnum.valueOf|valueOf#static(kotlin.String){}[0] - final fun values(): kotlin/Array // com.huanshankeji.kotlinx.serialization.benchmark.protobuf/ProtoBufBenchmark.ParamEnum.values|values#static(){}[0] - } -} - -final class com.huanshankeji.kotlinx.serialization.benchmark/DefaultLongWrapper { // com.huanshankeji.kotlinx.serialization.benchmark/DefaultLongWrapper|null[0] - constructor (kotlin/Long) // com.huanshankeji.kotlinx.serialization.benchmark/DefaultLongWrapper.|(kotlin.Long){}[0] - - final val value // com.huanshankeji.kotlinx.serialization.benchmark/DefaultLongWrapper.value|{}value[0] - final fun (): kotlin/Long // com.huanshankeji.kotlinx.serialization.benchmark/DefaultLongWrapper.value.|(){}[0] - - final object $serializer : kotlinx.serialization.internal/GeneratedSerializer { // com.huanshankeji.kotlinx.serialization.benchmark/DefaultLongWrapper.$serializer|null[0] - final val descriptor // com.huanshankeji.kotlinx.serialization.benchmark/DefaultLongWrapper.$serializer.descriptor|{}descriptor[0] - final fun (): kotlinx.serialization.descriptors/SerialDescriptor // com.huanshankeji.kotlinx.serialization.benchmark/DefaultLongWrapper.$serializer.descriptor.|(){}[0] - - final fun childSerializers(): kotlin/Array> // com.huanshankeji.kotlinx.serialization.benchmark/DefaultLongWrapper.$serializer.childSerializers|childSerializers(){}[0] - final fun deserialize(kotlinx.serialization.encoding/Decoder): com.huanshankeji.kotlinx.serialization.benchmark/DefaultLongWrapper // com.huanshankeji.kotlinx.serialization.benchmark/DefaultLongWrapper.$serializer.deserialize|deserialize(kotlinx.serialization.encoding.Decoder){}[0] - final fun serialize(kotlinx.serialization.encoding/Encoder, com.huanshankeji.kotlinx.serialization.benchmark/DefaultLongWrapper) // com.huanshankeji.kotlinx.serialization.benchmark/DefaultLongWrapper.$serializer.serialize|serialize(kotlinx.serialization.encoding.Encoder;com.huanshankeji.kotlinx.serialization.benchmark.DefaultLongWrapper){}[0] - } - - final object Companion { // com.huanshankeji.kotlinx.serialization.benchmark/DefaultLongWrapper.Companion|null[0] - final fun serializer(): kotlinx.serialization/KSerializer // com.huanshankeji.kotlinx.serialization.benchmark/DefaultLongWrapper.Companion.serializer|serializer(){}[0] - } -} - -final class com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataBenchmark : com.huanshankeji.kotlinx.serialization.benchmark/BaseBenchmark { // com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataBenchmark|null[0] - constructor () // com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataBenchmark.|(){}[0] - - final var paramEnum // com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataBenchmark.paramEnum|{}paramEnum[0] - final fun (): com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataParamEnum // com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataBenchmark.paramEnum.|(){}[0] - final fun (com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataParamEnum) // com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataBenchmark.paramEnum.|(com.huanshankeji.kotlinx.serialization.benchmark.DifferentDataParamEnum){}[0] - - final fun serializeToJsonWithSerializerFromKType(): kotlin/String // com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataBenchmark.serializeToJsonWithSerializerFromKType|serializeToJsonWithSerializerFromKType(){}[0] - final fun serializeToJsonWithStaticSerializer(): kotlin/String // com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataBenchmark.serializeToJsonWithStaticSerializer|serializeToJsonWithStaticSerializer(){}[0] - final fun serializeToProtobufWithSerializerFromKType(): kotlin/ByteArray // com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataBenchmark.serializeToProtobufWithSerializerFromKType|serializeToProtobufWithSerializerFromKType(){}[0] - final fun serializeToProtobufWithStaticSerializer(): kotlin/ByteArray // com.huanshankeji.kotlinx.serialization.benchmark/DifferentDataBenchmark.serializeToProtobufWithStaticSerializer|serializeToProtobufWithStaticSerializer(){}[0] -} - -final class com.huanshankeji.kotlinx.serialization.benchmark/FixedLongWrapper { // com.huanshankeji.kotlinx.serialization.benchmark/FixedLongWrapper|null[0] - constructor (kotlin/Long) // com.huanshankeji.kotlinx.serialization.benchmark/FixedLongWrapper.|(kotlin.Long){}[0] - - final val value // com.huanshankeji.kotlinx.serialization.benchmark/FixedLongWrapper.value|{}value[0] - final fun (): kotlin/Long // com.huanshankeji.kotlinx.serialization.benchmark/FixedLongWrapper.value.|(){}[0] - - final object $serializer : kotlinx.serialization.internal/GeneratedSerializer { // com.huanshankeji.kotlinx.serialization.benchmark/FixedLongWrapper.$serializer|null[0] - final val descriptor // com.huanshankeji.kotlinx.serialization.benchmark/FixedLongWrapper.$serializer.descriptor|{}descriptor[0] - final fun (): kotlinx.serialization.descriptors/SerialDescriptor // com.huanshankeji.kotlinx.serialization.benchmark/FixedLongWrapper.$serializer.descriptor.|(){}[0] - - final fun childSerializers(): kotlin/Array> // com.huanshankeji.kotlinx.serialization.benchmark/FixedLongWrapper.$serializer.childSerializers|childSerializers(){}[0] - final fun deserialize(kotlinx.serialization.encoding/Decoder): com.huanshankeji.kotlinx.serialization.benchmark/FixedLongWrapper // com.huanshankeji.kotlinx.serialization.benchmark/FixedLongWrapper.$serializer.deserialize|deserialize(kotlinx.serialization.encoding.Decoder){}[0] - final fun serialize(kotlinx.serialization.encoding/Encoder, com.huanshankeji.kotlinx.serialization.benchmark/FixedLongWrapper) // com.huanshankeji.kotlinx.serialization.benchmark/FixedLongWrapper.$serializer.serialize|serialize(kotlinx.serialization.encoding.Encoder;com.huanshankeji.kotlinx.serialization.benchmark.FixedLongWrapper){}[0] - } - - final object Companion { // com.huanshankeji.kotlinx.serialization.benchmark/FixedLongWrapper.Companion|null[0] - final fun serializer(): kotlinx.serialization/KSerializer // com.huanshankeji.kotlinx.serialization.benchmark/FixedLongWrapper.Companion.serializer|serializer(){}[0] - } -} - -final class com.huanshankeji.kotlinx.serialization.benchmark/IntWrapper { // com.huanshankeji.kotlinx.serialization.benchmark/IntWrapper|null[0] - constructor (kotlin/Int) // com.huanshankeji.kotlinx.serialization.benchmark/IntWrapper.|(kotlin.Int){}[0] - - final val value // com.huanshankeji.kotlinx.serialization.benchmark/IntWrapper.value|{}value[0] - final fun (): kotlin/Int // com.huanshankeji.kotlinx.serialization.benchmark/IntWrapper.value.|(){}[0] - - final object $serializer : kotlinx.serialization.internal/GeneratedSerializer { // com.huanshankeji.kotlinx.serialization.benchmark/IntWrapper.$serializer|null[0] - final val descriptor // com.huanshankeji.kotlinx.serialization.benchmark/IntWrapper.$serializer.descriptor|{}descriptor[0] - final fun (): kotlinx.serialization.descriptors/SerialDescriptor // com.huanshankeji.kotlinx.serialization.benchmark/IntWrapper.$serializer.descriptor.|(){}[0] - - final fun childSerializers(): kotlin/Array> // com.huanshankeji.kotlinx.serialization.benchmark/IntWrapper.$serializer.childSerializers|childSerializers(){}[0] - final fun deserialize(kotlinx.serialization.encoding/Decoder): com.huanshankeji.kotlinx.serialization.benchmark/IntWrapper // com.huanshankeji.kotlinx.serialization.benchmark/IntWrapper.$serializer.deserialize|deserialize(kotlinx.serialization.encoding.Decoder){}[0] - final fun serialize(kotlinx.serialization.encoding/Encoder, com.huanshankeji.kotlinx.serialization.benchmark/IntWrapper) // com.huanshankeji.kotlinx.serialization.benchmark/IntWrapper.$serializer.serialize|serialize(kotlinx.serialization.encoding.Encoder;com.huanshankeji.kotlinx.serialization.benchmark.IntWrapper){}[0] - } - - final object Companion { // com.huanshankeji.kotlinx.serialization.benchmark/IntWrapper.Companion|null[0] - final fun serializer(): kotlinx.serialization/KSerializer // com.huanshankeji.kotlinx.serialization.benchmark/IntWrapper.Companion.serializer|serializer(){}[0] - } -} - -final class com.huanshankeji.kotlinx.serialization.benchmark/LongWrapper { // com.huanshankeji.kotlinx.serialization.benchmark/LongWrapper|null[0] - constructor (kotlin/Long) // com.huanshankeji.kotlinx.serialization.benchmark/LongWrapper.|(kotlin.Long){}[0] - - final val value // com.huanshankeji.kotlinx.serialization.benchmark/LongWrapper.value|{}value[0] - final fun (): kotlin/Long // com.huanshankeji.kotlinx.serialization.benchmark/LongWrapper.value.|(){}[0] - - final object $serializer : kotlinx.serialization.internal/GeneratedSerializer { // com.huanshankeji.kotlinx.serialization.benchmark/LongWrapper.$serializer|null[0] - final val descriptor // com.huanshankeji.kotlinx.serialization.benchmark/LongWrapper.$serializer.descriptor|{}descriptor[0] - final fun (): kotlinx.serialization.descriptors/SerialDescriptor // com.huanshankeji.kotlinx.serialization.benchmark/LongWrapper.$serializer.descriptor.|(){}[0] - - final fun childSerializers(): kotlin/Array> // com.huanshankeji.kotlinx.serialization.benchmark/LongWrapper.$serializer.childSerializers|childSerializers(){}[0] - final fun deserialize(kotlinx.serialization.encoding/Decoder): com.huanshankeji.kotlinx.serialization.benchmark/LongWrapper // com.huanshankeji.kotlinx.serialization.benchmark/LongWrapper.$serializer.deserialize|deserialize(kotlinx.serialization.encoding.Decoder){}[0] - final fun serialize(kotlinx.serialization.encoding/Encoder, com.huanshankeji.kotlinx.serialization.benchmark/LongWrapper) // com.huanshankeji.kotlinx.serialization.benchmark/LongWrapper.$serializer.serialize|serialize(kotlinx.serialization.encoding.Encoder;com.huanshankeji.kotlinx.serialization.benchmark.LongWrapper){}[0] - } - - final object Companion { // com.huanshankeji.kotlinx.serialization.benchmark/LongWrapper.Companion|null[0] - final fun serializer(): kotlinx.serialization/KSerializer // com.huanshankeji.kotlinx.serialization.benchmark/LongWrapper.Companion.serializer|serializer(){}[0] - } -} - -final class com.huanshankeji.kotlinx.serialization.benchmark/StringWrapper { // com.huanshankeji.kotlinx.serialization.benchmark/StringWrapper|null[0] - constructor (kotlin/String) // com.huanshankeji.kotlinx.serialization.benchmark/StringWrapper.|(kotlin.String){}[0] - - final val value // com.huanshankeji.kotlinx.serialization.benchmark/StringWrapper.value|{}value[0] - final fun (): kotlin/String // com.huanshankeji.kotlinx.serialization.benchmark/StringWrapper.value.|(){}[0] - - final object $serializer : kotlinx.serialization.internal/GeneratedSerializer { // com.huanshankeji.kotlinx.serialization.benchmark/StringWrapper.$serializer|null[0] - final val descriptor // com.huanshankeji.kotlinx.serialization.benchmark/StringWrapper.$serializer.descriptor|{}descriptor[0] - final fun (): kotlinx.serialization.descriptors/SerialDescriptor // com.huanshankeji.kotlinx.serialization.benchmark/StringWrapper.$serializer.descriptor.|(){}[0] - - final fun childSerializers(): kotlin/Array> // com.huanshankeji.kotlinx.serialization.benchmark/StringWrapper.$serializer.childSerializers|childSerializers(){}[0] - final fun deserialize(kotlinx.serialization.encoding/Decoder): com.huanshankeji.kotlinx.serialization.benchmark/StringWrapper // com.huanshankeji.kotlinx.serialization.benchmark/StringWrapper.$serializer.deserialize|deserialize(kotlinx.serialization.encoding.Decoder){}[0] - final fun serialize(kotlinx.serialization.encoding/Encoder, com.huanshankeji.kotlinx.serialization.benchmark/StringWrapper) // com.huanshankeji.kotlinx.serialization.benchmark/StringWrapper.$serializer.serialize|serialize(kotlinx.serialization.encoding.Encoder;com.huanshankeji.kotlinx.serialization.benchmark.StringWrapper){}[0] - } - - final object Companion { // com.huanshankeji.kotlinx.serialization.benchmark/StringWrapper.Companion|null[0] - final fun serializer(): kotlinx.serialization/KSerializer // com.huanshankeji.kotlinx.serialization.benchmark/StringWrapper.Companion.serializer|serializer(){}[0] - } -} - -final class com.huanshankeji.kotlinx.serialization.benchmark/TestDataBenchmark : com.huanshankeji.kotlinx.serialization.benchmark/BaseBenchmark { // com.huanshankeji.kotlinx.serialization.benchmark/TestDataBenchmark|null[0] - constructor () // com.huanshankeji.kotlinx.serialization.benchmark/TestDataBenchmark.|(){}[0] - - final fun serializeToJson(): kotlin/String // com.huanshankeji.kotlinx.serialization.benchmark/TestDataBenchmark.serializeToJson|serializeToJson(){}[0] - final fun serializeToJsonWithStaticSerializer(): kotlin/String // com.huanshankeji.kotlinx.serialization.benchmark/TestDataBenchmark.serializeToJsonWithStaticSerializer|serializeToJsonWithStaticSerializer(){}[0] - final fun serializeToProtobuf(): kotlin/ByteArray // com.huanshankeji.kotlinx.serialization.benchmark/TestDataBenchmark.serializeToProtobuf|serializeToProtobuf(){}[0] - final fun serializeToProtobufWithNothingWorkaround(): kotlin/ByteArray // com.huanshankeji.kotlinx.serialization.benchmark/TestDataBenchmark.serializeToProtobufWithNothingWorkaround|serializeToProtobufWithNothingWorkaround(){}[0] - final fun serializeToProtobufWithStaticSerializer(): kotlin/ByteArray // com.huanshankeji.kotlinx.serialization.benchmark/TestDataBenchmark.serializeToProtobufWithStaticSerializer|serializeToProtobufWithStaticSerializer(){}[0] -} - -final val com.huanshankeji.kotlinx.serialization.benchmark/maxDefaultLongWrapperDataSerializationConfig // com.huanshankeji.kotlinx.serialization.benchmark/maxDefaultLongWrapperDataSerializationConfig|{}maxDefaultLongWrapperDataSerializationConfig[0] - final fun (): com.huanshankeji.kotlinx.serialization.benchmark/DataSerializationConfig // com.huanshankeji.kotlinx.serialization.benchmark/maxDefaultLongWrapperDataSerializationConfig.|(){}[0] -final val com.huanshankeji.kotlinx.serialization.benchmark/maxFixedLongWrapperDataSerializationConfig // com.huanshankeji.kotlinx.serialization.benchmark/maxFixedLongWrapperDataSerializationConfig|{}maxFixedLongWrapperDataSerializationConfig[0] - final fun (): com.huanshankeji.kotlinx.serialization.benchmark/DataSerializationConfig // com.huanshankeji.kotlinx.serialization.benchmark/maxFixedLongWrapperDataSerializationConfig.|(){}[0] -final val com.huanshankeji.kotlinx.serialization.benchmark/maxLongWrapperDataSerializationConfig // com.huanshankeji.kotlinx.serialization.benchmark/maxLongWrapperDataSerializationConfig|{}maxLongWrapperDataSerializationConfig[0] - final fun (): com.huanshankeji.kotlinx.serialization.benchmark/DataSerializationConfig // com.huanshankeji.kotlinx.serialization.benchmark/maxLongWrapperDataSerializationConfig.|(){}[0] -final val com.huanshankeji.kotlinx.serialization.benchmark/testDataOfNothing // com.huanshankeji.kotlinx.serialization.benchmark/testDataOfNothing|{}testDataOfNothing[0] - final fun (): com.huanshankeji.kotlinx.serialization.benchmark/TestData // com.huanshankeji.kotlinx.serialization.benchmark/testDataOfNothing.|(){}[0] -final val com.huanshankeji.kotlinx.serialization.benchmark/testDataOfNothingDataSerializationConfig // com.huanshankeji.kotlinx.serialization.benchmark/testDataOfNothingDataSerializationConfig|{}testDataOfNothingDataSerializationConfig[0] - final fun (): com.huanshankeji.kotlinx.serialization.benchmark/DataSerializationConfig> // com.huanshankeji.kotlinx.serialization.benchmark/testDataOfNothingDataSerializationConfig.|(){}[0] -final val com.huanshankeji.kotlinx.serialization.benchmark/testDataOfNothingSerializer // com.huanshankeji.kotlinx.serialization.benchmark/testDataOfNothingSerializer|{}testDataOfNothingSerializer[0] - final fun (): kotlinx.serialization/SerializationStrategy> // com.huanshankeji.kotlinx.serialization.benchmark/testDataOfNothingSerializer.|(){}[0] -final val com.huanshankeji.kotlinx.serialization.benchmark/zeroDefaultLongWrapperDataSerializationConfig // com.huanshankeji.kotlinx.serialization.benchmark/zeroDefaultLongWrapperDataSerializationConfig|{}zeroDefaultLongWrapperDataSerializationConfig[0] - final fun (): com.huanshankeji.kotlinx.serialization.benchmark/DataSerializationConfig // com.huanshankeji.kotlinx.serialization.benchmark/zeroDefaultLongWrapperDataSerializationConfig.|(){}[0] -final val com.huanshankeji.kotlinx.serialization.benchmark/zeroFixedLongWrapperDataSerializationConfig // com.huanshankeji.kotlinx.serialization.benchmark/zeroFixedLongWrapperDataSerializationConfig|{}zeroFixedLongWrapperDataSerializationConfig[0] - final fun (): com.huanshankeji.kotlinx.serialization.benchmark/DataSerializationConfig // com.huanshankeji.kotlinx.serialization.benchmark/zeroFixedLongWrapperDataSerializationConfig.|(){}[0] -final val com.huanshankeji.kotlinx.serialization.benchmark/zeroLongWrapperDataSerializationConfig // com.huanshankeji.kotlinx.serialization.benchmark/zeroLongWrapperDataSerializationConfig|{}zeroLongWrapperDataSerializationConfig[0] - final fun (): com.huanshankeji.kotlinx.serialization.benchmark/DataSerializationConfig // com.huanshankeji.kotlinx.serialization.benchmark/zeroLongWrapperDataSerializationConfig.|(){}[0] - -final inline fun <#A: reified kotlin/Any?> com.huanshankeji.kotlinx.serialization.benchmark/DataSerializationConfig(#A): com.huanshankeji.kotlinx.serialization.benchmark/DataSerializationConfig<#A> // com.huanshankeji.kotlinx.serialization.benchmark/DataSerializationConfig|DataSerializationConfig(0:0){0§}[0] diff --git a/serialization/benchmark/jvm-only/api/kotlin-common-serialization-benchmark-jvm-only.api b/serialization/benchmark/jvm-only/api/kotlin-common-serialization-benchmark-jvm-only.api deleted file mode 100644 index 236fcc4..0000000 --- a/serialization/benchmark/jvm-only/api/kotlin-common-serialization-benchmark-jvm-only.api +++ /dev/null @@ -1,16 +0,0 @@ -public abstract class com/huanshankeji/kotlinx/serialization/benchmark/GoogleProtobufBaseBenchmark : com/huanshankeji/kotlinx/serialization/benchmark/BaseBenchmark { - public field paramEnum Lcom/huanshankeji/kotlinx/serialization/benchmark/GoogleProtobufBaseBenchmark$ParamEnum; - public fun ()V - public fun getParamEnum ()Lcom/huanshankeji/kotlinx/serialization/benchmark/GoogleProtobufBaseBenchmark$ParamEnum; - public fun setParamEnum (Lcom/huanshankeji/kotlinx/serialization/benchmark/GoogleProtobufBaseBenchmark$ParamEnum;)V -} - -public final class com/huanshankeji/kotlinx/serialization/benchmark/GoogleProtobufBaseBenchmark$ParamEnum : java/lang/Enum { - public static final field Max Lcom/huanshankeji/kotlinx/serialization/benchmark/GoogleProtobufBaseBenchmark$ParamEnum; - public static final field Zero Lcom/huanshankeji/kotlinx/serialization/benchmark/GoogleProtobufBaseBenchmark$ParamEnum; - public static fun getEntries ()Lkotlin/enums/EnumEntries; - public final fun getLongWrapper ()Lcom/huanshankeji/kotlinx/serialization/benchmark/LongWrapper; - public static fun valueOf (Ljava/lang/String;)Lcom/huanshankeji/kotlinx/serialization/benchmark/GoogleProtobufBaseBenchmark$ParamEnum; - public static fun values ()[Lcom/huanshankeji/kotlinx/serialization/benchmark/GoogleProtobufBaseBenchmark$ParamEnum; -} - diff --git a/vertx/with-context-receivers/api/kotlin-common-vertx-with-context-receivers.api b/vertx/with-context-receivers/api/kotlin-common-vertx-with-context-receivers.api deleted file mode 100644 index 41c7734..0000000 --- a/vertx/with-context-receivers/api/kotlin-common-vertx-with-context-receivers.api +++ /dev/null @@ -1,5 +0,0 @@ -public final class com/huanshankeji/vertx/kotlin/coroutines/ext/web/CoroutineHandlersKt { - public static final fun checkedCoroutineHandler (Lkotlinx/coroutines/CoroutineScope;Lio/vertx/ext/web/Route;Lkotlin/jvm/functions/Function2;)Lio/vertx/ext/web/Route; - public static final fun coroutineHandler (Lkotlinx/coroutines/CoroutineScope;Lio/vertx/ext/web/Route;Lkotlin/jvm/functions/Function2;)Lio/vertx/ext/web/Route; -} - From 4f302f01481914a56ae181def6d2096aeb240d90 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Wed, 4 Dec 2024 19:29:57 +0800 Subject: [PATCH 15/23] Bump Arrow to v2.0.0-rc.1 --- buildSrc/src/main/kotlin/VersionsAndDependencies.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt index 88b80a2..fcaad37 100644 --- a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt +++ b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt @@ -4,7 +4,7 @@ import com.huanshankeji.CommonVersions val projectVersion = "0.6.0-SNAPSHOT" -val commonVersions = CommonVersions(arrow = "2.0.0-beta.1") // for Wasm JS +val commonVersions = CommonVersions(arrow = "2.0.0-rc.1") // for Wasm JS val commonDependencies = CommonDependencies(commonVersions) val commonGradleClasspathDependencies = CommonGradleClasspathDependencies(commonVersions) From f06449da638caaace6652f79d95691b00d9f959a Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Wed, 4 Dec 2024 19:46:39 +0800 Subject: [PATCH 16/23] Replace deprecated `ExperimentalWasmDsl` opt-ins --- .../kotlin/multiplatform-conventions-without-ios.gradle.kts | 2 +- buildSrc/src/main/kotlin/multiplatform-conventions.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/multiplatform-conventions-without-ios.gradle.kts b/buildSrc/src/main/kotlin/multiplatform-conventions-without-ios.gradle.kts index 47f3edb..8e343fb 100644 --- a/buildSrc/src/main/kotlin/multiplatform-conventions-without-ios.gradle.kts +++ b/buildSrc/src/main/kotlin/multiplatform-conventions-without-ios.gradle.kts @@ -1,4 +1,4 @@ -import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl +import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl plugins { id("common-conventions") diff --git a/buildSrc/src/main/kotlin/multiplatform-conventions.gradle.kts b/buildSrc/src/main/kotlin/multiplatform-conventions.gradle.kts index 6e8500f..25b83d5 100644 --- a/buildSrc/src/main/kotlin/multiplatform-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/multiplatform-conventions.gradle.kts @@ -1,4 +1,4 @@ -import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl +import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl plugins { id("common-conventions") From 4b2a8261a3d1e4b23821e953d645fd86079554e1 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Wed, 4 Dec 2024 19:51:32 +0800 Subject: [PATCH 17/23] Remove the `multiplatform-conventions-without-ios` "buildSrc" Gradle plugin which is no longer used --- ...latform-conventions-without-ios.gradle.kts | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 buildSrc/src/main/kotlin/multiplatform-conventions-without-ios.gradle.kts diff --git a/buildSrc/src/main/kotlin/multiplatform-conventions-without-ios.gradle.kts b/buildSrc/src/main/kotlin/multiplatform-conventions-without-ios.gradle.kts deleted file mode 100644 index 8e343fb..0000000 --- a/buildSrc/src/main/kotlin/multiplatform-conventions-without-ios.gradle.kts +++ /dev/null @@ -1,19 +0,0 @@ -import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl - -plugins { - id("common-conventions") - kotlin("multiplatform") - id("com.huanshankeji.kotlin-multiplatform-sonatype-ossrh-publish-conventions") -} - -kotlin { - jvm() - jvmToolchain(8) - - //androidTarget() - - js() - - @OptIn(ExperimentalWasmDsl::class) - wasmJs() -} From b47943ded8eefbe52cd4904a755f180cf733e4a6 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Wed, 4 Dec 2024 20:15:19 +0800 Subject: [PATCH 18/23] Remove an obsolete comment --- buildSrc/build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 2ec3da5..74a2c1d 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -15,7 +15,6 @@ repositories { } dependencies { - // With Kotlin 2.0.20, a "Could not parse POM" build error occurs in the JVM projects of some dependent projects. implementation(kotlin("gradle-plugin", "2.1.0")) implementation("com.huanshankeji:common-gradle-dependencies:0.8.0-20241016") // don't use a snapshot version in a main branch implementation("com.huanshankeji.team:gradle-plugins:0.8.0") // don't use a snapshot version in a main branch From 038b7c85f5ee7961f196fe7a6ae9b6a556a5ea20 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Wed, 4 Dec 2024 20:56:59 +0800 Subject: [PATCH 19/23] Bump common-gradle-dependencies to v0.9.0-20241203-SNAPSHOT --- buildSrc/build.gradle.kts | 4 ++-- buildSrc/src/main/kotlin/VersionsAndDependencies.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 74a2c1d..b751cd7 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -16,7 +16,7 @@ repositories { dependencies { implementation(kotlin("gradle-plugin", "2.1.0")) - implementation("com.huanshankeji:common-gradle-dependencies:0.8.0-20241016") // don't use a snapshot version in a main branch - implementation("com.huanshankeji.team:gradle-plugins:0.8.0") // don't use a snapshot version in a main branch + implementation("com.huanshankeji:common-gradle-dependencies:0.9.0-20241203-SNAPSHOT") // TODO don't use a snapshot version in a main branch + implementation("com.huanshankeji.team:gradle-plugins:0.9.0-SNAPSHOT") // TODO don't use a snapshot version in a main branch implementation("org.jetbrains.dokka:dokka-gradle-plugin:2.0.0-Beta") } diff --git a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt index 52b06b7..fa8a769 100644 --- a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt +++ b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt @@ -4,7 +4,7 @@ import com.huanshankeji.CommonVersions val projectVersion = "0.6.1-SNAPSHOT" -val commonVersions = CommonVersions(arrow = "2.0.0-rc.1" /* for Wasm JS*/, exposed = "0.56.0") +val commonVersions = CommonVersions() val commonDependencies = CommonDependencies(commonVersions) val commonGradleClasspathDependencies = CommonGradleClasspathDependencies(commonVersions) From 2fb3d8231e319e355388343ea75740105ce842ac Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Wed, 4 Dec 2024 21:03:39 +0800 Subject: [PATCH 20/23] Fix Kotest `Arb.default` deprecations and remove an explicit type argument and some opt-ins that are no longer needed --- .../kotlin/com/huanshankeji/codec/BasicCodecsTest.kt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/core/src/commonTest/kotlin/com/huanshankeji/codec/BasicCodecsTest.kt b/core/src/commonTest/kotlin/com/huanshankeji/codec/BasicCodecsTest.kt index 0e555bd..57fc302 100644 --- a/core/src/commonTest/kotlin/com/huanshankeji/codec/BasicCodecsTest.kt +++ b/core/src/commonTest/kotlin/com/huanshankeji/codec/BasicCodecsTest.kt @@ -3,11 +3,10 @@ package com.huanshankeji.codec import io.kotest.property.Arb import io.kotest.property.Exhaustive import io.kotest.property.arbitrary.byteArray -import io.kotest.property.arbitrary.default import io.kotest.property.arbitrary.list import io.kotest.property.checkAll import io.kotest.property.exhaustive.of -import kotlinx.coroutines.ExperimentalCoroutinesApi +import io.kotest.property.resolution.default import kotlinx.coroutines.test.TestResult import kotlinx.coroutines.test.runTest import kotlin.test.Test @@ -15,7 +14,7 @@ import kotlin.test.assertContentEquals import kotlin.test.assertEquals class BasicCodecsTest { - @OptIn(ExperimentalUnsignedTypes::class, ExperimentalCoroutinesApi::class) + @OptIn(ExperimentalUnsignedTypes::class) @Test fun testConversionBetweenLongAndBigEndianBytes(): TestResult { val long = 0x0123456789ABCDEFU.toLong() @@ -23,13 +22,12 @@ class BasicCodecsTest { assertContentEquals(bytes, long.toBigEndianBytes()) assertEquals(long, bytes.bigEndianToLong()) - @OptIn(ExperimentalCoroutinesApi::class) return runTest { checkAll { assertEquals(it, it.toBigEndianBytes().bigEndianToLong()) assertEquals(it, it.toBigEndianBytes().asList().bigEndianToLong()) } - checkAll(Arb.byteArray(Exhaustive.of(8), Arb.default())) { + checkAll(Arb.byteArray(Exhaustive.of(8), Arb.default())) { assertContentEquals(it, it.bigEndianToLong().toBigEndianBytes()) } checkAll>(Arb.list(Arb.default(), 8..8)) { From 08298edefbce44cefdcd360277e075e7a92dfffa Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Thu, 5 Dec 2024 02:50:31 +0800 Subject: [PATCH 21/23] Bump our common-gradle-dependencies to v0.9.0-20241203 and our Gradle plugins to v0.9.0 --- buildSrc/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index b751cd7..4a622a5 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -16,7 +16,7 @@ repositories { dependencies { implementation(kotlin("gradle-plugin", "2.1.0")) - implementation("com.huanshankeji:common-gradle-dependencies:0.9.0-20241203-SNAPSHOT") // TODO don't use a snapshot version in a main branch - implementation("com.huanshankeji.team:gradle-plugins:0.9.0-SNAPSHOT") // TODO don't use a snapshot version in a main branch + implementation("com.huanshankeji:common-gradle-dependencies:0.9.0-20241203") // don't use a snapshot version in a main branch + implementation("com.huanshankeji.team:gradle-plugins:0.9.0") // don't use a snapshot version in a main branch implementation("org.jetbrains.dokka:dokka-gradle-plugin:2.0.0-Beta") } From 2db5602367cf3780aadbae193d7ab4c453ba95ef Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Thu, 5 Dec 2024 15:55:02 +0800 Subject: [PATCH 22/23] Add change log for v0.6.1 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21f7ffb..a08fb1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Change log +## v0.6.1 / 2024-12-05 + +* bump Kotlin to 2.1.0 and our library and build dependencies to the latest (including pre-release versions except for Vert.x 5) +* deprecate `PgPoolOptions.setUpConventionally`, which should've been included in v0.6.0 but was not + ## v0.6.0 / 2024-11-29 * add conversion functions to convert Vert.x `Buffer`s to kotlinx-io `RawSink`s and `Sink`s and Okio `Sink`s and `BufferedSink`s From b2dba3a0996e1a2f3f1d8f0cbf7d241025f9a336 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Sat, 4 Jan 2025 22:04:43 +0800 Subject: [PATCH 23/23] Update a link README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b98393c..37cd577 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Huanshankeji's common code libraries in Kotlin -These include a core library to extend the Kotlin language and its standard library, and extension libraries for various Kotlin and Java libraries such as [Λrrow](https://arrow-kt.io/), Coroutines ([docs here](https://kotlinlang.org/docs/coroutines-overview.html) and [repository here](https://github.com/Kotlin/kotlinx.coroutines)), [Exposed](https://github.com/JetBrains/Exposed), [Ktor](https://ktor.io/), [reflection](https://kotlinlang.org/docs/reflection.html), Serialization ([docs here](https://kotlinlang.org/docs/serialization.html) and [repository here](https://github.com/Kotlin/kotlinx.serialization)), [Vert.x](https://vertx.io/) (along with extensions for [kotlinx-io](https://github.com/Kotlin/kotlinx-io) and [Okio](https://square.github.io/okio/)), etc. For common extensions for Compose Multiplatform, check out [compose-multiplatform-common](https://github.com/huanshankeji/compose-multiplatform-material/tree/main/compose-multiplatform-common). +These include a core library to extend the Kotlin language and its standard library, and extension libraries for various Kotlin and Java libraries such as [Λrrow](https://arrow-kt.io/), Coroutines ([docs here](https://kotlinlang.org/docs/coroutines-overview.html) and [repository here](https://github.com/Kotlin/kotlinx.coroutines)), [Exposed](https://github.com/JetBrains/Exposed), [Ktor](https://ktor.io/), [reflection](https://kotlinlang.org/docs/reflection.html), Serialization ([docs here](https://kotlinlang.org/docs/serialization.html) and [repository here](https://github.com/Kotlin/kotlinx.serialization)), [Vert.x](https://vertx.io/) (along with extensions for [kotlinx-io](https://github.com/Kotlin/kotlinx-io) and [Okio](https://square.github.io/okio/)), etc. For common extensions for Compose Multiplatform, check out [compose-multiplatform-common](https://github.com/huanshankeji/compose-multiplatform-html-unified/tree/main/common). Currently supported targets by multiplatform libraries: JVM, JS (browser), iOS (`iosX64`, `iosArm64`, and `iosSimulatorArm64`), and Wasm JS.