Merge pull request #44 from FHannes/master

Fix for issues #41 and #42

.github/workflows/gradle.yml

@@ -15,28 +15,17 @@ jobs:
         env:
           # see https://www.jetbrains.com/idea/download/previous.html
           # and https://www.jetbrains.com/intellij-repository/snapshots/
-          - IDEA_VERSION: IC-15.0.6
-          - IDEA_VERSION: IC-2016.3.8
-          - IDEA_VERSION: IC-2017.3.6
-          - IDEA_VERSION: IC-2018.3.6
-          - IDEA_VERSION: IC-2019.3.3
-          - IDEA_VERSION: IC-2020.3
-            JDK_VERSION: '11'
+          - IDEA_VERSION: IC-2022.2.5
+          - IDEA_VERSION: IC-2022.3.1
+          - IDEA_VERSION: IC-2023.2.2
           - IDEA_VERSION: IU-LATEST-EAP-SNAPSHOT
-            JDK_VERSION: '11'
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
-        if: matrix.env.JDK_VERSION != '11'
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-        if: matrix.env.JDK_VERSION == '11'
+          java-version: 17
       - name: Build with Gradle
         run: |
           ./gradlew -PideaVersion=${IDEA_VERSION} buildPlugin
@@ -47,4 +36,4 @@ jobs:
         with:
           name: ${{env.DIST_FILE}}
           path: build/distributions/jetbrains-plugin-st4-*.zip
-        if: matrix.env.IDEA_VERSION == 'IC-2020.3'
+        if: matrix.env.IDEA_VERSION == 'IC-2022.2.5'

.gitignore

@@ -12,6 +12,8 @@
 hs_err_pid*
 
 /build
+/bin
 /.gradle
 /.idea/
 *.iml
+*.ipr

build.gradle.kts

@@ -0,0 +1,68 @@
+plugins {
+    id("java")
+    id("org.jetbrains.intellij") version "1.15.0"
+    id("antlr")
+}
+
+group = "antlr"
+version = properties["pluginVersion"].toString()
+
+repositories {
+    mavenCentral()
+}
+
+intellij {
+    version.set(properties["ideaVersion"].toString())
+    type.set("IC") // Target IDE Platform
+
+    pluginName.set("jetbrains-plugin-st4")
+    downloadSources = true
+    updateSinceUntilBuild = false
+}
+
+dependencies {
+    antlr("org.antlr:antlr4:${properties["antlr4Version"]}") {
+        exclude(group = "com.ibm.icu", module = "icu4j")
+    }
+    implementation("org.antlr:antlr4-intellij-adaptor:0.1")
+    implementation("org.antlr:antlr4-runtime:${properties["antlr4Version"]}")
+    testImplementation("junit:junit:4.13.2")
+    testImplementation("org.mockito:mockito-core:5.5.0")
+}
+
+sourceSets {
+    main {
+        antlr {
+            setIncludes(listOf("ST*.g4"))
+        }
+    }
+}
+
+// See https://github.com/gradle/gradle/issues/820#issuecomment-1585814999
+configurations {
+    api {
+        setExtendsFrom(extendsFrom.filterNot { it == configurations.antlr })
+    }
+}
+
+tasks {
+    // Set the JVM compatibility versions
+    withType<JavaCompile> {
+        sourceCompatibility = "17"
+        targetCompatibility = "17"
+    }
+
+    patchPluginXml {
+        sinceBuild.set("222.4554.10")
+    }
+
+    generateGrammarSource {
+        arguments = arguments + listOf(
+            "-package", "org.antlr.jetbrains.st4plugin.parsing",
+            "-long-messages",
+            "-no-visitor",
+            "-no-listener",
+            "-lib","src/main/antlr"
+        )
+    }
+}

gradle.properties

@@ -2,7 +2,7 @@ pluginVersion=0.10-SNAPSHOT
 
 # e.g. IC-2016.3.3, IU-2018.2.5 etc
 # For a list of possible values, refer to the section 'com.jetbrains.intellij.idea' at https://www.jetbrains.com/intellij-repository/releases
-ideaVersion=2020.2
+ideaVersion=2022.2.5
 
 # The version of ANTLR v4 that will be used to generate the parser
-antlr4Version=4.9
+antlr4Version=4.13.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists