Skip to content

Commit 0325d39

Browse files
authored
Update CI to iOS 18.5 and Xcode 16.4 (Swift 6.1.2) (#1)
1 parent 5b66142 commit 0325d39

5 files changed

Lines changed: 15 additions & 15 deletions

File tree

.github/workflows/compatibility_tests.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ jobs:
1212
strategy:
1313
matrix:
1414
os: [macos-15]
15-
xcode-version: ["16.0"]
15+
xcode-version: ["16.4"] # Swift 6.1.2
1616
runs-on: ${{ matrix.os }}
1717
env:
1818
UNSAFEHETEROGENEOUSBUFFER_SWIFTUI_COMPATIBILITY_TEST: 1
1919
steps:
2020
- uses: actions/checkout@v4
2121
- name: Setup Xcode
22-
uses: maxim-lobanov/setup-xcode@v1
22+
uses: OpenSwiftUIProject/OpenSwiftUI/.github/actions/setup-xcode@main
2323
with:
2424
xcode-version: ${{ matrix.xcode-version }}
2525
- name: Run compatibility tests
@@ -33,16 +33,16 @@ jobs:
3333
fail-fast: false
3434
matrix:
3535
os: [macos-15]
36-
xcode-version: ["16.0"]
37-
ios-version: ["18.0"]
36+
xcode-version: ["16.4"] # Swift 6.1.2
37+
ios-version: ["18.5"]
3838
ios-simulator-name: ["iPhone 16 Pro"]
3939
runs-on: ${{ matrix.os }}
4040
env:
4141
UNSAFEHETEROGENEOUSBUFFER_SWIFTUI_COMPATIBILITY_TEST: 1
4242
steps:
4343
- uses: actions/checkout@v4
4444
- name: Setup Xcode
45-
uses: maxim-lobanov/setup-xcode@v1
45+
uses: OpenSwiftUIProject/OpenSwiftUI/.github/actions/setup-xcode@main
4646
with:
4747
xcode-version: ${{ matrix.xcode-version }}
4848
- name: Run compatibility tests

.github/workflows/ios.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ jobs:
1212
strategy:
1313
matrix:
1414
os: [macos-15]
15-
xcode-version: [16.0]
16-
ios-version: ["18.0"]
15+
xcode-version: ["16.4"] # Swift 6.1.2
16+
ios-version: ["18.5"]
1717
ios-simulator-name: ["iPhone 16 Pro"]
1818
runs-on: ${{ matrix.os }}
1919
env:
2020
UNSAFEHETEROGENEOUSBUFFER_SWIFTUI_COMPATIBILITY_TEST: 0
2121
steps:
2222
- uses: actions/checkout@v4
2323
- name: Setup Xcode
24-
uses: maxim-lobanov/setup-xcode@v1
24+
uses: OpenSwiftUIProject/OpenSwiftUI/.github/actions/setup-xcode@main
2525
with:
2626
xcode-version: ${{ matrix.xcode-version }}
2727
- name: Swift version

.github/workflows/macos.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,24 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@v4
1717
- name: Setup Xcode
18-
uses: maxim-lobanov/setup-xcode@v1
18+
uses: OpenSwiftUIProject/OpenSwiftUI/.github/actions/setup-xcode@main
1919
with:
20-
xcode-version: 16.0
20+
xcode-version: "16.4"
2121
- name: Build XCFramework
2222
run: ./Scripts/build_xcframework.sh
2323
macos_test:
2424
name: Execute tests on macOS
2525
strategy:
2626
matrix:
2727
os: [macos-15]
28-
xcode-version: [16.0]
28+
xcode-version: ["16.4"] # Swift 6.1.2
2929
runs-on: ${{ matrix.os }}
3030
env:
3131
UNSAFEHETEROGENEOUSBUFFER_SWIFTUI_COMPATIBILITY_TEST: 0
3232
steps:
3333
- uses: actions/checkout@v4
3434
- name: Setup Xcode
35-
uses: maxim-lobanov/setup-xcode@v1
35+
uses: OpenSwiftUIProject/OpenSwiftUI/.github/actions/setup-xcode@main
3636
with:
3737
xcode-version: ${{ matrix.xcode-version }}
3838
- name: Build and run tests in debug mode with coverage

.github/workflows/ubuntu.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ jobs:
1010
ubuntu_test:
1111
name: Execute tests on Ubuntu
1212
strategy:
13+
fail-fast: false
1314
matrix:
14-
swift_version: ["6.0.1"]
15+
swift_version: ["6.1.2"]
1516
runs-on: ubuntu-22.04
1617
env:
1718
UNSAFEHETEROGENEOUSBUFFER_SWIFTUI_COMPATIBILITY_TEST: 0

Scripts/update.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ git add Sources/UnsafeHeterogeneousBuffer/UnsafeHeterogeneousBuffer.swift \
6767
git commit -m "$(cat <<EOF
6868
Update from OpenSwiftUI upstream
6969
70-
Upstream commit: $UPSTREAM_COMMIT_HASH
70+
Upstream: https://github.com/OpenSwiftUIProject/OpenSwiftUI/blob/$UPSTREAM_COMMIT_HASH/Sources/OpenSwiftUICore/Data/DynamicProperty/UnsafeHeterogeneousBuffer.swift
7171
7272
Transformations applied:
7373
- Changed package → public access control
@@ -76,7 +76,6 @@ Transformations applied:
7676
- Added compatibility test conditionals
7777
- Replaced OpenSwiftUI helpers with standard Swift
7878
79-
OpenSwiftUI: https://github.com/OpenSwiftUIProject/OpenSwiftUI
8079
EOF
8180
)"
8281

0 commit comments

Comments
 (0)