Merge pull request #147 from simple-robot/dev/upgrade_mirai

更新 mirai 到 v2.15.0
simple-robot · Jul 11, 2023 · d542c4c · d542c4c
2 parents af63ad5 + 666f51c
commit d542c4c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/buildSrc/src/main/kotlin/P.kt b/buildSrc/src/main/kotlin/P.kt
@@ -17,7 +17,7 @@ import love.forte.gradle.common.core.project.Version
 import love.forte.gradle.common.core.project.minus
 import love.forte.gradle.common.core.project.version
 
-val simbotVersionInfo = version(3, 1, 0)
+val simbotVersionInfo = version(3, 2, 0)
 
 @JvmField
 val SIMBOT_VERSION = simbotVersionInfo.toString()
@@ -40,11 +40,12 @@ sealed class P {
                 major = "${simbotVersionInfo.major}.${simbotVersionInfo.minor}",
                 0, 0
             )
-            val status = version("M8")
-            versionWithoutSnapshot = mainVersion - status
-
-            val mainStatus = if (isSnapshot()) (status - Version.SNAPSHOT) else status
-            version = mainVersion - mainStatus
+//            val status = version("M8")
+//            versionWithoutSnapshot = mainVersion - status
+            versionWithoutSnapshot = mainVersion
+            version = if (isSnapshot()) (mainVersion - Version.SNAPSHOT) else mainVersion
+//            val mainStatus = if (isSnapshot()) (status - Version.SNAPSHOT) else status
+//            version = mainVersion - mainStatus
         }
 
         const val GROUP = "love.forte.simbot.component"

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -7,7 +7,7 @@ openjdk-jmh = "1.35"
 [libraries]
 
 # mirai
-mirai = "net.mamoe:mirai-core-jvm:2.15.0-RC"
+mirai = "net.mamoe:mirai-core-jvm:2.15.0"
 
 # kotlinx-serialization
 kotlinx-serialization-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version.ref = "kotlinx-serialization" }