diff --git a/Example/Tuist/Patches/OpenSwiftUI_SPI-resource-bundle-accessor.patch b/Example/Tuist/Patches/OpenSwiftUI_SPI-resource-bundle-accessor.patch deleted file mode 100644 index e428b9c28..000000000 --- a/Example/Tuist/Patches/OpenSwiftUI_SPI-resource-bundle-accessor.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Derived/Sources/TuistBundle+OpenSwiftUI_SPI.h -+++ b/Derived/Sources/TuistBundle+OpenSwiftUI_SPI.h -@@ -1 +1,3 @@ -+#if __OBJC__ -+ - #import -@@ -13 +15,3 @@ - #endif -\ No newline at end of file -+ -+#endif -\ No newline at end of file diff --git a/Example/setup.sh b/Example/setup.sh index 1a4e4e9ea..9b265a28d 100755 --- a/Example/setup.sh +++ b/Example/setup.sh @@ -46,10 +46,3 @@ fi run_mise install run_mise exec -- tuist install run_mise exec -- tuist generate --no-open - -# Tuist currently injects Objective-C resource accessor headers into every -# C-family source through GCC_PREFIX_HEADER. Keep the generated header inert -# for plain C sources until Tuist scopes the injection to Objective-C sources. -# https://github.com/tuist/tuist/issues/12559 -patch -d "$SCRIPT_DIR/.." -p1 < \ - "$SCRIPT_DIR/Tuist/Patches/OpenSwiftUI_SPI-resource-bundle-accessor.patch" diff --git a/Package.resolved b/Package.resolved index a81354875..aaac3e90b 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "3482eb6440e1059ead3596c30808f817c4758ff588afaca85b25a988276317ae", + "originHash" : "4936af510542c85bcb1667f8d1c18ac48e764fe6b115f9942f7b7f7132d8a84d", "pins" : [ { "identity" : "darwinprivateframeworks", @@ -7,7 +7,7 @@ "location" : "https://github.com/OpenSwiftUIProject/DarwinPrivateFrameworks.git", "state" : { "branch" : "main", - "revision" : "b7e6ba165f3763dd477f55cc55b4a63f51385571" + "revision" : "0cec3b3219dd2d99818e861e3dca7598e7554f98" } }, { @@ -16,7 +16,7 @@ "location" : "https://github.com/OpenSwiftUIProject/OpenAttributeGraph", "state" : { "branch" : "main", - "revision" : "e3484bf5e6ccb6214a4d88b7846f2bde35af1d19" + "revision" : "6a260ef4aa2fd926b0cf34d21d5290921e6e7323" } }, { diff --git a/Package.swift b/Package.swift index 2370b7bda..58c8b86a2 100644 --- a/Package.swift +++ b/Package.swift @@ -222,11 +222,8 @@ var sharedSwiftSettings: [SwiftSetting] = [ .define("OPENSWIFTUI_RELEASE_\(releaseVersion)"), .unsafeFlags(["-Xfrontend", "-experimental-spi-only-imports"]), // Swift 6.3.3 crashes while indexing AppKit with the private framework shims. - // Tuist used to duplicate unconditional settings into SDK-conditioned OTHER_SWIFT_FLAGS: - // https://github.com/tuist/tuist/issues/12377 - // Fixed by https://github.com/tuist/tuist/pull/12411 in Tuist 4.206.0-canary.16. - // FIXME: Keep this unconditional until the project's Tuist version includes that fix. - .unsafeFlags(["-index-ignore-system-modules"]), + // Keep source indexing enabled while skipping imported system modules. + .unsafeFlags(["-index-ignore-system-modules"], .when(platforms: [.macOS])), ] if releaseVersion >= 2021 { diff --git a/mise.compute.toml b/mise.compute.toml index 4194f9350..f6b6e1398 100644 --- a/mise.compute.toml +++ b/mise.compute.toml @@ -1,5 +1,5 @@ [tools] -tuist = "4.203.4" +tuist = "4.206.0" [env] TUIST_USE_SWIFTERPM=1 diff --git a/mise.toml b/mise.toml index 8952e958a..a196a3adc 100644 --- a/mise.toml +++ b/mise.toml @@ -1,5 +1,5 @@ [tools] -tuist = "4.203.4" +tuist = "4.206.0" [env] TUIST_USE_SWIFTERPM=1