Skip to content

Commit 29fd888

Browse files
ForteScarletForteScarlet
authored
Merge pull request #484 from simple-robot/v3.0.0-beta-dev
Release: v3.0.0-M1
2 parents 5b367ab + 7ecbdff commit 29fd888

File tree

4 files changed

+84
-169
lines changed

4 files changed

+84
-169
lines changed

‎.changelog/v3.0.0-M1.md

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<details>
2+
<summary><b>仓库参考</b></summary>
3+
4+
| **模块** | **search.maven** |
5+
|---------|------------------|
6+
| simbot-logger | [v3.0.0-M1](https://search.maven.org/artifact/love.forte.simbot/simbot-logger/3.0.0-M1/jar) |
7+
| simbot-logger-jvm | [v3.0.0-M1](https://search.maven.org/artifact/love.forte.simbot/simbot-logger-jvm/3.0.0-M1/jar) |
8+
| simbot-logger-js | [v3.0.0-M1](https://search.maven.org/artifact/love.forte.simbot/simbot-logger-js/3.0.0-M1/jar) |
9+
| simbot-api | [v3.0.0-M1](https://search.maven.org/artifact/love.forte.simbot/simbot-api/3.0.0-M1/jar) |
10+
| simbot-core | [v3.0.0-M1](https://search.maven.org/artifact/love.forte.simbot/simbot-core/3.0.0-M1/jar) |
11+
| simboot-api | [v3.0.0-M1](https://search.maven.org/artifact/love.forte.simbot.boot/simboot-api/3.0.0-M1/jar) |
12+
| simboot-core | [v3.0.0-M1](https://search.maven.org/artifact/love.forte.simbot.boot/simboot-core/3.0.0-M1/jar) |
13+
| simboot-core-annotation | [v3.0.0-M1](https://search.maven.org/artifact/love.forte.simbot.boot/simboot-core-annotation/3.0.0-M1/jar) |
14+
| simboot-core-spring-boot-starter | [v3.0.0-M1](https://search.maven.org/artifact/love.forte.simbot.boot/simboot-core-spring-boot-starter/3.0.0-M1/jar) |
15+
16+
</details>
17+
18+
期间暂无相关反馈，发布 `v3.0.0` 第一个预发布里程碑版本。将会开始逐步完善文档内容。

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ sealed class P(override val group: String) : ProjectDetail() {
7676
init {
7777
val mainVersion = version(3, 0, 0)
7878
//
79-
var status = version("beta", 3)
79+
var status = version("M1")
8080
versionWithoutSnapshot = mainVersion - status.copy()
8181
if (isSnapshot()) {
8282
status = status - Version.SNAPSHOT

‎buildSrc/src/main/kotlin/simbot.changelog-generator.gradle.kts

+23-105
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022 ForteScarlet <[email protected]>
2+
* Copyright (c) 2022-2022 ForteScarlet <[email protected]>
33
*
44
* 本文件是 simply-robot (或称 simple-robot 3.x 、simbot 3.x ) 的一部分。
55
*
@@ -56,14 +56,12 @@ tasks.create("createChangelog") {
5656
file.createNewFile()
5757

5858
val autoGenerateText = buildString {
59-
appendLine("**仓库参考:**").appendLine()
60-
6159
appendLine("<details>")
6260
appendLine("<summary><b>仓库参考</b></summary>")
6361
appendLine()
6462

65-
appendLine("| **模块** | **repo1.maven** | **search.maven** |")
66-
appendLine("|---------|-----------------|------------------|")
63+
appendLine("| **模块** | **search.maven** |")
64+
appendLine("|---------|------------------|")
6765
repoRowMulti(simbotLoggerKotlin, "simbot-logger", "love.forte.simbot", "simbot-logger", realVersion)
6866
repoRow("simbot-api", "love.forte.simbot", "simbot-api", realVersion)
6967
repoRow("simbot-core", "love.forte.simbot", "simbot-core", realVersion)
@@ -76,127 +74,47 @@ tasks.create("createChangelog") {
7674
appendLine("</details>")
7775
}
7876

79-
// val autoGenerateText0 = """
80-
// **仓库参考:**
81-
//
82-
// | **模块** | **repo1.maven** | **search.maven** |
83-
// |---------|-----------------|------------------|
84-
// ${repoRow("simbot-api", "love.forte.simbot", "simbot-api", realVersion)}
85-
// ${repoRow("simbot-core", "love.forte.simbot", "simbot-core", realVersion)}
86-
// ${repoRow("simbot-logger-jvm", "love.forte.simbot", "simbot-logger-jvm", realVersion)}
87-
// ${repoRow("simbot-logger-js", "love.forte.simbot", "simbot-logger-js", realVersion)}
88-
// ${repoRow("simbot-logger-macosx64", "love.forte.simbot", "simbot-logger-macosx64", realVersion)}
89-
// ${repoRow("simbot-logger-linuxx64", "love.forte.simbot", "simbot-logger-linuxx64", realVersion)}
90-
// ${repoRow("simbot-logger-mingwx64", "love.forte.simbot", "simbot-logger-mingwx64", realVersion)}
91-
// ${repoRow("simboot-api", "love.forte.simbot.boot", "simboot-api", realVersion)}
92-
// ${repoRow("simboot-core", "love.forte.simbot.boot", "simboot-core", realVersion)}
93-
// ${repoRow("simboot-core-annotation", "love.forte.simbot.boot", "simboot-core-annotation", realVersion)}
94-
// ${
95-
// repoRow(
96-
// "simboot-core-spring-boot-starter",
97-
// "love.forte.simbot.boot",
98-
// "simboot-core-spring-boot-starter",
99-
// realVersion
100-
// )
101-
// }
102-
//
103-
//
104-
//
105-
//
106-
// """.trimIndent()
107-
108-
10977
file.writeText(autoGenerateText)
11078
}
111-
112-
/*
113-
**仓库参考:**
114-
115-
* [simbot-api: $version](https://repo1.maven.org/maven2/love/forte/simbot/simbot-api/$realVersion)
116-
* [simbot-core: $version](https://repo1.maven.org/maven2/love/forte/simbot/simbot-core/$realVersion)
117-
* [simbot-logger: $version](https://repo1.maven.org/maven2/love/forte/simbot/simbot-logger/$realVersion)
118-
* [simboot-api: $version](https://repo1.maven.org/maven2/love/forte/simbot/boot/simboot-api/$realVersion)
119-
* [simboot-core: $version](https://repo1.maven.org/maven2/love/forte/simbot/boot/simboot-core/$realVersion)
120-
* [simboot-core-annotation: $version](https://repo1.maven.org/maven2/love/forte/simbot/boot/simboot-core-annotation/$realVersion)
121-
* [simboot-core-spring-boot-starter: $version](https://repo1.maven.org/maven2/love/forte/simbot/boot/simboot-core-spring-boot-starter/$realVersion)
122-
123-
*/
124-
125-
// ## 组件更新
126-
// 相关组件会在后续三日内跟进更新
127-
// - [mirai组件](https://github.com/simple-robot/simbot-component-mirai/releases)
128-
// - [腾讯频道组件](https://github.com/simple-robot/simbot-component-tencent-guild/releases)
129-
// - [开黑啦组件](https://github.com/simple-robot/simbot-component-kaiheila/releases)
130-
13179
}
13280
}
13381

134-
// fun repoRow(moduleName: String, group: String, id: String, version: String): String {
135-
// return "| $moduleName | [$moduleName: v$version](https://repo1.maven.org/maven2/${
136-
// group.replace(
137-
// ".",
138-
// "/"
139-
// )
140-
// }/${
141-
// id.replace(
142-
// ".",
143-
// "/"
144-
// )
145-
// }/$version) | [$moduleName: v$version](https://search.maven.org/artifact/$group/$id/$version/jar) |"
146-
// }
147-
//
148-
// fun repoRowMulti(
149-
// kotlin: KotlinMultiplatformExtension,
150-
// moduleName: String,
151-
// group: String,
152-
// id: String,
153-
// version: String,
154-
// ): String {
155-
// kotlin.targets.forEach {
156-
// println("simbot-logger target: $it")
157-
// }
158-
//
159-
// return repoRow(moduleName, group, id, version)
160-
// }
16182

16283

16384
fun StringBuilder.repoRow(moduleName: String, group: String, id: String, version: String) {
164-
append("| ").append(moduleName).append(" | [").append(moduleName).append(": v").append(version)
165-
append("](https://repo1.maven.org/maven2/")
166-
append(group.replace(".", "/"))
167-
append('/')
168-
append(id.replace(".", "/"))
169-
append('/')
170-
append(version)
171-
append(") | [")
172-
append(moduleName).append(": v").append(version)
85+
append("| ").append(moduleName)
86+
append(" | [")
87+
append("v").append(version)
17388
append("](https://search.maven.org/artifact/")
17489
append(group).append("/").append(id).append("/").append(version).append("/jar) |")
17590
appendLine()
176-
// "| $moduleName | [$moduleName: v$version](https://repo1.maven.org/maven2/${
177-
// group.replace(
178-
// ".",
179-
// "/"
180-
// )
181-
// }/${
182-
// id.replace(
183-
// ".",
184-
// "/"
185-
// )
186-
// }/$version) | [$moduleName: v$version](https://search.maven.org/artifact/$group/$id/$version/jar) |"
18791
}
18892

93+
private val multiPlatformType = setOf(
94+
KotlinPlatformType.common,
95+
KotlinPlatformType.jvm,
96+
KotlinPlatformType.js,
97+
)
98+
18999
fun StringBuilder.repoRowMulti(
190100
kotlin: KotlinMultiplatformExtension,
191101
moduleName: String,
192102
group: String,
193103
id: String,
194104
version: String,
195105
) {
196-
kotlin.targets.forEach {
197-
if (it.platformType != KotlinPlatformType.common) {
198-
repoRow("$moduleName-${it.targetName}", group, "$id-${it.targetName.toLowerCase()}", version)
106+
kotlin.targets.filter {
107+
it.platformType in multiPlatformType
108+
}.sortedBy {
109+
it.platformType
110+
}.forEach {
111+
when (it.platformType) {
112+
KotlinPlatformType.common ->
113+
repoRow("$moduleName", group, id, version)
114+
else ->
115+
repoRow("$moduleName-${it.targetName}", group, "$id-${it.targetName.toLowerCase()}", version)
199116
}
117+
200118
}
201119

202120
}

‎simbot-apis/simbot-api/src/main/kotlin/love/forte/simbot/LoggerFactories.kt

+42-63
Original file line numberDiff line numberDiff line change
@@ -20,71 +20,50 @@
2020

2121
package love.forte.simbot
2222

23-
24-
// /**
25-
// * api模块下使用的 i18n内容。
26-
// * TODO
27-
// */
28-
// internal val
29-
// @receiver:PropertyKey(resourceBundle = "lang.api-message")
30-
// String.i18n: String
31-
// get() = I18n[this]
32-
33-
// TODO
34-
//
35-
// internal object I18n {
36-
// private val resourceBundle = ResourceBundle.getBundle("lang/api-message")
37-
// operator fun get(
38-
// @PropertyKey(
39-
// resourceBundle = "lang.api-message"
40-
// )
41-
// key: String,
42-
// ): String = resourceBundle.getString(key)
43-
//
44-
// val keys: Iterator<String> get() = resourceBundle.keys.iterator()
45-
// val locale: String get() = resourceBundle.locale.displayName
46-
// }
47-
23+
import love.forte.simbot.logger.Logger
24+
import love.forte.simbot.logger.logger
25+
import kotlin.reflect.KClass
4826

4927
/**
5028
* 日志工厂, 用于得到一个日志实例.
5129
* @author ForteScarlet
5230
*/
53-
// public object LoggerFactory {
54-
//
55-
// /**
56-
// * 根据名称得到一个 [Logger].
57-
// *
58-
// * @see LoggerFactory.getLogger
59-
// */
60-
// @JvmStatic
61-
// public fun getLogger(name: String): Logger = LoggerFactory.getLogger(name)
62-
//
63-
// /**
64-
// * 根据 [KClass]（的全限定名称）构建一个 [Logger].
65-
// *
66-
// */
67-
// @JvmStatic
68-
// public fun getLogger(type: KClass<*>): Logger =
69-
// kotlin.runCatching { getLogger(type.java) }.getOrElse {
70-
// kotlin.runCatching { getLogger(type.qualifiedName ?: type.simpleName ?: type.toString()) }.getOrElse {
71-
// getLogger(type.toString())
72-
// }
73-
// }
74-
//
75-
// /**
76-
// * 根据 [T]（的全限定名称）构建一个 [Logger].
77-
// *
78-
// */
79-
// public inline fun <reified T : Any> getLogger(): Logger = getLogger(T::class)
80-
//
81-
//
82-
// /**
83-
// * 根据 [Class] 构建一个 [Logger].
84-
// *
85-
// * @see LoggerFactory.getLogger
86-
// */
87-
// @JvmStatic
88-
// public fun getLogger(type: Class<*>): Logger = LoggerFactory.getLogger(type)
89-
//
90-
// }
31+
@Deprecated(
32+
"Use love.forte.simbot.logger.LoggerFactory",
33+
ReplaceWith("love.forte.simbot.logger.LoggerFactory"),
34+
DeprecationLevel.ERROR
35+
)
36+
public object LoggerFactory {
37+
38+
/**
39+
* 根据名称得到一个 [Logger].
40+
*
41+
* @see LoggerFactory.getLogger
42+
*/
43+
@JvmStatic
44+
public fun getLogger(name: String): Logger = love.forte.simbot.logger.LoggerFactory.getLogger(name)
45+
46+
/**
47+
* 根据 [KClass]（的全限定名称）构建一个 [Logger].
48+
*
49+
*/
50+
@JvmStatic
51+
public fun getLogger(type: KClass<*>): Logger =
52+
love.forte.simbot.logger.LoggerFactory.getLogger(type)
53+
54+
/**
55+
* 根据 [T]（的全限定名称）构建一个 [Logger].
56+
*
57+
*/
58+
public inline fun <reified T : Any> getLogger(): Logger = love.forte.simbot.logger.LoggerFactory.logger<T>()
59+
60+
61+
/**
62+
* 根据 [Class] 构建一个 [Logger].
63+
*
64+
* @see LoggerFactory.getLogger
65+
*/
66+
@JvmStatic
67+
public fun getLogger(type: Class<*>): Logger = love.forte.simbot.logger.LoggerFactory.getLogger(type)
68+
69+
}

0 commit comments

Comments
 (0)