refactor: address PR review comments (round 2)

- Rename workflow to "Build SwiftPM" (tido64)
- Replace shallow clone + fetch with actions/checkout for Hermes (tido64)
- Use efficient git init + fetch pattern in buildFromHermesCommit (tido64)
- Extract reusable build env object in hermes.js (tido64)
- Move macOS version resolution to fork-only macosVersionResolver.js (tido64)
- Replace platformLinkerSettings with #if os(macOS) in Package.swift (Saad)
- Revert CMAKE_OSX_DEPLOYMENT_TARGET from build-apple-framework.sh (Saad)
- Add // [macOS] tag to os require in hermes.js (tido64)

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: Saadnajmi

.github/workflows/microsoft-build-spm.yml

@@ -1,4 +1,4 @@
-name: Build SPM
+name: Build SwiftPM
 
 on:
   workflow_call:
@@ -43,14 +43,14 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           key: hermes-v1-${{ steps.resolve.outputs.hermes-commit }}-Debug
-          path: /tmp/hermes-destroot
+          path: hermes-destroot
 
       - name: Upload cached Hermes artifacts
         if: steps.cache.outputs.cache-hit == 'true'
         uses: actions/upload-artifact@v4
         with:
           name: hermes-artifacts
-          path: /tmp/hermes-destroot
+          path: hermes-destroot
           retention-days: 1
 
   build-hermesc:
@@ -68,17 +68,17 @@ jobs:
         run: sudo xcode-select --switch /Applications/Xcode_16.2.app
 
       - name: Clone Hermes
-        run: |
-          git clone --depth 1 https://github.com/facebook/hermes.git /tmp/hermes
-          cd /tmp/hermes
-          git fetch --depth 1 origin ${{ needs.resolve-hermes.outputs.hermes-commit }}
-          git checkout ${{ needs.resolve-hermes.outputs.hermes-commit }}
+        uses: actions/checkout@v4
+        with:
+          repository: facebook/hermes
+          ref: ${{ needs.resolve-hermes.outputs.hermes-commit }}
+          path: hermes
 
       - name: Build hermesc
-        working-directory: /tmp/hermes
+        working-directory: hermes
         env:
-          HERMES_PATH: /tmp/hermes
-          JSI_PATH: /tmp/hermes/API/jsi
+          HERMES_PATH: ${{ github.workspace }}/hermes
+          JSI_PATH: ${{ github.workspace }}/hermes/API/jsi
           MAC_DEPLOYMENT_TARGET: '14.0'
         run: |
           source $GITHUB_WORKSPACE/packages/react-native/sdks/hermes-engine/utils/build-apple-framework.sh
@@ -88,7 +88,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: hermesc
-          path: /tmp/hermes/build_host_hermesc
+          path: hermes/build_host_hermesc
           retention-days: 1
 
   build-hermes-slice:
@@ -118,27 +118,27 @@ jobs:
           sudo xcodebuild -runFirstLaunch
 
       - name: Clone Hermes
-        run: |
-          git clone --depth 1 https://github.com/facebook/hermes.git /tmp/hermes
-          cd /tmp/hermes
-          git fetch --depth 1 origin ${{ needs.resolve-hermes.outputs.hermes-commit }}
-          git checkout ${{ needs.resolve-hermes.outputs.hermes-commit }}
+        uses: actions/checkout@v4
+        with:
+          repository: facebook/hermes
+          ref: ${{ needs.resolve-hermes.outputs.hermes-commit }}
+          path: hermes
 
       - name: Download hermesc
         uses: actions/download-artifact@v4
         with:
           name: hermesc
-          path: /tmp/hermes/build_host_hermesc
+          path: hermes/build_host_hermesc
 
       - name: Restore hermesc permissions
-        run: chmod +x /tmp/hermes/build_host_hermesc/bin/hermesc
+        run: chmod +x ${{ github.workspace }}/hermes/build_host_hermesc/bin/hermesc
 
       - name: Build Hermes slice (${{ matrix.slice }})
-        working-directory: /tmp/hermes
+        working-directory: hermes
         env:
           BUILD_TYPE: Debug
-          HERMES_PATH: /tmp/hermes
-          JSI_PATH: /tmp/hermes/API/jsi
+          HERMES_PATH: ${{ github.workspace }}/hermes
+          JSI_PATH: ${{ github.workspace }}/hermes/API/jsi
           IOS_DEPLOYMENT_TARGET: '15.1'
           MAC_DEPLOYMENT_TARGET: '14.0'
           XROS_DEPLOYMENT_TARGET: '1.0'
@@ -150,7 +150,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: hermes-slice-${{ matrix.slice }}
-          path: /tmp/hermes/destroot
+          path: hermes/destroot
           retention-days: 1
 
   assemble-hermes:
@@ -172,26 +172,26 @@ jobs:
 
       - name: Assemble destroot from slices
         run: |
-          mkdir -p /tmp/hermes/destroot/Library/Frameworks
+          mkdir -p ${{ github.workspace }}/hermes/destroot/Library/Frameworks
           for slice_dir in /tmp/slices/hermes-slice-*; do
             slice_name=$(basename "$slice_dir" | sed 's/hermes-slice-//')
             echo "Copying slice: $slice_name"
-            cp -R "$slice_dir/Library/Frameworks/$slice_name" /tmp/hermes/destroot/Library/Frameworks/
+            cp -R "$slice_dir/Library/Frameworks/$slice_name" ${{ github.workspace }}/hermes/destroot/Library/Frameworks/
             # Copy include and bin directories (identical across slices, only need one copy)
-            if [ -d "$slice_dir/include" ] && [ ! -d /tmp/hermes/destroot/include ]; then
-              cp -R "$slice_dir/include" /tmp/hermes/destroot/
+            if [ -d "$slice_dir/include" ] && [ ! -d ${{ github.workspace }}/hermes/destroot/include ]; then
+              cp -R "$slice_dir/include" ${{ github.workspace }}/hermes/destroot/
             fi
             if [ -d "$slice_dir/bin" ]; then
-              cp -R "$slice_dir/bin" /tmp/hermes/destroot/
+              cp -R "$slice_dir/bin" ${{ github.workspace }}/hermes/destroot/
             fi
           done
           echo "Assembled destroot contents:"
-          ls -la /tmp/hermes/destroot/Library/Frameworks/
+          ls -la ${{ github.workspace }}/hermes/destroot/Library/Frameworks/
 
       - name: Create universal xcframework
-        working-directory: /tmp/hermes
+        working-directory: hermes
         env:
-          HERMES_PATH: /tmp/hermes
+          HERMES_PATH: ${{ github.workspace }}/hermes
         run: |
           source $GITHUB_WORKSPACE/packages/react-native/sdks/hermes-engine/utils/build-apple-framework.sh
           create_universal_framework "iphoneos" "iphonesimulator" "macosx" "xros" "xrsimulator"
@@ -200,13 +200,13 @@ jobs:
         uses: actions/cache/save@v4
         with:
           key: hermes-v1-${{ needs.resolve-hermes.outputs.hermes-commit }}-Debug
-          path: /tmp/hermes/destroot
+          path: hermes/destroot
 
       - name: Upload Hermes artifacts
         uses: actions/upload-artifact@v4
         with:
           name: hermes-artifacts
-          path: /tmp/hermes/destroot
+          path: hermes/destroot
           retention-days: 1
 
   build-spm:

packages/react-native/Package.swift

@@ -243,18 +243,23 @@ let reactJsErrorHandler = RNTarget(
 
 /// React-graphicsApple
 /// This represents the React-graphicsApple BUCK module
+// [macOS: UIKit on iOS/visionOS, AppKit on macOS
+#if os(macOS)
 let reactGraphicsApple = RNTarget(
   name: .reactGraphicsApple,
   path: "ReactCommon/react/renderer/graphics/platform/ios",
-  linkedFrameworks: ["CoreGraphics"],
-  // [macOS: UIKit on iOS/visionOS, AppKit on macOS
-  platformLinkerSettings: [
-    .linkedFramework("UIKit", .when(platforms: [.iOS, .visionOS])),
-    .linkedFramework("AppKit", .when(platforms: [.macOS])),
-  ],
-  // macOS]
+  linkedFrameworks: ["CoreGraphics", "AppKit"],
+  dependencies: [.reactDebug, .jsi, .reactUtils, .reactNativeDependencies]
+)
+#else
+let reactGraphicsApple = RNTarget(
+  name: .reactGraphicsApple,
+  path: "ReactCommon/react/renderer/graphics/platform/ios",
+  linkedFrameworks: ["CoreGraphics", "UIKit"],
   dependencies: [.reactDebug, .jsi, .reactUtils, .reactNativeDependencies]
 )
+#endif
+// macOS]
 
 /// React-graphics.podspec
 let reactGraphics = RNTarget(
@@ -541,17 +546,21 @@ let reactSettings = RNTarget(
 // [macOS
 /// React-RCTUIKit.podspec
 /// UIKit/AppKit compatibility layer for React Native macOS.
+#if os(macOS)
 let reactRCTUIKit = RNTarget(
   name: .reactRCTUIKit,
   path: "React/RCTUIKit",
-  // [macOS: UIKit on iOS/visionOS, AppKit on macOS
-  platformLinkerSettings: [
-    .linkedFramework("UIKit", .when(platforms: [.iOS, .visionOS])),
-    .linkedFramework("AppKit", .when(platforms: [.macOS])),
-  ],
-  // macOS]
+  linkedFrameworks: ["AppKit"],
   excludedPaths: ["README.md"]
 )
+#else
+let reactRCTUIKit = RNTarget(
+  name: .reactRCTUIKit,
+  path: "React/RCTUIKit",
+  linkedFrameworks: ["UIKit"],
+  excludedPaths: ["README.md"]
+)
+#endif
 // macOS]
 
 // MARK: Target list
@@ -659,16 +668,14 @@ class BinaryTarget: BaseTarget {
 
 class RNTarget: BaseTarget {
   let linkedFrameworks: [String]
-  let platformLinkerSettings: [LinkerSetting] // [macOS] Platform-conditional framework linking (e.g. UIKit vs AppKit)
   let excludedPaths: [String]
   let dependencies: [String]
   let sources: [String]?
   let publicHeadersPath: String?
   let defines: [CXXSetting]
 
-  init(name: String, path: String, searchPaths: [String] = [], linkedFrameworks: [String] = [], platformLinkerSettings: [LinkerSetting] = [], excludedPaths: [String] = [], dependencies: [String] = [], sources: [String]? = nil, publicHeadersPath: String? = ".", defines: [CXXSetting] = []) {
+  init(name: String, path: String, searchPaths: [String] = [], linkedFrameworks: [String] = [], excludedPaths: [String] = [], dependencies: [String] = [], sources: [String]? = nil, publicHeadersPath: String? = ".", defines: [CXXSetting] = []) {
     self.linkedFrameworks = linkedFrameworks
-    self.platformLinkerSettings = platformLinkerSettings
     self.excludedPaths = excludedPaths
     self.dependencies = dependencies
     self.sources = sources
@@ -704,7 +711,7 @@ class RNTarget: BaseTarget {
   override func target(targets: [BaseTarget]) -> Target {
     let searchPaths: [String] = self.headerSearchPaths(targets: targets)
 
-    let linkerSettings = self.linkedFrameworks.reduce([]) { $0 + [LinkerSetting.linkedFramework($1)] } + self.platformLinkerSettings // [macOS]
+    let linkerSettings = self.linkedFrameworks.reduce([]) { $0 + [LinkerSetting.linkedFramework($1)] }
 
     return Target.reactNativeTarget(
       name: self.name,