From 60d8961c26b7cf04c44d3bfebe15876ef616edcc Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@yahooinc.com>
Date: Thu, 11 Apr 2024 15:08:47 +0200
Subject: Make Intellij plugin support 2024.1 version

Some minor fixes in build files
---
 integration/intellij/build.gradle.kts | 15 ++++++---------
 integration/intellij/pom.xml          |  2 +-
 2 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'integration/intellij')

diff --git a/integration/intellij/build.gradle.kts b/integration/intellij/build.gradle.kts
index 89101020920..6fff4e8f519 100644
--- a/integration/intellij/build.gradle.kts
+++ b/integration/intellij/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 group="ai.vespa"
-version="1.6.0" // Also update pom.xml version AND the version below if this is changed
+version="1.6.1" // Also update pom.xml version AND the version below if this is changed
 
 defaultTasks("buildPlugin")
 
@@ -18,14 +18,13 @@ apply(plugin="org.jetbrains.grammarkit")
 
 task<GenerateLexerTask>("generateSdLexer") {
   sourceFile.set(file("src/main/jflex/ai/vespa/intellij/schema/lexer/sd.flex"))
-  targetDir.set("target/generated-sources/jflex/ai/vespa/intellij/schema/lexer/")
-  targetClass.set("SdLexer")
+  targetOutputDir.set(file("target/generated-sources/jflex/ai/vespa/intellij/schema/lexer/"))
   purgeOldFiles.set(true)
 }
 
 task<GenerateParserTask>("generateSdParser") {
   sourceFile.set(file("src/main/bnf/ai/vespa/intellij/schema/parser/sd.bnf"))
-  targetRoot.set("target/generated-sources/bnf/")
+  targetRootOutputDir.set(file("target/generated-sources/bnf/"))
   pathToParser.set("ai/vespa/intellij/schema/parser/SdParser.java")
   pathToPsiRoot.set("ai/vespa/intellij/schema/parser/psi/")
   purgeOldFiles.set(true)
@@ -43,7 +42,7 @@ sourceSets {
 
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
-  version.set("2023.3")
+  version.set("2024.1")
 }
 
 tasks {
@@ -55,12 +54,10 @@ tasks {
   }
 
   patchPluginXml {
-    version.set("1.6.0") // Keep in sync with pom.xml TODO: Use one version property
+    version.set("1.6.1") // Keep in sync with pom.xml TODO: Use one version property
     // Appears on the plugin page in preferences/plugins
     changeNotes.set("""
-      Updated Vespa icon
-      Support for IntelliJ 2023.3
-      Compatibility with all JetBrains IDEs
+      Support for IntelliJ 2024.1
     """)
   }
 
diff --git a/integration/intellij/pom.xml b/integration/intellij/pom.xml
index 8156ac8a142..4a82c73f98e 100644
--- a/integration/intellij/pom.xml
+++ b/integration/intellij/pom.xml
@@ -9,7 +9,7 @@
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <artifactId>vespa-intellij</artifactId> <!-- Not used - plugin is build by gradle -->
-    <version>1.6.0</version> <!-- See copy-zip below, which depends on this being the same as the v. in build.gradle.kts -->
+    <version>1.6.1</version> <!-- See copy-zip below, which depends on this being the same as the v. in build.gradle.kts -->
     <description>
         Maven wrapper for the gradle build of this IntelliJ plugin.
     </description>
-- 
cgit v1.2.3