[RFC] In Progress - Release 1.0 - Swift Codegen

.circleci/config.yml

@@ -200,18 +200,46 @@ workflows:
     jobs:
       - Swift_Build:
           name: Build with SPM
+          filters:
+            # Don't run this on any branch with "1.0" in the name (temporary!)
+            branches:
+              ignore: /.*1.0.*/
       - IntegrationTests_macOS_current:
           name: Apollo Integration Tests macOS << pipeline.parameters.macos_version >>
+          filters:
+            # Don't run this on any branch with "1.0" in the name (temporary!)
+            branches:
+              ignore: /.*1.0.*/
       - macOS_current:
           name: Apollo macOS << pipeline.parameters.macos_version >>
+          filters:
+            # Don't run this on any branch with "1.0" in the name (temporary!)
+            branches:
+              ignore: /.*1.0.*/
       - iOS_current:
           name: Apollo iOS << pipeline.parameters.ios_current_version >>
+          filters:
+            # Don't run this on any branch with "1.0" in the name (temporary!)
+            branches:
+              ignore: /.*1.0.*/
       - iOS_previous:
           name: Apollo iOS << pipeline.parameters.ios_previous_version >>
+          filters:
+            # Don't run this on any branch with "1.0" in the name (temporary!)
+            branches:
+              ignore: /.*1.0.*/
       - tvOS_current:
           name: Apollo tvOS << pipeline.parameters.tvos_version >>
+          filters:
+            # Don't run this on any branch with "1.0" in the name (temporary!)
+            branches:
+              ignore: /.*1.0.*/
       - CodegenLib_macOS_current:
           name: Swift Code Generation
+          filters:
+            # Don't run this on any branch with "1.0" in the name (temporary!)
+            branches:
+              ignore: /.*1.0.*/
       - CocoaPodsTrunk:
           name: Push Podspec to CocoaPods Trunk
           requires:

Apollo.podspec

@@ -22,10 +22,6 @@ Pod::Spec.new do |s|
 
   s.subspec 'Core' do |ss|
     ss.source_files = 'Sources/Apollo/*.swift','Sources/ApolloUtils/*.swift','Sources/ApolloAPI/*.swift'
-    ss.exclude_files = 'Sources/ApolloAPI/CodegenV1/*.swift'
-    ss.preserve_paths = [
-      'scripts/run-bundled-codegen.sh',
-    ]
   end
 
   # Apollo provides exactly one persistent cache out-of-the-box, as a reasonable default choice for

Apollo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,6 +1,42 @@
 {
   "object": {
     "pins": [
+      {
+        "package": "CwlCatchException",
+        "repositoryURL": "https://github.com/mattgallagher/CwlCatchException.git",
+        "state": {
+          "branch": null,
+          "revision": "35f9e770f54ce62dd8526470f14c6e137cef3eea",
+          "version": "2.1.1"
+        }
+      },
+      {
+        "package": "CwlPreconditionTesting",
+        "repositoryURL": "https://github.com/mattgallagher/CwlPreconditionTesting.git",
+        "state": {
+          "branch": null,
+          "revision": "c21f7bab5ca8eee0a9998bbd17ca1d0eb45d4688",
+          "version": "2.1.0"
+        }
+      },
+      {
+        "package": "InflectorKit",
+        "repositoryURL": "https://github.com/mattt/InflectorKit.git",
+        "state": {
+          "branch": null,
+          "revision": "d8cbcc04972690aaa5fc760a2b9ddb3e9f0decd7",
+          "version": "1.0.0"
+        }
+      },
+      {
+        "package": "Nimble",
+        "repositoryURL": "https://github.com/Quick/Nimble.git",
+        "state": {
+          "branch": null,
+          "revision": "c93f16c25af5770f0d3e6af27c9634640946b068",
+          "version": "9.2.1"
+        }
+      },
       {
         "package": "SQLite.swift",
         "repositoryURL": "https://github.com/stephencelis/SQLite.swift.git",
@@ -9,6 +45,15 @@
           "revision": "60a65015f6402b7c34b9a924f755ca0a73afeeaa",
           "version": "0.13.1"
         }
+      },
+      {
+        "package": "swift-collections",
+        "repositoryURL": "https://github.com/apple/swift-collections.git",
+        "state": {
+          "branch": null,
+          "revision": "48254824bb4248676bf7ce56014ff57b142b77eb",
+          "version": "1.0.2"
+        }
       }
     ]
   },

Configuration/Apollo/Apollo-Target-AnimalKingdomAPI.xcconfig

@@ -0,0 +1,3 @@
+#include "../Shared/Workspace-Universal-Framework.xcconfig"
+
+INFOPLIST_FILE = Sources/AnimalKingdomAPI/Info.plist

Configuration/Shared/Workspace-Target-Test.xcconfig

@@ -8,4 +8,4 @@ ENABLE_BITCODE = NO
 WARNING_CFLAGS = $(inherited) -Wno-documentation-unknown-command -Wno-incomplete-module -Wno-disabled-macro-expansion -Wno-shadow
 
 /// Test Target Deployment Target
-MACOSX_DEPLOYMENT_TARGET = 10.15
+MACOSX_DEPLOYMENT_TARGET = 11.0

Configuration/Shared/Workspace-Target-TestSupport.xcconfig

@@ -6,4 +6,4 @@ FRAMEWORK_SEARCH_PATHS = $(DEVELOPER_FRAMEWORKS_DIR) $(PLATFORM_DIR)/Developer/L
 OTHER_LDFLAGS = -weak_framework XCTest
 
 /// Test Target Deployment Target
-MACOSX_DEPLOYMENT_TARGET = 10.15
+MACOSX_DEPLOYMENT_TARGET = 11.0

Package.resolved

@@ -1,6 +1,15 @@
 {
   "object": {
     "pins": [
+      {
+        "package": "InflectorKit",
+        "repositoryURL": "https://github.com/mattt/InflectorKit",
+        "state": {
+          "branch": null,
+          "revision": "d8cbcc04972690aaa5fc760a2b9ddb3e9f0decd7",
+          "version": "1.0.0"
+        }
+      },
       {
         "package": "SQLite.swift",
         "repositoryURL": "https://github.com/stephencelis/SQLite.swift.git",
@@ -9,6 +18,15 @@
           "revision": "60a65015f6402b7c34b9a924f755ca0a73afeeaa",
           "version": "0.13.1"
         }
+      },
+      {
+        "package": "swift-collections",
+        "repositoryURL": "https://github.com/apple/swift-collections",
+        "state": {
+          "branch": null,
+          "revision": "2d33a0ea89c961dcb2b3da2157963d9c0370347e",
+          "version": "1.0.1"
+        }
       }
     ]
   },

Package.swift

@@ -38,7 +38,13 @@ let package = Package(
   dependencies: [
     .package(
       url: "https://github.com/stephencelis/SQLite.swift.git",
-      .upToNextMinor(from: "0.13.1"))
+        .upToNextMinor(from: "0.13.1")),
+    .package(
+      url: "https://github.com/mattt/InflectorKit",
+      .upToNextMinor(from: "1.0.0")),
+    .package(
+      url: "https://github.com/apple/swift-collections",
+      .upToNextMajor(from: "1.0.0"))
   ],
   targets: [
     .target(
@@ -54,8 +60,7 @@ let package = Package(
       name: "ApolloAPI",
       dependencies: [],
       exclude: [
-        "Info.plist",
-        "CodegenV1"
+        "Info.plist"
       ]),
     .target(
       name: "ApolloUtils",
@@ -67,14 +72,15 @@ let package = Package(
       name: "ApolloCodegenLib",
       dependencies: [
         "ApolloUtils",
+        .product(name: "InflectorKit", package: "InflectorKit"),
+        .product(name: "OrderedCollections", package: "swift-collections")
       ],
       exclude: [
         "Info.plist",
         "Frontend/JavaScript",
       ],
       resources: [
         .copy("Frontend/dist/ApolloCodegenFrontend.bundle.js"),
-        .copy("Frontend/dist/ApolloCodegenFrontend.bundle.js.map")
       ]),
     .target(
       name: "ApolloSQLite",

Sources/AnimalKingdomAPI/AnimalKingdomAPI.h

@@ -0,0 +1,11 @@
+#import <Foundation/Foundation.h>
+
+//! Project version number for AnimalKingdomAPI.
+FOUNDATION_EXPORT double AnimalKingdomAPIVersionNumber;
+
+//! Project version string for AnimalKingdomAPI.
+FOUNDATION_EXPORT const unsigned char AnimalKingdomAPIVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <AnimalKingdomAPI/PublicHeader.h>
+
+