diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 50ec61eec..66852d7dc 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -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" \ @@ -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" \ diff --git a/Example/Project.swift b/Example/Project.swift index 689a7ae0f..75d4c989c 100644 --- a/Example/Project.swift +++ b/Example/Project.swift @@ -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", ]) @@ -75,7 +71,7 @@ func settings(base: SettingsDictionary = [:], xcconfig: Path) -> Settings { .settings( base: base, configurations: targetConfigurations(xcconfig), - defaultSettings: .none, + defaultSettings: .essential, defaultConfiguration: "OpenSwiftUIDebug" ) } @@ -454,7 +450,7 @@ let project = Project( ), settings: .settings( configurations: projectConfigurations, - defaultSettings: .none, + defaultSettings: .essential, defaultConfiguration: "OpenSwiftUIDebug" ), targets: targets, diff --git a/Example/Tuist/Package.resolved b/Example/Tuist/Package.resolved index 300cac598..e252f0305 100644 --- a/Example/Tuist/Package.resolved +++ b/Example/Tuist/Package.resolved @@ -4,7 +4,7 @@ { "identity" : "compute", "kind" : "remoteSourceControl", - "location" : "https://github.com/OpenSwiftUIProject/Compute", + "location" : "https://github.com/openswiftuiproject/compute", "state" : { "revision" : "bf9cfe57ba8b3dc7307a95fb10a6133e70db3089", "version" : "0.3.0-bugfix.1" @@ -13,7 +13,7 @@ { "identity" : "equatable", "kind" : "remoteSourceControl", - "location" : "https://github.com/OpenSwiftUIProject/equatable.git", + "location" : "https://github.com/openswiftuiproject/equatable", "state" : { "branch" : "main", "revision" : "8f1dccead65d97173ed695c6c1ba9d0570d35619" @@ -22,7 +22,7 @@ { "identity" : "opencoregraphics", "kind" : "remoteSourceControl", - "location" : "https://github.com/OpenSwiftUIProject/OpenCoreGraphics", + "location" : "https://github.com/openswiftuiproject/opencoregraphics", "state" : { "branch" : "main", "revision" : "050239bd42b19a4c8b1ef3936bfb9f3589ecfc46" @@ -31,7 +31,7 @@ { "identity" : "openobservation", "kind" : "remoteSourceControl", - "location" : "https://github.com/OpenSwiftUIProject/OpenObservation", + "location" : "https://github.com/openswiftuiproject/openobservation", "state" : { "branch" : "main", "revision" : "05e0581e76b7153338836469320a4789fd0257e2" @@ -67,7 +67,7 @@ { "identity" : "swift-snapshot-testing", "kind" : "remoteSourceControl", - "location" : "https://github.com/OpenSwiftUIProject/swift-snapshot-testing.git", + "location" : "https://github.com/openswiftuiproject/swift-snapshot-testing", "state" : { "revision" : "1bc16f430d8410e7f087d4c787767b26fd32fe30", "version" : "1.19.3" @@ -85,7 +85,7 @@ { "identity" : "symbollocator", "kind" : "remoteSourceControl", - "location" : "https://github.com/OpenSwiftUIProject/SymbolLocator.git", + "location" : "https://github.com/openswiftuiproject/symbollocator", "state" : { "revision" : "546053c03f282df1a8270853da6692e1b078be09", "version" : "0.2.1" diff --git a/Example/Tuist/Package.swift b/Example/Tuist/Package.swift index 120e8f2c6..08b8e4e5e 100644 --- a/Example/Tuist/Package.swift +++ b/Example/Tuist/Package.swift @@ -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", ] @@ -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 diff --git a/Example/mise.compute.toml b/Example/mise.compute.toml index 09cabd79a..669d1d17b 100644 --- a/Example/mise.compute.toml +++ b/Example/mise.compute.toml @@ -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 diff --git a/Example/mise.toml b/Example/mise.toml index 0cc17a74a..781b275bf 100644 --- a/Example/mise.toml +++ b/Example/mise.toml @@ -1,5 +1,6 @@ [tools] -tuist = "4.193.0" +tuist = "4.202.5" [env] +TUIST_USE_SWIFTERPM=1 OPENSWIFTUI_OPENATTRIBUTESHIMS_ATTRIBUTEGRAPH = "1" diff --git a/mise.toml b/mise.toml index 0cc17a74a..781b275bf 100644 --- a/mise.toml +++ b/mise.toml @@ -1,5 +1,6 @@ [tools] -tuist = "4.193.0" +tuist = "4.202.5" [env] +TUIST_USE_SWIFTERPM=1 OPENSWIFTUI_OPENATTRIBUTESHIMS_ATTRIBUTEGRAPH = "1"