Skip to content

Commit 167ea33

Browse files
authored
[idea] feat: support IDEA 2023.2 (#2775)
feat: support IDEA 2023.2 close #2769
1 parent 1c7bba8 commit 167ea33

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

buildSrc/src/main/kotlin/Versions.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ object Versions {
2828

2929
val core get() = project
3030
val console get() = project
31-
val consoleIntellij get() = "231-$project-182-1" // idea-mirai-kotlin-patch
31+
val consoleIntellij get() = "232-$project-182-1" // idea-mirai-kotlin-patch
3232
val consoleTerminal get() = project
3333

3434
const val kotlinCompiler = "1.8.10"
@@ -37,7 +37,7 @@ object Versions {
3737

3838
const val dokka = "1.8.10"
3939

40-
const val kotlinCompilerForIdeaPlugin = "1.8.20-RC" // 231 bundles 1.8.20
40+
const val kotlinCompilerForIdeaPlugin = "1.8.20" // 232 bundles 1.8.20
4141

4242
const val coroutines = "1.6.4"
4343
const val atomicFU = "0.20.0"
@@ -75,7 +75,7 @@ object Versions {
7575
const val junit = "5.7.2"
7676

7777
const val yamlkt = "0.12.0"
78-
const val intellijGradlePlugin = "1.13.2"
78+
const val intellijGradlePlugin = "1.15.0"
7979

8080
// https://github.com/google/jimfs
8181
// Java In Memory File System
@@ -87,7 +87,7 @@ object Versions {
8787

8888
// don't update easily unless you want your disk space -= 1000 MB
8989
// (700 MB for IDEA, 150 MB for sources, 150 MB for JBR)
90-
const val intellij = "2023.1"
90+
const val intellij = "2023.2"
9191
}
9292

9393
@Suppress("unused")

mirai-console/tools/intellij-plugin/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ kotlin.target.compilations.all {
7373
// https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library
7474
tasks.withType<org.jetbrains.intellij.tasks.PatchPluginXmlTask> {
7575
sinceBuild.set("223")
76-
untilBuild.set("231.*")
76+
untilBuild.set("232.*")
7777
pluginDescription.set(
7878
"""
7979
Plugin development support for <a href='https://github.com/mamoe/mirai'>Mirai Console</a>

mirai-console/tools/intellij-plugin/run/projects/test-project/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
*/
99

1010
plugins {
11-
kotlin("jvm") version "1.8.10"
12-
kotlin("plugin.serialization") version "1.8.10"
11+
kotlin("jvm") version "1.8.20"
12+
kotlin("plugin.serialization") version "1.8.20"
1313
id("net.mamoe.mirai-console") version "2.99.0-local"
1414
java
1515
}

mirai-console/tools/intellij-plugin/run/projects/test-project/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99

1010
distributionBase=GRADLE_USER_HOME
1111
distributionPath=wrapper/dists
12-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
12+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
1313
zipStoreBase=GRADLE_USER_HOME
1414
zipStorePath=wrapper/dists

mirai-console/tools/intellij-plugin/src/diagnostics/PluginDataValuesChecker.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,8 @@ class PluginDataValuesChecker : CallChecker, DeclarationChecker {
178178
}
179179

180180
private fun canBeSerializedInternally(descriptor: ClassDescriptor): Boolean {
181-
@Suppress("UNUSED_VARIABLE") val name = when (descriptor.defaultType.getJetTypeFqName(false)) {
181+
@Suppress("UNUSED_VARIABLE")
182+
val name = when (descriptor.defaultType.getKotlinTypeFqName(false)) {
182183
// kotlinx.serialization
183184
"kotlin.Unit" -> "UnitSerializer"
184185
"Z", "kotlin.Boolean" -> "BooleanSerializer"
@@ -233,4 +234,3 @@ private fun canBeSerializedInternally(descriptor: ClassDescriptor): Boolean {
233234
}
234235
return true
235236
}
236-

0 commit comments

Comments
 (0)