mirai: migrate to console 1.0-RC-dev-29

iTXTech · Sep 28, 2020 · 5f5c936 · 5f5c936
1 parent cbeb3f5
commit 5f5c936
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -20,16 +20,16 @@ kotlin {
 }
 
 repositories {
-    maven("https://mirrors.huaweicloud.com/repository/maven")
+    maven("https://maven.aliyun.com/repository/public")
     maven("https://dl.bintray.com/him188moe/mirai")
     maven("https://dl.bintray.com/kotlin/kotlin-eap")
 }
 
 dependencies {
     api("org.jetbrains.kotlinx:atomicfu:0.14.4")
 
-    implementation("net.mamoe:mirai-core:1.3.0")
-    implementation("net.mamoe:mirai-console:1.0-M4")
+    implementation("net.mamoe:mirai-core:1.3.1")
+    implementation("net.mamoe:mirai-console:1.0-RC-dev-29")
 }
 
 tasks.named<Jar>("jar") {
@@ -45,8 +45,8 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
 }
 
 bintray {
-    user = property("buser") as String?
-    key = property("bkey") as String?
+    user = findProperty("buser") as String?
+    key = findProperty("bkey") as String?
     setPublications("mavenJava")
     setConfigurations("archives")
     pkg.apply {

diff --git a/src/main/kotlin/org/itxtech/mirainative/MiraiNative.kt b/src/main/kotlin/org/itxtech/mirainative/MiraiNative.kt
@@ -191,7 +191,7 @@ object MiraiNative : KotlinPlugin(
     fun launchEvent(b: suspend CoroutineScope.() -> Unit) = launch(context = eventDispatcher, block = b)
 
     fun getVersion(): String {
-        var version = description.version.value
+        var version = description.version.toString()
         val mf = javaClass.classLoader.getResources("META-INF/MANIFEST.MF")
         while (mf.hasMoreElements()) {
             val manifest = Manifest(mf.nextElement().openStream())

diff --git a/src/main/kotlin/org/itxtech/mirainative/manager/PluginManager.kt b/src/main/kotlin/org/itxtech/mirainative/manager/PluginManager.kt
@@ -31,6 +31,7 @@ import kotlinx.serialization.json.Json
 import net.mamoe.mirai.console.command.CommandManager.INSTANCE.register
 import net.mamoe.mirai.console.command.CommandSender
 import net.mamoe.mirai.console.command.CompositeCommand
+import net.mamoe.mirai.console.util.ConsoleExperimentalApi
 import org.itxtech.mirainative.Bridge
 import org.itxtech.mirainative.MiraiNative
 import org.itxtech.mirainative.bridge.NativeBridge
@@ -205,6 +206,7 @@ object PluginManager {
         }
     }
 
+    @OptIn(ConsoleExperimentalApi::class)
     object NpmCommand : CompositeCommand(
         MiraiNative, "npm",
         description = "Mirai Native 插件管理器"