Skip to content

Upstream trivial diffs #693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jakepetroules merged 1 commit into from
Jul 31, 2025
Merged

Upstream trivial diffs #693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Sources/SWBBuildService/BuildServiceEntryPoint.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ extension BuildService {
///
/// Called directly from the exported C entry point `swiftbuildServiceEntryPoint` for in-process connections, or from `BuildService.main()` (after some basic file descriptor setup) for out-of-process connections.
fileprivate static func run(inputFD: FileDescriptor, outputFD: FileDescriptor, connectionMode: ServiceHostConnectionMode, pluginsDirectory: URL?, arguments: [String], pluginLoadingFinished: () throws -> Void) async throws {
let pluginManager = await { @PluginExtensionSystemActor in
let pluginManager = try await { @PluginExtensionSystemActor () async throws in
// Create the plugin manager and load plugins.
let pluginManager = PluginManager(skipLoadingPluginIdentifiers: [])

Expand Down
8 changes: 7 additions & 1 deletion Sources/SWBCore/Specs/CoreBuildSystem.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1195,7 +1195,6 @@ When `GENERATE_INFOPLIST_FILE` is enabled, sets the value of the [CFBundleIdenti
Type = StringList;
Category = "Search Paths";
DefaultValue = "*.nib *.lproj *.framework *.gch *.xcode* *.xcassets *.icon (*) .DS_Store CVS .svn .git .hg *.pbproj *.pbxproj";
DefaultValue = "*.nib *.lproj *.framework *.gch *.xcode* *.xcassets (*) .DS_Store CVS .svn .git .hg *.pbproj *.pbxproj";
},
{
Name = "VERSIONING_SYSTEM";
Expand Down Expand Up @@ -3652,6 +3651,13 @@ When this setting is enabled:
Category = "Localization";
Description = "When enabled, string tables generated in a localization export will prefer the String Catalog format.";
},
{ Name = STRING_CATALOG_GENERATE_SYMBOLS;
Type = Boolean;
DefaultValue = NO;
DisplayName = "Generate String Catalog Symbols";
Category = "Localization";
Description = "When enabled, symbols will be generated for manually-managed strings in String Catalogs.";
},

// rdar://108915072 (Move Siri Category and relevant configs out of CoreBuildSystem)
// Siri Settings
Expand Down
2 changes: 1 addition & 1 deletion Sources/SWBTaskExecution/BuildDescription.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1398,7 +1398,7 @@ package final class TaskActionRegistry: Sendable {
implementations = try TaskActionExtensionPoint.taskActionImplementations(pluginManager: pluginManager)
}

func withSerializationContext<T>(_ block: () throws -> T) rethrows -> T {
@_spi(Testing) public func withSerializationContext<T>(_ block: () throws -> T) rethrows -> T {
try TaskAction.$taskActionImplementations.withValue(implementations) {
try block()
}
Expand Down