Skip to content

Commit

Permalink
[idea] feat: support IDEA 2023.2 (#2775)
Browse files Browse the repository at this point in the history
feat: support IDEA 2023.2

close #2769
  • Loading branch information
Samarium150 authored Aug 20, 2023
1 parent 1c7bba8 commit 167ea33
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion mirai-console/tools/intellij-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -233,4 +234,3 @@ private fun canBeSerializedInternally(descriptor: ClassDescriptor): Boolean {
}
return true
}

0 comments on commit 167ea33

Please sign in to comment.