From b1de020938ab7c73af67e39db09d64d7f385579e Mon Sep 17 00:00:00 2001 From: ForteScarlet Date: Thu, 24 Feb 2022 21:37:54 +0800 Subject: [PATCH] release for v3.0.0.preview.4.0 --- .changelog/v3.0.0.preview.4.0.md | 21 +++++++++++++++++++ .github/workflows/publish-release.yml | 2 +- .github/workflows/publish-snapshot.yml | 2 +- .../simbot/logger/SimbotLoggerProcessor.kt | 2 +- buildSrc/src/main/kotlin/P.kt | 5 ++++- 5 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 .changelog/v3.0.0.preview.4.0.md diff --git a/.changelog/v3.0.0.preview.4.0.md b/.changelog/v3.0.0.preview.4.0.md new file mode 100644 index 000000000..4aa37eba4 --- /dev/null +++ b/.changelog/v3.0.0.preview.4.0.md @@ -0,0 +1,21 @@ + + +## simbot-logger +发布新的模块 `simbot-logger` 并作为simbot下的默认日志模块。 + +`simbot-logger` 实现 [SLF4J API](https://www.slf4j.org/), 是一个简易的异步高性能日志模块。但无法于专业的日志框架相提并论。如果你没有非常高的日志要求，可以考虑使用默认的 `simbot-logger`, 否则请考虑自行切换其他经得起考验的日志框架。 + +`simbot-logger` 默认的处理器仅为控制台输出日志，默认为 `INFO` 级别。如果你需要快捷的调整输入等级，请添加JVm运行参数 `simbot.logger.level` 指定等级, 例如 ： +``` +-Dsimbot.logger.level=DEBUG +``` + +如果你希望提供更多处理器来满足复杂需求，例如除了控制台输出以外，你还需要日志文件输出，请参考 `love.forte.simbot.logger.SimbotLoggerProcessor` 文档说明。 + + +## 组件更新 +相关组件会在后续跟进更新 +- [mirai组件](https://github.com/simple-robot/simbot-component-mirai/releases) +- [腾讯频道组件](https://github.com/simple-robot/simbot-component-tencent-guild/releases) + +## 其他日志 diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index da96a9ec3..cafd42300 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -31,7 +31,7 @@ jobs: uses: gradle/gradle-build-action@v2 with: gradle-version: 7.4 - arguments: clean build test publishToSonatype closeAndReleaseStagingRepository -DreleaseOnly -Psigning.secretKeyRingFile=ForteScarlet.gpg -Psigning.keyId=${{ secrets.SIGN_KEY_ID }} -Psigning.password=${{ secrets.SIGN_PASS }} -Psonatype.username=${{ secrets.OSS_USERNAME }} -Psonatype.password=${{ secrets.OSS_PASSWORD }} -Porg.gradle.jvmargs="org.gradle.jvmargs=-Xmx4G -Xms4G -XX:MaxMetaspaceSize=512m -Dfile.encoding=UT-8" -Porg.gradle.workers.max=16 -Porg.gradle.parallel=true + arguments: clean build test publishToSonatype closeAndReleaseStagingRepository -DisSnapshot=false -DreleaseOnly -Psigning.secretKeyRingFile=ForteScarlet.gpg -Psigning.keyId=${{ secrets.SIGN_KEY_ID }} -Psigning.password=${{ secrets.SIGN_PASS }} -Psonatype.username=${{ secrets.OSS_USERNAME }} -Psonatype.password=${{ secrets.OSS_PASSWORD }} -Porg.gradle.jvmargs="org.gradle.jvmargs=-Xmx4G -Xms4G -XX:MaxMetaspaceSize=512m -Dfile.encoding=UT-8" -Porg.gradle.workers.max=16 -Porg.gradle.parallel=true create-release: name: Create release diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index 364ce9e81..123a7c590 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -34,7 +34,7 @@ jobs: uses: gradle/gradle-build-action@v2 with: gradle-version: 7.4 - arguments: clean build test publishToSonatype closeAndReleaseStagingRepository -DsnapshotOnly -Psigning.secretKeyRingFile=ForteScarlet.gpg -Psigning.keyId=${{ secrets.SIGN_KEY_ID }} -Psigning.password=${{ secrets.SIGN_PASS }} -Psonatype.username=${{ secrets.OSS_USERNAME }} -Psonatype.password=${{ secrets.OSS_PASSWORD }} -Porg.gradle.jvmargs="org.gradle.jvmargs=-Xmx4G -Xms4G -XX:MaxMetaspaceSize=512m -Dfile.encoding=UT-8" -Porg.gradle.workers.max=16 -Porg.gradle.parallel=true + arguments: clean build test publishToSonatype closeAndReleaseStagingRepository -DisSnapshot=true -DsnapshotOnly -Psigning.secretKeyRingFile=ForteScarlet.gpg -Psigning.keyId=${{ secrets.SIGN_KEY_ID }} -Psigning.password=${{ secrets.SIGN_PASS }} -Psonatype.username=${{ secrets.OSS_USERNAME }} -Psonatype.password=${{ secrets.OSS_PASSWORD }} -Porg.gradle.jvmargs="org.gradle.jvmargs=-Xmx4G -Xms4G -XX:MaxMetaspaceSize=512m -Dfile.encoding=UT-8" -Porg.gradle.workers.max=16 -Porg.gradle.parallel=true diff --git a/apis/simbot-logger/src/main/kotlin/love/forte/simbot/logger/SimbotLoggerProcessor.kt b/apis/simbot-logger/src/main/kotlin/love/forte/simbot/logger/SimbotLoggerProcessor.kt index 883342deb..1fd50d7b1 100644 --- a/apis/simbot-logger/src/main/kotlin/love/forte/simbot/logger/SimbotLoggerProcessor.kt +++ b/apis/simbot-logger/src/main/kotlin/love/forte/simbot/logger/SimbotLoggerProcessor.kt @@ -39,7 +39,7 @@ public interface SimbotLoggerProcessor { } /** - * [SimbotLoggerProcessor] 的工厂接口， 通过 `Java Service Loader` 进行加载。 + * [SimbotLoggerProcessor] 的工厂接口， 通过 `Java Service Loader` ([java.util.ServiceLoader]) 进行加载。 */ public interface SimbotLoggerProcessorsFactory { public fun getProcessors(): List diff --git a/buildSrc/src/main/kotlin/P.kt b/buildSrc/src/main/kotlin/P.kt index 63fd24449..ddc9e235c 100644 --- a/buildSrc/src/main/kotlin/P.kt +++ b/buildSrc/src/main/kotlin/P.kt @@ -28,7 +28,10 @@ abstract class SimbotProject { sealed class P : SimbotProject() { @Suppress("MemberVisibilityCanBePrivate") object Simbot { - const val SNAPSHOT = true + init { + println("System.getProperty(\"isSnapshot\"): ${System.getProperty("isSnapshot")}") + } + val SNAPSHOT = System.getProperty("isSnapshot")?.equals("true", true) ?: false const val GROUP = "love.forte.simbot" const val BOOT_GROUP = "love.forte.simbot.boot" private const val REAL_VERSION = "3.0.0.preview.4.0"