Add platform 212 to matrix (#356)

Author: cedricziel

.github/workflows/build.yml

@@ -37,20 +37,13 @@ jobs:
     strategy:
       matrix:
         include:
-          - idea_version: "IU-2020.3.3"
-            java_version: "1.11"
-            php_plugin_version: "203.7148.15"
-            psi_viewer_plugin_version: "203-SNAPSHOT"
-            grammar_kit_plugin_version: "2020.2.1"
-            since_build: "203"
-            until_build: "203.*"
-          - idea_version: "IU-2021.1"
-            java_version: "1.11"
-            php_plugin_version: "211.6693.120"
-            psi_viewer_plugin_version: "211-SNAPSHOT"
-            grammar_kit_plugin_version: "2020.2.1"
-            since_build: "211"
-            until_build: "211.*"
+          - idea_version: "IU-2021.2.2"
+            java_version: "11"
+            php_plugin_version: "212.5284.49"
+            psi_viewer_plugin_version: "212-SNAPSHOT"
+            grammar_kit_plugin_version: "2021.1.3"
+            since_build: "212"
+            until_build: "212.*"
 
     steps:
 
@@ -102,20 +95,13 @@ jobs:
     strategy:
       matrix:
         include:
-          - idea_version: "IU-2020.3.3"
-            java_version: "1.11"
-            php_plugin_version: "203.7148.15"
-            psi_viewer_plugin_version: "203-SNAPSHOT"
-            grammar_kit_plugin_version: "2020.2.1"
-            since_build: "203"
-            until_build: "203.*"
-          - idea_version: "IU-2021.1"
-            java_version: "1.11"
-            php_plugin_version: "211.6693.120"
-            psi_viewer_plugin_version: "211-SNAPSHOT"
-            grammar_kit_plugin_version: "2020.2.1"
-            since_build: "211"
-            until_build: "211.*"
+          - idea_version: "IU-2021.2.2"
+            java_version: "11"
+            php_plugin_version: "212.5284.49"
+            psi_viewer_plugin_version: "212-SNAPSHOT"
+            grammar_kit_plugin_version: "2021.1.3"
+            since_build: "212"
+            until_build: "212.*"
 
     outputs:
       cms-name: ${{ steps.properties.outputs.cms-name }}
@@ -223,7 +209,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
 
       # Check out current repository
       - name: Fetch Sources
@@ -308,8 +294,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - since_build: "203"
-          - since_build: "211"
+          - since_build: "212"
 
     steps:
 

.github/workflows/release.yml

@@ -24,20 +24,13 @@ jobs:
     strategy:
       matrix:
         include:
-          - idea_version: "IU-2020.3.3"
+          - idea_version: "IU-2021.2.2"
             java_version: "1.11"
-            php_plugin_version: "203.7148.15"
-            psi_viewer_plugin_version: "203-SNAPSHOT"
-            grammar_kit_plugin_version: "2020.2.1"
-            since_build: "203"
-            until_build: "203.*"
-          - idea_version: "IU-2021.1"
-            java_version: "1.11"
-            php_plugin_version: "211.6693.120"
-            psi_viewer_plugin_version: "211-SNAPSHOT"
-            grammar_kit_plugin_version: "2020.2.1"
-            since_build: "211"
-            until_build: "211.*"
+            php_plugin_version: "212.5284.49"
+            psi_viewer_plugin_version: "212-SNAPSHOT"
+            grammar_kit_plugin_version: "2021.1.3"
+            since_build: "212"
+            until_build: "212.*"
     outputs:
       prefixed-version: ${{ steps.properties.outputs.prefixed-version }}
 

CHANGELOG.md

@@ -6,10 +6,13 @@
 ### Changed
 - change main target for changelog patching to master
 - use nightly channel when publishing Fluid or TypoScript plugins
+- upgrade gradle-intellij plugin to 1.1.6
 
 ### Deprecated
 
 ### Removed
+- only support 2021.2.2
+- remove MissingTableInspectionTest as it's not compatible
 
 ### Fixed
 

build.gradle

@@ -1,7 +1,7 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 
 plugins {
-    id "org.jetbrains.intellij" version "0.7.2" apply false
+    id "org.jetbrains.intellij" version "1.1.6" apply false
     id "org.jetbrains.grammarkit" version "${grammarKitPluginVersion}" apply false
     id 'org.jetbrains.changelog' version '1.1.1'
 }
@@ -30,11 +30,12 @@ subprojects {
     apply plugin: 'idea'
     apply plugin: 'org.jetbrains.intellij'
     apply plugin: 'java'
-    apply plugin: "org.jetbrains.grammarkit"
+    apply plugin: 'org.jetbrains.grammarkit'
 
     repositories {
         mavenCentral()
         jcenter()
+        maven { url 'https://jitpack.io' }
     }
 
     changelog {
@@ -48,8 +49,8 @@ subprojects {
     }
 
     intellij {
-        version ideaVersion
-        updateSinceUntilBuild true
+        version.set(ideaVersion)
+        updateSinceUntilBuild.set(true)
 
         tasks {
             "buildSearchableOptions" {
@@ -60,29 +61,29 @@ subprojects {
 
     patchPluginXml {
         if (customSinceBuild) {
-            sinceBuild customSinceBuild
+            sinceBuild.set(customSinceBuild)
         }
         if (customUntilBuild) {
-            untilBuild customUntilBuild
+            untilBuild.set(customUntilBuild)
         }
 
-        changeNotes changelog.getUnreleased().toHTML()
-        pluginDescription htmlFixer("${project.projectDir}/src/main/resources/META-INF/description.html")
+        changeNotes.set(provider { changelog.getLatest().toHTML() })
+        pluginDescription.set(htmlFixer("${project.projectDir}/src/main/resources/META-INF/description.html"))
     }
 
     grammarKit {
         jflexRelease = jFlexRelease
     }
 
     runPluginVerifier {
-        ideVersions pluginVerifierIdeVersions
+        ideVersions.set(pluginVerifierIdeVersions.split(',').toList())
     }
 
     test.testLogging.exceptionFormat = TestExceptionFormat.FULL
 }
 
 wrapper {
-    gradleVersion '6.2'
+    gradleVersion '7.2'
 }
 
 test.testLogging.exceptionFormat = TestExceptionFormat.FULL

gradle.properties

@@ -5,19 +5,26 @@ pluginNameFluid = TYPO3 Fluid Support
 pluginNameTypoScript = TYPO3 TypoScript Support
 pluginVersion = 0.7.1
 
-javaVersion = 1.8
-javaTargetVersion = 1.8
+javaVersion = 1.11
+javaTargetVersion = 1.11
 
 jFlexRelease = 1.7.0-1
 
-pluginVerifierIdeVersions = 2020.3.3, 2021.1
+pluginVerifierIdeVersions = 2021.2
 
-grammarKitPluginVersion = 2020.2.1
-ideaVersion = IU-2021.1
-phpPluginVersion = 211.6693.120
-psiViewerPluginVersion = 211-SNAPSHOT
-customSinceBuild=211
-customUntilBuild=211.*
+grammarKitPluginVersion = 2021.1.3
+ideaVersion = IU-2021.2.2
+phpPluginVersion = 212.5284.49
+psiViewerPluginVersion = 212-SNAPSHOT
+customSinceBuild=212
+customUntilBuild=212.*
+
+#grammarKitPluginVersion = 2020.2.1
+#ideaVersion = IU-2021.1
+#phpPluginVersion = 211.6693.120
+#psiViewerPluginVersion = 211-SNAPSHOT
+#customSinceBuild=211
+#customUntilBuild=211.*
 
 #grammarKitPluginVersion = 2020.2.1
 #ideaVersion = IU-2020.3.3

gradle/wrapper/gradle-wrapper.jar

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