From c433450be22b6857f62dbcc04273c787991d9622 Mon Sep 17 00:00:00 2001 From: Him188 Date: Wed, 25 Nov 2020 17:19:52 +0800 Subject: [PATCH] Update dependencies --- backend/mirai-console/test/TestMiraiConosle.kt | 6 +++--- build.gradle.kts | 1 + buildSrc/src/main/kotlin/Versions.kt | 8 ++++---- .../src/main/kotlin/org/example/myplugin/MyPluginMain.kt | 3 +++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/backend/mirai-console/test/TestMiraiConosle.kt b/backend/mirai-console/test/TestMiraiConosle.kt index d5186fabe..2c919c5d5 100644 --- a/backend/mirai-console/test/TestMiraiConosle.kt +++ b/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 diff --git a/build.gradle.kts b/build.gradle.kts index 29fe2bea4..f2faf5936 100644 --- a/build.gradle.kts +++ b/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", diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 81dc13016..6bc49035d 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/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}" diff --git a/tools/intellij-plugin/run/projects/test-project/src/main/kotlin/org/example/myplugin/MyPluginMain.kt b/tools/intellij-plugin/run/projects/test-project/src/main/kotlin/org/example/myplugin/MyPluginMain.kt index 34a50f190..5f3ad337a 100644 --- a/tools/intellij-plugin/run/projects/test-project/src/main/kotlin/org/example/myplugin/MyPluginMain.kt +++ b/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>()