Merge pull request #138 from joemasilotti/spm-only

Remove Carthage and Cocoapods support
hotwired · Sep 12, 2023 · 7ce71d4 · 7ce71d4
2 parents 9bc59f3 + dfc0a0c
commit 7ce71d4
Show file tree

Hide file tree

Showing 22 changed files with 247 additions and 949 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,21 +8,5 @@ jobs:
     steps:
     - uses: actions/checkout@master
 
-    - name: Cache carthage
-      uses: actions/cache@v2
-      with:
-        path: Carthage
-        key: carthage-xcode13.2.1-${{ hashFiles('Cartfile.resolved') }}
-        restore-keys: |
-          carthage-xcode13.2.1
-          carthage-
-
-    - name: Build Dependencies
-      run: bin/carthage.sh bootstrap --cache-builds --use-xcframeworks --platform ios
-      env:
-        DEVELOPER_DIR: /Applications/Xcode_13.2.1.app
-
     - name: Run Tests
-      run: xcodebuild -project Turbo.xcodeproj -scheme Turbo test -quiet -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13'
-      env:
-        DEVELOPER_DIR: /Applications/Xcode_13.2.1.app
+      run: xcodebuild -scheme Turbo test -quiet -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14'
diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...kage.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...kage.xcworkspace/contents.xcworkspacedata
diff --git a/...roj/xcshareddata/xcschemes/Turbo.xcscheme → ...ode/xcshareddata/xcschemes/Turbo.xcscheme b/...roj/xcshareddata/xcschemes/Turbo.xcscheme → ...ode/xcshareddata/xcschemes/Turbo.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1220"
-   version = "1.3">
+   LastUpgradeVersion = "1430"
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -14,10 +14,24 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C149E34D2575780900158E8C"
-               BuildableName = "Turbo.framework"
+               BlueprintIdentifier = "Turbo"
+               BuildableName = "Turbo"
                BlueprintName = "Turbo"
-               ReferencedContainer = "container:Turbo.xcodeproj">
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "Turbo_TurboTests"
+               BuildableName = "Turbo_TurboTests"
+               BlueprintName = "Turbo_TurboTests"
+               ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -26,16 +40,17 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C149E3562575780900158E8C"
-               BuildableName = "Tests.xctest"
-               BlueprintName = "Tests"
-               ReferencedContainer = "container:Turbo.xcodeproj">
+               BlueprintIdentifier = "TurboTests"
+               BuildableName = "TurboTests"
+               BlueprintName = "TurboTests"
+               ReferencedContainer = "container:">
             </BuildableReference>
          </TestableReference>
       </Testables>
@@ -60,10 +75,10 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "C149E34D2575780900158E8C"
-            BuildableName = "Turbo.framework"
+            BlueprintIdentifier = "Turbo"
+            BuildableName = "Turbo"
             BlueprintName = "Turbo"
-            ReferencedContainer = "container:Turbo.xcodeproj">
+            ReferencedContainer = "container:">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>

diff --git a/Cartfile.private b/Cartfile.private
diff --git a/Cartfile.resolved b/Cartfile.resolved
diff --git a/Demo/Demo.xcodeproj/project.pbxproj b/Demo/Demo.xcodeproj/project.pbxproj
@@ -3,10 +3,11 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 52;
 	objects = {
 
 /* Begin PBXBuildFile section */
+		84ACD7322AAE743300234C57 /* Turbo in Frameworks */ = {isa = PBXBuildFile; productRef = 84ACD7312AAE743300234C57 /* Turbo */; };
 		C106CBE3257FF87700498F6F /* ErrorPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C106CBE2257FF87700498F6F /* ErrorPresenter.swift */; };
 		C10DF228257AB81D009412E7 /* path-configuration.json in Resources */ = {isa = PBXBuildFile; fileRef = C10DF227257AB81D009412E7 /* path-configuration.json */; };
 		C10DF242257AD845009412E7 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C10DF241257AD845009412E7 /* ViewController.swift */; };
@@ -15,8 +16,6 @@
 		C153F00F2578057900926D30 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C153F00D2578057900926D30 /* Main.storyboard */; };
 		C153F0112578057A00926D30 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C153F0102578057A00926D30 /* Assets.xcassets */; };
 		C153F0142578057A00926D30 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C153F0122578057A00926D30 /* LaunchScreen.storyboard */; };
-		C153F02E25780F6900926D30 /* Turbo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C153F02D25780F6900926D30 /* Turbo.framework */; };
-		C153F02F25780F6900926D30 /* Turbo.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C153F02D25780F6900926D30 /* Turbo.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		C153F03525784BEA00926D30 /* NumbersViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C153F03425784BEA00926D30 /* NumbersViewController.swift */; };
 		C175FE782579905300C8DF50 /* Demo.swift in Sources */ = {isa = PBXBuildFile; fileRef = C175FE772579905300C8DF50 /* Demo.swift */; };
 		CB4FB651273AE23B00119FD3 /* TurboNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB4FB650273AE23B00119FD3 /* TurboNavigationController.swift */; };
@@ -29,14 +28,14 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				C153F02F25780F6900926D30 /* Turbo.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		84ACD72F2AAE733C00234C57 /* turbo-ios */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "turbo-ios"; path = ..; sourceTree = "<group>"; };
 		C106CBE2257FF87700498F6F /* ErrorPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorPresenter.swift; sourceTree = "<group>"; };
 		C10DF227257AB81D009412E7 /* path-configuration.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "path-configuration.json"; sourceTree = "<group>"; };
 		C10DF241257AD845009412E7 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@@ -47,7 +46,6 @@
 		C153F0102578057A00926D30 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		C153F0132578057A00926D30 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		C153F0152578057A00926D30 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		C153F02D25780F6900926D30 /* Turbo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Turbo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		C153F0332578302F00926D30 /* Turbo Demo.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Turbo Demo.entitlements"; sourceTree = "<group>"; };
 		C153F03425784BEA00926D30 /* NumbersViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumbersViewController.swift; sourceTree = "<group>"; };
 		C175FE772579905300C8DF50 /* Demo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Demo.swift; sourceTree = "<group>"; };
@@ -59,19 +57,35 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C153F02E25780F6900926D30 /* Turbo.framework in Frameworks */,
+				84ACD7322AAE743300234C57 /* Turbo in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		84ACD72E2AAE733C00234C57 /* Packages */ = {
+			isa = PBXGroup;
+			children = (
+				84ACD72F2AAE733C00234C57 /* turbo-ios */,
+			);
+			name = Packages;
+			sourceTree = "<group>";
+		};
+		84ACD7302AAE743000234C57 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		C153EFFB2578057900926D30 = {
 			isa = PBXGroup;
 			children = (
 				C153F0062578057900926D30 /* Demo */,
+				84ACD72E2AAE733C00234C57 /* Packages */,
 				C153F0052578057900926D30 /* Products */,
-				C153F02C25780F6900926D30 /* Frameworks */,
+				84ACD7302AAE743000234C57 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -103,14 +117,6 @@
 			name = Demo;
 			sourceTree = "<group>";
 		};
-		C153F02C25780F6900926D30 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				C153F02D25780F6900926D30 /* Turbo.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
 		CB4FB64F273AE22800119FD3 /* Navigation */ = {
 			isa = PBXGroup;
 			children = (
@@ -136,6 +142,9 @@
 			dependencies = (
 			);
 			name = Demo;
+			packageProductDependencies = (
+				84ACD7312AAE743300234C57 /* Turbo */,
+			);
 			productName = Demo;
 			productReference = C153F0042578057900926D30 /* Turbo Demo.app */;
 			productType = "com.apple.product-type.application";
@@ -407,6 +416,13 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		84ACD7312AAE743300234C57 /* Turbo */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = Turbo;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = C153EFFC2578057900926D30 /* Project object */;
 }
diff --git a/Demo/Demo.xcworkspace/contents.xcworkspacedata b/Demo/Demo.xcworkspace/contents.xcworkspacedata
diff --git a/Demo/Demo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Demo/Demo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/Demo/README.md b/Demo/README.md
@@ -1,6 +1,6 @@
 # Demo
 
-Open `Demo.xcworkspace` and run the `Demo` app target. By default, the demo app loads a remotely hosted Turbo demo app. The demo app itself describes the various features it supports and you can navigate through the app to explore.
+Open `Demo.xcodeproj` and run the `Demo` app target. By default, the demo app loads a remotely hosted Turbo demo app. The demo app itself describes the various features it supports and you can navigate through the app to explore.
 
 You can also clone that demo app to experiment from [https://github.com/hotwired/turbo-native-demo](https://github.com/hotwired/turbo-native-demo). Once the local demo server is running, then you just need to change `Demo.current` to use `local` in `Demo/Demo.swift` to point to the local version of the demo.
 

diff --git a/Docs/Installation.md b/Docs/Installation.md
diff --git a/Package.resolved b/Package.resolved
@@ -0,0 +1,59 @@
+{
+  "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" : "1f3bde57bde12f5e7b07909848c071e9b73d6edc",
+        "version" : "10.0.0"
+      }
+    },
+    {
+      "identity" : "ohhttpstubs",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/AliSoftware/OHHTTPStubs",
+      "state" : {
+        "revision" : "12f19662426d0434d6c330c6974d53e2eb10ecd9",
+        "version" : "9.1.0"
+      }
+    },
+    {
+      "identity" : "quick",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/quick/quick",
+      "state" : {
+        "revision" : "f9d519828bb03dfc8125467d8f7b93131951124c",
+        "version" : "5.0.1"
+      }
+    },
+    {
+      "identity" : "swifter",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/httpswift/swifter",
+      "state" : {
+        "revision" : "9483a5d459b45c3ffd059f7b55f9638e268632fd",
+        "version" : "1.5.0"
+      }
+    }
+  ],
+  "version" : 2
+}