[feat](fluent) Add macOS native support (#133)

* [feat](fluent) Add macOS native support

* Refactor: Centralize macOS distribution settings

* Add macos native ci

* feat(macos): Apply backdrop to window

* [build](macos) Add workaround for including resources in macOS native target

- Updated the Compose Multiplatform plugin alias from `compose` to `compose-multiplatform` in all relevant build scripts and the version catalog.

- Added the Compose Multiplatform plugin as a dependency in the `build-plugin` module.

---------

Co-authored-by: KonYaco <atwzj233@gmail.com>

Author: Sanlorng

.github/workflows/multiplatform_snapshot_build.yml

@@ -41,6 +41,12 @@ jobs:
           - type: macOS
             desktop: dmg
             os: macos-latest
+          - type: macosArm64
+            native: dmg
+            os: macos-latest
+          - type: macosX64
+            native: dmg
+            os: macos-13
           - type: iOS
             iOS: ipa
             # workaround runner version for iPhoneOS sdk 18.2
@@ -127,6 +133,18 @@ jobs:
           name: Gallery-${{ matrix.type }}-${{ github.run_id }}
           path: ${{github.workspace}}/gallery/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
+      - 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 }}
+
       # iOS Build Action, Note: Due to the long build time, the iOS build only build the debug version.
       - name: Set up Xcode
         if: ${{ matrix.iOS }}

README.md

@@ -21,15 +21,14 @@ Thank you for using our library. We look forward to receiving your feedback and
 
 ### Supported Kotlin Targets
 
-| Target            | Platform              |
-|:------------------|:----------------------|
-| desktop           | Linux, macOS, Windows |
-| iosX64            | iPhone, iPad          |
-| iosArm64          | iPhone, iPad          |
-| iosSimulatorArm64 | iOS Simulator         |
-| androidTarget     | Android Devices       |
-| wasmJs            | Web Browsers          |
-| js                | Web Browsers          |
+| Target           | Platform                   |
+|:-----------------|:---------------------------|
+| desktop          | Linux, macOS, Windows      |
+| macos            | macOS                      |
+| ios              | iPhone, iPad, iOS Simulator|
+| android          | Android Devices            |
+| wasmJs           | Web Browsers               |
+| js               | Web Browsers               |
 
 ## Quick Start
 

build-plugin/build.gradle.kts

@@ -14,6 +14,7 @@ dependencies {
     implementation(kotlin("gradle-plugin", libs.versions.kotlin.get()))
     gradlePluginImplementation(libs.plugins.android.kotlin.multiplatform.library.get())
     gradlePluginImplementation(libs.plugins.maven.publish.get())
+    gradlePluginImplementation(libs.plugins.compose.multiplatform.get())
 }
 
 fun DependencyHandler.gradlePluginImplementation(plugin: PluginDependency) {

build-plugin/src/main/java/io/github/composefluent/plugin/build/BuildExtension.kt

@@ -26,35 +26,81 @@ fun KotlinMultiplatformExtension.applyTargets(namespaceModule: String = "") {
     iosX64()
     iosArm64()
     iosSimulatorArm64()
+    macosArm64()
+    macosX64()
 
     applyHierarchyTemplate {
         sourceSetTrees(KotlinSourceSetTree.main, KotlinSourceSetTree.test)
 
         common {
             group("skiko") {
-                withCompilations {
-                    it.target.name != "android"
-                }
+                group("jvm")
+                group("native")
+                group("web")
             }
 
-            group("jvm") {
-                withJvm()
+            group("android") {
                 withAndroidTarget()
                 withCompilations { it.target.name == "android" }
             }
 
+            group("jvm") {
+                withJvm()
+            }
+
+            group("jvmCommon") {
+                group("jvm")
+                group("android")
+            }
+
             group("web") {
                 withJs()
                 withWasmJs()
             }
 
+            group("native") {
+                group("apple")
+                group("mingw")
+                group("linux")
+            }
+
             group("apple") {
-                withApple()
+                group("ios")
+                group("macos")
+                group("tvos")
+                group("watchos")
+            }
+
+            group("tvos") {
+                withTvos()
+            }
+
+            group("watchos") {
+                withWatchos()
             }
 
             group("ios") {
                 withIos()
             }
+
+            group("macos") {
+                withMacos()
+            }
+
+            group("mingw") {
+                withMingw()
+            }
+
+            group("linux") {
+                withLinux()
+            }
+
+            group("desktopCommon") {
+                group("macos")
+                group("mingw")
+                group("linux")
+                group("jvm")
+            }
         }
     }
 }

build.gradle.kts

@@ -3,7 +3,7 @@ import io.github.composefluent.plugin.build.BuildConfig
 plugins {
     alias(libs.plugins.kotlin.multiplatform) apply false
     alias(libs.plugins.kotlin.compose)
-    alias(libs.plugins.compose) 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

fluent-icons-core/build.gradle.kts

@@ -4,7 +4,7 @@ import io.github.composefluent.plugin.build.applyTargets
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.kotlin.compose)
-    alias(libs.plugins.compose)
+    alias(libs.plugins.compose.multiplatform)
     alias(libs.plugins.android.kotlin.multiplatform.library)
     alias(libs.plugins.ksp)
     alias(libs.plugins.maven.publish)

fluent-icons-extended/build.gradle.kts

@@ -4,7 +4,7 @@ import io.github.composefluent.plugin.build.applyTargets
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.kotlin.compose)
-    alias(libs.plugins.compose)
+    alias(libs.plugins.compose.multiplatform)
     alias(libs.plugins.android.kotlin.multiplatform.library)
     alias(libs.plugins.ksp)
     alias(libs.plugins.maven.publish)

fluent/build.gradle.kts

@@ -4,7 +4,7 @@ import io.github.composefluent.plugin.build.applyTargets
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.kotlin.compose)
-    alias(libs.plugins.compose)
+    alias(libs.plugins.compose.multiplatform)
     alias(libs.plugins.android.kotlin.multiplatform.library)
     alias(libs.plugins.ksp)
     alias(libs.plugins.maven.publish)