diff --git a/Package.resolved b/Package.resolved index aad04306..53f46a7b 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "b92f2d9817035bd19956e4bcb16078ff69c6f55783a4b7050209f008e615826f", + "originHash" : "63410ed7266ea52796cbd3155e88de62eb6f52f3ffba07a8b338d10bd332ff65", "pins" : [ { "identity" : "aexml", @@ -33,8 +33,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/tuist/FileSystem.git", "state" : { - "revision" : "f59c05363f2968d734d4901b011b1264eb82f6b5", - "version" : "0.9.2" + "revision" : "7aed628044e2e0595aec876cadb694aacab13a16", + "version" : "0.10.8" } }, { @@ -42,8 +42,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/p-x9/MachOKit", "state" : { - "revision" : "b4b752d9d2cf3975ee05620c66284a3414fcf56e", - "version" : "0.32.0" + "revision" : "d0b543aa795d83539691b80959b0adb152b072e7", + "version" : "0.35.1" } }, { @@ -51,8 +51,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/Kolos65/Mockable.git", "state" : { - "revision" : "118a0b8934e585b80952586db30bcb72aef45a74", - "version" : "0.3.2" + "revision" : "ee133a696dce312da292b00d0944aafaa808eaca", + "version" : "0.4.0" } }, { @@ -105,8 +105,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/swiftlang/swift-docc-plugin", "state" : { - "revision" : "85e4bb4e1cd62cec64a4b8e769dcefdf0c5b9d64", - "version" : "1.4.3" + "revision" : "d1691545d53581400b1de9b0472d45eb25c19fed", + "version" : "1.4.4" } }, { diff --git a/Tuist.swift b/Tuist.swift deleted file mode 100644 index 537bccfc..00000000 --- a/Tuist.swift +++ /dev/null @@ -1,10 +0,0 @@ -import ProjectDescription - -let config = Config( - cloud: .cloud( - projectId: "tuist/xcodegraph", - url: "https://cloud.tuist.io", - options: [.optional] - ), - swiftVersion: .init("5.10") -) diff --git a/Tuist/ProjectDescriptionHelpers/Module.swift b/Tuist/ProjectDescriptionHelpers/Module.swift deleted file mode 100644 index 76e3187f..00000000 --- a/Tuist/ProjectDescriptionHelpers/Module.swift +++ /dev/null @@ -1,244 +0,0 @@ -import Foundation -import ProjectDescription - -public enum Module: String, CaseIterable { - case xcodeGraph = "XcodeGraph" - case xcodeGraphMapper = "XcodeGraphMapper" - case xcodeMetadata = "XcodeMetadata" - - public var isRunnable: Bool { - switch self { - default: - return false - } - } - - public var acceptanceTestTargets: [Target] { - var targets: [Target] = [] - - if let acceptanceTestsTargetName { - targets.append(target( - name: acceptanceTestsTargetName, - product: .unitTests, - dependencies: acceptanceTestDependencies - )) - } - - return targets - } - - public var unitTestTargets: [Target] { - var targets: [Target] = [] - - if let unitTestsTargetName { - targets.append( - target( - name: unitTestsTargetName, - product: .unitTests, - dependencies: unitTestDependencies - ) - ) - } - - if let integrationTestsTargetName { - targets.append( - target( - name: integrationTestsTargetName, - product: .unitTests, - dependencies: integrationTestsDependencies - ) - ) - } - - return targets - } - - public var testTargets: [Target] { - return unitTestTargets + acceptanceTestTargets - } - - public var targets: [Target] { - return sourceTargets + testTargets - } - - public var sourceTargets: [Target] { - return [ - target( - name: targetName, - product: product, - dependencies: dependencies - ), - ] - } - - public var acceptanceTestsTargetName: String? { - switch self { - default: - return nil - } - } - - public var unitTestsTargetName: String? { - switch self { - case .xcodeGraph, .xcodeGraphMapper, .xcodeMetadata: - return "\(rawValue)Tests" - } - } - - public var integrationTestsTargetName: String? { - switch self { - case .xcodeGraph, .xcodeGraphMapper, .xcodeMetadata: - return nil - } - } - - public var targetName: String { - rawValue - } - - public var product: Product { - switch self { - default: - return .staticFramework - } - } - - public var acceptanceTestDependencies: [TargetDependency] { - let dependencies: [TargetDependency] = switch self { - default: - [] - } - return dependencies - } - - public var strictConcurrencySetting: String? { - switch self { - default: - return nil - } - } - - public var dependencies: [TargetDependency] { - let dependencies: [TargetDependency] = switch self { - case .xcodeGraph: - [ - .external(name: "AnyCodable"), - .external(name: "Path"), - ] - case .xcodeGraphMapper: - [ - .target(name: Module.xcodeGraph.rawValue), - .target(name: Module.xcodeMetadata.rawValue), - .external(name: "Path"), - .external(name: "Command"), - .external(name: "XcodeProj"), - ] - case .xcodeMetadata: - [ - .external(name: "FileSystem"), - .external(name: "Mockable"), - .external(name: "ServiceContextModule"), - ] - } - return dependencies - } - - public var unitTestDependencies: [TargetDependency] { - var dependencies: [TargetDependency] = switch self { - case .xcodeGraph, .xcodeMetadata, .xcodeGraphMapper: - [ - ] - } - dependencies = dependencies + [.target(name: targetName)] - return dependencies - } - - public var testingDependencies: [TargetDependency] { - let dependencies: [TargetDependency] = switch self { - case .xcodeGraph, .xcodeGraphMapper, .xcodeMetadata: - [ - ] - } - return dependencies + [.target(name: targetName)] - } - - public var integrationTestsDependencies: [TargetDependency] { - var dependencies: [TargetDependency] = switch self { - case .xcodeGraph, .xcodeGraphMapper, .xcodeMetadata: - [] - } - dependencies.append(.target(name: targetName)) - return dependencies - } - - fileprivate func target( - name: String, - product: Product, - dependencies: [TargetDependency] - ) -> Target { - let rootFolder: String - switch product { - case .unitTests: - rootFolder = "Tests" - default: - rootFolder = "Sources" - } - let resources: ResourceFileElements = switch self { - case .xcodeGraph, .xcodeGraphMapper, .xcodeMetadata: - [] - } - var debugSettings: ProjectDescription.SettingsDictionary = ["SWIFT_ACTIVE_COMPILATION_CONDITIONS": "$(inherited) MOCKING"] - var releaseSettings: ProjectDescription.SettingsDictionary = [:] - - if let strictConcurrencySetting, product == .framework { - debugSettings["SWIFT_STRICT_CONCURRENCY"] = .string(strictConcurrencySetting) - releaseSettings["SWIFT_STRICT_CONCURRENCY"] = .string(strictConcurrencySetting) - } - - let settings = Settings.settings( - configurations: [ - .debug( - name: "Debug", - settings: debugSettings, - xcconfig: nil - ), - .release( - name: "Release", - settings: releaseSettings, - xcconfig: nil - ), - ] - ) - return .target( - name: name, - destinations: [.mac], - product: product, - bundleId: "io.tuist.\(name)", - deploymentTargets: .macOS("13.0"), - infoPlist: .default, - sources: [.glob("\(rootFolder)/\(name)/**/*.swift", excluding: ["**/Fixtures/**"])], - dependencies: dependencies, - settings: settings - ) - } - - fileprivate var settings: Settings { - switch self { - default: - return .settings( - configurations: [ - .debug( - name: "Debug", - settings: ["SWIFT_ACTIVE_COMPILATION_CONDITIONS": "$(inherited) MOCKING"], - xcconfig: nil - ), - .release( - name: "Release", - settings: [:], - xcconfig: nil - ), - ] - ) - } - } -} diff --git a/Workspace.swift b/Workspace.swift deleted file mode 100644 index 9c0b976f..00000000 --- a/Workspace.swift +++ /dev/null @@ -1,7 +0,0 @@ -import ProjectDescription - -let workspace = Workspace( - name: "XcodeGraph", - projects: ["."], - generationOptions: .options(autogeneratedWorkspaceSchemes: .disabled) -)