Migrate plugin to Jewel

Author: egorikftp

build.gradle.kts

@@ -32,15 +32,24 @@ allprojects {
                 }
             }
             mavenCentral()
+            maven("https://www.jetbrains.com/intellij-repository/releases")
+            maven("https://www.jetbrains.com/intellij-repository/snapshots")
+            maven("https://cache-redirector.jetbrains.com/intellij-dependencies")
+
             intellijPlatform {
                 defaultRepositories()
             }
         }
         // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin.html#setting-up-intellij-platform
         dependencies {
             extensions.configure<IntelliJPlatformDependenciesExtension> {
-                intellijIdeaCommunity("2024.3")
+                // https://plugins.jetbrains.com/docs/intellij/android-studio-releases-list.html
+                intellijIdea("2025.2.4")
+
                 bundledPlugin("org.jetbrains.kotlin")
+
+                // https://github.com/JetBrains/intellij-platform-compose-plugin-template
+                composeUI()
             }
         }
     }

gradle/libs.versions.toml

@@ -1,11 +1,11 @@
 [versions]
-compose = "1.8.2"
+compose = "1.9.0"
 intellij = "2.10.5"
 jacoco = "0.8.13"
 jdkRelease = "17"
 kotlin = "2.2.21"
 kover = "0.9.4"
-leviathan = "3.1.0-1.8.2"
+leviathan = "3.1.0"
 ktor = "3.3.3"
 
 [libraries]
@@ -24,7 +24,7 @@ ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "kto
 ktor-serialization-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
 leviathan = { module = "io.github.composegears:leviathan", version.ref = "leviathan" }
 leviathan-compose = { module = "io.github.composegears:leviathan-compose", version.ref = "leviathan" }
-tiamat = "io.github.composegears:tiamat:2.1.0-1.8.2"
+tiamat = "io.github.composegears:tiamat:2.1.0"
 xpp3 = "org.ogce:xpp3:1.1.6"
 xmlutil = "io.github.pdvrieze.xmlutil:serialization:0.91.3"
 

settings.gradle.kts

@@ -39,6 +39,9 @@ dependencyResolutionManagement {
             }
         }
         mavenCentral()
+        maven("https://www.jetbrains.com/intellij-repository/releases")
+        maven("https://www.jetbrains.com/intellij-repository/snapshots")
+        maven("https://cache-redirector.jetbrains.com/intellij-dependencies")
         maven(url = file("m2"))
 
         versionCatalogs {

tools/idea-plugin/build.gradle.kts

@@ -1,6 +1,6 @@
 import io.github.composegears.valkyrie.task.CheckComposeVersionCompatibility
 import org.jetbrains.changelog.Changelog
-import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
+import org.jetbrains.intellij.platform.gradle.extensions.excludeKotlinStdlib
 import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask.FailureLevel
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
@@ -15,8 +15,26 @@ plugins {
 group = rootProject.providers.gradleProperty("GROUP").get()
 version = rootProject.providers.gradleProperty("VERSION_NAME").get()
 
-repositories {
-    maven(url = file("../../m2"))
+configurations.all {
+    // Exclude Compose Multiplatform dependencies not needed in IntelliJ plugin
+    //  exclude("androidx.annotation")
+    //  exclude("androidx.arch.core")
+    //  exclude("androidx.compose")
+    //  exclude("androidx.lifecycle")
+    //  exclude("org.jetbrains.compose")
+    //  exclude("org.jetbrains.compose.foundation")
+    //  exclude("org.jetbrains.compose.runtime")
+    //  exclude("org.jetbrains.compose.ui")
+    //  exclude("org.jetbrains.jewel")
+    //  exclude("org.jetbrains.kotlin")
+    //  exclude("org.jetbrains.kotlinx")
+    exclude("org.jetbrains.skiko")
+
+    exclude(group = "net.sourceforge.plantuml") // PlantUML (~20MB) - from dev.snipme:highlights
+
+    // Exclude kotlinx-serialization-json-io to prevent conflicts with IntelliJ's bundled libraries
+    exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-serialization-json-io")
+    exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-serialization-json-io-jvm")
 }
 
 configurations.all {
@@ -33,7 +51,10 @@ dependencies {
     implementation(projects.compose.util)
     implementation(projects.sdk.compose.codeviewer)
     implementation(projects.sdk.compose.highlightsCore)
-    implementation(projects.sdk.compose.foundation)
+    implementation(projects.sdk.compose.foundation) {
+        excludeKotlinStdlib()
+        excludeCompose()
+    }
     implementation(projects.sdk.core.extensions)
     implementation(projects.sdk.intellij.psi.iconpack)
     implementation(projects.sdk.intellij.psi.imagevector)
@@ -43,28 +64,8 @@ dependencies {
     implementation(projects.sdk.ir.xml)
     implementation(projects.shared)
 
-    compileOnly(compose.desktop.currentOs) {
-        exclude(group = "org.jetbrains.compose.material")
-    }
-    implementation(compose.desktop.common) {
-        exclude(group = "org.jetbrains.compose.material")
-    }
-    implementation(compose.desktop.linux_arm64) {
-        exclude(group = "org.jetbrains.compose.material")
-    }
-    implementation(compose.desktop.linux_x64) {
-        exclude(group = "org.jetbrains.compose.material")
-    }
-    implementation(compose.desktop.macos_arm64) {
-        exclude(group = "org.jetbrains.compose.material")
-    }
-    implementation(compose.desktop.macos_x64) {
-        exclude(group = "org.jetbrains.compose.material")
-    }
-    implementation(compose.desktop.windows_x64) {
-        exclude(group = "org.jetbrains.compose.material")
-    }
     implementation(compose.material3)
+    implementation(compose.preview)
 
     implementation(libs.android.build.tools)
     implementation(libs.fonticons)
@@ -85,6 +86,7 @@ dependencies {
 
     intellijPlatform {
         zipSigner()
+        pluginVerifier()
     }
 }
 
@@ -97,7 +99,7 @@ intellijPlatform {
     projectName = "valkyrie-plugin"
     pluginConfiguration {
         ideaVersion {
-            sinceBuild = "243"
+            sinceBuild = "252"
             untilBuild = provider { null }
         }
         changeNotes = provider { changelog.render(Changelog.OutputType.HTML) }
@@ -114,14 +116,7 @@ intellijPlatform {
             FailureLevel.NOT_DYNAMIC,
         )
         ides {
-            create(
-                type = IntelliJPlatformType.IntellijIdeaCommunity,
-                version = "2024.3.7",
-            )
-            create(
-                type = IntelliJPlatformType.IntellijIdeaCommunity,
-                version = "2025.2",
-            )
+            recommended()
         }
     }
     signing {
@@ -173,3 +168,11 @@ tasks {
         dependsOn(checkComposeVersionCompatibility)
     }
 }
+
+
+fun ModuleDependency.excludeCompose() {
+    exclude("org.jetbrains.compose")
+    exclude("org.jetbrains.compose.foundation")
+    exclude("org.jetbrains.compose.runtime")
+    exclude("org.jetbrains.compose.ui")
+}

tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ValkyrieToolWindow.kt

@@ -1,8 +1,6 @@
 package io.github.composegears.valkyrie
 
-import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.ui.awt.ComposePanel
 import com.intellij.openapi.project.DumbAware
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.wm.ToolWindow
@@ -13,24 +11,20 @@ import io.github.composegears.valkyrie.ui.di.DI
 import io.github.composegears.valkyrie.ui.foundation.LocalSnackBar
 import io.github.composegears.valkyrie.ui.foundation.rememberSnackbarState
 import io.github.composegears.valkyrie.ui.foundation.theme.ValkyrieTheme
-import io.github.composegears.valkyrie.ui.platform.buildComposePanel
+import org.jetbrains.jewel.bridge.addComposeTab
 
 class ValkyrieToolWindow :
     ToolWindowFactory,
     DumbAware {
 
     override fun createToolWindowContent(project: Project, toolWindow: ToolWindow) {
-        System.setProperty("compose.swing.render.on.graphics", "true")
-
         DI.initWith(project)
 
-        toolWindow.apply {
-            setTitleActions(listOf(RefreshPluginAction()))
-            addComposePanel {
-                ValkyrieTheme(project = project, currentComponent = this) {
-                    CompositionLocalProvider(LocalSnackBar provides rememberSnackbarState()) {
-                        ValkyriePlugin()
-                    }
+        toolWindow.setTitleActions(listOf(RefreshPluginAction()))
+        toolWindow.addComposeTab(focusOnClickInside = true) {
+            ValkyrieTheme(project = project) {
+                CompositionLocalProvider(LocalSnackBar provides rememberSnackbarState()) {
+                    ValkyriePlugin()
                 }
             }
         }
@@ -40,10 +34,3 @@ class ValkyrieToolWindow :
         const val ID = "Valkyrie"
     }
 }
-
-private fun ToolWindow.addComposePanel(
-    displayName: String = "",
-    isLockable: Boolean = true,
-    content: @Composable ComposePanel.() -> Unit,
-) = buildComposePanel(content = content)
-    .also { contentManager.addContent(contentManager.factory.createContent(it, displayName, isLockable)) }

tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/action/dialog/RequiredIconPackModeDialog.kt

@@ -20,9 +20,9 @@ import io.github.composegears.valkyrie.sdk.compose.foundation.layout.CenterVerti
 import io.github.composegears.valkyrie.ui.foundation.icons.Warning
 import io.github.composegears.valkyrie.ui.foundation.theme.PreviewTheme
 import io.github.composegears.valkyrie.ui.foundation.theme.ValkyrieTheme
-import io.github.composegears.valkyrie.ui.platform.buildComposePanel
 import java.awt.event.ActionEvent
 import javax.swing.Action
+import org.jetbrains.jewel.bridge.compose
 
 class RequiredIconPackModeDialog(
     private val message: String,
@@ -36,7 +36,7 @@ class RequiredIconPackModeDialog(
         init()
     }
 
-    override fun createCenterPanel() = buildComposePanel {
+    override fun createCenterPanel() = compose(focusOnClickInside = true) {
         ValkyrieTheme {
             DialogContentUi(
                 modifier = Modifier.fillMaxSize(),

tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/editor/TextEditorWithImageVectorPreview.kt

@@ -52,7 +52,7 @@ private class ImageVectorPreviewEditor(
 
     private val composePanel = ComposePanel().apply {
         setContent {
-            ValkyrieTheme(project, this) {
+            ValkyrieTheme(project) {
                 VirtualFileImageVector(
                     modifier = Modifier.fillMaxSize(),
                     file = file,