From 372f3e9f43c23c1f2895ec53a7713a507595c24a Mon Sep 17 00:00:00 2001 From: Charlie Egan Date: Tue, 19 May 2026 10:29:29 +0100 Subject: [PATCH 1/3] dependencies: Update lsp4ij to 0.19.3 0.19.2, https://github.com/redhat-developer/lsp4ij/releases/tag/0.19.2: threading fixes, file watcher freeze/crash fixes, null LSP command title support. 0.19.3, https://github.com/redhat-developer/lsp4ij/releases/tag/0.19.3: IntelliJ 2025.3 + 2026.1 support, custom launcher builder in LSPClientFeatures, breadcrumb fix for JS/TS files, various DAP and threading bug fixes. Signed-off-by: Charlie Egan --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index e9e839da..3537ab74 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -80,7 +80,7 @@ allprojects { create(platformType, platformVersion) val pluginList = mutableListOf( "PsiViewer:$psiViewerPluginVersion", - "com.redhat.devtools.lsp4ij:0.19.1" + "com.redhat.devtools.lsp4ij:0.19.3" ) plugins(pluginList) From 138872515041f748372f3f73f32f0eab10a69ebf Mon Sep 17 00:00:00 2001 From: Charlie Egan Date: Tue, 19 May 2026 11:21:12 +0100 Subject: [PATCH 2/3] build: Update the platform module Update to latest supported by our gradle version. Signed-off-by: Charlie Egan --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3537ab74..ee6f12ed 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -41,7 +41,7 @@ idea { plugins { idea kotlin("jvm") version "2.1.20" - id("org.jetbrains.intellij.platform.module") version "2.5.0" + id("org.jetbrains.intellij.platform.module") version "2.9.0" // 2.10.0+ requires Gradle 8.13, 2.12.0+ requires Gradle 9.0 id("org.jetbrains.grammarkit") version "2022.3.2.2" } From 4a94a2219026b1cadc509d992feea93ddb148bf6 Mon Sep 17 00:00:00 2001 From: Charlie Egan Date: Tue, 19 May 2026 13:42:23 +0100 Subject: [PATCH 3/3] build: Update gradle Signed-off-by: Charlie Egan --- build.gradle.kts | 12 ++++++------ gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index ee6f12ed..8645eeb7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -41,7 +41,7 @@ idea { plugins { idea kotlin("jvm") version "2.1.20" - id("org.jetbrains.intellij.platform.module") version "2.9.0" // 2.10.0+ requires Gradle 8.13, 2.12.0+ requires Gradle 9.0 + id("org.jetbrains.intellij.platform.module") version "2.16.0" id("org.jetbrains.grammarkit") version "2022.3.2.2" } @@ -155,7 +155,7 @@ project(":plugin") { ides { // Use single IDE version on CI to reduce risk of running out of disk space on GHA runner if (System.getenv("CI") != null) { - ide(IntelliJPlatformType.IntellijIdeaUltimate, verifierIdeVersion) + create(IntelliJPlatformType.IntellijIdeaUltimate, verifierIdeVersion) } else { recommended() } @@ -175,8 +175,8 @@ project(":plugin") { dependencies { intellijPlatform { - pluginModule(implementation(project(":"))) - pluginModule(implementation(project(":idea"))) + pluginComposedModule(implementation(project(":"))) + pluginComposedModule(implementation(project(":idea"))) } } } @@ -191,14 +191,14 @@ project(":") { testOutput(sourceSets.getByName("test").output.classesDirs) } - val generateRegoLexer = task("generateRegoLexer") { + val generateRegoLexer = tasks.register("generateRegoLexer") { sourceFile.set(file("src/main/grammar/RegoLexer.flex")) targetOutputDir.set(project.layout.projectDirectory.dir("src/main/gen/org/openpolicyagent/ideaplugin/lang/lexer")) purgeOldFiles.set(true) } - val generateRegoParser = task("generateRegoParser") { + val generateRegoParser = tasks.register("generateRegoParser") { sourceFile.set(file("src/main/grammar/Rego.bnf")) targetRootOutputDir.set(project.layout.projectDirectory.dir("src/main/gen")) pathToParser.set("/org/openpolicyagent/ideaplugin/lang/parser/RegoParser.java") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22ce..e8094c00 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-9.4.1-20260309092226%2B0000-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME