From c25ad6ee383e4a149bb907d207e8809bf1c2a90e Mon Sep 17 00:00:00 2001 From: "carlrobertoh@gmail.com" Date: Mon, 10 Feb 2025 17:34:16 +0000 Subject: [PATCH] fix: remove clashing coroutines deps --- build.gradle.kts | 2 -- gradle/libs.versions.toml | 3 --- .../service/custom/CustomServiceConfigurable.kt | 16 ++++++++++++---- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index cfb76c07..1b000d30 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -65,8 +65,6 @@ dependencies { implementation(kotlin("stdlib")) implementation(kotlin("reflect")) implementation(libs.jsoup) - implementation(libs.kotlinx.coroutines.swing) - implementation(libs.kotlinx.coroutines.core) implementation(libs.commons.text) implementation(libs.jtokkit) testImplementation(kotlin("test")) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e469525e..55578148 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,7 +15,6 @@ kotlin = "2.0.0" llm-client = "0.8.35" okio = "3.9.0" tree-sitter = "0.24.4" -coroutines = "1.7.3" [libraries] analytics = { module = "com.rudderstack.sdk.java.analytics:analytics", version.ref = "analytics" } @@ -32,8 +31,6 @@ kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", v llm-client = { module = "ee.carlrobert:llm-client", version.ref = "llm-client" } okio = { module = "com.squareup.okio:okio", version.ref = "okio" } tree-sitter = { module = "io.github.bonede:tree-sitter", version.ref = "tree-sitter" } -kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "coroutines" } -kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } [plugins] changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" } diff --git a/src/main/kotlin/ee/carlrobert/codegpt/settings/service/custom/CustomServiceConfigurable.kt b/src/main/kotlin/ee/carlrobert/codegpt/settings/service/custom/CustomServiceConfigurable.kt index 30eba4b6..9d591569 100644 --- a/src/main/kotlin/ee/carlrobert/codegpt/settings/service/custom/CustomServiceConfigurable.kt +++ b/src/main/kotlin/ee/carlrobert/codegpt/settings/service/custom/CustomServiceConfigurable.kt @@ -1,21 +1,29 @@ package ee.carlrobert.codegpt.settings.service.custom +import com.intellij.openapi.application.runInEdt import com.intellij.openapi.components.service import com.intellij.openapi.options.Configurable import ee.carlrobert.codegpt.settings.service.custom.form.CustomServiceListForm +import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.cancel -import kotlinx.coroutines.swing.Swing import javax.swing.JComponent +import kotlin.coroutines.CoroutineContext + +object SwingDispatcher : CoroutineDispatcher() { + override fun dispatch(context: CoroutineContext, block: Runnable) { + runInEdt { + block.run() + } + } +} class CustomServiceConfigurable : Configurable { - private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Swing.immediate) + private val coroutineScope = CoroutineScope(SupervisorJob() + SwingDispatcher) private lateinit var component: CustomServiceListForm - override fun getDisplayName(): String { return "CodeGPT: Custom Service" }