Merge pull request #18 from Squarespace/avyazovoy/MOBILE-1956-SPM-sup…

…port MOBILE-1956: SPM support
Squarespace · Oct 31, 2023 · 672aea9 · 672aea9
2 parents 7698dc3 + a14c9e7
commit 672aea9
Show file tree

Hide file tree

Showing 35 changed files with 163 additions and 190 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,3 +38,13 @@ jobs:
         with:
           name: test_artifacts
           path: ${{ steps.define_validation_dir.outputs.path }}
+
+      - name: Install xcbeautify
+        run: brew install xcbeautify
+
+      - name: Run SPM unit tests
+        run: |
+          xcodebuild test \
+          -scheme swift-simple-source \
+          -destination 'platform=iOS Simulator,name=iPhone SE (3rd generation),OS=latest' \
+          | xcbeautify
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,12 @@ project.xcworkspace/
 xcuserdata/
 *.xccheckout
 
+#SPM
+/.build
+/Packages
+.swiftpm/
+.netrc
+
 # RubyGems Bundler
 vendor/bundle/
 

diff --git a/Examples/Podfile b/Examples/Podfile
diff --git a/Examples/Podfile.lock b/Examples/Podfile.lock
diff --git a/Examples/SimpleSourceExample.xcodeproj/project.pbxproj b/Examples/SimpleSourceExample.xcodeproj/project.pbxproj
@@ -3,11 +3,11 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 56;
+	objectVersion = 60;
 	objects = {
 
 /* Begin PBXBuildFile section */
-		1125C4B111C313BADE9DEE27 /* Pods_SimpleSourceExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E03B72459B7D8A89ED6D1A29 /* Pods_SimpleSourceExample.framework */; };
+		62FF82AA2AF09C9500C7EB61 /* SimpleSource in Frameworks */ = {isa = PBXBuildFile; productRef = 62FF82A92AF09C9500C7EB61 /* SimpleSource */; };
 		C424C2691E3B4B2900CEE8C0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C424C2681E3B4B2900CEE8C0 /* AppDelegate.swift */; };
 		C424C26B1E3B4B2900CEE8C0 /* ColorTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C424C26A1E3B4B2900CEE8C0 /* ColorTableViewController.swift */; };
 		C424C26E1E3B4B2900CEE8C0 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C424C26C1E3B4B2900CEE8C0 /* Main.storyboard */; };
@@ -35,8 +35,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		65333953768EE8F03228185B /* Pods-SimpleSourceExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SimpleSourceExample.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SimpleSourceExample/Pods-SimpleSourceExample.debug.xcconfig"; sourceTree = "<group>"; };
-		8C2328A1D61B2AA900671F49 /* Pods-SimpleSourceExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SimpleSourceExample.release.xcconfig"; path = "Pods/Target Support Files/Pods-SimpleSourceExample/Pods-SimpleSourceExample.release.xcconfig"; sourceTree = "<group>"; };
 		C424C2651E3B4B2900CEE8C0 /* SimpleSourceExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SimpleSourceExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		C424C2681E3B4B2900CEE8C0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		C424C26A1E3B4B2900CEE8C0 /* ColorTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorTableViewController.swift; sourceTree = "<group>"; };
@@ -63,45 +61,25 @@
 		C424C2AB1E3D1B1600CEE8C0 /* characters.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = characters.json; sourceTree = "<group>"; };
 		C4847CC4200388DD00841DBA /* ItemListTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemListTableViewController.swift; sourceTree = "<group>"; };
 		C4E8EA791EABC18300D5EE1D /* ReorderingColorGridViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReorderingColorGridViewController.swift; sourceTree = "<group>"; };
-		E03B72459B7D8A89ED6D1A29 /* Pods_SimpleSourceExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SimpleSourceExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		C424C2621E3B4B2900CEE8C0 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				1125C4B111C313BADE9DEE27 /* Pods_SimpleSourceExample.framework in Frameworks */,
+				62FF82AA2AF09C9500C7EB61 /* SimpleSource in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		5D1976861E89CF5DB8542DB1 /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				65333953768EE8F03228185B /* Pods-SimpleSourceExample.debug.xcconfig */,
-				8C2328A1D61B2AA900671F49 /* Pods-SimpleSourceExample.release.xcconfig */,
-			);
-			name = Pods;
-			sourceTree = "<group>";
-		};
-		6C8F20F1EEC12F51A1D3E66B /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				E03B72459B7D8A89ED6D1A29 /* Pods_SimpleSourceExample.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
 		C424C25C1E3B4B2900CEE8C0 = {
 			isa = PBXGroup;
 			children = (
 				C424C2671E3B4B2900CEE8C0 /* SimpleSourceExample */,
 				C424C2661E3B4B2900CEE8C0 /* Products */,
-				5D1976861E89CF5DB8542DB1 /* Pods */,
-				6C8F20F1EEC12F51A1D3E66B /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -264,17 +242,18 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = C424C2771E3B4B2900CEE8C0 /* Build configuration list for PBXNativeTarget "SimpleSourceExample" */;
 			buildPhases = (
-				C9493BAEA1942A5FAEECDEE7 /* [CP] Check Pods Manifest.lock */,
 				C424C2611E3B4B2900CEE8C0 /* Sources */,
 				C424C2621E3B4B2900CEE8C0 /* Frameworks */,
 				C424C2631E3B4B2900CEE8C0 /* Resources */,
-				61726B5B8A96F790C3CA8367 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 			);
 			name = SimpleSourceExample;
+			packageProductDependencies = (
+				62FF82A92AF09C9500C7EB61 /* SimpleSource */,
+			);
 			productName = SimpleSourceExample;
 			productReference = C424C2651E3B4B2900CEE8C0 /* SimpleSourceExample.app */;
 			productType = "com.apple.product-type.application";
@@ -306,6 +285,9 @@
 				Base,
 			);
 			mainGroup = C424C25C1E3B4B2900CEE8C0;
+			packageReferences = (
+				62FF82A82AF09C7600C7EB61 /* XCLocalSwiftPackageReference ".." */,
+			);
 			productRefGroup = C424C2661E3B4B2900CEE8C0 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -330,44 +312,6 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
-/* Begin PBXShellScriptBuildPhase section */
-		61726B5B8A96F790C3CA8367 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-SimpleSourceExample/Pods-SimpleSourceExample-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-SimpleSourceExample/Pods-SimpleSourceExample-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-SimpleSourceExample/Pods-SimpleSourceExample-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		C9493BAEA1942A5FAEECDEE7 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-SimpleSourceExample-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-/* End PBXShellScriptBuildPhase section */
-
 /* Begin PBXSourcesBuildPhase section */
 		C424C2611E3B4B2900CEE8C0 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -539,7 +483,6 @@
 		};
 		C424C2781E3B4B2900CEE8C0 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 65333953768EE8F03228185B /* Pods-SimpleSourceExample.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = SimpleSourceExample/Info.plist;
@@ -554,7 +497,6 @@
 		};
 		C424C2791E3B4B2900CEE8C0 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 8C2328A1D61B2AA900671F49 /* Pods-SimpleSourceExample.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = SimpleSourceExample/Info.plist;
@@ -590,6 +532,20 @@
 		};
 /* End XCConfigurationList section */
 
+/* Begin XCLocalSwiftPackageReference section */
+		62FF82A82AF09C7600C7EB61 /* XCLocalSwiftPackageReference ".." */ = {
+			isa = XCLocalSwiftPackageReference;
+			relativePath = ..;
+		};
+/* End XCLocalSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		62FF82A92AF09C9500C7EB61 /* SimpleSource */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = SimpleSource;
+		};
+/* End XCSwiftPackageProductDependency section */
+
 /* Begin XCVersionGroup section */
 		C424C29D1E3D030600CEE8C0 /* CharacterModel.xcdatamodeld */ = {
 			isa = XCVersionGroup;

diff --git a/Examples/SimpleSourceExample.xcodeproj/xcshareddata/xcschemes/SimpleSourceExample.xcscheme b/Examples/SimpleSourceExample.xcodeproj/xcshareddata/xcschemes/SimpleSourceExample.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1500"
-   version = "1.3">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -20,28 +20,15 @@
                ReferencedContainer = "container:SimpleSourceExample.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C73479B4B3EC915F6BFD710EFCBAA9B3"
-               BuildableName = "SimpleSource-Unit-Tests.xctest"
-               BlueprintName = "SimpleSource-Unit-Tests"
-               ReferencedContainer = "container:Pods/Pods.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldAutocreateTestPlan = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -51,18 +38,6 @@
             ReferencedContainer = "container:SimpleSourceExample.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C73479B4B3EC915F6BFD710EFCBAA9B3"
-               BuildableName = "SimpleSource-Unit-Tests.xctest"
-               BlueprintName = "SimpleSource-Unit-Tests"
-               ReferencedContainer = "container:Pods/Pods.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"

diff --git a/Examples/SimpleSourceExample.xcworkspace/contents.xcworkspacedata b/Examples/SimpleSourceExample.xcworkspace/contents.xcworkspacedata
diff --git a/Examples/SimpleSourceExample/Colors.swift b/Examples/SimpleSourceExample/Colors.swift
@@ -1,5 +1,6 @@
 import Foundation
 import SimpleSource
+import UIKit
 
 // MARK: Sections
 

diff --git a/Package.resolved b/Package.resolved
@@ -0,0 +1,41 @@
+{
+  "pins" : [
+    {
+      "identity" : "cwlcatchexception",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/mattgallagher/CwlCatchException.git",
+      "state" : {
+        "revision" : "3b123999de19bf04905bc1dfdb76f817b0f2cc00",
+        "version" : "2.1.2"
+      }
+    },
+    {
+      "identity" : "cwlpreconditiontesting",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/mattgallagher/CwlPreconditionTesting.git",
+      "state" : {
+        "revision" : "a23ded2c91df9156628a6996ab4f347526f17b6b",
+        "version" : "2.1.2"
+      }
+    },
+    {
+      "identity" : "nimble",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Quick/Nimble",
+      "state" : {
+        "revision" : "edaedc1ec86f14ac6e2ca495b94f0ff7150d98d0",
+        "version" : "12.3.0"
+      }
+    },
+    {
+      "identity" : "quick",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Quick/Quick",
+      "state" : {
+        "revision" : "ef9aaf3f634b3a1ab6f54f1173fe2400b36e7cb8",
+        "version" : "7.3.0"
+      }
+    }
+  ],
+  "version" : 2
+}