瀏覽代碼

Update dependencies

Him188 5 年之前
父節點
當前提交
c433450be2

+ 3 - 3
backend/mirai-console/test/TestMiraiConosle.kt

@@ -14,7 +14,6 @@ import net.mamoe.mirai.console.MiraiConsoleImplementation.Companion.start
 import net.mamoe.mirai.console.command.CommandManager
 import net.mamoe.mirai.console.data.MemoryPluginDataStorage
 import net.mamoe.mirai.console.data.PluginDataStorage
-import net.mamoe.mirai.console.logging.LoggerController
 import net.mamoe.mirai.console.plugin.jvm.JvmPluginLoader
 import net.mamoe.mirai.console.plugin.loader.PluginLoader
 import net.mamoe.mirai.console.util.ConsoleExperimentalApi
@@ -27,12 +26,13 @@ import java.nio.file.Path
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.resume
+import kotlin.io.path.createTempDirectory
 import kotlin.test.assertNotNull
 
-@OptIn(ConsoleInternalApi::class)
+@OptIn(ConsoleInternalApi::class, kotlin.io.path.ExperimentalPathApi::class)
 fun initTestEnvironment() {
     object : MiraiConsoleImplementation {
-        override val rootPath: Path = createTempDir().toPath()
+        override val rootPath: Path = createTempDirectory()
 
         @ConsoleExperimentalApi
         override val frontEndDescription: MiraiConsoleFrontEndDescription

+ 1 - 0
build.gradle.kts

@@ -53,6 +53,7 @@ val experimentalAnnotations = arrayOf(
     "kotlin.experimental.ExperimentalTypeInference",
     "kotlinx.coroutines.ExperimentalCoroutinesApi",
     "kotlinx.serialization.ExperimentalSerializationApi",
+    "kotlin.io.path.ExperimentalPathApi",
     "io.ktor.util.KtorExperimentalAPI",
 
     "net.mamoe.mirai.utils.MiraiInternalAPI",

+ 4 - 4
buildSrc/src/main/kotlin/Versions.kt

@@ -18,8 +18,8 @@ object Versions {
     const val kotlinCompiler = "1.4.20"
     const val kotlinStdlib = "1.4.20"
 
-    const val kotlinIntellijPlugin = "1.4.20-RC-IJ2020.2-1" // -release
-    const val intellij = "2020.2.1"
+    const val kotlinIntellijPlugin = "1.4.20-release-IJ2020.2-1" // keep to newest as kotlinCompiler
+    const val intellij = "2020.2.1" // don't update easily unless you want your disk space -= 500MB
 
 
     const val coroutines = "1.4.0"
@@ -34,7 +34,7 @@ object Versions {
     const val blockingBridge = "1.4.1"
 
     @Suppress("SpellCheckingInspection")
-    const val yamlkt = "0.7.3"
+    const val yamlkt = "0.7.4"
 
     const val intellijGradlePlugin = "0.4.16"
 }
@@ -42,7 +42,7 @@ object Versions {
 const val `kotlin-compiler` = "org.jetbrains.kotlin:kotlin-compiler:${Versions.kotlinCompiler}"
 
 const val `kotlin-stdlib` = "org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlinStdlib}"
-const val `kotlin-stdlib-jdk8` = "org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlinStdlib}"
+const val `kotlin-stdlib-jdk8` = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${Versions.kotlinStdlib}"
 const val `kotlin-reflect` = "org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlinStdlib}"
 const val `kotlin-test` = "org.jetbrains.kotlin:kotlin-test:${Versions.kotlinStdlib}"
 const val `kotlin-test-junit5` = "org.jetbrains.kotlin:kotlin-test-junit5:${Versions.kotlinStdlib}"

+ 3 - 0
tools/intellij-plugin/run/projects/test-project/src/main/kotlin/org/example/myplugin/MyPluginMain.kt

@@ -32,6 +32,9 @@ object MyPluginMain : KotlinPlugin(
 }
 
 
+val x = "弱智黄色"
+
+
 object MyData : AutoSavePluginData("") {
     val value by value("")
     val value2 by value<Map<String, String>>()