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
8 changes: 4 additions & 4 deletions .github/workflows/compatibility_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@ jobs:
matrix:
include:
- os: macos-15
xcode-version: "26.3" # Swift 6.2.4
runs-on: ${{ matrix.os }}
xcode-version: "26.6" # Swift 6.3.3
runs-on:
- ${{ matrix.os }}
- xcode-26.6
env:
OPENATTRIBUTEGRAPH_WERROR: 1
OPENATTRIBUTEGRAPH_COMPATIBILITY_TEST: 1
Expand Down Expand Up @@ -49,9 +51,7 @@ jobs:
shell: bash
- name: Run tests against Apple's AttributeGraph on macOS via SwiftPM
run: |
# Swift 6.2.4 crashes while indexing C++ interop test targets.
swift test \
--disable-index-store \
--build-path .build-compatibility-test-debug
- name: Run tests against Apple's AttributeGraph on macOS via Xcode
run: |
Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/compute.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ jobs:
strategy:
fail-fast: false
matrix:
# Swift 6.2.4 crashes swift-frontend when compiling C++ interop on Linux.
# Swift 6.3.2 has been verified locally on Linux.
swift_version: ["6.3.2"]
swift_version: ["6.3.3"]
runs-on: ubuntu-22.04
env:
OPENATTRIBUTEGRAPH_WERROR: 1
Expand All @@ -37,8 +35,10 @@ jobs:
fail-fast: false
matrix:
os: [macos-15]
xcode-version: ["26.3"]
runs-on: ${{ matrix.os }}
xcode-version: ["26.6"]
runs-on:
- ${{ matrix.os }}
- xcode-26.6
env:
OPENATTRIBUTEGRAPH_WERROR: 1
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE: 1
Expand All @@ -63,12 +63,14 @@ jobs:
fail-fast: false
matrix:
os: [macos-15]
xcode-version: ["26.3"]
xcode-version: ["26.6"]
ios-version: ["18.5"]
include:
- ios-version: "18.5"
ios-simulator-name: "iPhone 16 Pro"
runs-on: ${{ matrix.os }}
runs-on:
- ${{ matrix.os }}
- xcode-26.6
env:
OPENATTRIBUTEGRAPH_WERROR: 1
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE: 1
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ jobs:
fail-fast: false
matrix:
os: [macos-15]
xcode-version: ["26.3"] # Swift 6.2.4
xcode-version: ["26.6"] # Swift 6.3.3
ios-version: ["18.5"]
include:
- ios-version: "18.5"
ios-simulator-name: "iPhone 16 Pro"
runs-on: ${{ matrix.os }}
runs-on:
- ${{ matrix.os }}
- xcode-26.6
env:
OPENATTRIBUTEGRAPH_WERROR: 1
OPENATTRIBUTEGRAPH_USE_LOCAL_DEPS: 1
Expand Down Expand Up @@ -52,7 +54,6 @@ jobs:
- name: Build in debug mode on iOS
run: |
source Scripts/Tuist/common.sh
# Swift 6.2.4 crashes while indexing C++ interop test targets.
tuist_xcodebuild \
"${RUNNER_TEMP:-/tmp}/openattributegraph-ios-build-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT:-0}.xcresult" \
build \
Expand All @@ -63,12 +64,10 @@ jobs:
-derivedDataPath .build-debug \
-skipMacroValidation \
-skipPackagePluginValidation \
COMPILER_INDEX_STORE_ENABLE=NO \
OTHER_SWIFT_FLAGS="-warnings-as-errors"
- name: Build and run tests in debug mode with coverage on iOS Simulator
run: |
source Scripts/Tuist/common.sh
# Swift 6.2.4 crashes while indexing C++ interop test targets.
tuist_xcodebuild \
"${RUNNER_TEMP:-/tmp}/openattributegraph-ios-test-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT:-0}.xcresult" \
test \
Expand All @@ -79,8 +78,7 @@ jobs:
-enableCodeCoverage=YES \
-derivedDataPath .build-test-debug \
-skipPackagePluginValidation \
-skipMacroValidation \
COMPILER_INDEX_STORE_ENABLE=NO
-skipMacroValidation
# OTHER_SWIFT_FLAGS="-warnings-as-errors" Conflicting options '-warnings-as-errors' and '-suppress-warnings'
- name: Generate iOS coverage report
run: |
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ jobs:
fail-fast: false
matrix:
os: [macos-15]
xcode-version: ["26.3"] # Swift 6.2.4
runs-on: ${{ matrix.os }}
xcode-version: ["26.6"] # Swift 6.3.3
runs-on:
- ${{ matrix.os }}
- xcode-26.6
env:
OPENATTRIBUTEGRAPH_WERROR: 1
OPENATTRIBUTEGRAPH_USE_LOCAL_DEPS: 1
Expand All @@ -34,9 +36,7 @@ jobs:
shell: bash
- name: Build and run tests in debug mode with coverage
run: |
# Swift 6.2.4 crashes while indexing C++ interop test targets.
swift test \
--disable-index-store \
-c debug \
--enable-code-coverage \
--build-path .build-test-debug
Expand All @@ -46,9 +46,7 @@ jobs:
> coverage.txt
- name: Build and run tests in release mode
run: |
# Swift 6.2.4 crashes while indexing C++ interop test targets.
swift test \
--disable-index-store \
-c release \
--enable-code-coverage \
--build-path .build-test-release
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/oag_binary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ jobs:
fail-fast: false
matrix:
os: [macos-15]
xcode-version: ["26.3"]
runs-on: ${{ matrix.os }}
xcode-version: ["26.6"]
runs-on:
- ${{ matrix.os }}
- xcode-26.6
env:
OPENATTRIBUTEGRAPH_WERROR: 1
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_OAG_USE_BINARY: 1
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ on:
jobs:
release:
name: Build and Publish Release
runs-on: macos-15
runs-on:
- macos-15
- xcode-26.6
permissions:
contents: write
id-token: write
Expand All @@ -22,7 +24,7 @@ jobs:
- name: Setup Xcode
uses: OpenSwiftUIProject/setup-xcode@v2
with:
xcode-version: "26.3"
xcode-version: "26.6"
- name: Set up mise
uses: jdx/mise-action@v2
with:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ jobs:
strategy:
fail-fast: false
matrix:
# Swift 6.2.4 crashes swift-frontend when compiling C++ interop tests on Linux.
# Swift 6.3.2 has been verified locally on Linux.
swift_version: ["6.3.2"]
swift_version: ["6.3.3"]
runs-on: ubuntu-22.04
env:
OPENATTRIBUTEGRAPH_WERROR: 1
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/xcframework.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ jobs:
fail-fast: false
matrix:
os: [macos-15]
xcode-version: ["26.3"] # Swift 6.2.4
runs-on: ${{ matrix.os }}
xcode-version: ["26.6"] # Swift 6.3.3
runs-on:
- ${{ matrix.os }}
- xcode-26.6
env:
GH_TOKEN: ${{ github.token }}
steps:
Expand Down
9 changes: 1 addition & 8 deletions Example/Project.swift
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
import ProjectDescription

let indexStoreDisabledSettings: SettingsDictionary = [
// Swift 6.2.4 crashes while indexing C++ interop package targets.
"COMPILER_INDEX_STORE_ENABLE": "NO",
]

let project = Project(
name: "Example",
settings: .settings(base: indexStoreDisabledSettings),
targets: [
.target(
name: "Example",
Expand All @@ -19,8 +13,7 @@ let project = Project(
dependencies: [
.sdk(name: "c++", type: .library),
.external(name: "OpenAttributeGraph"),
],
settings: .settings(base: indexStoreDisabledSettings)
]
),
]
)
7 changes: 6 additions & 1 deletion Example/Tuist.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@ let tuist = Tuist(
),
project: .tuist(
generationOptions: .options(
enableCaching: Environment.isCI
optionalAuthentication: true,
enableCaching: Environment.isCI,
manifestEnvironment: [
"OPENSWIFTUI_*",
"OPENATTRIBUTEGRAPH_*",
]
)
)
)
2 changes: 1 addition & 1 deletion Example/Tuist/Package.resolved

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

11 changes: 2 additions & 9 deletions Example/Tuist/Package.swift
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
// swift-tools-version: 6.2
// swift-tools-version: 6.3

import PackageDescription

#if TUIST
import ProjectDescription

let indexStoreDisabledSettings: SettingsDictionary = [
// Swift 6.2.4 crashes while indexing C++ interop package targets.
"COMPILER_INDEX_STORE_ENABLE": "NO",
]

let packageSettings = PackageSettings(
baseSettings: .settings(base: indexStoreDisabledSettings)
)
let packageSettings = PackageSettings()
#endif

let package = Package(
Expand Down
2 changes: 1 addition & 1 deletion Example/mise.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[tools]
tuist = "4.203.1"
tuist = "4.203.4"
2 changes: 1 addition & 1 deletion 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.2
// swift-tools-version: 6.3

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 @@ -60,7 +60,7 @@ For a simpler setup, you can use the prebuilt XCFramework available on the [rele

## Build

The current suggested toolchain to build the project is Swift 6.2.4 / Xcode 26.3.
The current suggested toolchain to build the project is Swift 6.3.3 / Xcode 26.6.

### Clone Swift headers

Expand Down
2 changes: 1 addition & 1 deletion Scripts/CI/ag_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ filepath() {
}

REPO_ROOT="$(dirname $(dirname $(dirname $(filepath $0))))"
DARWINPRIVATEFRAMEWORKS_FALLBACK_REVISION="b0c3d94ff6b7200754ad2adf948fd3c6ebaef956"
DARWINPRIVATEFRAMEWORKS_FALLBACK_REVISION="b7e6ba165f3763dd477f55cc55b4a63f51385571"

clone_checkout_ag() {
cd $REPO_ROOT
Expand Down
1 change: 1 addition & 0 deletions Tuist.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ let tuist = Tuist(
),
project: .tuist(
generationOptions: .options(
optionalAuthentication: true,
enableCaching: Environment.isCI,
manifestEnvironment: [
"OPENSWIFTUI_*",
Expand Down
2 changes: 1 addition & 1 deletion Tuist/Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version: 6.2
// swift-tools-version: 6.3
import PackageDescription

#if TUIST
Expand Down
2 changes: 1 addition & 1 deletion mise.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[tools]
tuist = "4.203.1"
tuist = "4.203.4"
Loading