Merge branch 'master' into kantis/updating-runwriteaction

kotest · Jun 25, 2024 · 56d43ae · 56d43ae
2 parents 2243be4 + d24c9ad
commit 56d43ae
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -90,7 +90,7 @@ val plugins = listOf(
 )
 
 val productName = System.getenv("PRODUCT_NAME") ?: "IC-241"
-val jvmTarget = System.getenv("JVM_TARGET") ?: "11"
+val jvmTargetVersion = System.getenv("JVM_TARGET") ?: "11"
 val descriptor = plugins.first { it.sourceFolder == productName }
 
 val jetbrainsToken: String by project
@@ -137,20 +137,13 @@ sourceSets {
    }
 }
 
-tasks {
-
-   compileKotlin {
-      kotlinOptions {
-         jvmTarget = jvmTarget
-      }
-   }
-
-   withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-      kotlinOptions {
-         jvmTarget = jvmTarget
-      }
+kotlin {
+   compilerOptions {
+      jvmToolchain(JavaLanguageVersion.of(jvmTargetVersion).asInt())
    }
+}
 
+tasks {
    buildPlugin {
       archiveClassifier.set(descriptor.sdkVersion)
    }

diff --git a/src/main/kotlin/io/kotest/plugin/intellij/toolwindow/toolbar.kt b/src/main/kotlin/io/kotest/plugin/intellij/toolwindow/toolbar.kt
@@ -3,6 +3,7 @@ package io.kotest.plugin.intellij.toolwindow
 import com.intellij.icons.AllIcons
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.ActionPlaces
+import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.DefaultActionGroup
@@ -53,6 +54,8 @@ class ExpandAllAction(private val tree: TestFileTree) : AnAction("Expand All", n
 class FilterCallbacksAction(private val tree: TestFileTree) :
    ToggleAction("Filter Vallbacks", null, AllIcons.Nodes.Controller) {
 
+   override fun getActionUpdateThread() = ActionUpdateThread.EDT
+
    override fun isSelected(e: AnActionEvent): Boolean {
       return TestExplorerState.showCallbacks
    }
@@ -66,6 +69,8 @@ class FilterCallbacksAction(private val tree: TestFileTree) :
 class FilterModulesAction(private val tree: TestFileTree) :
    ToggleAction("Filter Modules", null, AllIcons.Nodes.ModuleGroup) {
 
+   override fun getActionUpdateThread() = ActionUpdateThread.EDT
+
    override fun isSelected(e: AnActionEvent): Boolean {
       return TestExplorerState.showModules
    }
@@ -77,6 +82,7 @@ class FilterModulesAction(private val tree: TestFileTree) :
 }
 
 class FilterTagsAction(private val tree: TestFileTree) : ToggleAction("Filter Tags", null, AllIcons.Nodes.Tag) {
+   override fun getActionUpdateThread() = ActionUpdateThread.EDT
 
    override fun isSelected(e: AnActionEvent): Boolean {
       return TestExplorerState.showTags
@@ -89,6 +95,7 @@ class FilterTagsAction(private val tree: TestFileTree) : ToggleAction("Filter Ta
 }
 
 class FilterIncludesAction(private val tree: TestFileTree) : ToggleAction("Filter Includes", null, AllIcons.Nodes.Tag) {
+   override fun getActionUpdateThread() = ActionUpdateThread.EDT
 
    override fun isSelected(e: AnActionEvent): Boolean {
       return TestExplorerState.showIncludes
@@ -105,6 +112,7 @@ class NavigateToNodeAction : ToggleAction(
    null,
    AllIcons.General.AutoscrollToSource
 ) {
+   override fun getActionUpdateThread() = ActionUpdateThread.EDT
 
    override fun isSelected(e: AnActionEvent): Boolean {
       return TestExplorerState.autoscrollToSource

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -12,7 +12,7 @@
 
    <!-- correct values will be set by the build plugin -->
    <version>1.0.0</version>
-   <idea-version since-build="211.6085.26"/>
+   <idea-version since-build="223.4884.69"/>
 
    <depends>org.jetbrains.kotlin</depends>
    <depends>com.intellij.modules.java</depends>