diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e3148e605..a43199645 100644 --- 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 index f5fb20ec8..f2ac95e17 100644 --- 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 index 48eabef8a..8cc91d675 100644 --- 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 index b638145f8..6f3264e71 100644 --- 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/activiti-intellij-plugin/src/main/kotlin/com/valb3r/bpmn/intellij/activiti/plugin/actions/ViewActivitiBpmnDiagramAction.kt b/activiti-intellij-plugin/src/main/kotlin/com/valb3r/bpmn/intellij/activiti/plugin/actions/ViewActivitiBpmnDiagramAction.kt index a666572d2..98323e1ec 100644 --- a/activiti-intellij-plugin/src/main/kotlin/com/valb3r/bpmn/intellij/activiti/plugin/actions/ViewActivitiBpmnDiagramAction.kt +++ b/activiti-intellij-plugin/src/main/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 index 907fb4f0f..d11121065 100644 --- 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 @@ - + diff --git a/activiti-xml-parser/build.gradle b/activiti-xml-parser/build.gradle index b64c2ec6a..36b1fbc9f 100644 --- 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 } } \ No newline at end of file diff --git a/bpmn-intellij-plugin-common-tests/build.gradle b/bpmn-intellij-plugin-common-tests/build.gradle index 701cf0c7b..c13b133f3 100644 --- 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 index cf361966e..7a0b6324d 100644 --- 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 index d88d91ba3..6ce85cc5c 100644 --- 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 index f5fdd68be..9e09b1500 100644 --- 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 index ba658f35d..4c7a8169e 100644 --- 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/camunda-intellij-plugin/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/actions/ViewCamundaBpmnDiagramAction.kt b/camunda-intellij-plugin/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/actions/ViewCamundaBpmnDiagramAction.kt index 9c1c6ceab..6f380721c 100644 --- a/camunda-intellij-plugin/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/camunda/actions/ViewCamundaBpmnDiagramAction.kt +++ b/camunda-intellij-plugin/src/main/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 index 838d9b5ae..d0bf56f50 100644 --- 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 @@ - + diff --git a/camunda-xml-parser/build.gradle b/camunda-xml-parser/build.gradle index 25b20fc1e..6a01eacef 100644 --- 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 } } \ No newline at end of file diff --git a/flowable-intellij-plugin/build.gradle b/flowable-intellij-plugin/build.gradle index d977b9577..7d4c1af88 100644 --- 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() @@ -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/flowable-intellij-plugin/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/actions/ViewFlowableBpmnDiagramAction.kt b/flowable-intellij-plugin/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/actions/ViewFlowableBpmnDiagramAction.kt index 2fc0a6cf8..2e7b43466 100644 --- a/flowable-intellij-plugin/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/actions/ViewFlowableBpmnDiagramAction.kt +++ b/flowable-intellij-plugin/src/main/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-intellij-plugin/src/main/resources/META-INF/plugin.xml b/flowable-intellij-plugin/src/main/resources/META-INF/plugin.xml index c72e6b9b6..8ad35a35c 100644 --- a/flowable-intellij-plugin/src/main/resources/META-INF/plugin.xml +++ b/flowable-intellij-plugin/src/main/resources/META-INF/plugin.xml @@ -98,7 +98,7 @@ - + diff --git a/flowable-xml-parser/build.gradle b/flowable-xml-parser/build.gradle index 96e333f20..269688b1a 100644 --- 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() @@ -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 } } \ No newline at end of file diff --git a/xml-parser-api/build.gradle b/xml-parser-api/build.gradle index c0bb78ed3..b2a60033c 100644 --- 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 index 0a18be409..1c16a78ba 100644 --- 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() @@ -24,13 +24,13 @@ dependencies { compileKotlin { kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" apiVersion = kotlinApiVersion } } compileTestKotlin { kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" apiVersion = kotlinApiVersion } } @@ -51,7 +51,7 @@ test { jacocoTestReport { // Adjust the output of the test report reports { - xml.enabled true - csv.enabled false + xml.required = true + csv.required = true } } \ No newline at end of file