Merge remote-tracking branch 'origin/main' into codegen-vaildation-re…

…factor
apollographql · Dec 16, 2023 · b780737 · b780737
2 parents 65075c2 + 707e93d
commit b780737
Show file tree

Hide file tree

Showing 35 changed files with 82 additions and 71 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  secops: apollo/[email protected].3
+  secops: apollo/[email protected].4
 
 workflows:
   security-scans:

diff --git a/.tuist-version b/.tuist-version
@@ -1 +1 @@
-3.19.0
+3.35.5
diff --git 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/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/Package.swift b/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/Package.swift
@@ -23,9 +23,6 @@ let package = Package(
       name: "TestApp",
       dependencies: [
         .product(name: "ApolloAPI", package: "apollo-ios")
-      ],
-      swiftSettings: [
-        .unsafeFlags(["-warnings-as-errors"])
       ]),
     .testTarget(
       name: "TestAppTests",

diff --git a/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/test-project.sh b/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/test-project.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-swift test
+swift test -Xswiftc -warnings-as-errors
diff --git a/Tests/TestCodeGenConfigurations/EmbeddedInTarget-RelativeAbsolute/PackageOne/Package.swift b/Tests/TestCodeGenConfigurations/EmbeddedInTarget-RelativeAbsolute/PackageOne/Package.swift
@@ -45,9 +45,6 @@ let package = Package(
         "graphql/PetDetails.graphql",
         "graphql/AllAnimalsIncludeSkipQuery.graphql",
         "graphql/PetAdoptionMutation.graphql"
-      ],
-      swiftSettings: [
-        .unsafeFlags(["-warnings-as-errors"])
       ]),
     .testTarget(
       name: "PackageOneTests",

diff --git a/Tests/TestCodeGenConfigurations/EmbeddedInTarget-RelativeAbsolute/PackageTwo/Package.swift b/Tests/TestCodeGenConfigurations/EmbeddedInTarget-RelativeAbsolute/PackageTwo/Package.swift
@@ -22,9 +22,6 @@ let package = Package(
       name: "PackageTwo",
       dependencies: [
         .product(name: "ApolloAPI", package: "apollo-ios"),
-      ],
-      swiftSettings: [
-        .unsafeFlags(["-warnings-as-errors"])
       ]),
     .target(
       name: "TestMocks",

diff --git a/Tests/TestCodeGenConfigurations/EmbeddedInTarget-RelativeAbsolute/test-project.sh b/Tests/TestCodeGenConfigurations/EmbeddedInTarget-RelativeAbsolute/test-project.sh
@@ -1,9 +1,10 @@
 #!/bin/bash
+set -e
 
 echo "Testing PackageOne.."
 cd PackageOne
-swift test
+swift test -Xswiftc -warnings-as-errors
 
 echo "Testing PackageTwo.."
 cd ../PackageTwo
-swift test
+swift test -Xswiftc -warnings-as-errors
diff --git a/Tests/TestCodeGenConfigurations/SwiftPackageManager/Package.swift b/Tests/TestCodeGenConfigurations/SwiftPackageManager/Package.swift
@@ -23,9 +23,6 @@ let package = Package(
       dependencies: [
         .product(name: "Apollo", package: "apollo-ios"),
         .product(name: "AnimalKingdomAPI", package: "AnimalKingdomAPI")
-      ],
-      swiftSettings: [
-        .unsafeFlags(["-warnings-as-errors"])
       ]
     ),
     .testTarget(

diff --git a/Tests/TestCodeGenConfigurations/SwiftPackageManager/test-project.sh b/Tests/TestCodeGenConfigurations/SwiftPackageManager/test-project.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-swift test
+swift test -Xswiftc -warnings-as-errors
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/apollo-ios-codegen/.circleci/config.yml b/apollo-ios-codegen/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  secops: apollo/[email protected].3
+  secops: apollo/[email protected].4
 
 workflows:
   security-scans:

diff --git a/apollo-ios-codegen/Sources/GraphQLCompiler/ApolloCodegenFrontendBundle.swift b/apollo-ios-codegen/Sources/GraphQLCompiler/ApolloCodegenFrontendBundle.swift
diff --git a/apollo-ios-codegen/Sources/GraphQLCompiler/JavaScript/package.json b/apollo-ios-codegen/Sources/GraphQLCompiler/JavaScript/package.json
@@ -13,7 +13,7 @@
     "npm": ">=7"
   },
   "dependencies": {
-    "graphql": "17.0.0-alpha.2",
+    "graphql": "17.0.0-alpha.3",
     "tslib": "^2.3.0"
   },
   "devDependencies": {

diff --git a/apollo-ios-codegen/Sources/GraphQLCompiler/JavaScript/rollup.config.js b/apollo-ios-codegen/Sources/GraphQLCompiler/JavaScript/rollup.config.js
@@ -22,7 +22,7 @@ const options = {
     }),
     replace({
       preventAssignment: true,
-      "process.env.NODE_ENV": JSON.stringify("production"),
+      "globalThis.process.env.NODE_ENV": JSON.stringify("production"),
     }),
     terser({
       keep_classnames: true,

diff --git a/apollo-ios-pagination/.circleci/config.yml b/apollo-ios-pagination/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  secops: apollo/[email protected].3
+  secops: apollo/[email protected].4
 
 workflows:
   security-scans:

diff --git a/apollo-ios/.circleci/config.yml b/apollo-ios/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  secops: apollo/[email protected].3
+  secops: apollo/[email protected].4
 
 workflows:
   security-scans:
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