Merge pull request #4 from Cjsah/dev

修改指令解析器为kotlin 修改插件加载器为kotlin 修改控制台指令为kotlin 优化程序的java调用更新kotlin版本到1.5.30 更新maria-core版本到2.8.3 更新log4j版本到2.17.0 移除遗留的slf4j
Cjsah · Dec 22, 2021 · ba9f9c5 · ba9f9c5
2 parents 4028d7d + 5e0378d
commit ba9f9c5
Show file tree

Hide file tree

Showing 89 changed files with 1,870 additions and 2,261 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,7 @@
+//file:noinspection GroovyAssignabilityCheck
+//file:noinspection GrDeprecatedAPIUsage
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.5.10'
+    id 'org.jetbrains.kotlin.jvm' version '1.5.30'
     id 'maven-publish'
 }
 
@@ -17,12 +19,11 @@ repositories {
 
 dependencies {
     api "org.jetbrains.kotlin:kotlin-stdlib"
-    api 'net.mamoe:mirai-core:2.7.1'
-    api 'org.apache.logging.log4j:log4j-api:2.15.0'
-    api 'org.apache.logging.log4j:log4j-core:2.15.0'
-    api 'com.google.code.gson:gson:2.8.9'
+    api "com.google.code.gson:gson:2.8.9"
     api "com.github.HyDevelop:HyConfigLib:3.1.52"
-    api 'org.slf4j:slf4j-nop:1.7.32'
+    api "net.mamoe:mirai-core:${mirai_version}"
+    api "org.apache.logging.log4j:log4j-api:${log4j_version}"
+    api "org.apache.logging.log4j:log4j-core:${log4j_version}"
 }
 
 tasks.withType(JavaCompile).configureEach {

diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,5 @@
 build_number = undefined
 mvn_group = net.cjsah.console
-console_version = 1.0.12
+console_version = 1.1.0
+mirai_version = 2.8.3
+log4j_version = 2.17.0
diff --git a/src/main/java/net/cjsah/console/ConsoleCommand.java b/src/main/java/net/cjsah/console/ConsoleCommand.java
diff --git a/src/main/java/net/cjsah/console/command/Command.java b/src/main/java/net/cjsah/console/command/Command.java
diff --git a/src/main/java/net/cjsah/console/command/CommandManager.java b/src/main/java/net/cjsah/console/command/CommandManager.java
diff --git a/src/main/java/net/cjsah/console/command/Dispatcher.java b/src/main/java/net/cjsah/console/command/Dispatcher.java
diff --git a/src/main/java/net/cjsah/console/command/ParseResults.java b/src/main/java/net/cjsah/console/command/ParseResults.java