From 02363fa086ecc42f07f3f330225bc7a3559ed5e7 Mon Sep 17 00:00:00 2001
From: Johannes Mey <johannes.mey@tu-dresden.de>
Date: Tue, 4 Jun 2024 16:45:50 +0200
Subject: [PATCH] update

---
 CHANGELOG.md      |  1 +
 build.gradle.kts  | 23 ++++++++++-------------
 gradle.properties |  4 ++--
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7302687..be36246 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## [Unreleased]
 
 ### Added
+- Support for IntelliJ IDEA 2024.1.
 
 ### Changed
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 9301448..a714d79 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,15 +15,15 @@ plugins {
     // Kotlin support
     id("org.jetbrains.kotlin.jvm") version "1.9.0"
     // gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
-    id("org.jetbrains.intellij") version "1.15.0"
+    id("org.jetbrains.intellij") version "1.17.3"
     // gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
     id("org.jetbrains.changelog") version "2.0.0"
     // detekt linter - read more: https://detekt.github.io/detekt/gradle.html
-    id("io.gitlab.arturbosch.detekt") version "1.23.0"
+    id("io.gitlab.arturbosch.detekt") version "1.23.3"
     // ktlint linter - read more: https://github.com/JLLeitschuh/ktlint-gradle
-    id("org.jlleitschuh.gradle.ktlint") version "11.3.2"
+    id("org.jlleitschuh.gradle.ktlint") version "12.1.1"
     // grammrkit - read more: https://plugins.gradle.org/plugin/org.jetbrains.grammarkit
-    id("org.jetbrains.grammarkit") version "2022.3.1"
+    id("org.jetbrains.grammarkit") version "2022.3.2.2"
 }
 
 group = properties("pluginGroup")
@@ -35,8 +35,8 @@ repositories {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 idea {
@@ -82,15 +82,14 @@ tasks {
 
     val generateGrammarLexer = task<GenerateLexerTask>("generateGrammarLexer") {
         sourceFile.set(file("src/main/grammar/Grammar.flex"))
-        targetDir.set("src/gen/java/org/jastadd/tooling/grammar/lexer/")
-        targetClass.set("GrammarLexer")
+        targetOutputDir.set(file("src/gen/java/org/jastadd/tooling/grammar/lexer/"))
         purgeOldFiles.set(true)
     }
 
     // not fully working because of https://github.com/JetBrains/gradle-grammar-kit-plugin/issues/3
     val generateGrammarParser = task<GenerateParserTask>("generateGrammarParser") {
         sourceFile.set(file("src/main/grammar/Grammar.bnf"))
-        targetRoot.set("src/gen/java")
+        targetRootOutputDir.set(file("src/gen/java"))
         pathToParser.set("/org/jastadd/tooling/grammar/GrammarParser.java")
         pathToPsiRoot.set("/org/jastadd/tooling/grammar/psi")
         purgeOldFiles.set(true)
@@ -98,15 +97,14 @@ tasks {
 
     val generateAspectLexer = task<GenerateLexerTask>("generateAspectLexer") {
         sourceFile.set(file("src/main/grammar/Aspect.flex"))
-        targetDir.set("src/gen/java/org/jastadd/tooling/aspect/lexer/")
-        targetClass.set("AspectLexer")
+        targetOutputDir.set(file("src/gen/java/org/jastadd/tooling/aspect/lexer/"))
         purgeOldFiles.set(true)
     }
 
     // not fully working because of https://github.com/JetBrains/gradle-grammar-kit-plugin/issues/3
     val generateAspectParser = task<GenerateParserTask>("generateAspectParser") {
         sourceFile.set(file("src/main/grammar/Aspect.bnf"))
-        targetRoot.set("src/gen/java")
+        targetRootOutputDir.set(file("src/gen/java"))
         pathToParser.set("/org/jastadd/tooling/aspect/AspectParser.java")
         pathToPsiRoot.set("/org/jastadd/tooling/aspect/psi")
         purgeOldFiles.set(true)
@@ -119,7 +117,6 @@ tasks {
         dependsOn(generateAspectParser)
     }
 
-    // Set the compatibility versions to 1.8
     withType<JavaCompile> {
         sourceCompatibility = "17"
         targetCompatibility = "17"
diff --git a/gradle.properties b/gradle.properties
index f815e6a..269c3ec 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,11 +9,11 @@ pluginRepositoryUrl = https://git-st.inf.tu-dresden.de/jastadd/jetbrains-plugin/
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
 pluginSinceBuild = 223
-pluginUntilBuild = 233.*
+pluginUntilBuild = 241.*
 
 ## Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
 ## See https://jb.gg/intellij-platform-builds-list for available build versions.
-#pluginVerifierIdeVersions = 2022.2.4, 2022.3.1, 2023.1.2
+pluginVerifierIdeVersions = 2022.2.4, 2022.3.1, 2023.1.2
 
 platformType = IC
 platformVersion = 2023.3.2
-- 
GitLab