From dcb1573f2c1facd8738c314fdec0cf4dab0712fb Mon Sep 17 00:00:00 2001
From: Exidex <16986685+Exidex@users.noreply.github.com>
Date: Tue, 22 Aug 2023 11:35:40 +0200
Subject: [PATCH] Add 2023.1 and 2023.2 compatibility. Minimal required version
 is now 2022.3

---
 .github/workflows/build.yml        |  4 ++--
 .github/workflows/release.yml      |  4 ++--
 .github/workflows/run-ui-tests.yml |  4 ++--
 CHANGELOG.md                       |  5 ++++-
 build.gradle.kts                   | 10 +++++-----
 gradle.properties                  | 10 +++++-----
 6 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a1a2e38..b09a2da 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,12 +48,12 @@ jobs:
       - name: Gradle Wrapper Validation
         uses: gradle/wrapper-validation-action@v1.0.4
 
-      # Setup Java 11 environment for the next steps
+      # Setup Java 17 environment for the next steps
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
           distribution: zulu
-          java-version: 11
+          java-version: 17
 
       # Set environment variables
       - name: Export Properties
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fb8f261..7d57e0f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,12 +23,12 @@ jobs:
         with:
           ref: ${{ github.event.release.tag_name }}
 
-      # Setup Java 11 environment for the next steps
+      # Setup Java 17 environment for the next steps
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
           distribution: zulu
-          java-version: 11
+          java-version: 17
 
       # Set environment variables
       - name: Export Properties
diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml
index 1e4456d..0eb49b5 100644
--- a/.github/workflows/run-ui-tests.yml
+++ b/.github/workflows/run-ui-tests.yml
@@ -35,12 +35,12 @@ jobs:
       - name: Fetch Sources
         uses: actions/checkout@v3
 
-      # Setup Java 11 environment for the next steps
+      # Setup Java 17 environment for the next steps
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
           distribution: zulu
-          java-version: 11
+          java-version: 17
 
       # Run IDEA prepared for UI testing
       - name: Run IDE
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0dd4594..f4430eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,12 @@
 # intellij-kdl Changelog
 
 ## [Unreleased]
+### Added
+- 2023.1 and 2023.2 compatibility
+- Minimal required version is now 2022.3
 
 ## [1.0.1]
-### Added
+### Added
 - 2022.3 compatibility
 
 ## [1.0.0]
diff --git a/build.gradle.kts b/build.gradle.kts
index d745ad9..36fd367 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
     id("org.jetbrains.intellij") version "1.9.0"
     id("org.jetbrains.changelog") version "1.3.1"
     id("org.jetbrains.qodana") version "0.1.13"
-    id("org.jetbrains.grammarkit") version "2021.2.2"
+    id("org.jetbrains.grammarkit") version "2022.3.1"
     id("org.ajoberstar.grgit") version "5.0.0"
 }
 
@@ -25,7 +25,7 @@ repositories {
 
 kotlin {
     jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
+        languageVersion.set(JavaLanguageVersion.of(17))
     }
 }
 
@@ -114,21 +114,21 @@ sourceSets {
 }
 
 val generateKdlLexer = task<GenerateLexerTask>("generateKdlLexer") {
-    source.set("src/main/grammars/KdlLexer.flex")
+    sourceFile.set(file("src/main/grammars/KdlLexer.flex"))
     targetDir.set("src/genparser/dev/kdl/lang/lexer")
     targetClass.set("KdlLexer")
     purgeOldFiles.set(true)
 }
 
 val generateKdlStringLexer = task<GenerateLexerTask>("generateKdlStringLexer") {
-    source.set("src/main/grammars/KdlStringLexer.flex")
+    sourceFile.set(file("src/main/grammars/KdlStringLexer.flex"))
     targetDir.set("src/genparser/dev/kdl/lang/escape")
     targetClass.set("KdlStringLexer")
     purgeOldFiles.set(true)
 }
 
 val generateKdlParser = task<GenerateParserTask>("generateKdlParser") {
-    source.set("src/main/grammars/KdlParser.bnf")
+    sourceFile.set(file("src/main/grammars/KdlParser.bnf"))
     targetRoot.set("src/genparser")
     pathToParser.set("dev/kdl/lang/parser/KdlParser.java")
     pathToPsiRoot.set("dev/kdl/lang/psi")
diff --git a/gradle.properties b/gradle.properties
index 3ec97b2..b69d47f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,14 +1,14 @@
 pluginGroup=dev.kdl
 pluginName=intellij-kdl
-pluginVersion=1.0.1
+pluginVersion=2.0.0
 
-pluginSinceBuild=213
-pluginUntilBuild=223.*
+pluginSinceBuild=223
+pluginUntilBuild=232.*
 
 platformType=IC
-platformVersion=2021.3.3
+platformVersion=2022.3
 
-platformPlugins=PsiViewer:213-SNAPSHOT
+platformPlugins=PsiViewer:2022.3
 
 gradleVersion=7.5.1