Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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.16.0"
id("org.jetbrains.grammarkit") version "2022.3.2.2"

}
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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()
}
Expand All @@ -175,8 +175,8 @@ project(":plugin") {

dependencies {
intellijPlatform {
pluginModule(implementation(project(":")))
pluginModule(implementation(project(":idea")))
pluginComposedModule(implementation(project(":")))
pluginComposedModule(implementation(project(":idea")))
}
}
}
Expand All @@ -191,14 +191,14 @@ project(":") {
testOutput(sourceSets.getByName("test").output.classesDirs)
}

val generateRegoLexer = task<GenerateLexerTask>("generateRegoLexer") {
val generateRegoLexer = tasks.register<GenerateLexerTask>("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<GenerateParserTask>("generateRegoParser") {
val generateRegoParser = tasks.register<GenerateParserTask>("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")
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like some type of nightly build, no? I'm sure it's not a big deal, just wondering if this was a requirement for the lsp4ij bump somehow, in favor of a stable build.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I had a look and gradle-9.4-bin.zip didn't seem to exist, even though the is actually one more recent release.

Good to call out, but I think this is ok for the time being.

networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading