依赖升级

Author: zerofancy

build.gradle.kts

@@ -1,46 +1,38 @@
-import org.jetbrains.compose.compose
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
-import java.nio.file.Files
 
 plugins {
-    kotlin("multiplatform")
-    id("org.jetbrains.compose")
+    alias(libs.plugins.kotlinMultiplatform)
+    alias(libs.plugins.composeCompiler)
+    alias(libs.plugins.composeMultiplatform)
+    alias(libs.plugins.buildconfig)
 }
 
 group = "top.ntutn"
 version = "2.0.0"
 
+buildConfig {
+    buildConfigField("String", "APP_NAME", "\"${project.name}\"")
+    buildConfigField("String", "APP_VERSION", "\"${version}\"")
+}
+
 repositories {
     google()
     mavenCentral()
     maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
 }
 
 kotlin {
-    jvm {
-        compilations.all {
-            kotlinOptions.jvmTarget = "11"
-        }
-        withJava()
-    }
+    jvm("desktop")
     sourceSets {
-        val jvmMain by getting {
-            kotlin {
-                sourceSets["jvmMain"].kotlin.srcDir("build/src/generated/kotlin")
-            }
-            dependencies {
-                implementation(compose.desktop.currentOs)
-                // https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
-                implementation("org.apache.commons:commons-lang3:3.12.0")
-                // https://mvnrepository.com/artifact/com.arkivanov.decompose/decompose
-//                implementation("com.arkivanov.decompose:decompose:1.0.0-alpha-06")
-//                implementation("com.arkivanov.decompose:extensions-compose-jetbrains:1.0.0-alpha-06")
-                implementation("org.mapdb:mapdb:3.0.8") {
-                    exclude("org.jetbrains.kotlin", "kotlin-stdlib")
-                }
+        val desktopMain by getting
+        desktopMain.dependencies {
+            implementation(compose.desktop.currentOs)
+            implementation("org.apache.commons:commons-lang3:3.12.0")
+            implementation("org.mapdb:mapdb:3.0.8") {
+                exclude("org.jetbrains.kotlin", "kotlin-stdlib")
             }
+            implementation(libs.kotlinx.coroutines.swing)
         }
-        val jvmTest by getting
     }
 }
 
@@ -53,7 +45,7 @@ compose.desktop {
             packageName = "floatclock"
             packageVersion = version.toString()
             linux {
-                iconFile.set(project.file("src/jvmMain/resources/clock.png"))
+                iconFile.set(project.file("src/desktopMain/resources/clock.png"))
             }
             windows {
                 shortcut = true
@@ -63,139 +55,6 @@ compose.desktop {
             }
         }
         args("--release")
-        // https://stackoverflow.com/a/44059335
-        /**
-         * Exception in thread "AWT-EventQueue-0" java.lang.reflect.InaccessibleObjectException: Unable to make private static int javax.swing.JOptionPane.styleFromMessageType(int) accessible: module java.desktop does not "opens javax.swing" to unnamed module @6e428587
-        at java.base/java.lang.reflect.AccessibleObject.checkCanSetAccessible(AccessibleObject.java:354)
-        at java.base/java.lang.reflect.AccessibleObject.checkCanSetAccessible(AccessibleObject.java:297)
-        at java.base/java.lang.reflect.Method.checkCanSetAccessible(Method.java:199)
-        at java.base/java.lang.reflect.Method.setAccessible(Method.java:193)
-        at top.ntutn.zhd.util.MsgBox$Companion.showOptionDialog(MsgBox.kt:29)
-        at top.ntutn.zhd.util.MsgBox$Companion.access$showOptionDialog(MsgBox.kt:11)
-        at top.ntutn.zhd.util.MsgBox.show(MsgBox.kt:100)
-        at top.ntutn.zhd.httrack.HttrackComponent$startListen$2.invokeSuspend(HttrackComponent.kt:51)
-        at kotlin.coroutines.jvm.internal.BaseContinuationImpl.resumeWith(ContinuationImpl.kt:33)
-        at kotlinx.coroutines.DispatchedTask.run(DispatchedTask.kt:106)
-        at java.desktop/java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:318)
-        at java.desktop/java.awt.EventQueue.dispatchEventImpl(EventQueue.java:771)
-        at java.desktop/java.awt.EventQueue$4.run(EventQueue.java:722)
-        at java.desktop/java.awt.EventQueue$4.run(EventQueue.java:716)
-        at java.base/java.security.AccessController.doPrivileged(AccessController.java:399)
-        at java.base/java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:86)
-        at java.desktop/java.awt.EventQueue.dispatchEvent(EventQueue.java:741)
-        at java.desktop/java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:203)
-        at java.desktop/java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:124)
-        at java.desktop/java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:113)
-        at java.desktop/java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:109)
-        at java.desktop/java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:101)
-        at java.desktop/java.awt.EventDispatchThread.run(EventDispatchThread.java:90)
-        Suppressed: kotlinx.coroutines.DiagnosticCoroutineContextException: [StandaloneCoroutine{Cancelling}@511348e2, Dispatchers.Main]
-         */
         jvmArgs += listOf("--add-opens=java.desktop/javax.swing=ALL-UNNAMED")
     }
 }
-
-tasks.register("generateBuildConfig") {
-    val content = """
-        package top.ntutn.floatclock
-        
-        object BuildConfig {
-            val version = "$version"
-        }
-    """.trimIndent()
-    val dir = File(projectDir, "build/src/generated/kotlin/top/ntutn/floatclock").also {
-        if (it.exists()) {
-            it.deleteRecursively()
-        }
-        it.mkdirs()
-    }
-    File(dir, "BuildConfig.kt").writeText(content)
-}
-
-tasks.register("repackageDeb") {
-    dependsOn(tasks.getByPath("packageDeb"))
-    doLast {
-        val repackageOutputPath = File(projectDir, "build/compose/binaries/main/repackageDeb")
-        if (repackageOutputPath.exists()) {
-            repackageOutputPath.deleteRecursively()
-        }
-        repackageOutputPath.mkdirs()
-        println("repackage output is ${repackageOutputPath.absolutePath}")
-        val extractPath = File(repackageOutputPath, "extract").also { it.mkdir() }
-        val debianPath = File(extractPath, "DEBIAN").also { it.mkdir() }
-        val buildPath = File(repackageOutputPath, "build").also { it.mkdir() }
-
-        // 查找原有deb文件
-        val originDebFile = File(projectDir, "build/compose/binaries/main/deb").listFiles { _: File, name: String ->
-            name.endsWith(".deb")
-        }?.firstOrNull()
-        require(originDebFile != null) { "未找到原始打包结果！" }
-
-        println("原始打包结果 ${originDebFile.absolutePath}")
-
-        // 解包
-        execProcessWait("dpkg", "-X", originDebFile.absolutePath, extractPath.absolutePath + "/")
-        execProcessWait("dpkg", "-e", originDebFile.absolutePath, debianPath.absolutePath + "/")
-
-        // 释放LICENSE文件
-        File(debianPath, "copyright").writeText(File(projectDir, "LICENSE").readText())
-        File(extractPath, "opt/floatclock/share/doc/copyright").writeText(File(projectDir, "LICENSE").readText())
-
-        // 重建快捷方式
-        val libDir = File(extractPath, "opt/floatclock/lib")
-        File(projectDir, "repackageDeb/opt/floatclock/lib/floatclock.desktop").copyTo(File(libDir, "floatclock-floatclock.desktop"), true)
-
-        // 覆盖控制脚本
-        val installSize = Files.walk(File(extractPath, "opt").toPath()).mapToLong { p -> p.toFile().length() }.sum().let {
-            (it / 1024f).toLong()
-        }
-        val newControl = File(projectDir, "repackageDeb/DEBIAN/control").readText()
-            .replace("{version}", version.toString())
-            .replace("{maintainer}", "zerofancy")
-            .replace("{maintainer-email}", "[email protected]")
-            .replace("{description}", "A simple clock floating on other windows.")
-            .replace("{installed-size}", installSize.toString())
-            .replace("{homepage}", "https://github.com/zerofancy/floatclock")
-        File(debianPath, "control").writeText(newControl)
-        File(projectDir, "repackageDeb/DEBIAN/preinst").copyTo(File(debianPath, "preinst"), true)
-
-        // 重置DEBIAN文件夹权限
-        execProcessWait("chmod", "755", "-R", debianPath.absolutePath)
-
-        // 重新打包 (ubuntu下默认使用zstd压缩，但这不能被debian/deepin现有版本支持)
-        execProcessWait("dpkg-deb", "-b","-Zxz", extractPath.absolutePath, buildPath.absolutePath + "/")
-
-        val outputFile = buildPath.listFiles { _: File, name: String-> name.endsWith(".deb") }?.firstOrNull()
-        require(outputFile != null)
-
-        val arch = "amd64"
-        val finalOutputFile = File(buildPath, "floatclock_${version}-1_$arch.deb")
-
-        outputFile.renameTo(finalOutputFile)
-
-        println("重新打包输出文件 ${finalOutputFile.absolutePath}")
-    }
-}
-
-fun execProcessWait(command: String, vararg args: String = emptyArray()) {
-    val commandAndArgs = listOf(command) + args
-    print("exec:" + commandAndArgs.joinToString(" "))
-    val process = Runtime.getRuntime().exec(commandAndArgs.toTypedArray())
-    val code = process.waitFor()
-    process.inputStream.use { inputStream ->
-        inputStream.readAllBytes().decodeToString().let {
-            println(it)
-        }
-    }
-    process.errorStream.use {
-        val errorOutput = it.readAllBytes().decodeToString()
-        println(errorOutput)
-    }
-    require(code == 0)
-}
-
-tasks {
-    "compileJava" {
-        dependsOn("generateBuildConfig")
-    }
-}

gradle/libs.versions.toml

@@ -0,0 +1,14 @@
+[versions]
+compose-multiplatform = "1.7.3"
+kotlin = "2.1.20"
+kotlinx-coroutines = "1.10.2"
+buildconfig = "5.6.2"
+
+[libraries]
+kotlinx-coroutines-swing = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-swing", version.ref = "kotlinx-coroutines" }
+
+[plugins]
+composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "compose-multiplatform" }
+composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+buildconfig = { id = "com.github.gmazzo.buildconfig", version.ref = "buildconfig" }

settings.gradle.kts

@@ -6,11 +6,6 @@ pluginManagement {
         mavenCentral()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     }
-
-    plugins {
-        kotlin("multiplatform").version(extra["kotlin.version"] as String)
-        id("org.jetbrains.compose").version(extra["compose.version"] as String)
-    }
 }
 
 rootProject.name = "floatclock"

src/jvmMain/kotlin/top/ntutn/floatclock/AboutDialog.kt renamed to src/desktopMain/kotlin/top/ntutn/floatclock/AboutDialog.kt

@@ -33,7 +33,7 @@ fun AboutContent() {
                 modifier = modifier.size(64.dp, 64.dp)
             )
             Spacer(modifier.height(8.dp))
-            Text("kotlin-float-clock ${BuildConfig.version}", modifier = modifier)
+            Text("${BuildConfig.APP_NAME} ${BuildConfig.APP_VERSION}", modifier = modifier)
             Spacer(modifier.height(8.dp))
             ClickableText(buildAnnotatedString {
                 pushStringAnnotation(tag = "URL", annotation = url)