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
33 changes: 0 additions & 33 deletions .github/scripts/fix-toolchain.sh

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/compatibility_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -48,4 +48,4 @@ jobs:
-sdk macosx \
-destination "platform=macOS" \
-skipPackagePluginValidation \
-skipMacroValidation
-skipMacroValidation
2 changes: 1 addition & 1 deletion .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version: 6.1
// swift-tools-version: 6.2

import Foundation
import PackageDescription
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,3 @@ ORB_EXPORT bool ORBColorModeHasExtendedRange(ORBColorMode mode) ORB_SWIFT_NAME(g
ORB_EXTERN_C_END

ORB_ASSUME_NONNULL_END

66 changes: 32 additions & 34 deletions Tests/OpenRenderBoxCompatibilityTests/ColorTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
}
Loading