Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 移除 和 mirai-api-http 冲突的 net.mamoe.yamlkt #169

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: 移除 和 mirai-api-http 冲突的 net.mamoe.yamlkt #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions buildSrc/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pluginManagement {
repositories {
maven(url = "https://mirrors.huaweicloud.com/repository/maven")
gradlePluginPortal()
}
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/Versions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import java.io.File
import java.util.concurrent.TimeUnit

object Versions {
const val projectVersion = "0.3.4"
const val projectVersion = "0.3.5"

const val miraiCoreVersion = "2.4.0"
const val miraiConsoleVersion = "2.4.0"
Expand Down
2 changes: 1 addition & 1 deletion onebot-mirai/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {
compileOnly(kotlin("serialization", Versions.kotlinVersion))
compileOnly("com.google.auto.service", "auto-service-annotations", Versions.autoService)

implementation("net.mamoe.yamlkt:yamlkt:${Versions.yamlkt}")
// implementation("net.mamoe.yamlkt:yamlkt:${Versions.yamlkt}")
implementation(kotlin("reflect", Versions.kotlinVersion))
implementation(kotlinx("serialization-cbor", Versions.kotlinSerializationVersion))
implementation(kotlinx("serialization-json", Versions.kotlinSerializationVersion))
Expand Down
4 changes: 2 additions & 2 deletions onebot-mirai/src/main/kotlin/com/github/yyuueexxiinngg/onebot/PluginSettings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
import net.mamoe.mirai.console.data.AutoSavePluginConfig
import net.mamoe.mirai.console.data.value
import net.mamoe.yamlkt.Comment
// import net.mamoe.yamlkt.Comment

object PluginSettings : AutoSavePluginConfig("settings") {
var proxy by value("")
Expand Down Expand Up @@ -44,7 +44,7 @@ object PluginSettings : AutoSavePluginConfig("settings") {
var postUrl: String = "",
var postMessageFormat: String = "string",
var secret: String = "",
@Comment("上报超时时间, 单位毫秒, 须大于0才会生效")
// @Comment("上报超时时间, 单位毫秒, 须大于0才会生效")
var timeout: Long = 0L
)

Expand Down