Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/compatibility_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -33,16 +33,16 @@ 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:
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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ 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:
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: Swift version
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@ 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:
name: Execute tests on macOS
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
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions Scripts/update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -76,7 +76,6 @@ Transformations applied:
- Added compatibility test conditionals
- Replaced OpenSwiftUI helpers with standard Swift

OpenSwiftUI: https://github.com/OpenSwiftUIProject/OpenSwiftUI
EOF
)"

Expand Down
Loading