From dc1bc2d883c43e81f8181709bb5c0cb86e157f34 Mon Sep 17 00:00:00 2001 From: Kyle Date: Sun, 7 Jun 2026 17:38:04 +0800 Subject: [PATCH 1/4] Update CI toolchain versions --- .github/workflows/compatibility_tests.yml | 4 ++-- .github/workflows/ios.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- Package.resolved | 2 +- Package.swift | 2 +- README.md | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/compatibility_tests.yml b/.github/workflows/compatibility_tests.yml index 06cdc05..e1da6db 100644 --- a/.github/workflows/compatibility_tests.yml +++ b/.github/workflows/compatibility_tests.yml @@ -14,7 +14,7 @@ jobs: matrix: include: - os: macos-15 - xcode-version: "16.4" # Swift 6.1.2 + xcode-version: "26.3" # Swift 6.2.4 runs-on: ${{ matrix.os }} env: OPENRENDERBOX_WERROR: 1 @@ -48,4 +48,4 @@ jobs: -sdk macosx \ -destination "platform=macOS" \ -skipPackagePluginValidation \ - -skipMacroValidation \ No newline at end of file + -skipMacroValidation diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 509b72f..d68603b 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: os: [macos-15] - xcode-version: ["16.4"] # Swift 6.1.2 + xcode-version: ["26.3"] # Swift 6.2.4 ios-version: ["18.5"] include: - ios-version: "18.5" diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index e9f8c7c..862d939 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: os: [macos-15] - xcode-version: [16.4] # Swift 6.1.2 + xcode-version: ["26.3"] # Swift 6.2.4 runs-on: ${{ matrix.os }} env: OPENRENDERBOX_WERROR: 1 diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 7c704da..eb9ba5c 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - swift_version: ["6.1.2"] + swift_version: ["6.2.4"] runs-on: ubuntu-22.04 env: OPENRENDERBOX_WERROR: 1 diff --git a/Package.resolved b/Package.resolved index 659e3fb..69ac1ba 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "030dd1b5d51c353f6561859605d7a71043caed24528e27ea847be041a4ba12aa", + "originHash" : "79a10d248c4a2bb8cac89835379abd152272810c8ece94d61faf3565b4a22dd7", "pins" : [ { "identity" : "darwinprivateframeworks", diff --git a/Package.swift b/Package.swift index 79eb034..e23f616 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version: 6.1 +// swift-tools-version: 6.2 import Foundation import PackageDescription diff --git a/README.md b/README.md index 7b61b38..1911d5f 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Currently, this project is in early development. ## Build -The current suggested toolchain to build the project is Swift 6.1.2 / Xcode 16.4. +The current suggested toolchain to build the project is Swift 6.2.4 / Xcode 26.3. ## Supported platforms From 7b1a5c60827d3466425aeacee4072600795099ee Mon Sep 17 00:00:00 2001 From: Kyle Date: Sun, 7 Jun 2026 17:38:19 +0800 Subject: [PATCH 2/4] Remove obsolete toolchain patch --- .github/scripts/fix-toolchain.sh | 33 -------------------------------- .github/workflows/ubuntu.yml | 4 ---- 2 files changed, 37 deletions(-) delete mode 100755 .github/scripts/fix-toolchain.sh diff --git a/.github/scripts/fix-toolchain.sh b/.github/scripts/fix-toolchain.sh deleted file mode 100755 index 447ef4c..0000000 --- a/.github/scripts/fix-toolchain.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -set -e - -# Find the path to swift binary -SWIFT_PATH=$(which swift) -echo "Swift binary found at: $SWIFT_PATH" - -# Extract the toolchain path from swift binary path -# Remove /usr/bin/swift from the path to get the toolchain root -TOOLCHAIN_ROOT=$(dirname $(dirname "$SWIFT_PATH")) -echo "Toolchain root: $TOOLCHAIN_ROOT" - -# Construct the path to CFBase.h -CFBASE_PATH="$TOOLCHAIN_ROOT/lib/swift/CoreFoundation/CFBase.h" -echo "Looking for CFBase.h at: $CFBASE_PATH" - -# Check if the file exists -if [ -f "$CFBASE_PATH" ]; then - echo "Found CFBase.h, applying patch..." - - # Create a backup of the original file - cp "$CFBASE_PATH" "$CFBASE_PATH.bak" - - # Replace the include line - sed -i 's/#include /\/\/ #include /g' "$CFBASE_PATH" - - echo "Patch applied successfully." - echo "Original file backed up at $CFBASE_PATH.bak" -else - echo "ERROR: Could not find CFBase.h in expected location." - echo "Toolchain structure may be different than expected." - exit 1 -fi diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index eb9ba5c..a21191d 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -24,10 +24,6 @@ jobs: - name: Swift version run: | which swift && swift --version - - name: Toolchain fix patch - run: | - # Fix swift-corelibs-foundation#5211 - .github/scripts/fix-toolchain.sh - name: Building and running tests in debug mode with coverage run: | swift test \ From 127d18dacea5a68dde3a7efe0c8cb2936f06d59b Mon Sep 17 00:00:00 2001 From: Kyle Date: Sun, 7 Jun 2026 18:08:17 +0800 Subject: [PATCH 3/4] Remove unneeded compiler check --- .../include/OpenRenderBox/ORBColorMode.h | 1 - .../ColorTests.swift | 66 +++++++++---------- 2 files changed, 32 insertions(+), 35 deletions(-) diff --git a/Sources/OpenRenderBoxCxx/include/OpenRenderBox/ORBColorMode.h b/Sources/OpenRenderBoxCxx/include/OpenRenderBox/ORBColorMode.h index fde751c..2ead50c 100644 --- a/Sources/OpenRenderBoxCxx/include/OpenRenderBox/ORBColorMode.h +++ b/Sources/OpenRenderBoxCxx/include/OpenRenderBox/ORBColorMode.h @@ -19,4 +19,3 @@ ORB_EXPORT bool ORBColorModeHasExtendedRange(ORBColorMode mode) ORB_SWIFT_NAME(g ORB_EXTERN_C_END ORB_ASSUME_NONNULL_END - diff --git a/Tests/OpenRenderBoxCompatibilityTests/ColorTests.swift b/Tests/OpenRenderBoxCompatibilityTests/ColorTests.swift index 815308f..4290091 100644 --- a/Tests/OpenRenderBoxCompatibilityTests/ColorTests.swift +++ b/Tests/OpenRenderBoxCompatibilityTests/ColorTests.swift @@ -151,28 +151,27 @@ struct ColorTests { } #endif - #if compiler(>=6.2) // old Xcode version swift-testing bug @Suite struct ColorModeTests { // MARK: - ORBColorModeWorkingColorSpace @Test("ORBColorModeWorkingColorSpace", arguments: [ - (ORBColor.Mode.mode0, ORBColor.ColorSpace.SRGB), - (ORBColor.Mode.mode1, ORBColor.ColorSpace.linearSRGB), - (ORBColor.Mode.mode2, ORBColor.ColorSpace.linearSRGB), - (ORBColor.Mode.mode3, ORBColor.ColorSpace.SRGB), - (ORBColor.Mode.mode4, ORBColor.ColorSpace.SRGB), - (ORBColor.Mode.mode5, ORBColor.ColorSpace.SRGB), - (ORBColor.Mode.mode6, ORBColor.ColorSpace.linearSRGB), - (ORBColor.Mode.mode7, ORBColor.ColorSpace.linearSRGB), - (ORBColor.Mode.mode8, ORBColor.ColorSpace.linearSRGB), - (ORBColor.Mode.mode9, ORBColor.ColorSpace.SRGB), - (ORBColor.Mode.mode10, ORBColor.ColorSpace.linearSRGB), - (ORBColor.Mode.mode11, ORBColor.ColorSpace.SRGB), - (ORBColor.Mode.mode12, ORBColor.ColorSpace.SRGB), - (ORBColor.Mode.mode13, ORBColor.ColorSpace.linearSRGB), - (ORBColor.Mode.mode14, ORBColor.ColorSpace.SRGB), - (ORBColor.Mode.mode15, ORBColor.ColorSpace.linearSRGB), + (ORBColor.Mode(rawValue: 0), ORBColor.ColorSpace.SRGB), + (ORBColor.Mode(rawValue: 1), ORBColor.ColorSpace.linearSRGB), + (ORBColor.Mode(rawValue: 2), ORBColor.ColorSpace.linearSRGB), + (ORBColor.Mode(rawValue: 3), ORBColor.ColorSpace.SRGB), + (ORBColor.Mode(rawValue: 4), ORBColor.ColorSpace.SRGB), + (ORBColor.Mode(rawValue: 5), ORBColor.ColorSpace.SRGB), + (ORBColor.Mode(rawValue: 6), ORBColor.ColorSpace.linearSRGB), + (ORBColor.Mode(rawValue: 7), ORBColor.ColorSpace.linearSRGB), + (ORBColor.Mode(rawValue: 8), ORBColor.ColorSpace.linearSRGB), + (ORBColor.Mode(rawValue: 9), ORBColor.ColorSpace.SRGB), + (ORBColor.Mode(rawValue: 10), ORBColor.ColorSpace.linearSRGB), + (ORBColor.Mode(rawValue: 11), ORBColor.ColorSpace.SRGB), + (ORBColor.Mode(rawValue: 12), ORBColor.ColorSpace.SRGB), + (ORBColor.Mode(rawValue: 13), ORBColor.ColorSpace.linearSRGB), + (ORBColor.Mode(rawValue: 14), ORBColor.ColorSpace.SRGB), + (ORBColor.Mode(rawValue: 15), ORBColor.ColorSpace.linearSRGB), ]) func colorModeWorkingColorSpace(mode: ORBColor.Mode, expectedColorSpace: ORBColor.ColorSpace) { #expect(mode.workingColorSpace == expectedColorSpace) @@ -181,26 +180,25 @@ struct ColorTests { // MARK: - ORBColorModeHasExtendedRange @Test("ORBColorModeHasExtendedRange", arguments: [ - (ORBColor.Mode.mode0, false), - (ORBColor.Mode.mode1, false), - (ORBColor.Mode.mode2, true), - (ORBColor.Mode.mode3, false), - (ORBColor.Mode.mode4, false), - (ORBColor.Mode.mode5, false), - (ORBColor.Mode.mode6, false), - (ORBColor.Mode.mode7, false), - (ORBColor.Mode.mode8, false), - (ORBColor.Mode.mode9, false), - (ORBColor.Mode.mode10, false), - (ORBColor.Mode.mode11, true), - (ORBColor.Mode.mode12, true), - (ORBColor.Mode.mode13, true), - (ORBColor.Mode.mode14, false), - (ORBColor.Mode.mode15, false), + (ORBColor.Mode(rawValue: 0), false), + (ORBColor.Mode(rawValue: 1), false), + (ORBColor.Mode(rawValue: 2), true), + (ORBColor.Mode(rawValue: 3), false), + (ORBColor.Mode(rawValue: 4), false), + (ORBColor.Mode(rawValue: 5), false), + (ORBColor.Mode(rawValue: 6), false), + (ORBColor.Mode(rawValue: 7), false), + (ORBColor.Mode(rawValue: 8), false), + (ORBColor.Mode(rawValue: 9), false), + (ORBColor.Mode(rawValue: 10), false), + (ORBColor.Mode(rawValue: 11), true), + (ORBColor.Mode(rawValue: 12), true), + (ORBColor.Mode(rawValue: 13), true), + (ORBColor.Mode(rawValue: 14), false), + (ORBColor.Mode(rawValue: 15), false), ]) func colorModeHasExtendedRange(mode: ORBColor.Mode, expectedResult: Bool) { #expect(mode.hasExtendedRange == expectedResult) } } - #endif } From cf39609dc7b2152236ff8dd0872192a1c8a95fa4 Mon Sep 17 00:00:00 2001 From: Kyle Date: Sun, 7 Jun 2026 18:48:07 +0800 Subject: [PATCH 4/4] Bump DarwinPrivateFrameworks depdency --- Package.resolved | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.resolved b/Package.resolved index 69ac1ba..a9ae7cd 100644 --- a/Package.resolved +++ b/Package.resolved @@ -7,7 +7,7 @@ "location" : "https://github.com/OpenSwiftUIProject/DarwinPrivateFrameworks.git", "state" : { "branch" : "main", - "revision" : "8e4b56ac649f58b7d2555cc1f8418dde8c5bc8cd" + "revision" : "b0c3d94ff6b7200754ad2adf948fd3c6ebaef956" } }, {