From f5ff4be3a25dc5c628a22058be759edb70352b5a Mon Sep 17 00:00:00 2001 From: Him188 Date: Wed, 20 Jul 2022 18:50:50 +0800 Subject: [PATCH] idea: Support 221-222. fix #2124 --- buildSrc/src/main/kotlin/Versions.kt | 10 +++++----- mirai-console/tools/intellij-plugin/build.gradle.kts | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 2ab466065..ab35778b0 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -23,14 +23,14 @@ object Versions { val core = project val console = project - val consoleIntellij = "221-$project-162-1" // idea-mirai-kotlin-patch + val consoleIntellij = "221-$project-171-1" // idea-mirai-kotlin-patch val consoleTerminal = project const val kotlinCompiler = "1.7.0" const val kotlinStdlib = kotlinCompiler const val dokka = "1.6.21" - const val kotlinCompilerForIdeaPlugin = "1.7.0" + const val kotlinCompilerForIdeaPlugin = "1.7.10" const val coroutines = "1.6.2" const val atomicFU = "0.17.2" @@ -66,9 +66,9 @@ object Versions { const val yamlkt = "0.12.0" const val intellijGradlePlugin = "1.7.0" - // const val kotlinIntellijPlugin = "211-1.5.20-release-284-IJ7442.40" // keep to newest as kotlinCompiler - const val intellij = "2022.1" // don't update easily unless you want your disk space -= 500MB - + // don't update easily unless you want your disk space -= 1000 MB + // (700 MB for IDEA, 150 MB for sources, 150 MB for JBR) + const val intellij = "222.3345-EAP-CANDIDATE-SNAPSHOT" } @Suppress("unused") diff --git a/mirai-console/tools/intellij-plugin/build.gradle.kts b/mirai-console/tools/intellij-plugin/build.gradle.kts index 74c29ee0d..9c528cb6f 100644 --- a/mirai-console/tools/intellij-plugin/build.gradle.kts +++ b/mirai-console/tools/intellij-plugin/build.gradle.kts @@ -28,7 +28,7 @@ description = "IntelliJ plugin for Mirai Console" // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { version.set(Versions.intellij) - downloadSources.set(true) + downloadSources.set(IDEA_ACTIVE) updateSinceUntilBuild.set(false) sandboxDir.set(projectDir.resolve("run/idea-sandbox").absolutePath) @@ -71,8 +71,8 @@ kotlin.target.compilations.all { // https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library tasks.withType { - sinceBuild.set("221.0") - untilBuild.set("221.999999") + sinceBuild.set("221") + untilBuild.set("222.*") pluginDescription.set( """ Plugin development support for Mirai Console