diff --git a/.tuist-version b/.tuist-version index 209f5795d..fe5d7123a 100644 --- a/.tuist-version +++ b/.tuist-version @@ -1 +1 @@ -3.19.0 \ No newline at end of file +3.35.5 \ No newline at end of file diff --git a/Configuration/Shared/Workspace-Target-Framework.xcconfig b/Configuration/Shared/Workspace-Target-Framework.xcconfig index f02138d8d..bb0901c18 100644 --- a/Configuration/Shared/Workspace-Target-Framework.xcconfig +++ b/Configuration/Shared/Workspace-Target-Framework.xcconfig @@ -12,4 +12,5 @@ FRAMEWORK_VERSION[sdk=macosx*] = A APPLICATION_EXTENSION_API_ONLY = YES -DEFINES_MODULE = YES +DEFINES_MODULE = NO + diff --git a/Tuist/ProjectDescriptionHelpers/Enums/ApolloTarget.swift b/Tuist/ProjectDescriptionHelpers/Enums/ApolloTarget.swift index b4a683ae8..7f4fe92a1 100644 --- a/Tuist/ProjectDescriptionHelpers/Enums/ApolloTarget.swift +++ b/Tuist/ProjectDescriptionHelpers/Enums/ApolloTarget.swift @@ -87,28 +87,48 @@ public enum ApolloTarget { return "Apollo-Target-UploadAPI" } } + + public var destinations: Destinations { + switch self { + case .animalKingdomAPI, + .apolloCodegenLibWrapper, + .apolloCodegenInternalTestHelpers, + .apolloCodegenTests, + .apolloInternalTestHelpers, + .apolloPaginationTests, + .apolloPerformanceTests, + .apolloServerIntegrationTests, + .apolloTests, + .apolloWrapper, + .codegenCLITests, + .gitHubAPI, + .starWarsAPI, + .subscriptionAPI, + .uploadAPI: + return Destinations([.mac]) + } + } - public var deploymentTarget: DeploymentTarget { - var version = "10.15" + public var deploymentTargets: DeploymentTargets { switch self { case .animalKingdomAPI, - .apolloCodegenLibWrapper, .apolloWrapper, .gitHubAPI, .starWarsAPI, .subscriptionAPI, .uploadAPI: - version = "10.15" - case .apolloCodegenInternalTestHelpers, - .apolloCodegenTests, - .apolloInternalTestHelpers, + return DeploymentTargets(macOS: "10.15") + case .apolloInternalTestHelpers, .apolloPerformanceTests, .apolloServerIntegrationTests, .apolloTests, - .apolloPaginationTests, + .apolloPaginationTests: + return DeploymentTargets(macOS: "12.0") + case .apolloCodegenInternalTestHelpers, + .apolloCodegenLibWrapper, + .apolloCodegenTests, .codegenCLITests: - version = "12.5" + return DeploymentTargets(macOS: "12.0") } - return .macOS(targetVersion: version) } } diff --git a/Tuist/ProjectDescriptionHelpers/Settings/Settings+Apollo.swift b/Tuist/ProjectDescriptionHelpers/Settings/Settings+Apollo.swift index 35038409d..7c0877308 100644 --- a/Tuist/ProjectDescriptionHelpers/Settings/Settings+Apollo.swift +++ b/Tuist/ProjectDescriptionHelpers/Settings/Settings+Apollo.swift @@ -7,11 +7,14 @@ extension Settings { let debugConfig = Configuration.debug(name: .debug, xcconfig: configPath) let releaseConfig = Configuration.release(name: .release, xcconfig: configPath) let performanceTestingConfig = Configuration.release(name: .performanceTesting, xcconfig: configPath) - let settings = Settings.settings(configurations: [ + let settings = Settings.settings( + configurations: [ debugConfig, releaseConfig, performanceTestingConfig - ]) + ], + defaultSettings: .none + ) return settings } diff --git a/Tuist/ProjectDescriptionHelpers/Targets/Target+AnimalKingdomAPI.swift b/Tuist/ProjectDescriptionHelpers/Targets/Target+AnimalKingdomAPI.swift index eeeb8c2d3..e4c9c3e9c 100644 --- a/Tuist/ProjectDescriptionHelpers/Targets/Target+AnimalKingdomAPI.swift +++ b/Tuist/ProjectDescriptionHelpers/Targets/Target+AnimalKingdomAPI.swift @@ -7,10 +7,10 @@ extension Target { return Target( name: target.name, - platform: .macOS, + destinations: target.destinations, product: .framework, bundleId: "com.apollographql.\(target.name.lowercased())", - deploymentTarget: target.deploymentTarget, + deploymentTargets: target.deploymentTargets, infoPlist: .file(path: "Sources/\(target.name)/Info.plist"), sources: [ "Sources/\(target.name)/\(target.name)/Sources/**", diff --git a/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloCodegenInternalTestHelpers.swift b/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloCodegenInternalTestHelpers.swift index 1b861ed27..59bef90b1 100644 --- a/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloCodegenInternalTestHelpers.swift +++ b/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloCodegenInternalTestHelpers.swift @@ -7,10 +7,10 @@ extension Target { return Target( name: target.name, - platform: .macOS, + destinations: target.destinations, product: .framework, bundleId: "com.apollographql.\(target.name.lowercased())", - deploymentTarget: target.deploymentTarget, + deploymentTargets: target.deploymentTargets, infoPlist: .file(path: "Tests/\(target.name)/Info.plist"), sources: [ "Tests/\(target.name)/**", diff --git a/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloCodegenLibWrapper.swift b/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloCodegenLibWrapper.swift index e29a48abd..08d808826 100644 --- a/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloCodegenLibWrapper.swift +++ b/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloCodegenLibWrapper.swift @@ -7,10 +7,10 @@ extension Target { return Target( name: target.name, - platform: .macOS, + destinations: target.destinations, product: .framework, bundleId: "com.apollographql.\(target.name.lowercased())", - deploymentTarget: target.deploymentTarget, + deploymentTargets: target.deploymentTargets, infoPlist: .file(path: "Tests/\(target.name)/Info.plist"), dependencies: [ .package(product: "ApolloCodegenLib") diff --git a/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloCodegenTests.swift b/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloCodegenTests.swift index fbea34d2e..918d8b7bf 100644 --- a/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloCodegenTests.swift +++ b/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloCodegenTests.swift @@ -7,10 +7,10 @@ extension Target { return Target( name: target.name, - platform: .macOS, + destinations: target.destinations, product: .unitTests, bundleId: "com.apollographql.\(target.name.lowercased())", - deploymentTarget: target.deploymentTarget, + deploymentTargets: target.deploymentTargets, infoPlist: .file(path: "Tests/\(target.name)/Info.plist"), sources: [ "Tests/\(target.name)/**", diff --git a/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloInternalTestHelpers.swift b/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloInternalTestHelpers.swift index 69e267e42..746693cca 100644 --- a/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloInternalTestHelpers.swift +++ b/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloInternalTestHelpers.swift @@ -7,10 +7,10 @@ extension Target { return Target( name: target.name, - platform: .macOS, + destinations: target.destinations, product: .framework, bundleId: "com.apollographql.\(target.name.lowercased())", - deploymentTarget: target.deploymentTarget, + deploymentTargets: target.deploymentTargets, infoPlist: .file(path: "Tests/\(target.name)/Info.plist"), sources: [ "Tests/\(target.name)/**", diff --git a/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloPaginationTests.swift b/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloPaginationTests.swift index 7317e1307..f9456e53d 100644 --- a/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloPaginationTests.swift +++ b/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloPaginationTests.swift @@ -7,10 +7,10 @@ extension Target { return Target( name: target.name, - platform: .macOS, + destinations: target.destinations, product: .unitTests, bundleId: "com.apollographql.\(target.name.lowercased())", - deploymentTarget: target.deploymentTarget, + deploymentTargets: target.deploymentTargets, sources: [ "Tests/\(target.name)/**", ], diff --git a/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloPerformanceTests.swift b/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloPerformanceTests.swift index 88230ec34..03fb474b6 100644 --- a/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloPerformanceTests.swift +++ b/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloPerformanceTests.swift @@ -7,10 +7,10 @@ extension Target { return Target( name: target.name, - platform: .macOS, + destinations: target.destinations, product: .unitTests, bundleId: "com.apollographql.\(target.name.lowercased())", - deploymentTarget: target.deploymentTarget, + deploymentTargets: target.deploymentTargets, infoPlist: .file(path: "Tests/\(target.name)/Info.plist"), sources: [ "Tests/\(target.name)/**", diff --git a/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloServerIntegrationTests.swift b/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloServerIntegrationTests.swift index aece6861a..f9ce831d3 100644 --- a/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloServerIntegrationTests.swift +++ b/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloServerIntegrationTests.swift @@ -7,10 +7,10 @@ extension Target { return Target( name: target.name, - platform: .macOS, + destinations: target.destinations, product: .unitTests, bundleId: "com.apollographql.\(target.name.lowercased())", - deploymentTarget: target.deploymentTarget, + deploymentTargets: target.deploymentTargets, infoPlist: .file(path: "Tests/\(target.name)/Info.plist"), sources: [ "Tests/\(target.name)/**", diff --git a/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloTests.swift b/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloTests.swift index fc9414158..add5da31c 100644 --- a/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloTests.swift +++ b/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloTests.swift @@ -7,10 +7,10 @@ extension Target { return Target( name: target.name, - platform: .macOS, + destinations: target.destinations, product: .unitTests, bundleId: "com.apollographql.\(target.name.lowercased())", - deploymentTarget: target.deploymentTarget, + deploymentTargets: target.deploymentTargets, infoPlist: .file(path: "Tests/\(target.name)/Info.plist"), sources: [ "Tests/\(target.name)/**", diff --git a/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloWrapper.swift b/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloWrapper.swift index 9cce844a4..78d04f1a5 100644 --- a/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloWrapper.swift +++ b/Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloWrapper.swift @@ -7,10 +7,10 @@ extension Target { return Target( name: target.name, - platform: .macOS, + destinations: target.destinations, product: .framework, bundleId: "com.apollographql.\(target.name.lowercased())", - deploymentTarget: target.deploymentTarget, + deploymentTargets: target.deploymentTargets, infoPlist: .file(path: "Tests/\(target.name)/Info.plist"), dependencies: [ .package(product: "Apollo") diff --git a/Tuist/ProjectDescriptionHelpers/Targets/Target+CodegenCLITests.swift b/Tuist/ProjectDescriptionHelpers/Targets/Target+CodegenCLITests.swift index 3c8e94a41..d107b8156 100644 --- a/Tuist/ProjectDescriptionHelpers/Targets/Target+CodegenCLITests.swift +++ b/Tuist/ProjectDescriptionHelpers/Targets/Target+CodegenCLITests.swift @@ -7,10 +7,10 @@ extension Target { return Target( name: target.name, - platform: .macOS, + destinations: target.destinations, product: .unitTests, bundleId: "com.apollographql.\(target.name.lowercased())", - deploymentTarget: target.deploymentTarget, + deploymentTargets: target.deploymentTargets, infoPlist: .file(path: "Tests/\(target.name)/Info.plist"), sources: [ "Tests/\(target.name)/*.swift", diff --git a/Tuist/ProjectDescriptionHelpers/Targets/Target+GitHubAPI.swift b/Tuist/ProjectDescriptionHelpers/Targets/Target+GitHubAPI.swift index bfefc3c1f..e736df097 100644 --- a/Tuist/ProjectDescriptionHelpers/Targets/Target+GitHubAPI.swift +++ b/Tuist/ProjectDescriptionHelpers/Targets/Target+GitHubAPI.swift @@ -7,10 +7,10 @@ extension Target { return Target( name: target.name, - platform: .macOS, + destinations: target.destinations, product: .framework, bundleId: "com.apollographql.\(target.name.lowercased())", - deploymentTarget: target.deploymentTarget, + deploymentTargets: target.deploymentTargets, infoPlist: .file(path: "Sources/\(target.name)/Info.plist"), sources: [ "Sources/\(target.name)/\(target.name)/Sources/**" diff --git a/Tuist/ProjectDescriptionHelpers/Targets/Target+StarWarsAPI.swift b/Tuist/ProjectDescriptionHelpers/Targets/Target+StarWarsAPI.swift index d2f472e53..ee36c175b 100644 --- a/Tuist/ProjectDescriptionHelpers/Targets/Target+StarWarsAPI.swift +++ b/Tuist/ProjectDescriptionHelpers/Targets/Target+StarWarsAPI.swift @@ -7,10 +7,10 @@ extension Target { return Target( name: target.name, - platform: .macOS, + destinations: target.destinations, product: .framework, bundleId: "com.apollographql.\(target.name.lowercased())", - deploymentTarget: target.deploymentTarget, + deploymentTargets: target.deploymentTargets, infoPlist: .file(path: "Sources/\(target.name)/Info.plist"), sources: [ "Sources/\(target.name)/\(target.name)/Sources/**" diff --git a/Tuist/ProjectDescriptionHelpers/Targets/Target+SubscriptionAPI.swift b/Tuist/ProjectDescriptionHelpers/Targets/Target+SubscriptionAPI.swift index 465a89120..08112951b 100644 --- a/Tuist/ProjectDescriptionHelpers/Targets/Target+SubscriptionAPI.swift +++ b/Tuist/ProjectDescriptionHelpers/Targets/Target+SubscriptionAPI.swift @@ -7,10 +7,10 @@ extension Target { return Target( name: target.name, - platform: .macOS, + destinations: target.destinations, product: .framework, bundleId: "com.apollographql.\(target.name.lowercased())", - deploymentTarget: target.deploymentTarget, + deploymentTargets: target.deploymentTargets, infoPlist: .file(path: "Sources/\(target.name)/Info.plist"), sources: [ "Sources/\(target.name)/\(target.name)/Sources/**" diff --git a/Tuist/ProjectDescriptionHelpers/Targets/Target+UploadAPI.swift b/Tuist/ProjectDescriptionHelpers/Targets/Target+UploadAPI.swift index a1fa45a79..7813d1f62 100644 --- a/Tuist/ProjectDescriptionHelpers/Targets/Target+UploadAPI.swift +++ b/Tuist/ProjectDescriptionHelpers/Targets/Target+UploadAPI.swift @@ -7,10 +7,10 @@ extension Target { return Target( name: target.name, - platform: .macOS, + destinations: target.destinations, product: .framework, bundleId: "com.apollographql.\(target.name.lowercased())", - deploymentTarget: target.deploymentTarget, + deploymentTargets: target.deploymentTargets, infoPlist: .file(path: "Sources/\(target.name)/Info.plist"), sources: [ "Sources/\(target.name)/\(target.name)/Sources/**"