From f28cf77347c750b6fc918460835803a3aaca8fe3 Mon Sep 17 00:00:00 2001 From: FalsePattern Date: Thu, 17 Apr 2025 09:43:59 +0200 Subject: [PATCH] ci: [NO BACKPORT] switch to IDE 2025.1 --- build.gradle.kts | 4 ++-- core/build.gradle.kts | 5 ++++- gradle.properties | 8 +++++--- lsp/build.gradle.kts | 5 ++++- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9f120e29..51b5a3d8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,8 +6,8 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask plugins { - kotlin("jvm") version "2.0.21" apply false - kotlin("plugin.serialization") version "2.0.21" apply false + kotlin("jvm") version "2.1.10" apply false + kotlin("plugin.serialization") version "2.1.10" apply false id("org.jetbrains.intellij.platform") version "2.5.0" id("org.jetbrains.changelog") version "2.2.1" id("org.jetbrains.grammarkit") version "2022.3.2.2" apply false diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 32259f17..8f06a8b0 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -9,12 +9,15 @@ plugins { val ideaCommunityVersion: String by project val useInstaller = property("useInstaller").toString().toBoolean() +val serializationVersion: String by project dependencies { intellijPlatform { create(IntelliJPlatformType.IntellijIdeaCommunity, ideaCommunityVersion, useInstaller = useInstaller) } - compileOnly("org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3") + compileOnly("org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:$serializationVersion") { + isTransitive = false + } } //region grammars diff --git a/gradle.properties b/gradle.properties index 20f145b6..7e60d093 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,11 +3,11 @@ pluginRepositoryUrl=https://github.com/FalsePattern/ZigBrains pluginVersion=25.0.2 -pluginSinceBuild=243 +pluginSinceBuild=251 pluginUntilBuild= -ideaCommunityVersion=2024.3 -clionVersion=2024.3 +ideaCommunityVersion=2025.1 +clionVersion=2025.1 useInstaller=true javaVersion=21 # ideaCommunity / clion @@ -17,6 +17,8 @@ lsp4jVersion=0.21.1 lsp4ijVersion=0.12.0 lsp4ijNightly=false +serializationVersion=1.7.3 + kotlin.stdlib.default.dependency=false kotlin.code.style=official org.gradle.configuration-cache=true diff --git a/lsp/build.gradle.kts b/lsp/build.gradle.kts index a8cad36d..fb902561 100644 --- a/lsp/build.gradle.kts +++ b/lsp/build.gradle.kts @@ -8,12 +8,15 @@ val lsp4ijVersion: String by project val lsp4jVersion: String by project val ideaCommunityVersion: String by project val useInstaller = property("useInstaller").toString().toBoolean() +val serializationVersion: String by project dependencies { intellijPlatform { create(IntelliJPlatformType.IntellijIdeaCommunity, ideaCommunityVersion, useInstaller = useInstaller) } - compileOnly("org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3") + compileOnly("org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:$serializationVersion") { + isTransitive = false + } compileOnly("com.redhat.devtools.intellij:lsp4ij:$lsp4ijVersion") compileOnly("org.eclipse.lsp4j:org.eclipse.lsp4j:$lsp4jVersion") implementation(project(":core")) {