From 411c0949664780cef8913a341ab691eb1c75b481 Mon Sep 17 00:00:00 2001
From: Kyle <kyle201817146@gmail.com>
Date: Sun, 5 Oct 2025 16:21:03 +0800
Subject: [PATCH 1/2] Update script commit message

---
 Scripts/update.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Scripts/update.sh b/Scripts/update.sh
index 72b3dbd..3ac23ec 100755
--- a/Scripts/update.sh
+++ b/Scripts/update.sh
@@ -67,7 +67,7 @@ git add Sources/UnsafeHeterogeneousBuffer/UnsafeHeterogeneousBuffer.swift \
 git commit -m "$(cat <<EOF
 Update from OpenSwiftUI upstream
 
-Upstream commit: $UPSTREAM_COMMIT_HASH
+Upstream: https://github.com/OpenSwiftUIProject/OpenSwiftUI/blob/$UPSTREAM_COMMIT_HASH/Sources/OpenSwiftUICore/Data/DynamicProperty/UnsafeHeterogeneousBuffer.swift
 
 Transformations applied:
 - Changed package → public access control
@@ -76,7 +76,6 @@ Transformations applied:
 - Added compatibility test conditionals
 - Replaced OpenSwiftUI helpers with standard Swift
 
-OpenSwiftUI: https://github.com/OpenSwiftUIProject/OpenSwiftUI
 EOF
 )"
 

From 7682fa6392f3950da2bae527ff73f47586d24f7f Mon Sep 17 00:00:00 2001
From: Kyle <kyle201817146@gmail.com>
Date: Sun, 5 Oct 2025 16:22:05 +0800
Subject: [PATCH 2/2] Update CI to iOS 18.5 and Xcode 16.4 (Swift 6.1.2)

- Update Xcode version from 16.0 to 16.4 (Swift 6.1.2)
- Update iOS simulator version from 18.0 to 18.5
- Update Swift version from 6.0.1 to 6.1.2 for Ubuntu tests
- Switch to OpenSwiftUI setup-xcode action for consistency with OAG
- Add fail-fast: false to Ubuntu workflow for better CI resilience
---
 .github/workflows/compatibility_tests.yml | 10 +++++-----
 .github/workflows/ios.yml                 |  6 +++---
 .github/workflows/macos.yml               |  8 ++++----
 .github/workflows/ubuntu.yml              |  3 ++-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/compatibility_tests.yml b/.github/workflows/compatibility_tests.yml
index 611f2a8..6bd7ffa 100644
--- a/.github/workflows/compatibility_tests.yml
+++ b/.github/workflows/compatibility_tests.yml
@@ -12,14 +12,14 @@ jobs:
     strategy:
       matrix:
         os: [macos-15]
-        xcode-version: ["16.0"]
+        xcode-version: ["16.4"]   # Swift 6.1.2
     runs-on: ${{ matrix.os }}
     env:
       UNSAFEHETEROGENEOUSBUFFER_SWIFTUI_COMPATIBILITY_TEST: 1
     steps:
       - uses: actions/checkout@v4
       - name: Setup Xcode
-        uses: maxim-lobanov/setup-xcode@v1
+        uses: OpenSwiftUIProject/OpenSwiftUI/.github/actions/setup-xcode@main
         with:
           xcode-version: ${{ matrix.xcode-version }}
       - name: Run compatibility tests
@@ -33,8 +33,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-15]
-        xcode-version: ["16.0"]
-        ios-version: ["18.0"]
+        xcode-version: ["16.4"]   # Swift 6.1.2
+        ios-version: ["18.5"]
         ios-simulator-name: ["iPhone 16 Pro"]
     runs-on: ${{ matrix.os }}
     env:
@@ -42,7 +42,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup Xcode
-        uses: maxim-lobanov/setup-xcode@v1
+        uses: OpenSwiftUIProject/OpenSwiftUI/.github/actions/setup-xcode@main
         with:
           xcode-version: ${{ matrix.xcode-version }}
       - name: Run compatibility tests
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
index c4d7118..40df31e 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -12,8 +12,8 @@ jobs:
     strategy:
       matrix:
         os: [macos-15]
-        xcode-version: [16.0]
-        ios-version: ["18.0"]
+        xcode-version: ["16.4"]   # Swift 6.1.2
+        ios-version: ["18.5"]
         ios-simulator-name: ["iPhone 16 Pro"]
     runs-on: ${{ matrix.os }}
     env:
@@ -21,7 +21,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup Xcode
-        uses: maxim-lobanov/setup-xcode@v1
+        uses: OpenSwiftUIProject/OpenSwiftUI/.github/actions/setup-xcode@main
         with:
           xcode-version: ${{ matrix.xcode-version }}
       - name: Swift version
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 5d5bc97..9c3f7e9 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -15,9 +15,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup Xcode
-        uses: maxim-lobanov/setup-xcode@v1
+        uses: OpenSwiftUIProject/OpenSwiftUI/.github/actions/setup-xcode@main
         with:
-          xcode-version: 16.0
+          xcode-version: "16.4"
       - name: Build XCFramework
         run: ./Scripts/build_xcframework.sh
   macos_test:
@@ -25,14 +25,14 @@ jobs:
     strategy:
       matrix:
         os: [macos-15]
-        xcode-version: [16.0]
+        xcode-version: ["16.4"]   # Swift 6.1.2
     runs-on: ${{ matrix.os }}
     env:
       UNSAFEHETEROGENEOUSBUFFER_SWIFTUI_COMPATIBILITY_TEST: 0
     steps:
       - uses: actions/checkout@v4
       - name: Setup Xcode
-        uses: maxim-lobanov/setup-xcode@v1
+        uses: OpenSwiftUIProject/OpenSwiftUI/.github/actions/setup-xcode@main
         with:
           xcode-version: ${{ matrix.xcode-version }}
       - name: Build and run tests in debug mode with coverage
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 218b3a1..228f15e 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -10,8 +10,9 @@ jobs:
   ubuntu_test:
     name: Execute tests on Ubuntu
     strategy:
+      fail-fast: false
       matrix:
-        swift_version: ["6.0.1"]
+        swift_version: ["6.1.2"]
     runs-on: ubuntu-22.04
     env:
       UNSAFEHETEROGENEOUSBUFFER_SWIFTUI_COMPATIBILITY_TEST: 0