From 30e372e6c272a9c77b544ffffa89eceec3b09e9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Oct 2024 06:22:47 +0000 Subject: [PATCH 1/3] build(deps): bump kotlinPoet from 1.18.1 to 2.0.0 Bumps `kotlinPoet` from 1.18.1 to 2.0.0. Updates `com.squareup:kotlinpoet` from 1.18.1 to 2.0.0 - [Release notes](https://github.com/square/kotlinpoet/releases) - [Changelog](https://github.com/square/kotlinpoet/blob/main/docs/changelog.md) - [Commits](https://github.com/square/kotlinpoet/compare/1.18.1...2.0.0) Updates `com.squareup:kotlinpoet-ksp` from 1.18.1 to 2.0.0 - [Release notes](https://github.com/square/kotlinpoet/releases) - [Changelog](https://github.com/square/kotlinpoet/blob/main/docs/changelog.md) - [Commits](https://github.com/square/kotlinpoet/compare/1.18.1...2.0.0) --- updated-dependencies: - dependency-name: com.squareup:kotlinpoet dependency-type: direct:production update-type: version-update:semver-major - dependency-name: com.squareup:kotlinpoet-ksp dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 66efe1b..c7d6da6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ gradleCommon = "0.6.0" # ksp ksp = "2.0.20-1.0.25" # https://square.github.io/kotlinpoet/ -kotlinPoet = "1.18.1" +kotlinPoet = "2.0.0" # https://mockk.io/ mockk = "1.13.13" # https://detekt.dev/docs/intro From d14717e23d741b56cb95a2d5f6ccb8fb961618f2 Mon Sep 17 00:00:00 2001 From: ForteScarlet Date: Thu, 31 Oct 2024 15:13:28 +0800 Subject: [PATCH 2/3] Upgrade simbot from 4.6.0 to 4.7.0 and add kotlinx-io to libs.versions --- .changelog/v1.0.0-RC.md | 11 ----------- .changelog/v1.0.0.md | 7 ------- .changelog/v1.0.1.md | 7 ------- .changelog/v1.1.0.md | 7 ------- .changelog/v1.3.0.md | 7 ------- .changelog/v1.4.0.md | 7 ------- .changelog/v1.4.1.md | 7 ------- .changelog/v1.4.2.md | 7 ------- gradle/libs.versions.toml | 6 +++++- 9 files changed, 5 insertions(+), 61 deletions(-) delete mode 100644 .changelog/v1.0.0-RC.md delete mode 100644 .changelog/v1.0.0.md delete mode 100644 .changelog/v1.0.1.md delete mode 100644 .changelog/v1.1.0.md delete mode 100644 .changelog/v1.3.0.md delete mode 100644 .changelog/v1.4.0.md delete mode 100644 .changelog/v1.4.1.md delete mode 100644 .changelog/v1.4.2.md diff --git a/.changelog/v1.0.0-RC.md b/.changelog/v1.0.0-RC.md deleted file mode 100644 index efbd19b..0000000 --- a/.changelog/v1.0.0-RC.md +++ /dev/null @@ -1,11 +0,0 @@ -> 对应核心版本: [**v4.1.0**](https://github.com/simple-robot/simpler-robot/releases/tag/v4.1.0) - - -我们欢迎并期望着您的的[反馈](https://github.com/simple-robot/simbot-component-onebot/issues)或[协助](https://github.com/simple-robot/simbot-component-onebot/pulls)， -感谢您的贡献与支持！ - -也欢迎您为我们献上一颗 `star`，这是对我们最大的鼓励与认可！ - -> [!note] -> 这是一个RC版本。由于之前内部的打包、发布配置进行过一次较大的变动，因此使用此版本先对版本的发布流程进行一次验证。 -> 如果流程无误、且没有其他问题、BUG反馈，则后续会跟进 `v1.0.0` 的发布。 diff --git a/.changelog/v1.0.0.md b/.changelog/v1.0.0.md deleted file mode 100644 index edbb24f..0000000 --- a/.changelog/v1.0.0.md +++ /dev/null @@ -1,7 +0,0 @@ -> 对应核心版本: [**v4.1.0**](https://github.com/simple-robot/simpler-robot/releases/tag/v4.1.0) - - -我们欢迎并期望着您的的[反馈](https://github.com/simple-robot/simbot-component-onebot/issues)或[协助](https://github.com/simple-robot/simbot-component-onebot/pulls)， -感谢您的贡献与支持！ - -也欢迎您为我们献上一颗 `star`，这是对我们最大的鼓励与认可！ diff --git a/.changelog/v1.0.1.md b/.changelog/v1.0.1.md deleted file mode 100644 index edbb24f..0000000 --- a/.changelog/v1.0.1.md +++ /dev/null @@ -1,7 +0,0 @@ -> 对应核心版本: [**v4.1.0**](https://github.com/simple-robot/simpler-robot/releases/tag/v4.1.0) - - -我们欢迎并期望着您的的[反馈](https://github.com/simple-robot/simbot-component-onebot/issues)或[协助](https://github.com/simple-robot/simbot-component-onebot/pulls)， -感谢您的贡献与支持！ - -也欢迎您为我们献上一颗 `star`，这是对我们最大的鼓励与认可！ diff --git a/.changelog/v1.1.0.md b/.changelog/v1.1.0.md deleted file mode 100644 index edbb24f..0000000 --- a/.changelog/v1.1.0.md +++ /dev/null @@ -1,7 +0,0 @@ -> 对应核心版本: [**v4.1.0**](https://github.com/simple-robot/simpler-robot/releases/tag/v4.1.0) - - -我们欢迎并期望着您的的[反馈](https://github.com/simple-robot/simbot-component-onebot/issues)或[协助](https://github.com/simple-robot/simbot-component-onebot/pulls)， -感谢您的贡献与支持！ - -也欢迎您为我们献上一颗 `star`，这是对我们最大的鼓励与认可！ diff --git a/.changelog/v1.3.0.md b/.changelog/v1.3.0.md deleted file mode 100644 index c397d83..0000000 --- a/.changelog/v1.3.0.md +++ /dev/null @@ -1,7 +0,0 @@ -> 对应核心版本: [**v4.6.0**](https://github.com/simple-robot/simpler-robot/releases/tag/v4.6.0) - - -我们欢迎并期望着您的的[反馈](https://github.com/simple-robot/simbot-component-onebot/issues)或[协助](https://github.com/simple-robot/simbot-component-onebot/pulls)， -感谢您的贡献与支持！ - -也欢迎您为我们献上一颗 `star`，这是对我们最大的鼓励与认可！ diff --git a/.changelog/v1.4.0.md b/.changelog/v1.4.0.md deleted file mode 100644 index c397d83..0000000 --- a/.changelog/v1.4.0.md +++ /dev/null @@ -1,7 +0,0 @@ -> 对应核心版本: [**v4.6.0**](https://github.com/simple-robot/simpler-robot/releases/tag/v4.6.0) - - -我们欢迎并期望着您的的[反馈](https://github.com/simple-robot/simbot-component-onebot/issues)或[协助](https://github.com/simple-robot/simbot-component-onebot/pulls)， -感谢您的贡献与支持！ - -也欢迎您为我们献上一颗 `star`，这是对我们最大的鼓励与认可！ diff --git a/.changelog/v1.4.1.md b/.changelog/v1.4.1.md deleted file mode 100644 index c397d83..0000000 --- a/.changelog/v1.4.1.md +++ /dev/null @@ -1,7 +0,0 @@ -> 对应核心版本: [**v4.6.0**](https://github.com/simple-robot/simpler-robot/releases/tag/v4.6.0) - - -我们欢迎并期望着您的的[反馈](https://github.com/simple-robot/simbot-component-onebot/issues)或[协助](https://github.com/simple-robot/simbot-component-onebot/pulls)， -感谢您的贡献与支持！ - -也欢迎您为我们献上一颗 `star`，这是对我们最大的鼓励与认可！ diff --git a/.changelog/v1.4.2.md b/.changelog/v1.4.2.md deleted file mode 100644 index c397d83..0000000 --- a/.changelog/v1.4.2.md +++ /dev/null @@ -1,7 +0,0 @@ -> 对应核心版本: [**v4.6.0**](https://github.com/simple-robot/simpler-robot/releases/tag/v4.6.0) - - -我们欢迎并期望着您的的[反馈](https://github.com/simple-robot/simbot-component-onebot/issues)或[协助](https://github.com/simple-robot/simbot-component-onebot/pulls)， -感谢您的贡献与支持！ - -也欢迎您为我们献上一颗 `star`，这是对我们最大的鼓励与认可！ diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c7d6da6..10e1924 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,12 +2,13 @@ kotlin = "2.0.20" kotlinx-coroutines = "1.9.0" kotlinx-serialization = "1.7.3" +kotlinx-io = "0.5.4" dokka = "1.9.20" ktor = "2.3.12" openjdk-jmh = "1.37" log4j = "2.24.1" # simbot -simbot = "4.6.1" +simbot = "4.7.0" suspendTransform = "2.0.20-0.9.3" gradleCommon = "0.6.0" # ksp @@ -49,6 +50,9 @@ kotlinx-coroutines-reactor = { group = "org.jetbrains.kotlinx", name = "kotlinx- kotlinx-serialization-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version.ref = "kotlinx-serialization" } kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization" } +# kotlinx-io +kotlinx-io-core = { module = "org.jetbrains.kotlinx:kotlinx-io-core", version.ref = "kotlinx-io" } + # ktor ktor-serialization-kotlinxJson = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" } From 9da67c8d1f2496660d92a12e2d2d6fb06a283689 Mon Sep 17 00:00:00 2001 From: ForteScarlet Date: Thu, 31 Oct 2024 17:25:58 +0800 Subject: [PATCH 3/3] release: v1.4.4 --- buildSrc/src/main/kotlin/P.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/P.kt b/buildSrc/src/main/kotlin/P.kt index a79395f..df59d28 100644 --- a/buildSrc/src/main/kotlin/P.kt +++ b/buildSrc/src/main/kotlin/P.kt @@ -37,8 +37,8 @@ object P { override val description: String get() = DESCRIPTION override val homepage: String get() = HOMEPAGE - const val VERSION = "1.4.3" - const val NEXT_VERSION = "1.4.4" + const val VERSION = "1.4.4" + const val NEXT_VERSION = "1.4.5" override val snapshotVersion = "$NEXT_VERSION-SNAPSHOT" override val version = if (isSnapshot()) snapshotVersion else VERSION