github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-03-12 22:10:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

[idea] feat: support IDEA 2023.2 (#2775)

Browse Source 
feat: support IDEA 2023.2

close #2769
This commit is contained in:
Samarium 2023-08-20 01:21:57 -06:00 committed by GitHub
parent 1c7bba8305
commit 167ea338f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buildSrc/src/main/kotlin/Versions.kt
View File

@ -28,7 +28,7 @@ object Versions {
val core get() = project val core get() = project
val console 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 val consoleTerminal get() = project
const val kotlinCompiler = "1.8.10" const val kotlinCompiler = "1.8.10"
@ -37,7 +37,7 @@ object Versions {
const val dokka = "1.8.10" 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 coroutines = "1.6.4"
const val atomicFU = "0.20.0" const val atomicFU = "0.20.0"
@ -75,7 +75,7 @@ object Versions {
const val junit = "5.7.2" const val junit = "5.7.2"
const val yamlkt = "0.12.0" const val yamlkt = "0.12.0"
const val intellijGradlePlugin = "1.13.2" const val intellijGradlePlugin = "1.15.0"
// https://github.com/google/jimfs // https://github.com/google/jimfs
// Java In Memory File System // Java In Memory File System
@ -87,7 +87,7 @@ object Versions {
// don't update easily unless you want your disk space -= 1000 MB // don't update easily unless you want your disk space -= 1000 MB
// (700 MB for IDEA, 150 MB for sources, 150 MB for JBR) // (700 MB for IDEA, 150 MB for sources, 150 MB for JBR)
const val intellij = "2023.1" const val intellij = "2023.2"
} }
@Suppress("unused") @Suppress("unused")

2
mirai-console/tools/intellij-plugin/build.gradle.kts
View File

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

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

@ -8,8 +8,8 @@
*/ */
plugins { plugins {
kotlin("jvm") version "1.8.10" kotlin("jvm") version "1.8.20"
kotlin("plugin.serialization") version "1.8.10" kotlin("plugin.serialization") version "1.8.20"
id("net.mamoe.mirai-console") version "2.99.0-local" id("net.mamoe.mirai-console") version "2.99.0-local"
java java
} }

2
mirai-console/tools/intellij-plugin/run/projects/test-project/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -9,6 +9,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

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

@ -178,7 +178,8 @@ class PluginDataValuesChecker : CallChecker, DeclarationChecker {
} }
private fun canBeSerializedInternally(descriptor: ClassDescriptor): Boolean { 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 // kotlinx.serialization
"kotlin.Unit" -> "UnitSerializer" "kotlin.Unit" -> "UnitSerializer"
"Z", "kotlin.Boolean" -> "BooleanSerializer" "Z", "kotlin.Boolean" -> "BooleanSerializer"
@ -233,4 +234,3 @@ private fun canBeSerializedInternally(descriptor: ClassDescriptor): Boolean {
} }
return true return true
} }