Updated builds + Initial fix for #387

valb3r · Apr 28, 2024 · 6d72af3 · 6d72af3
1 parent 1083451
commit 6d72af3
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 16 deletions.
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()

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-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()

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()

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()

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()

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-2023.1'
     intellijPlatformPlugins = ['java', 'DatabaseTools'] // DatabaseTools is for BPMN process 'debugging'
 
     kotlinStdlib = '1.5.30'
@@ -26,7 +26,7 @@ ext {
 
 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()

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-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()

diff --git a/flowable-intellij-plugin/build.gradle b/flowable-intellij-plugin/build.gradle
@@ -6,7 +6,7 @@ plugins {
 
 group = 'com.valb3r.bpmn.intellij.plugin.flowable'
 
-sourceCompatibility = 1.8
+sourceCompatibility = 17
 
 repositories {
     mavenCentral()

diff --git a/.../kotlin/com/valb3r/bpmn/intellij/plugin/flowable/actions/ViewFlowableBpmnDiagramAction.kt b/.../kotlin/com/valb3r/bpmn/intellij/plugin/flowable/actions/ViewFlowableBpmnDiagramAction.kt
@@ -1,6 +1,7 @@
 package com.valb3r.bpmn.intellij.plugin.flowable.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 ViewFlowableBpmnDiagramAction : BaseViewBpmnDiagramAction() {
     override fun notificationBalloon(project: Project, message: String, type: NotificationType) {
         showNotificationBalloon(project, message, type)
     }
+
+    override fun getActionUpdateThread(): ActionUpdateThread {
+        return ActionUpdateThread.BGT
+    }
 }
diff --git a/flowable-xml-parser/build.gradle b/flowable-xml-parser/build.gradle
@@ -7,7 +7,7 @@ plugins {
 group = 'com.valb3r.bpmn.intellij.plugin.flowable.parser'
 
 
-sourceCompatibility = 1.8
+sourceCompatibility = 17
 
 repositories {
     mavenCentral()

diff --git a/xml-parser-api/build.gradle b/xml-parser-api/build.gradle
@@ -6,7 +6,7 @@ plugins {
 
 group = 'com.valb3r.bpmn.intellij.plugin.bpmn.api'
 
-sourceCompatibility = 1.8
+sourceCompatibility = 17
 
 repositories {
     mavenCentral()

diff --git a/xml-parser-core/build.gradle b/xml-parser-core/build.gradle
@@ -5,7 +5,7 @@ plugins {
 
 group = 'com.valb3r.bpmn.intellij.plugin.bpmn.parser.core'
 
-sourceCompatibility = 1.8
+sourceCompatibility = 17
 
 repositories {
     mavenCentral()