v1.0.4

ForteScarlet · Mar 25, 2024 · c9171fa · c9171fa
1 parent 2e10a2f
commit c9171fa
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 12 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "love.forte.bouns"
-version = "1.0-SNAPSHOT"
+version = "1.0.4"
 
 repositories {
     mavenCentral()
@@ -50,8 +50,7 @@ dependencies {
     implementation(libs.koalaPlot.core)
 }
 
-val versionValue = "1.0.4"
-val groupId = "forte.app"
+val projectName = "StopBonus"
 
 // https://github.com/JetBrains/compose-multiplatform/blob/master/tutorials/Native_distributions_and_local_execution/README.md
 compose.desktop {
@@ -67,21 +66,29 @@ compose.desktop {
             modules("java.sql", "java.naming")
 
             targetFormats(
-                // TargetFormat.AppImage,
-                TargetFormat.Exe, TargetFormat.Dmg, TargetFormat.Deb
+                TargetFormat.Dmg, TargetFormat.Exe, TargetFormat.Msi, TargetFormat.Deb, TargetFormat.Rpm
             )
-            packageName = "StopBonus"
-            packageVersion = versionValue
-            vendor = "ForteScarlet"
+
+            packageName = projectName
+            packageVersion = project.version.toString()
+            vendor = "Forte Scarlet"
             description = "别再奖励自己了！"
             copyright = "Copyright © 2024 Forte Scarlet."
 
+            linux {
+                menuGroup = project.group.toString()
+                iconFile.set(project.rootDir.resolve("icon.png"))
+            }
+
+            macOS {
+                bundleID = "${project.group}.$projectName"
+                iconFile.set(project.rootDir.resolve("icon.icns"))
+            }
+
             windows {
                 shortcut = true
                 dirChooser = true
-                menu = true
-                menuGroup = groupId
-                perUserInstall = true
+                menuGroup = project.group.toString()
                 iconFile.set(project.rootDir.resolve("icon.ico"))
                 upgradeUuid = "f4a9a22b-b663-4848-95a8-7c0cf844da3f"
             }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/icon.icns b/icon.icns
diff --git a/src/test/kotlin/FTest.kt b/src/test/kotlin/FTest.kt
@@ -0,0 +1,17 @@
+import java.nio.file.FileSystem
+import java.nio.file.FileSystems
+import java.nio.file.Files
+import kotlin.io.path.Path
+
+fun main() {
+
+    System.getenv().forEach { (k, v) ->
+        println("$k:\t$v")
+    }
+
+    println("====")
+
+    System.getProperties().list(System.out)
+
+
+}