Merge pull request #389 from valb3r/bugfix/FBP-387-EDT-exception

Updated builds + Initial fix for https://github.com/valb3r/flowable-b…
valb3r · Apr 29, 2024 · 2a08cc5 · 2a08cc5
2 parents 1083451 + a1ff844
commit 2a08cc5
Show file tree

Hide file tree

Showing 21 changed files with 88 additions and 67 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,10 +9,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 17
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -9,10 +9,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -25,10 +25,10 @@ jobs:
           fi
         env:
           TAG_NAME: ${{ github.ref_name }}
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build, test with Gradle

diff --git a/activiti-intellij-plugin/build.gradle b/activiti-intellij-plugin/build.gradle
@@ -6,7 +6,7 @@ plugins {
 
 group = 'com.valb3r.bpmn.intellij.plugin.activiti'
 
-sourceCompatibility = 1.8
+sourceCompatibility = 17
 
 repositories {
     mavenCentral()
@@ -43,7 +43,7 @@ intellij {
 }
 
 runPluginVerifier {
-    ideVersions = ["IU-2021.3", "IC-2021.3"]
+    ideVersions = ["IU-2022.3", "IC-2022.3"]
 }
 
 verifyPlugin {
@@ -56,13 +56,13 @@ publishPlugin {
 
 compileKotlin {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
         apiVersion = kotlinApiVersion
     }
 }
 compileTestKotlin {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
         apiVersion = kotlinApiVersion
     }
 }
@@ -87,7 +87,7 @@ test {
 jacocoTestReport {
     // Adjust the output of the test report
     reports {
-        xml.enabled true
-        csv.enabled false
+        xml.required = true
+        csv.required = true
     }
 }
diff --git a/.../kotlin/com/valb3r/bpmn/intellij/activiti/plugin/actions/ViewActivitiBpmnDiagramAction.kt b/.../kotlin/com/valb3r/bpmn/intellij/activiti/plugin/actions/ViewActivitiBpmnDiagramAction.kt
@@ -1,6 +1,7 @@
 package com.valb3r.bpmn.intellij.activiti.plugin.actions
 
 import com.intellij.notification.NotificationType
+import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.components.ServiceManager
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiFile
@@ -23,4 +24,8 @@ class ViewActivitiBpmnDiagramAction : BaseViewBpmnDiagramAction() {
     override fun notificationBalloon(project: Project, message: String, type: NotificationType) {
         showNotificationBalloon(project, message, type)
     }
+
+    override fun getActionUpdateThread(): ActionUpdateThread {
+        return ActionUpdateThread.BGT
+    }
 }
diff --git a/activiti-intellij-plugin/src/main/resources/META-INF/plugin.xml b/activiti-intellij-plugin/src/main/resources/META-INF/plugin.xml
@@ -98,7 +98,7 @@
     <!-- <helpset file="myhelp.jar" path="/Help.hs" /> -->
 
     <!-- Minimum and maximum build of IDE compatible with the plugin -->
-    <idea-version since-build="213"/>
+    <idea-version since-build="223"/>
 
     <!-- Resource bundle (/messages/MyPluginBundle.properties) to be used with `key` attributes in extension points
          and implicit keys like `action.[pluginID].[ActionID].text` -->

diff --git a/activiti-xml-parser/build.gradle b/activiti-xml-parser/build.gradle
@@ -7,7 +7,7 @@ plugins {
 group = 'com.valb3r.bpmn.intellij.plugin.activiti.parser'
 
 
-sourceCompatibility = 1.8
+sourceCompatibility = 17
 
 repositories {
     mavenCentral()
@@ -38,18 +38,20 @@ dependencies {
 
 compileKotlin {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
         apiVersion = kotlinApiVersion
     }
 }
 compileTestKotlin {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
         apiVersion = kotlinApiVersion
     }
 }
 
 test {
+    jvmArgs "--add-opens=java.base/java.nio.charset=ALL-UNNAMED"
+
     jacoco {
         destinationFile = file("${buildDir}/jacoco/test.exec")
     }
@@ -65,7 +67,7 @@ test {
 jacocoTestReport {
     // Adjust the output of the test report
     reports {
-        xml.enabled true
-        csv.enabled false
+        xml.required = true
+        csv.required = true
     }
 }
diff --git a/bpmn-intellij-plugin-common-tests/build.gradle b/bpmn-intellij-plugin-common-tests/build.gradle
@@ -6,7 +6,7 @@ plugins {
 
 group = 'com.valb3r.bpmn.intellij.plugin.core.tests'
 
-sourceCompatibility = 1.8
+sourceCompatibility = 17
 
 repositories {
     mavenCentral()
@@ -40,13 +40,13 @@ sourceSets {
 
 compileKotlin {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
         apiVersion = kotlinApiVersion
     }
 }
 compileTestKotlin {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
         apiVersion = kotlinApiVersion
     }
 }

diff --git a/bpmn-intellij-plugin-commons/build.gradle b/bpmn-intellij-plugin-commons/build.gradle
@@ -6,7 +6,7 @@ plugins {
 
 group 'com.valb3r.bpmn.intellij.plugin.commons'
 
-sourceCompatibility = 1.8
+sourceCompatibility = 17
 
 repositories {
     mavenCentral()
@@ -47,13 +47,13 @@ publishPlugin.enabled = false
 
 compileKotlin {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
         apiVersion = kotlinApiVersion
     }
 }
 compileTestKotlin {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
         apiVersion = kotlinApiVersion
     }
 }
@@ -78,7 +78,7 @@ test {
 jacocoTestReport {
     // Adjust the output of the test report
     reports {
-        xml.enabled true
-        csv.enabled false
+        xml.required = true
+        csv.required = true
     }
 }
diff --git a/bpmn-intellij-plugin-core/build.gradle b/bpmn-intellij-plugin-core/build.gradle
@@ -6,7 +6,7 @@ plugins {
 
 group 'com.valb3r.bpmn.intellij.plugin.core'
 
-sourceCompatibility = 1.8
+sourceCompatibility = 17
 
 repositories {
     mavenCentral()
@@ -53,13 +53,13 @@ publishPlugin.enabled = false
 
 compileKotlin {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
         apiVersion = kotlinApiVersion
     }
 }
 compileTestKotlin {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
         apiVersion = kotlinApiVersion
     }
 }
@@ -84,7 +84,7 @@ test {
 jacocoTestReport {
     // Adjust the output of the test report
     reports {
-        xml.enabled true
-        csv.enabled false
+        xml.required = true
+        csv.required = true
     }
 }
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,12 @@
 plugins {
     id 'java'
     id 'org.jetbrains.intellij' version '1.11.0'
-    id 'org.jetbrains.kotlin.jvm' version '1.5.30'
-    id 'org.jetbrains.kotlin.kapt' version '1.5.30'
+    id 'org.jetbrains.kotlin.jvm' version '1.6.0'
+    id 'org.jetbrains.kotlin.kapt' version '1.6.0'
 }
 
 ext {
-    intellijPlatform = 'IU-2021.3'
+    intellijPlatform = 'IU-2022.3'
     intellijPlatformPlugins = ['java', 'DatabaseTools'] // DatabaseTools is for BPMN process 'debugging'
 
     kotlinStdlib = '1.5.30'
@@ -20,13 +20,13 @@ ext {
     jsonPath = '2.8.0'
     junitPlatformRunner = '1.6.2'
     kluent = '1.68'
-    mockitoInline = '3.3.3'
+    mockitoInline = '5.2.0'
     mockitoKotlin = '2.2.0'
 }
 
 group = 'com.valb3r'
 
-sourceCompatibility = 1.8
+sourceCompatibility = 17
 
 repositories {
     mavenCentral()

diff --git a/camunda-intellij-plugin/build.gradle b/camunda-intellij-plugin/build.gradle
@@ -6,7 +6,7 @@ plugins {
 
 group = 'com.valb3r.bpmn.intellij.plugin.camunda'
 
-sourceCompatibility = 1.8
+sourceCompatibility = 17
 
 repositories {
     mavenCentral()
@@ -43,7 +43,7 @@ intellij {
 }
 
 runPluginVerifier {
-    ideVersions = ["IU-2021.3", "IC-2021.3"]
+    ideVersions = ["IU-2022.3", "IC-2022.3"]
 }
 
 verifyPlugin {
@@ -56,13 +56,13 @@ publishPlugin {
 
 compileKotlin {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
         apiVersion = kotlinApiVersion
     }
 }
 compileTestKotlin {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
         apiVersion = kotlinApiVersion
     }
 }
@@ -87,7 +87,7 @@ test {
 jacocoTestReport {
     // Adjust the output of the test report
     reports {
-        xml.enabled true
-        csv.enabled false
+        xml.required = true
+        csv.required = true
     }
 }
diff --git a/...in/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/actions/ViewCamundaBpmnDiagramAction.kt b/...in/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/actions/ViewCamundaBpmnDiagramAction.kt
@@ -1,12 +1,13 @@
 package com.valb3r.bpmn.intellij.plugin.camunda.actions
 
 import com.intellij.notification.NotificationType
+import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.components.ServiceManager
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiFile
-import com.valb3r.bpmn.intellij.plugin.camunda.notifications.showNotificationBalloon
 import com.valb3r.bpmn.intellij.plugin.camunda.CamundaBpmnPluginToolWindowProjectService
+import com.valb3r.bpmn.intellij.plugin.camunda.notifications.showNotificationBalloon
 import com.valb3r.bpmn.intellij.plugin.camunda.settings.CamundaBpmnPluginSettingsState
 import com.valb3r.bpmn.intellij.plugin.core.BpmnActionContext
 import com.valb3r.bpmn.intellij.plugin.core.actions.BaseViewBpmnDiagramAction
@@ -34,4 +35,8 @@ class ViewCamundaBpmnDiagramAction : BaseViewBpmnDiagramAction() {
         val psiElement = psiElement(anActionEvent)
         anActionEvent.presentation.isEnabledAndVisible = project != null && isValidFileName(psiElement?.containingFile?.name)
     }
+
+    override fun getActionUpdateThread(): ActionUpdateThread {
+        return ActionUpdateThread.BGT
+    }
 }
diff --git a/camunda-intellij-plugin/src/main/resources/META-INF/plugin.xml b/camunda-intellij-plugin/src/main/resources/META-INF/plugin.xml
@@ -104,7 +104,7 @@
     <!-- <helpset file="myhelp.jar" path="/Help.hs" /> -->
 
     <!-- Minimum and maximum build of IDE compatible with the plugin -->
-    <idea-version since-build="213"/>
+    <idea-version since-build="223"/>
 
     <!-- Resource bundle (/messages/MyPluginBundle.properties) to be used with `key` attributes in extension points
          and implicit keys like `action.[pluginID].[ActionID].text` -->

diff --git a/camunda-xml-parser/build.gradle b/camunda-xml-parser/build.gradle
@@ -7,7 +7,7 @@ plugins {
 group = 'com.valb3r.bpmn.intellij.plugin.camunda.parser'
 
 
-sourceCompatibility = 1.8
+sourceCompatibility = 17
 
 repositories {
     mavenCentral()
@@ -38,18 +38,20 @@ dependencies {
 
 compileKotlin {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
         apiVersion = kotlinApiVersion
     }
 }
 compileTestKotlin {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
         apiVersion = kotlinApiVersion
     }
 }
 
 test {
+    jvmArgs "--add-opens=java.base/java.nio.charset=ALL-UNNAMED"
+
     jacoco {
         destinationFile = file("${buildDir}/jacoco/test.exec")
     }
@@ -65,7 +67,7 @@ test {
 jacocoTestReport {
     // Adjust the output of the test report
     reports {
-        xml.enabled true
-        csv.enabled false
+        xml.required = true
+        csv.required = true
     }
 }