compose-fluent
diff --git a/‎.github/workflows/deploy-gh-pages.yml‎
Lines changed: 2 additions & 2 deletions b/‎.github/workflows/deploy-gh-pages.yml‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎.github/workflows/multiplatform_snapshot_build.yml‎
Lines changed: 32 additions & 11 deletions b/‎.github/workflows/multiplatform_snapshot_build.yml‎
Lines changed: 32 additions & 11 deletions
diff --git a/‎build-plugin/src/main/java/io/github/composefluent/plugin/build/BuildConfig.kt‎
Lines changed: 1 addition & 1 deletion b/‎build-plugin/src/main/java/io/github/composefluent/plugin/build/BuildConfig.kt‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎build-plugin/src/main/java/io/github/composefluent/plugin/build/BuildExtension.kt‎
Lines changed: 45 additions & 64 deletions b/‎build-plugin/src/main/java/io/github/composefluent/plugin/build/BuildExtension.kt‎
Lines changed: 45 additions & 64 deletions
diff --git a/‎build-plugin/src/main/java/io/github/composefluent/plugin/build/mac/MacLayeredIconTask.kt‎
Lines changed: 52 additions & 0 deletions b/‎build-plugin/src/main/java/io/github/composefluent/plugin/build/mac/MacLayeredIconTask.kt‎
Lines changed: 52 additions & 0 deletions
diff --git a/‎build.gradle.kts‎
Lines changed: 3 additions & 2 deletions b/‎build.gradle.kts‎
Lines changed: 3 additions & 2 deletions
@@ -36,14 +36,14 @@ jobs:
       - name: Build wasm target
         env:
           PROJECT_BUILD_TYPE: release
-        run: ./gradlew :gallery:wasmJsBrowserDistribution
+        run: ./gradlew :gallery:webApp:wasmJsBrowserDistribution
       - name: Setup Pages
         uses: actions/configure-pages@v5
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with:
           # Upload dist
-          path: ./gallery/build/dist/wasmJs/productionExecutable
+          path: ./gallery/webApp/build/dist/wasmJs/productionExecutable
 
   # Single deploy job since we're just deploying
   deploy:
 
@@ -23,46 +23,67 @@ on:
 jobs:
   build:
     strategy:
+      fail-fast: false
       matrix:
-        type: [PublishLibrary, Android, Windows, Linux, macOS, iOS, WasmJs, Js]
+        type: [PublishLibrary, Android, Windows, Linux, macOS, macosArm64, macosX64, iOS, WasmJs, Js]
         include:
           - type: PublishLibrary
             publish: release
             os: macos-latest
+
           - type: Android
             android: apk
             os: ubuntu-latest
+            module: androidApp
+
           - type: Windows
             desktop: msi
             os: windows-latest
+            module: jvmApp
+
           - type: Linux
             desktop: deb
             os: ubuntu-latest
+            module: jvmApp
+
           - type: macOS
             desktop: dmg
             os: macos-latest
+            module: jvmApp
+
           - type: macosArm64
             native: dmg
             os: macos-latest
+            module: macosApp
+
           - type: macosX64
             native: dmg
             os: macos-15-intel
+            module: macosApp
+
           - type: iOS
             iOS: ipa
             # workaround runner version for iPhoneOS sdk 18.2
             os: macos-15
+            module: iosApp
+
           - type: WasmJs
             js: wasmJs
             os: windows-latest
+            module: webApp
+
           - type: Js
             js: js
             os: ubuntu-latest
+            module: webApp
 
     runs-on: ${{ matrix.os }}
     if: ${{ github.event_name != 'pull_request_review' || github.event.review.state == 'approved' }}
     permissions:
       contents: read
       packages: write
+    env:
+      GRADLE_USER_HOME: ${{ github.workspace }}/.gradle-${{ matrix.type }}
 
     steps:
       - uses: actions/checkout@v4
@@ -105,7 +126,7 @@ jobs:
         if: ${{ matrix.android }}
         run: |
           echo "$ANDROID_KEYSTORE" | base64 --decode > ${{ github.workspace }}/android_sign_key.jks
-          ./gradlew :gallery:assembleRelease
+          ./gradlew :gallery:${{ matrix.module }}:assembleRelease
         env:
           ANDROID_KEYSTORE: ${{ secrets.ANDROID_KEYSTORE }}
           ANDROID_SIGNING_FILE: ${{ github.workspace }}/android_sign_key.jks
@@ -118,32 +139,32 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: Gallery-${{ matrix.type }}-${{ github.run_id }}
-          path: ${{github.workspace}}/gallery/build/outputs/**/*.${{ matrix.android }}
+          path: ${{github.workspace}}/gallery/${{ matrix.module }}/build/outputs/**/*.${{ matrix.android }}
 
       # Desktop Build Action
       - name: Build Gallery for ${{ matrix.type }}
         if: ${{ matrix.desktop }}
         run: |
-          ./gradlew :gallery:packageReleaseDistributionForCurrentOS
+          ./gradlew :gallery:${{ matrix.module }}:packageReleaseDistributionForCurrentOS
 
       - name: Upload desktop build artifacts
         if: ${{ matrix.desktop }}
         uses: actions/upload-artifact@v4
         with:
           name: Gallery-${{ matrix.type }}-${{ github.run_id }}
-          path: ${{github.workspace}}/gallery/build/compose/binaries/main-release/${{ matrix.desktop }}/*.${{ matrix.desktop }}
+          path: ${{github.workspace}}/gallery/${{ matrix.module }}/build/compose/binaries/main-release/${{ matrix.desktop }}/*.${{ matrix.desktop }}
 
       # Desktop Native Build Action
       - name: Build Gallery for ${{ matrix.type }}
         if: ${{ matrix.native }}
         run: |
-            ./gradlew :gallery:packageDistributionNativeReleaseForCurrentOS
+            ./gradlew :gallery:${{ matrix.module }}:packageDistributionNativeReleaseForCurrentOS
       - name: Upload desktop native build artifacts
         if: ${{ matrix.native }}
         uses: actions/upload-artifact@v4
         with:
           name: Gallery-${{ matrix.type }}-${{ github.run_id }}
-          path: ${{github.workspace}}/gallery/build/compose/binaries/main/**/*.${{ matrix.native }}
+          path: ${{github.workspace}}/gallery/${{ matrix.module }}/build/compose/binaries/main/**/*.${{ matrix.native }}
 
       # iOS Build Action, Note: Due to the long build time, the iOS build only build the debug version.
       - name: Set up Xcode
@@ -155,24 +176,24 @@ jobs:
       - name: Build Gallery for iOS
         if: ${{ matrix.iOS }}
         run: |
-          xcodebuild -scheme iosApp -configuration Debug -sdk iphoneos -archivePath gallery/iosApp/build/Gallery.xcarchive archive -workspace gallery/iosApp/iosApp.xcodeproj/project.xcworkspace CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
+          xcodebuild -scheme iosApp -configuration Debug -sdk iphoneos -archivePath gallery/${{ matrix.module }}/build/Gallery.xcarchive archive -workspace gallery/${{ matrix.module }}/iosApp.xcodeproj/project.xcworkspace CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
 
       - name: Upload iOS Artifact
         if: ${{ matrix.iOS }}
         uses: actions/upload-artifact@v4
         with:
           name: Gallery-${{ matrix.type }}-${{ github.run_id }}
-          path: ${{ github.workspace }}/gallery/iosApp/build/
+          path: ${{ github.workspace }}/gallery/${{ matrix.module }}/build/
 
       # Js and WasmJs Build Action
       - name: Build Gallery for ${{ matrix.type }}
         if: ${{ matrix.js }}
         run: |
-          ./gradlew :gallery:${{ matrix.js }}BrowserDistribution
+          ./gradlew :gallery:${{ matrix.module }}:${{ matrix.js }}BrowserDistribution
 
       - name: Upload ${{ matrix.type }} build artifacts
         if: ${{ matrix.js }}
         uses: actions/upload-artifact@v4
         with:
           name: Gallery-${{ matrix.type }}-${{ github.run_id }}
-          path: ./gallery/build/dist/${{ matrix.js }}/productionExecutable
+          path: ./gallery/${{ matrix.module }}/build/dist/${{ matrix.js }}/productionExecutable
@@ -22,7 +22,7 @@ object BuildConfig {
         internal set
 
     object Android {
-        const val compileSdkVersion = 35
+        const val compileSdkVersion = 36
 
         const val minSdkVersion = 24
     }
 
@@ -1,23 +1,24 @@
 package io.github.composefluent.plugin.build
 
-import com.android.build.api.dsl.androidLibrary
+import com.android.build.api.dsl.KotlinMultiplatformAndroidLibraryTarget
+import org.gradle.api.GradleException
+import org.gradle.kotlin.dsl.findByType
+import org.jetbrains.compose.desktop.application.dsl.AbstractDistributions
+import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetTree
 
 @OptIn(ExperimentalWasmDsl::class, ExperimentalKotlinGradlePluginApi::class)
 fun KotlinMultiplatformExtension.applyTargets(namespaceModule: String = "") {
-    jvm("desktop")
+    jvm()
 
-    try {
-        androidLibrary {
-            compileSdk = 35
-            namespace = "${BuildConfig.packageName}$namespaceModule"
-        }
-    } catch (_: IllegalStateException) {
-        // handle exception when android library plugin was not applied
-        androidTarget()
+    extensions.findByType<KotlinMultiplatformAndroidLibraryTarget>()?.apply {
+        compileSdk = BuildConfig.Android.compileSdkVersion
+        namespace = "${BuildConfig.packageName}$namespaceModule"
+        androidResources.enable = true
     }
 
     jvmToolchain(BuildConfig.Jvm.jvmToolchainVersion)
@@ -29,78 +30,58 @@ fun KotlinMultiplatformExtension.applyTargets(namespaceModule: String = "") {
     macosArm64()
     macosX64()
 
-    applyHierarchyTemplate {
+    applyDefaultHierarchyTemplate {
         sourceSetTrees(KotlinSourceSetTree.main, KotlinSourceSetTree.test)
 
         common {
-            group("skiko") {
-                group("jvm")
-                group("native")
-                group("web")
-            }
-
-            group("android") {
-                withAndroidTarget()
-                withCompilations { it.target.name == "android" }
+            group("jvm") {
+                withJvm()
             }
 
-            group("jvm") {
+            group("skiko") {
                 withJvm()
+                group("native")
+                group("web")
             }
 
             group("jvmCommon") {
                 group("jvm")
                 group("android")
             }
 
-            group("web") {
-                withJs()
-                withWasmJs()
-            }
-
-            group("native") {
-                group("apple")
+            group("desktop") {
+                group("macos")
                 group("mingw")
                 group("linux")
+                group("jvm")
             }
 
-            group("apple") {
-                group("ios")
-                group("macos")
-                group("tvos")
-                group("watchos")
-            }
-
-            group("tvos") {
-                withTvos()
-            }
-
-            group("watchos") {
-                withWatchos()
-            }
-
-            group("ios") {
-                withIos()
-            }
-
-            group("macos") {
-                withMacos()
+            group("android") {
+                withCompilations { it.platformType == KotlinPlatformType.androidJvm }
             }
+        }
 
-            group("mingw") {
-                withMingw()
-            }
+    }
+}
+
+fun getTarget(): String {
+    // 1. 动态确定当前平台对应的 Kotlin/Native 目标名称
+    val os = System.getProperty("os.name")
+    val arch = System.getProperty("os.arch")
+    val currentTargetName = when {
+        os.startsWith("Mac OS X") -> if (arch == "aarch64") "macosArm64" else "macosX64"
+        os.startsWith("Windows") -> "windowsX64"
+        os.startsWith("Linux") -> "linuxX64"
+        else -> throw GradleException("Unsupported OS for native distribution: '$os'")
+    }
+    return currentTargetName
+}
 
-            group("linux") {
-                withLinux()
-            }
+fun AbstractDistributions.applyDistributions(
+    vararg formats: TargetFormat = arrayOf(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
+) {
+    targetFormats(formats = formats)
+    packageName = "Compose Fluent Design Gallery"
+    packageVersion = BuildConfig.integerVersionName
 
-            group("desktopCommon") {
-                group("macos")
-                group("mingw")
-                group("linux")
-                group("jvm")
-            }
-        }
-    }
-}
+}
@@ -0,0 +1,52 @@
+package io.github.composefluent.plugin.build.mac
+
+import org.gradle.api.Task
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.file.FileSystemOperations
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.Property
+import org.gradle.kotlin.dsl.newInstance
+import java.io.File
+import javax.inject.Inject
+
+interface Injected {
+    @get:Inject
+    val fs: FileSystemOperations
+}
+
+// apply the icon composer for macos distributable
+fun Task.configureMacOSPackageTask(
+    packageName: Property<String>,
+    iconFile: RegularFileProperty,
+    destinationDir: DirectoryProperty,
+    replaceIconFile: Boolean = false,
+    assetsCarFile: File,
+    doLast: (resourceDir: File, injected: Injected) -> Unit = { _, _ -> }
+) {
+    inputs.file(assetsCarFile)
+    val injected = project.objects.newInstance<Injected>()
+
+    doLast {
+        val appContentDir = destinationDir.get().asFile.resolve("${packageName.get()}.app").resolve("Contents")
+        val bundleResourceDir = appContentDir.resolve("Resources")
+        val infoListFile = appContentDir.resolve("Info.plist")
+        val infoListFileContent = infoListFile.readText()
+        if (!infoListFileContent.contains("CFBundleIconName")) {
+            infoListFile.writeText(
+                text = infoListFileContent.replace(
+                    "<key>CFBundleIconFile</key>","<key>CFBundleIconName</key>\n<string>${iconFile.get().asFile.nameWithoutExtension}</string>\n<key>CFBundleIconFile</key>"
+                )
+            )
+
+        }
+        injected.fs.copy {
+            from(assetsCarFile)
+            into(bundleResourceDir)
+        }
+        if (replaceIconFile) {
+            val oldIconFile = bundleResourceDir.resolve("${packageName}.icns")
+            oldIconFile.renameTo(bundleResourceDir.resolve(iconFile.get().asFile.name))
+        }
+        doLast(bundleResourceDir, injected)
+    }
+}
@@ -2,9 +2,10 @@ import io.github.composefluent.plugin.build.BuildConfig
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform) apply false
-    alias(libs.plugins.kotlin.compose)
+    alias(libs.plugins.kotlin.jvm) apply false
+    alias(libs.plugins.kotlin.compose) apply false
+    alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.compose.multiplatform) apply false
-    alias(libs.plugins.compose.hotReload) apply false
     alias(libs.plugins.android.kotlin.multiplatform.library) apply false
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.kotlin.android) apply false
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ object BuildConfig {`
`22`	`22`	`internal set`
`23`	`23`
`24`	`24`	`object Android {`
`25`		`- const val compileSdkVersion = 35`
	`25`	`+ const val compileSdkVersion = 36`
`26`	`26`
`27`	`27`	`const val minSdkVersion = 24`
`28`	`28`	`}`