Merge branch 'main' into deps/graphql-js-17-alpha-3

apollographql · Dec 13, 2023 · 764e73e · 764e73e
2 parents cd91a81 + 7964293
commit 764e73e
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 21 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/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/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-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:

diff --git a/apollo-ios/Sources/ApolloAPI/DataDict.swift b/apollo-ios/Sources/ApolloAPI/DataDict.swift
@@ -48,7 +48,6 @@ public struct DataDict: Hashable {
     _storage.deferredFragments
   }
 
-  #warning("TODO, remove deferredFragments default value when we set these up in executor")
   public init(
     data: [String: AnyHashable],
     fulfilledFragments: Set<ObjectIdentifier>,