fix Vcs

build.gradle

@@ -11,8 +11,8 @@ buildscript {
 
     dependencies {
         classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
-        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:1.4-M1"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4-M1"
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' // don't use any other.
     }
 }

buildSrc/src/main/kotlin/versions.kt

@@ -11,9 +11,10 @@ import org.gradle.kotlin.dsl.DependencyHandlerScope
 
 object Versions {
     object Mirai {
-        const val core = "0.30.0"
-        const val console = "0.3.6"
-        const val consoleWrapper = "0.1.3"
+        const val core = "0.31.0"
+        const val console = "0.3.7"
+        const val consoleGraphical = "0.0.2"
+        const val consoleWrapper = "0.2.0"
     }
 
     object Kotlin {

gradle.properties

@@ -1,22 +1,2 @@
 # style guide
 kotlin.code.style=official
-# config
-miraiVersion=0.31.0
-miraiConsoleVersion=0.3.8
-miraiConsoleWrapperVersion=0.1.4
-miraiConsoleGraphicalVersion = 0.0.2
-kotlin.incremental.multiplatform=true
-kotlin.parallel.tasks.in.project=true
-# kotlin
-kotlinVersion=1.4-M1
-# kotlin libraries
-serializationVersion=0.20.0-1.4-M1
-coroutinesVersion=1.3.5-1.4-M1
-atomicFuVersion=0.14.2-1.4-M1
-kotlinXIoVersion=0.1.16
-coroutinesIoVersion=0.1.16
-# utility
-ktorVersion=1.3.2-1.4-M1
-klockVersion=1.7.0
-# gradle plugin
-protobufJavaVersion=3.10.0

mirai-console-graphical/build.gradle.kts

@@ -18,7 +18,6 @@ javafx {
 
 apply(plugin = "com.github.johnrengelman.shadow")
 
-version = Versions.Mirai.console
 
 /*
 tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>() {
@@ -28,8 +27,7 @@ tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>() {
 }
  */
 
-val miraiConsoleGraphicalVersion: String by project.ext
-version = miraiConsoleGraphicalVersion
+version = Versions.Mirai.console
 
 description = "Console Graphical Version with plugin support for mirai"
 bintray {
@@ -67,7 +65,7 @@ fun kotlinx(id: String, version: String) = "org.jetbrains.kotlinx:kotlinx-$id:$v
 
 fun ktor(id: String, version: String) = "io.ktor:ktor-$id:$version"
 
-val miraiVersion: String by rootProject.ext
+val miraiVersion = Versions.Mirai.core
 
 dependencies {
     implementation("net.mamoe:mirai-core-jvm:$miraiVersion")
@@ -91,6 +89,7 @@ val sourcesJar by tasks.registering(Jar::class) {
     from(sourceSets.main.get().allSource)
 }
 
+
 publishing {
     /*
     repositories {
@@ -105,7 +104,7 @@ publishing {
 
             groupId = rootProject.group.toString()
             artifactId = "mirai-console-graphical"
-            version = miraiConsoleGraphicalVersion
+            version = Versions.Mirai.consoleGraphical
 
             pom.withXml {
                 val root = asNode()

mirai-console-terminal/build.gradle.kts

@@ -31,7 +31,7 @@ fun kotlinx(id: String, version: String) = "org.jetbrains.kotlinx:kotlinx-$id:$v
 fun ktor(id: String, version: String) = "io.ktor:ktor-$id:$version"
 
 
-val miraiVersion: String by rootProject.ext
+val miraiVersion =  Versions.Mirai.core
 
 dependencies {
     implementation("net.mamoe:mirai-core-jvm:$miraiVersion")

mirai-console-wrapper/src/main/kotlin/net/mamoe/mirai/console/wrapper/ConsoleUpdater.kt

@@ -38,7 +38,14 @@ internal object ConsoleUpdater {
                 if (file.name.contains("mirai-console")) {
                     when (consoleType) {
                         CONSOLE_PURE -> {
-                            return file
+                            if(!file.name.contains("graphical")) {
+                                return file
+                            }
+                        }
+                        CONSOLE_GRAPHICAL -> {
+                            if(file.name.contains("graphical")) {
+                                return file
+                            }
                         }
                     }
                 }
@@ -108,7 +115,7 @@ internal object ConsoleUpdater {
         return if (consoleType == CONSOLE_PURE) {
             "mirai-console"
         } else {
-            "mirai-console-$consoleType"
+            "mirai-console-${consoleType.toLowerCase()}"
         }
     }
 

mirai-console/build.gradle.kts

@@ -38,8 +38,7 @@ dependencies {
     testApi("org.jsoup:jsoup:1.12.1")
 }
 
-val miraiConsoleVersion: String by project.ext
-version = miraiConsoleVersion
+version = Versions.Mirai.console
 
 description = "Console with plugin support for mirai"
 bintray {
@@ -82,7 +81,7 @@ publishing {
 
             groupId = rootProject.group.toString()
             artifactId = "mirai-console"
-            version = miraiConsoleVersion
+            version = version
 
             pom.withXml {
                 val root = asNode()