Skip to content
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

Tuist updates #201

Merged
merged 7 commits into from
Dec 15, 2023
Merged

Tuist updates #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bb4783a
Tuist Updates
BobaFetters Dec 11, 2023
1584617
Turn off defines_module
BobaFetters Dec 15, 2023
effbb79
Merge branch 'main' into tuist-updates
BobaFetters Dec 15, 2023
e09897f
Reverting unnecessary change
BobaFetters Dec 15, 2023
431366a
Sample change for ci
BobaFetters Dec 15, 2023
2a1afff
Minimum supported version bump
BobaFetters Dec 15, 2023
931e822
Removing sample change
BobaFetters Dec 15, 2023
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 .tuist-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.19.0
3.35.5
3 changes: 2 additions & 1 deletion Configuration/Shared/Workspace-Target-Framework.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ FRAMEWORK_VERSION[sdk=macosx*] = A

APPLICATION_EXTENSION_API_ONLY = YES

DEFINES_MODULE = YES
DEFINES_MODULE = NO

40 changes: 30 additions & 10 deletions Tuist/ProjectDescriptionHelpers/Enums/ApolloTarget.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
7 changes: 5 additions & 2 deletions Tuist/ProjectDescriptionHelpers/Settings/Settings+Apollo.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
4 changes: 2 additions & 2 deletions Tuist/ProjectDescriptionHelpers/Targets/Target+AnimalKingdomAPI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/**",
Expand Down
4 changes: 2 additions & 2 deletions Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloCodegenInternalTestHelpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)/**",
Expand Down
4 changes: 2 additions & 2 deletions Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloCodegenLibWrapper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloCodegenTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)/**",
Expand Down
4 changes: 2 additions & 2 deletions Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloInternalTestHelpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)/**",
Expand Down
4 changes: 2 additions & 2 deletions Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloPaginationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)/**",
],
Expand Down
4 changes: 2 additions & 2 deletions Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloPerformanceTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)/**",
Expand Down
4 changes: 2 additions & 2 deletions Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloServerIntegrationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)/**",
Expand Down
4 changes: 2 additions & 2 deletions Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)/**",
Expand Down
4 changes: 2 additions & 2 deletions Tuist/ProjectDescriptionHelpers/Targets/Target+ApolloWrapper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions Tuist/ProjectDescriptionHelpers/Targets/Target+CodegenCLITests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions Tuist/ProjectDescriptionHelpers/Targets/Target+GitHubAPI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/**"
Expand Down
4 changes: 2 additions & 2 deletions Tuist/ProjectDescriptionHelpers/Targets/Target+StarWarsAPI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/**"
Expand Down
4 changes: 2 additions & 2 deletions Tuist/ProjectDescriptionHelpers/Targets/Target+SubscriptionAPI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/**"
Expand Down
4 changes: 2 additions & 2 deletions Tuist/ProjectDescriptionHelpers/Targets/Target+UploadAPI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/**"
Expand Down
Loading