Migrate to Nucleus 2.0 and drop platformtools/SingleInstanceManager

kdroidFilter · kdroidFilter · commit cbdf014ba7b9 · 2026-07-10T18:09:58.000+03:00
- Bump Nucleus to 2.0.0-alpha, migrate coordinates/plugin id/packages to dev.nucleusframework
- Replace platformtools with Nucleus core-runtime Platform and LinuxDesktopEnvironment
- Remove bundled SingleInstanceManager in favor of the one provided by Nucleus core-runtime
diff --git a/README.md b/README.md
@@ -411,9 +411,11 @@ The single instance manager combined with the primary action (left-click) is par
 - Preserving the current state of the application during restoration
 - Offering behavior similar to native system applications
 
-Implementation example with `SingleInstanceManager`:
+Implementation example with `SingleInstanceManager` (provided by Nucleus):
 
 ```kotlin
+import dev.nucleusframework.core.runtime.SingleInstanceManager
+
 var isWindowVisible by remember { mutableStateOf(true) }
 
 val isSingleInstance = SingleInstanceManager.isSingleInstance(
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -48,7 +48,6 @@ kotlin {
             implementation(compose.components.resources)
             implementation(libs.kotlinx.coroutines.core)
             implementation(libs.kotlinx.coroutines.swing)
-            implementation(libs.platformtools.core)
             implementation(libs.nucleus.core.runtime)
             implementation(libs.nucleus.darkmode.detector)
         }
diff --git a/demo/build.gradle.kts b/demo/build.gradle.kts
@@ -1,4 +1,4 @@
-import io.github.kdroidfilter.nucleus.desktop.application.dsl.TargetFormat
+import dev.nucleusframework.desktop.application.dsl.TargetFormat
 
 plugins {
     alias(libs.plugins.multiplatform)
diff --git a/demo/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/demo/App.kt b/demo/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/demo/App.kt
@@ -8,7 +8,7 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import io.github.kdroidfilter.nucleus.darkmodedetector.isSystemInDarkMode
+import dev.nucleusframework.darkmodedetector.isSystemInDarkMode
 import kotlin.system.exitProcess
 
 @OptIn(ExperimentalMaterial3Api::class)
diff --git a/demo/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/demo/DemoAdaptivePositionWindows.kt b/demo/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/demo/DemoAdaptivePositionWindows.kt
@@ -17,7 +17,7 @@ import androidx.compose.ui.window.application
 import androidx.compose.ui.window.rememberWindowState
 import dev.nucleusframework.composenativetray.tray.api.Tray
 import dev.nucleusframework.composenativetray.utils.ComposeNativeTrayLoggingLevel
-import dev.nucleusframework.composenativetray.utils.SingleInstanceManager
+import dev.nucleusframework.core.runtime.SingleInstanceManager
 import dev.nucleusframework.composenativetray.utils.allowComposeNativeTrayLogging
 import dev.nucleusframework.composenativetray.utils.composeNativeTrayLoggingLevel
 import dev.nucleusframework.composenativetray.utils.getTrayPosition
diff --git a/demo/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/demo/DemoComposableMenu.kt b/demo/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/demo/DemoComposableMenu.kt
@@ -7,7 +7,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 import dev.nucleusframework.composenativetray.tray.api.Tray
-import dev.nucleusframework.composenativetray.utils.SingleInstanceManager
+import dev.nucleusframework.core.runtime.SingleInstanceManager
 import composenativetray.demo.generated.resources.Res
 import composenativetray.demo.generated.resources.icon
 import composenativetray.demo.generated.resources.icon2
diff --git a/demo/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/demo/DemoWithContextMenu.kt b/demo/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/demo/DemoWithContextMenu.kt
@@ -17,7 +17,7 @@ import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 import dev.nucleusframework.composenativetray.tray.api.Tray
 import dev.nucleusframework.composenativetray.utils.ComposeNativeTrayLoggingLevel
-import dev.nucleusframework.composenativetray.utils.SingleInstanceManager
+import dev.nucleusframework.core.runtime.SingleInstanceManager
 import dev.nucleusframework.composenativetray.utils.allowComposeNativeTrayLogging
 import dev.nucleusframework.composenativetray.utils.composeNativeTrayLoggingLevel
 import dev.nucleusframework.composenativetray.utils.getTrayPosition
diff --git a/demo/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/demo/DemoWithDrawableResources.kt b/demo/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/demo/DemoWithDrawableResources.kt
@@ -8,7 +8,7 @@ import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 import dev.nucleusframework.composenativetray.tray.api.Tray
 import dev.nucleusframework.composenativetray.utils.ComposeNativeTrayLoggingLevel
-import dev.nucleusframework.composenativetray.utils.SingleInstanceManager
+import dev.nucleusframework.core.runtime.SingleInstanceManager
 import dev.nucleusframework.composenativetray.utils.allowComposeNativeTrayLogging
 import dev.nucleusframework.composenativetray.utils.composeNativeTrayLoggingLevel
 import composenativetray.demo.generated.resources.Res
diff --git a/demo/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/demo/DemoWithImageVector.kt b/demo/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/demo/DemoWithImageVector.kt
@@ -10,7 +10,7 @@ import androidx.compose.ui.window.application
 import dev.nucleusframework.composenativetray.demo.svg.AcademicCap
 import dev.nucleusframework.composenativetray.tray.api.Tray
 import dev.nucleusframework.composenativetray.utils.ComposeNativeTrayLoggingLevel
-import dev.nucleusframework.composenativetray.utils.SingleInstanceManager
+import dev.nucleusframework.core.runtime.SingleInstanceManager
 import dev.nucleusframework.composenativetray.utils.allowComposeNativeTrayLogging
 import dev.nucleusframework.composenativetray.utils.composeNativeTrayLoggingLevel
 import dev.nucleusframework.composenativetray.utils.getTrayPosition
diff --git a/demo/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/demo/DemoWithPainter.kt b/demo/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/demo/DemoWithPainter.kt
@@ -8,7 +8,7 @@ import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 import dev.nucleusframework.composenativetray.tray.api.Tray
 import dev.nucleusframework.composenativetray.utils.ComposeNativeTrayLoggingLevel
-import dev.nucleusframework.composenativetray.utils.SingleInstanceManager
+import dev.nucleusframework.core.runtime.SingleInstanceManager
 import dev.nucleusframework.composenativetray.utils.allowComposeNativeTrayLogging
 import dev.nucleusframework.composenativetray.utils.composeNativeTrayLoggingLevel
 import dev.nucleusframework.composenativetray.utils.getTrayPosition
diff --git a/demo/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/demo/DemoWithPlatformSpecificIcons.kt b/demo/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/demo/DemoWithPlatformSpecificIcons.kt
@@ -10,7 +10,7 @@ import androidx.compose.ui.window.application
 import dev.nucleusframework.composenativetray.demo.svg.AcademicCap
 import dev.nucleusframework.composenativetray.tray.api.Tray
 import dev.nucleusframework.composenativetray.utils.ComposeNativeTrayLoggingLevel
-import dev.nucleusframework.composenativetray.utils.SingleInstanceManager
+import dev.nucleusframework.core.runtime.SingleInstanceManager
 import dev.nucleusframework.composenativetray.utils.allowComposeNativeTrayLogging
 import dev.nucleusframework.composenativetray.utils.composeNativeTrayLoggingLevel
 import dev.nucleusframework.composenativetray.utils.getTrayPosition
diff --git a/demo/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/demo/DemoWithoutContextMenu.kt b/demo/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/demo/DemoWithoutContextMenu.kt
@@ -15,7 +15,7 @@ import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 import dev.nucleusframework.composenativetray.tray.api.Tray
 import dev.nucleusframework.composenativetray.utils.ComposeNativeTrayLoggingLevel
-import dev.nucleusframework.composenativetray.utils.SingleInstanceManager
+import dev.nucleusframework.core.runtime.SingleInstanceManager
 import dev.nucleusframework.composenativetray.utils.allowComposeNativeTrayLogging
 import dev.nucleusframework.composenativetray.utils.composeNativeTrayLoggingLevel
 import dev.nucleusframework.composenativetray.utils.getTrayPosition
diff --git a/demo/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/demo/DynamicIconsDemo.kt b/demo/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/demo/DynamicIconsDemo.kt
@@ -22,7 +22,7 @@ import dev.nucleusframework.composenativetray.menu.api.Key
 import dev.nucleusframework.composenativetray.menu.api.KeyShortcut
 import dev.nucleusframework.composenativetray.tray.api.Tray
 import dev.nucleusframework.composenativetray.utils.ComposeNativeTrayLoggingLevel
-import dev.nucleusframework.composenativetray.utils.SingleInstanceManager
+import dev.nucleusframework.core.runtime.SingleInstanceManager
 import dev.nucleusframework.composenativetray.utils.allowComposeNativeTrayLogging
 import dev.nucleusframework.composenativetray.utils.composeNativeTrayLoggingLevel
 import composenativetray.demo.generated.resources.Res
diff --git a/demo/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/demo/DynamicTrayMenu.kt b/demo/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/demo/DynamicTrayMenu.kt
@@ -8,9 +8,9 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 import dev.nucleusframework.composenativetray.tray.api.Tray
-import io.github.kdroidfilter.nucleus.graalvm.GraalVmInitializer
+import dev.nucleusframework.graalvm.GraalVmInitializer
 import dev.nucleusframework.composenativetray.utils.ComposeNativeTrayLoggingLevel
-import dev.nucleusframework.composenativetray.utils.SingleInstanceManager
+import dev.nucleusframework.core.runtime.SingleInstanceManager
 import dev.nucleusframework.composenativetray.utils.allowComposeNativeTrayLogging
 import dev.nucleusframework.composenativetray.utils.composeNativeTrayLoggingLevel
 import dev.nucleusframework.composenativetray.utils.getTrayPosition
diff --git a/demo/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/demo/TrayAppDemo.kt b/demo/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/demo/TrayAppDemo.kt
@@ -25,8 +25,8 @@ import dev.nucleusframework.composenativetray.utils.WindowRaise
 import dev.nucleusframework.composenativetray.utils.allowComposeNativeTrayLogging
 import composenativetray.demo.generated.resources.Res
 import composenativetray.demo.generated.resources.icon
-import io.github.kdroidfilter.nucleus.darkmodedetector.isSystemInDarkMode
-import io.github.kdroidfilter.nucleus.graalvm.GraalVmInitializer
+import dev.nucleusframework.darkmodedetector.isSystemInDarkMode
+import dev.nucleusframework.graalvm.GraalVmInitializer
 import kotlinx.coroutines.launch
 import org.jetbrains.compose.resources.painterResource
 import java.io.File
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,21 +1,19 @@
 [versions]
 kermit = "2.0.8"
-kotlin = "2.3.10"
+kotlin = "2.4.0"
 kotlinx-coroutines = "1.11.0"
-compose = "1.10.3"
-platformtools = "0.7.5"
+compose = "1.11.1"
 detekt = "1.23.8"
 ktlint = "12.1.2"
-nucleus = "1.12.0"
+nucleus = "2.0.0-alpha-202607101252"
 
 [libraries]
 kermit = { module = "co.touchlab:kermit", version.ref = "kermit" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "kotlinx-coroutines" }
-platformtools-core = { module = "io.github.kdroidfilter:platformtools.core", version.ref = "platformtools" }
-nucleus-core-runtime = { module = "io.github.kdroidfilter:nucleus.core-runtime", version.ref = "nucleus" }
-nucleus-darkmode-detector = { module = "io.github.kdroidfilter:nucleus.darkmode-detector", version.ref = "nucleus" }
-nucleus-graalvm-runtime = { module = "io.github.kdroidfilter:nucleus.graalvm-runtime", version.ref = "nucleus" }
+nucleus-core-runtime = { module = "dev.nucleusframework:nucleus.core-runtime", version.ref = "nucleus" }
+nucleus-darkmode-detector = { module = "dev.nucleusframework:nucleus.darkmode-detector", version.ref = "nucleus" }
+nucleus-graalvm-runtime = { module = "dev.nucleusframework:nucleus.graalvm-runtime", version.ref = "nucleus" }
 
 [plugins]
 multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
@@ -25,4 +23,4 @@ vannitktech-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.
 dokka = { id = "org.jetbrains.dokka", version = "2.2.0" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
-nucleus = { id = "io.github.kdroidfilter.nucleus", version.ref = "nucleus" }
+nucleus = { id = "dev.nucleusframework", version.ref = "nucleus" }
diff --git a/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/lib/linux/LinuxOutsideClickWatcher.kt b/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/lib/linux/LinuxOutsideClickWatcher.kt
@@ -1,8 +1,7 @@
 package dev.nucleusframework.composenativetray.lib.linux
 
 import dev.nucleusframework.composenativetray.utils.isPointWithinLinuxStatusItem
-import io.github.kdroidfilter.platformtools.OperatingSystem
-import io.github.kdroidfilter.platformtools.getOperatingSystem
+import dev.nucleusframework.core.runtime.Platform
 import java.awt.Window
 import java.util.concurrent.Executors
 import java.util.concurrent.ScheduledExecutorService
@@ -30,7 +29,7 @@ class LinuxOutsideClickWatcher(
     private var rootWindow: Long = 0L
 
     fun start() {
-        if (getOperatingSystem() != OperatingSystem.LINUX) return
+        if (Platform.Current != Platform.Linux) return
         if (scheduler != null) return
 
         try {
diff --git a/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/lib/linux/LinuxTrayManager.kt b/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/lib/linux/LinuxTrayManager.kt
@@ -4,8 +4,7 @@ import dev.nucleusframework.composenativetray.utils.TrayClickTracker
 import dev.nucleusframework.composenativetray.utils.errorln
 import dev.nucleusframework.composenativetray.utils.infoln
 import dev.nucleusframework.composenativetray.utils.warnln
-import io.github.kdroidfilter.platformtools.LinuxDesktopEnvironment
-import io.github.kdroidfilter.platformtools.detectLinuxDesktopEnvironment
+import dev.nucleusframework.core.runtime.LinuxDesktopEnvironment
 import java.io.File
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.atomic.AtomicBoolean
@@ -54,7 +53,7 @@ internal class LinuxTrayManager(
     private val idByTitle: MutableMap<String, Int> = mutableMapOf()
     private val actionById: MutableMap<Int, () -> Unit> = mutableMapOf()
 
-    private fun isKDEDesktop(): Boolean = detectLinuxDesktopEnvironment() == LinuxDesktopEnvironment.KDE
+    private fun isKDEDesktop(): Boolean = LinuxDesktopEnvironment.Current == LinuxDesktopEnvironment.KDE
 
     // Native handle
     private var trayHandle: Long = 0L
diff --git a/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/lib/mac/MacOSWindowManager.kt b/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/lib/mac/MacOSWindowManager.kt
@@ -1,12 +1,11 @@
 package dev.nucleusframework.composenativetray.lib.mac
 
 import dev.nucleusframework.composenativetray.utils.debugln
-import io.github.kdroidfilter.platformtools.OperatingSystem
-import io.github.kdroidfilter.platformtools.getOperatingSystem
+import dev.nucleusframework.core.runtime.Platform
 
 class MacOSWindowManager {
     // Detect platform once
-    private val isMacOs: Boolean = getOperatingSystem() == OperatingSystem.MACOS
+    private val isMacOs: Boolean = Platform.Current == Platform.MacOS
 
     /**
      * Show the application in the Dock
diff --git a/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/lib/mac/MacOutsideClickWatcher.kt b/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/lib/mac/MacOutsideClickWatcher.kt
@@ -1,8 +1,7 @@
 package dev.nucleusframework.composenativetray.lib.mac
 
 import dev.nucleusframework.composenativetray.utils.isPointWithinMacStatusItem
-import io.github.kdroidfilter.platformtools.OperatingSystem
-import io.github.kdroidfilter.platformtools.getOperatingSystem
+import dev.nucleusframework.core.runtime.Platform
 import java.awt.MouseInfo
 import java.awt.Window
 import java.util.concurrent.Executors
@@ -23,7 +22,7 @@ class MacOutsideClickWatcher(
     private var prevLeft = false
 
     fun start() {
-        if (getOperatingSystem() != OperatingSystem.MACOS) return
+        if (Platform.Current != Platform.MacOS) return
         if (scheduler != null) return
         scheduler =
             Executors.newSingleThreadScheduledExecutor { r ->
diff --git a/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/lib/windows/WindowsOutsideClickWatcher.kt b/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/lib/windows/WindowsOutsideClickWatcher.kt
@@ -1,7 +1,6 @@
 package dev.nucleusframework.composenativetray.lib.windows
 
-import io.github.kdroidfilter.platformtools.OperatingSystem
-import io.github.kdroidfilter.platformtools.getOperatingSystem
+import dev.nucleusframework.core.runtime.Platform
 import java.awt.Window
 import java.util.concurrent.atomic.AtomicBoolean
 
@@ -26,7 +25,7 @@ class WindowsOutsideClickWatcher(
 
     /** Start the global low-level mouse hook on a dedicated daemon thread. */
     fun start() {
-        if (getOperatingSystem() != OperatingSystem.WINDOWS) return
+        if (Platform.Current != Platform.Windows) return
         synchronized(this) {
             if (hookThread != null) return
             stopping.set(false)
diff --git a/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/menu/impl/MacTrayMenuBuilderImpl.kt b/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/menu/impl/MacTrayMenuBuilderImpl.kt
@@ -13,7 +13,7 @@ import dev.nucleusframework.composenativetray.menu.api.KeyShortcut
 import dev.nucleusframework.composenativetray.menu.api.TrayMenuBuilder
 import dev.nucleusframework.composenativetray.utils.ComposableIconUtils
 import dev.nucleusframework.composenativetray.utils.IconRenderProperties
-import io.github.kdroidfilter.nucleus.darkmodedetector.isSystemInDarkMode
+import dev.nucleusframework.darkmodedetector.isSystemInDarkMode
 import org.jetbrains.compose.resources.DrawableResource
 import org.jetbrains.compose.resources.painterResource
 import java.util.concurrent.locks.ReentrantLock
diff --git a/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/tray/api/NativeTray.kt b/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/tray/api/NativeTray.kt
diff --git a/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/tray/api/TrayApp.kt b/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/tray/api/TrayApp.kt
diff --git a/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/tray/impl/AwtTrayInitializer.kt b/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/tray/impl/AwtTrayInitializer.kt
diff --git a/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/utils/DarkModeDetector.kt b/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/utils/DarkModeDetector.kt
diff --git a/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/utils/IconRenderProperties.kt b/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/utils/IconRenderProperties.kt
diff --git a/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/utils/SingleInstanceManager.kt b/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/utils/SingleInstanceManager.kt
diff --git a/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/utils/TrayPosition.kt b/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/utils/TrayPosition.kt

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ kotlin {`
`48`	`48`	`implementation(compose.components.resources)`
`49`	`49`	`implementation(libs.kotlinx.coroutines.core)`
`50`	`50`	`implementation(libs.kotlinx.coroutines.swing)`
`51`		`- implementation(libs.platformtools.core)`
`52`	`51`	`implementation(libs.nucleus.core.runtime)`
`53`	`52`	`implementation(libs.nucleus.darkmode.detector)`
`54`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import io.github.kdroidfilter.nucleus.desktop.application.dsl.TargetFormat`
	`1`	`+import dev.nucleusframework.desktop.application.dsl.TargetFormat`
`2`	`2`
`3`	`3`	`plugins {`
`4`	`4`	`alias(libs.plugins.multiplatform)`