Merge pull request #356 from SeeSharpSoft/fb_multi_version_build

Multi Version Build

Author: SeeSharpSoft

.github/workflows/PublishStable.yml

@@ -16,9 +16,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ideaVersion: IC-2022.1.1
+          - ideaVersion: 2022.2.1
             gkVersion: 2021.1.2
-          - ideaVersion: IC-2022.2.1
+          - ideaVersion: LATEST-EAP-SNAPSHOT
             gkVersion: 2021.1.2
 
     steps:
@@ -32,7 +32,6 @@ jobs:
       run: chmod +x gradlew
     - name: Build with Gradle
       env:
-
         IDEA_VERSION: ${{ matrix.ideaVersion }}
         GRAMMAR_KIT_VERSION: ${{ matrix.gkVersion }}
         IDEA_SOURCES: false

.github/workflows/PullRequest.yml

@@ -16,9 +16,11 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ideaVersion: PY-2022.1.1
+          - ideaVersion: 2022.2.1
+            ideaType: PS
             gkVersion: 2021.1.2
-          - ideaVersion: IC-2022.2.1
+          - ideaVersion: 2022.2.3
+            ideaType: PY
             gkVersion: 2021.1.2
 
     steps:
@@ -33,6 +35,7 @@ jobs:
     - name: Build with Gradle
       env:
         IDEA_VERSION: ${{ matrix.ideaVersion }}
+        IDEA_TYPE: ${{ matrix.ideaType }}
         GRAMMAR_KIT_VERSION: ${{ matrix.gkVersion }}
         IDEA_SOURCES: false
       run: xvfb-run ./gradlew test

README.md

@@ -7,7 +7,7 @@
 
 # CSV Editor Plugin for JetBrains IDE family
 
-Compatible with _IntelliJ IDEA  PhpStorm  WebStorm  PyCharm  RubyMine  AppCode  CLion  Gogland  DataGrip  Rider  MPS  Android Studio_ - __2022.1 and newer__
+Compatible with _IntelliJ IDEA  PhpStorm  WebStorm  PyCharm  RubyMine  AppCode  CLion  Gogland  DataGrip  Rider  MPS  Android Studio_ - __2022.2 and newer__
 
 This plugin introduces CSV (_Comma-Separated Values_) as a language to Jetbrains IDE with a syntax definition, structured language elements and associated file types (.csv/.tsv/.psv).
 This enables default editor features like syntax validation, highlighting and inspections for CSV-alike files.

build.gradle

@@ -21,8 +21,8 @@ jacocoTestReport {
 group 'net.seesharpsoft.intellij.plugins'
 
 apply plugin: 'java'
-project.sourceCompatibility = JavaVersion.VERSION_11
-project.targetCompatibility = JavaVersion.VERSION_11
+project.sourceCompatibility = JavaVersion.VERSION_17
+project.targetCompatibility = JavaVersion.VERSION_17
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
     options.compilerArgs << "-Xlint:deprecation"
@@ -66,18 +66,21 @@ idea {
     }
 }
 
-var final EAP_VERSION = 'LATEST-EAP-SNAPSHOT';
+var final EAP_VERSION = 'LATEST-EAP-SNAPSHOT'
+
 // IDE version - https://www.jetbrains.com/intellij-repository/releases
-var idea_version = System.getenv().getOrDefault('IDEA_VERSION', 'IC-2022.1.1')
-var build_version = idea_version == EAP_VERSION ? idea_version : idea_version.substring(5, 7) + idea_version.charAt(8) // extract e.g. '221' from 'IC-2022.1.1'
+var idea_version = System.getenv().getOrDefault('IDEA_VERSION', '2022.2.1')
+var build_version = idea_version == EAP_VERSION ? '223' : idea_version.substring(2, 4) + idea_version.charAt(5) // extract e.g. '221' from '2022.1.1'
 
 version '3.0.0-' + build_version
 
 apply plugin: 'org.jetbrains.intellij'
 intellij {
     version = idea_version
-    pluginName = 'CSV'
+    type = System.getenv().getOrDefault('IDEA_TYPE', 'IC')
+    pluginName = 'CSVEditor'
     updateSinceUntilBuild = true
+    sameSinceUntilBuild = true
     downloadSources = Boolean.parseBoolean(System.getenv().getOrDefault('IDEA_SOURCES', "true"))
 
     plugins = [
@@ -87,8 +90,7 @@ intellij {
 }
 patchPluginXml {
     // see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description
-    sinceBuild = build_version == EAP_VERSION ? '221' : build_version
-    untilBuild = build_version == EAP_VERSION ? '*' : build_version + ".*"
+    sinceBuild = build_version
 
     changeNotes = """<pre style="font-family: sans-serif">
 Major update release 3.*!