Skip to content

Commit 92c69d4

Browse files
committed
Sources: add missing imports required by MemberImportVisibility
1 parent fb00ef6 commit 92c69d4

File tree

144 files changed

+242
-59
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+242
-59
lines changed

Sources/SWBApplePlatform/ActoolInputFileGroupingStrategy.swift

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
public import SWBCore
1414
import SWBUtil
15+
import Foundation
1516

1617
/// A grouping strategy that groups all asset catalogs and all strings files that match sticker packs inside those asset catalogs.
1718
@_spi(Testing) public final class ActoolInputFileGroupingStrategy: InputFileGroupingStrategy {

Sources/SWBApplePlatform/AppIntentsMetadataTaskProducer.swift

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import SWBCore
1414
import SWBUtil
1515
import SWBTaskConstruction
16+
import SWBMacro
1617

1718
final class AppIntentsMetadataTaskProducer: PhasedTaskProducer, TaskProducer {
1819

Sources/SWBApplePlatform/CoreDataCompiler.swift

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import SWBUtil
1414
public import SWBCore
15+
import SWBMacro
1516

1617
public final class CoreDataModelCompilerSpec : GenericCompilerSpec, SpecIdentifierType, @unchecked Sendable {
1718
public static let identifier = "com.apple.compilers.model.coredata"

Sources/SWBApplePlatform/CoreMLCompiler.swift

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
public import SWBUtil
1414
public import SWBCore
1515
public import SWBMacro
16+
import SWBProtocol
1617

1718
public struct DiscoveredCoreMLToolSpecInfo: DiscoveredCommandLineToolSpecInfo {
1819
public let toolPath: Path
@@ -151,7 +152,7 @@ public final class CoreMLCompilerSpec : GenericCompilerSpec, SpecIdentifierType,
151152
// When the build setting is empty or is set to Automatic, then use an appropriate string based on the predominant source code language for the target.
152153
if languageSettingValue.isEmpty || languageSettingValue == "Automatic" {
153154
// Note that it would be pretty weird here to not have a configured target, or to have a target which is not a StandardTarget.
154-
let predominantSourceCodeLanguage = (cbc.producer.configuredTarget?.target as? StandardTarget)?.predominantSourceCodeLanguage ?? .undefined
155+
let predominantSourceCodeLanguage = (cbc.producer.configuredTarget?.target as? SWBCore.StandardTarget)?.predominantSourceCodeLanguage ?? .undefined
155156
switch predominantSourceCodeLanguage {
156157
case .swift:
157158
codegenLanguage = "Swift"
@@ -289,7 +290,7 @@ public final class CoreMLCompilerSpec : GenericCompilerSpec, SpecIdentifierType,
289290
}
290291

291292
guard
292-
let target = cbc.producer.configuredTarget?.target as? BuildPhaseTarget,
293+
let target = cbc.producer.configuredTarget?.target as? SWBCore.BuildPhaseTarget,
293294
let outputPath = headerOutputPath,
294295
target.headersBuildPhase != nil else { continue }
295296

Sources/SWBApplePlatform/DevelopmentAssetsTaskProducer.swift

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import SWBCore
1414
import SWBUtil
1515
import SWBTaskConstruction
16+
import SWBMacro
1617

1718
final class DevelopmentAssetsTaskProducer: StandardTaskProducer, TaskProducer {
1819
func generateTasks() async -> [any PlannedTask] {

Sources/SWBApplePlatform/InstrumentsPackageBuilderSpec.swift

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import SWBUtil
1414
public import SWBCore
15+
import SWBMacro
1516

1617
public final class InstrumentsPackageBuilderSpec: GenericCompilerSpec, SpecIdentifierType, @unchecked Sendable {
1718
public static let identifier = "com.apple.compilers.instruments-package-builder"

Sources/SWBApplePlatform/IntentsCompiler.swift

+5-3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
import SWBUtil
1414
public import SWBCore
15+
import SWBProtocol
16+
import SWBMacro
1517

1618
/// Payload information for Intents tasks.
1719
fileprivate struct IntentsTaskPayload: TaskPayload, Encodable {
@@ -122,7 +124,7 @@ public final class IntentsCompilerSpec : GenericCompilerSpec, SpecIdentifierType
122124
let outputDir = cbc.scope.evaluate(BuiltinMacros.DERIVED_FILE_DIR).join("IntentDefinitionGenerated").join(modelName).normalize()
123125

124126
guard
125-
let target = cbc.producer.configuredTarget?.target as? BuildPhaseTarget,
127+
let target = cbc.producer.configuredTarget?.target as? SWBCore.BuildPhaseTarget,
126128
target.sourcesBuildPhase != nil,
127129
let intentsCodegenVisibility = input.intentsCodegenVisibility else { return }
128130

@@ -136,7 +138,7 @@ public final class IntentsCompilerSpec : GenericCompilerSpec, SpecIdentifierType
136138
// When the build setting is empty or is set to Automatic, then use an appropriate string based on the predominant source code language for the target.
137139
if languageSettingValue.isEmpty || languageSettingValue == "Automatic" {
138140
// Note that it would be pretty weird here to not have a configured target, or to have a target which is not a StandardTarget.
139-
let predominantSourceCodeLanguage = (cbc.producer.configuredTarget?.target as? StandardTarget)?.predominantSourceCodeLanguage ?? .undefined
141+
let predominantSourceCodeLanguage = (cbc.producer.configuredTarget?.target as? SWBCore.StandardTarget)?.predominantSourceCodeLanguage ?? .undefined
140142
switch predominantSourceCodeLanguage {
141143
case .swift:
142144
codegenLanguage = "Swift"
@@ -236,7 +238,7 @@ public final class IntentsCompilerSpec : GenericCompilerSpec, SpecIdentifierType
236238
}
237239

238240
guard
239-
let target = cbc.producer.configuredTarget?.target as? BuildPhaseTarget,
241+
let target = cbc.producer.configuredTarget?.target as? SWBCore.BuildPhaseTarget,
240242
let outputPath = headerOutputPath,
241243
target.headersBuildPhase != nil else { continue }
242244

Sources/SWBApplePlatform/MiGCompiler.swift

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
public import SWBUtil
1414
public import SWBCore
1515
public import SWBMacro
16+
import SWBProtocol
1617

1718
public struct DiscoveredMiGToolSpecInfo: DiscoveredCommandLineToolSpecInfo {
1819
public let toolPath: Path

Sources/SWBApplePlatform/RealityAssetsCompilerSpec.swift

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import Foundation
1414
package import SWBCore
1515
import SWBUtil
16+
import SWBMacro
1617

1718
//---------------------
1819
//

Sources/SWBApplePlatform/ResMergerLinkerSpec.swift

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import SWBUtil
1414
public import SWBCore
15+
import SWBMacro
1516

1617
public final class ResMergerLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchecked Sendable {
1718
public static let identifier = "com.apple.pbx.linkers.resmerger"

Sources/SWBApplePlatform/XCStringsCompiler.swift

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import SWBUtil
1414
public import SWBCore
15+
import Foundation
1516

1617
public final class XCStringsCompilerSpec: GenericCompilerSpec, SpecIdentifierType, @unchecked Sendable {
1718
public static let identifier = "com.apple.compilers.xcstrings"

Sources/SWBApplePlatform/XCStringsInputFileGroupingStrategy.swift

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
public import SWBCore
14+
import SWBUtil
1415

1516
/// A grouping strategy that places each xcstrings table in its own group, along with any other .strings or .stringsdicts with the same basename.
1617
///

Sources/SWBBuildService/BuildOperationMessages.swift

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import SWBTaskConstruction
2121
import SWBTaskExecution
2222
package import SWBUtil
2323
import SWBMacro
24+
import Synchronization
2425

2526
// FIXME: Workaround: <rdar://problem/26249252> Unable to prefer my own type over NS renamed types
2627
import class SWBTaskExecution.Task

Sources/SWBBuildService/PreviewInfo.swift

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ package import SWBCore
1515
import SWBTaskConstruction
1616
package import SWBTaskExecution
1717
package import SWBUtil
18+
import SWBMacro
1819

1920
enum PreviewInfoErrors: Error {
2021
case noBuildDescription(any Error)

Sources/SWBBuildService/Session.swift

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public import SWBServiceCore
1717
package import SWBTaskExecution
1818
import SWBUtil
1919
import struct Foundation.UUID
20+
import Synchronization
2021

2122
enum SessionError: Error {
2223
case noSettings(String)

Sources/SWBBuildSystem/CleanOperation.swift

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ package import var Foundation.NSLocalizedDescriptionKey
2222
package import class Foundation.NSError
2323
package import struct Foundation.URL
2424
package import struct Foundation.UUID
25+
import SWBMacro
2526

2627
package final class CleanOperation: BuildSystemOperation, TargetDependencyResolverDelegate {
2728
package var diagnosticContext: DiagnosticContextData {

Sources/SWBBuildSystem/DependencyCycleFormatter.swift

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import SWBTaskExecution
1515
import SWBUtil
1616
import Foundation
1717
private import SWBLLBuild
18+
import SWBTaskConstruction
1819

1920
/// Convenience enum to encode whether a task is the beginning or end of a target, or something else.
2021
/// "End of a target" in this case is a task which tasks in other targets may be directly depending on, and so can mark the point at which we cross a target boundary.

Sources/SWBCore/BuildFileResolution.swift

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
public import SWBUtil
14+
import SWBMacro
1415

1516
/// Protocol to support getting resolved information about a `BuildFile` within a `ConfiguredTarget`.
1617
public protocol BuildFileResolution: SpecLookupContext {

Sources/SWBCore/ClangModuleVerifier/ModuleVerifierFramework.swift

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
public import SWBUtil
14+
import Foundation
1415

1516
public struct ModuleVerifierFramework {
1617
@_spi(Testing) public let directory: Path

Sources/SWBCore/ClangModuleVerifier/ModuleVerifierHeader.swift

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
public import SWBUtil
14+
import Foundation
1415

1516
enum HeaderKind: String {
1617
case publicHeader = "public"

Sources/SWBCore/ClangModuleVerifier/ModuleVerifierTarget.swift

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
public import SWBUtil
14+
import Foundation
1415

1516
public struct ModuleVerifierTarget: Equatable {
1617
public let value: String

Sources/SWBCore/ConfiguredTarget.swift

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
public import SWBUtil
14+
import SWBProtocol
1415

1516
public final class ConfiguredTarget: Hashable, CustomStringConvertible, Serializable, Comparable, Sendable, Encodable {
1617
/// The build parameters to use for this target.

Sources/SWBCore/MacroConfigFileLoader.swift

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
public import SWBUtil
1414
public import SWBMacro
15+
import Foundation
1516

1617
/// Information on a macro config file.
1718
@_spi(Testing) public struct MacroConfigInfo: Sendable {

Sources/SWBCore/MacroEvaluationExtensions.swift

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
public import SWBUtil
1414
public import SWBMacro
15+
import Foundation
1516

1617
public extension PropertyListItem
1718
{

Sources/SWBCore/MacroExpressionSourceExtensions.swift

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
public import SWBMacro
1414
public import SWBProtocol
15+
import SWBUtil
1516

1617
extension MacroNamespace {
1718
/// Parses `strings` as a macro expression string list, returning a MacroExpression object to represent it. The returned macro expression contains a copy of the input string and a compiled representation that can be used to evaluate the expression in a particular context. The diagnostics handler is invoked once for every issue found during the parsing. Even in the presence of errors, this method always returns an expression that’s as parsed as possible.

Sources/SWBCore/PlatformFiltering.swift

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
public import SWBMacro
14+
import SWBUtil
1415

1516
extension PlatformFilter {
1617
public convenience init?(_ scope: MacroEvaluationScope) {

Sources/SWBCore/ProjectModel/FilePathResolver.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
public import SWBUtil
1414
public import SWBMacro
15-
15+
import SWBProtocol
1616

1717
/// A FilePathResolver is used to resolve the absolute paths for Reference objects.
1818
public final class FilePathResolver: Sendable

Sources/SWBCore/ProjectModel/PIFLoader.swift

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
public import SWBUtil
1414
public import SWBProtocol
1515
public import SWBMacro
16+
import Foundation
1617

1718
enum PIFLoadingError: Error {
1819
/// Indicates a general PIF object decoding error.

Sources/SWBCore/ProjectModel/PlatformFilter.swift

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import SWBUtil
1414
import SWBProtocol
15+
import Foundation
1516

1617
/// Provides a generic mechanism to provide project model items to be filterable for a given platform.
1718
public final class PlatformFilter: ProjectModelItem, Hashable, Codable {

Sources/SWBCore/ProjectModel/Workspace.swift

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import SWBProtocol
1414
public import SWBUtil
1515
public import SWBMacro
16+
import Foundation
1617

1718
public enum DuplicatedIdentifierObjectType: String, Sendable {
1819
case project

Sources/SWBCore/Settings/BuildRuleFile.swift

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import Foundation
1414
import SWBMacro
15+
import SWBUtil
1516

1617
/// Decodable representation of a .xcbuildrules file's on-disk format.
1718
struct BuildRuleFile: Codable {

Sources/SWBCore/Settings/BuiltinMacros.swift

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
public import SWBMacro
14+
import Synchronization
1415

1516
/// The builtin macro declarations for things which are used directly by the build system.
1617
public final class BuiltinMacros {

Sources/SWBCore/SpecImplementations/CommandLineToolSpec.swift

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ public import SWBUtil
1414
public import struct Foundation.Data
1515
public import class Foundation.JSONDecoder
1616
public import SWBMacro
17+
import SWBProtocol
1718

1819
/// Describes the type and other characteristics of a single kind of input file accepted by a build tool.
1920
struct InputFileTypeDescriptor: Encodable, Sendable {

Sources/SWBCore/SpecImplementations/SpecRegistry.swift

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
import SWBLibc
1414
public import SWBUtil
1515
public import SWBMacro
16+
import Foundation
17+
import Synchronization
1618

1719
/// Delegate protocol used by the registry to report diagnostics.
1820
@_spi(Testing) public protocol SpecRegistryDelegate: DiagnosticProducingDelegate {}

Sources/SWBCore/SpecImplementations/Tools/CCompiler.swift

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
public import SWBUtil
1414
public import SWBMacro
15+
import Foundation
1516

1617

1718
/// Abstract C Compiler. This is not a concrete implementation, but rather it uses various information in the command build context to choose a specific compiler and to call `constructTasks()` on that compiler. This provides a level of indirection for projects that just want their source files compiled using the default C compiler. Depending on the context, the default C compiler for any particular combination of platform, architecture, and other factors may be Clang, ICC, GCC, or some other compiler.

Sources/SWBCore/SpecImplementations/Tools/ClangStatCache.swift

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13+
import SWBUtil
14+
1315
final public class ClangStatCacheSpec: GenericCommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
1416
public static let identifier = "com.apple.compilers.clang-stat-cache"
1517

Sources/SWBCore/SpecImplementations/Tools/CodeSign.swift

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
public import SWBUtil
1414
public import SWBMacro
15+
import Foundation
1516

1617
public final class CodesignToolSpec : CommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
1718
public static let identifier = "com.apple.build-tools.codesign"

Sources/SWBCore/SpecImplementations/Tools/ConcatenateTool.swift

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
public import SWBUtil
14+
import SWBMacro
1415

1516
public final class ConcatenateToolSpec : CommandLineToolSpec, SpecImplementationType, @unchecked Sendable {
1617
public static let identifier = "com.apple.build-tools.concatenate"

Sources/SWBCore/SpecImplementations/Tools/CreateBuildDirectory.swift

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import SWBUtil
14+
import SWBMacro
1415

1516
public final class CreateBuildDirectorySpec: CommandLineToolSpec, SpecImplementationType, @unchecked Sendable {
1617
public static let identifier = "com.apple.tools.create-build-directory"

Sources/SWBCore/SpecImplementations/Tools/InfoPlistTool.swift

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
public import SWBUtil
14+
import SWBMacro
15+
import Foundation
1416

1517
public final class InfoPlistToolSpec : GenericCommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
1618
public static let identifier = "com.apple.tools.info-plist-utility"

Sources/SWBCore/SpecImplementations/Tools/Lipo.swift

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import SWBProtocol
1414
import SWBUtil
15+
import SWBMacro
1516

1617
public final class LipoToolSpec: GenericCommandLineToolSpec, SpecIdentifierType, @unchecked Sendable {
1718

Sources/SWBCore/SpecImplementations/Tools/MasterObjectLink.swift

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import SWBUtil
14+
import SWBMacro
1415

1516
/// Spec to use the linker to run `ld -r` to create a prelinked object file (a.k.a. "master object file").
1617
final class MasterObjectLinkSpec: CommandLineToolSpec, SpecImplementationType, @unchecked Sendable {

Sources/SWBCore/SpecImplementations/Tools/MergeInfoPlist.swift

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
public import SWBUtil
14+
import SWBMacro
1415

1516
public final class MergeInfoPlistSpec: CommandLineToolSpec, SpecImplementationType, @unchecked Sendable {
1617
public static func construct(registry: SpecRegistry, proxy: SpecProxy) -> Spec {

0 commit comments

Comments
 (0)