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
6 changes: 4 additions & 2 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ jobs:
# Xcode 26.3 + iOS 18.5 fails to launch arm64 SwiftPM package test
# runners with CoreSimulator codesigning errors. Build the x86_64
# simulator slice to match the test command below until that is fixed.
NSUnbufferedIO=YES xcodebuild build \
# Swift 6.2 macro prebuilts do not support the x86_64 simulator
# testable macro target, so build SwiftSyntax from source instead.
NSUnbufferedIO=YES xcodebuild -IDEPackageEnablePrebuilts=NO build \
-scheme OpenSwiftUI \
-configuration Debug \
-destination "platform=iOS Simulator,OS=${{ matrix.ios-version }},name=${{ matrix.ios-simulator-name }},arch=x86_64" \
Expand All @@ -74,7 +76,7 @@ jobs:
set -o pipefail
# See the build step above: force x86_64 to avoid the arm64 package
# test runner launch/codesigning failure on this Xcode/iOS pair.
NSUnbufferedIO=YES xcodebuild test \
NSUnbufferedIO=YES xcodebuild -IDEPackageEnablePrebuilts=NO test \
-scheme OpenSwiftUI \
-configuration Debug \
-destination "platform=iOS Simulator,OS=${{ matrix.ios-version }},name=${{ matrix.ios-simulator-name }},arch=x86_64" \
Expand Down
8 changes: 2 additions & 6 deletions Example/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,12 @@ let openSwiftUIModeSettings: SettingsDictionary = [

let debugModeSettings: SettingsDictionary = [
"ENABLE_TESTABILITY": "YES",
"GCC_PREPROCESSOR_DEFINITIONS": "$(inherited) DEBUG=1",
"SWIFT_ACTIVE_COMPILATION_CONDITIONS": "$(inherited) DEBUG",
"SWIFT_COMPILATION_MODE": "singlefile",
"SWIFT_OPTIMIZATION_LEVEL": "-Onone",
]

let openSwiftUIDebugModeSettings = openSwiftUIModeSettings.merging([
"ENABLE_TESTABILITY": "YES",
"GCC_PREPROCESSOR_DEFINITIONS": "$(inherited) OPENSWIFTUI=1 DEBUG=1",
"SWIFT_ACTIVE_COMPILATION_CONDITIONS": "$(inherited) OPENSWIFTUI DEBUG",
"SWIFT_COMPILATION_MODE": "singlefile",
"SWIFT_OPTIMIZATION_LEVEL": "-Onone",
])
Expand All @@ -75,7 +71,7 @@ func settings(base: SettingsDictionary = [:], xcconfig: Path) -> Settings {
.settings(
base: base,
configurations: targetConfigurations(xcconfig),
defaultSettings: .none,
defaultSettings: .essential,
defaultConfiguration: "OpenSwiftUIDebug"
)
}
Expand Down Expand Up @@ -454,7 +450,7 @@ let project = Project(
),
settings: .settings(
configurations: projectConfigurations,
defaultSettings: .none,
defaultSettings: .essential,
defaultConfiguration: "OpenSwiftUIDebug"
),
targets: targets,
Expand Down
12 changes: 6 additions & 6 deletions Example/Tuist/Package.resolved

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

11 changes: 7 additions & 4 deletions Example/Tuist/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ import ProjectDescription

let examplePackageDestinations: Destinations = [.iPhone, .iPad, .mac, .appleVision]
let openSwiftUIPackageDebugSettings: SettingsDictionary = [
"GCC_PREPROCESSOR_DEFINITIONS": "$(inherited) DEBUG=1",
"SWIFT_ACTIVE_COMPILATION_CONDITIONS": "$(inherited) DEBUG",
"SWIFT_COMPILATION_MODE": "singlefile",
"SWIFT_OPTIMIZATION_LEVEL": "-Onone",
]
Expand Down Expand Up @@ -115,11 +113,16 @@ let packageSettings = PackageSettings(
productDestinations: packageProductDestinations,
baseSettings: .settings(
configurations: openSwiftUIPackageConfigurations,
defaultSettings: .none,
defaultSettings: .essential,
defaultConfiguration: "OpenSwiftUIDebug"
),
targetSettings: [
"OpenSwiftUI": .settings(base: openSwiftUITargetSettings),
"OpenSwiftUI": .settings(
base: openSwiftUITargetSettings,
configurations: openSwiftUIPackageConfigurations,
defaultSettings: .essential,
defaultConfiguration: "OpenSwiftUIDebug"
),
]
)
#endif
3 changes: 2 additions & 1 deletion Example/mise.compute.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[tools]
tuist = "4.193.0"
tuist = "4.202.5"

[env]
TUIST_USE_SWIFTERPM=1
OPENSWIFTUI_OPENATTRIBUTESHIMS_ATTRIBUTEGRAPH = "0"
OPENSWIFTUI_OPENATTRIBUTESHIMS_COMPUTE = "1"
OPENSWIFTUI_OPENATTRIBUTESHIMS_COMPUTE_BINARY = "0" # Upstream 0.3.0 still crashs for OSUI. And we need to use our patch
Expand Down
3 changes: 2 additions & 1 deletion Example/mise.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[tools]
tuist = "4.193.0"
tuist = "4.202.5"

[env]
TUIST_USE_SWIFTERPM=1
OPENSWIFTUI_OPENATTRIBUTESHIMS_ATTRIBUTEGRAPH = "1"
3 changes: 2 additions & 1 deletion mise.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[tools]
tuist = "4.193.0"
tuist = "4.202.5"

[env]
TUIST_USE_SWIFTERPM=1
OPENSWIFTUI_OPENATTRIBUTESHIMS_ATTRIBUTEGRAPH = "1"
Loading