feat: support IDEA 2023.2

close mamoe#2769
Samarium150 · Aug 16, 2023 · 0927184 · 0927184
1 parent 5ef291f
commit 0927184
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -28,7 +28,7 @@ object Versions {
 
     val core get() = project
     val console get() = project
-    val consoleIntellij get() = "231-$project-182-1" // idea-mirai-kotlin-patch
+    val consoleIntellij get() = "232-$project-182-1" // idea-mirai-kotlin-patch
     val consoleTerminal get() = project
 
     const val kotlinCompiler = "1.8.10"
@@ -37,7 +37,7 @@ object Versions {
 
     const val dokka = "1.8.10"
 
-    const val kotlinCompilerForIdeaPlugin = "1.8.20-RC" // 231 bundles 1.8.20
+    const val kotlinCompilerForIdeaPlugin = "1.8.20" // 232 bundles 1.8.20
 
     const val coroutines = "1.6.4"
     const val atomicFU = "0.20.0"
@@ -75,7 +75,7 @@ object Versions {
     const val junit = "5.7.2"
 
     const val yamlkt = "0.12.0"
-    const val intellijGradlePlugin = "1.13.2"
+    const val intellijGradlePlugin = "1.15.0"
 
     // https://github.com/google/jimfs
     // Java In Memory File System
@@ -87,7 +87,7 @@ object Versions {
 
     // 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 = "2023.1"
+    const val intellij = "2023.2"
 }
 
 @Suppress("unused")

diff --git a/mirai-console/tools/intellij-plugin/build.gradle.kts b/mirai-console/tools/intellij-plugin/build.gradle.kts
@@ -73,7 +73,7 @@ kotlin.target.compilations.all {
 // https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library
 tasks.withType<org.jetbrains.intellij.tasks.PatchPluginXmlTask> {
     sinceBuild.set("223")
-    untilBuild.set("231.*")
+    untilBuild.set("232.*")
     pluginDescription.set(
         """
         Plugin development support for <a href='https://github.com/mamoe/mirai'>Mirai Console</a>

diff --git a/mirai-console/tools/intellij-plugin/run/projects/test-project/build.gradle.kts b/mirai-console/tools/intellij-plugin/run/projects/test-project/build.gradle.kts
@@ -8,8 +8,8 @@
  */
 
 plugins {
-    kotlin("jvm") version "1.8.10"
-    kotlin("plugin.serialization") version "1.8.10"
+    kotlin("jvm") version "1.8.20"
+    kotlin("plugin.serialization") version "1.8.20"
     id("net.mamoe.mirai-console") version "2.99.0-local"
     java
 }

diff --git a/.../tools/intellij-plugin/run/projects/test-project/gradle/wrapper/gradle-wrapper.properties b/.../tools/intellij-plugin/run/projects/test-project/gradle/wrapper/gradle-wrapper.properties
@@ -9,6 +9,6 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/mirai-console/tools/intellij-plugin/src/diagnostics/PluginDataValuesChecker.kt b/mirai-console/tools/intellij-plugin/src/diagnostics/PluginDataValuesChecker.kt
@@ -178,7 +178,8 @@ class PluginDataValuesChecker : CallChecker, DeclarationChecker {
 }
 
 private fun canBeSerializedInternally(descriptor: ClassDescriptor): Boolean {
-    @Suppress("UNUSED_VARIABLE") val name = when (descriptor.defaultType.getJetTypeFqName(false)) {
+    @Suppress("UNUSED_VARIABLE")
+    val name = when (descriptor.defaultType.getKotlinTypeFqName(false)) {
         // kotlinx.serialization
         "kotlin.Unit" -> "UnitSerializer"
         "Z", "kotlin.Boolean" -> "BooleanSerializer"
@@ -233,4 +234,3 @@ private fun canBeSerializedInternally(descriptor: ClassDescriptor): Boolean {
     }
     return true
 }
-