Support SPM

bawn · Sep 12, 2020 · f97de87 · f97de87
1 parent 3bd25bd
commit f97de87
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 30 deletions.
diff --git a/Aquaman-Demo.xcodeproj/project.pbxproj b/Aquaman-Demo.xcodeproj/project.pbxproj
@@ -7,10 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		77D9764EB46A55419775F2D6 /* Pods_Aquaman_Demo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1818A6060E4BCD927F3FAB53 /* Pods_Aquaman_Demo.framework */; };
-		851E513024F4B9E600C329CA /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = 851E512F24F4B9E600C329CA /* SwiftPackageProductDependency */; };
-		DF37AB8C23B9F47D0047FEF9 /* Aquaman.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF786CD82230CB8800DD6955 /* Aquaman.framework */; };
-		DF37AB8D23B9F47D0047FEF9 /* Aquaman.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DF786CD82230CB8800DD6955 /* Aquaman.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		3E70E23AE12A03F719A61B86 /* Pods_Aquaman_Demo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1818A6060E4BCD927F3FAB53 /* Pods_Aquaman_Demo.framework */; };
 		DF457BB323B6131F00708C49 /* Aquaman_DemoUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF457BB223B6131F00708C49 /* Aquaman_DemoUITests.swift */; };
 		DF7AC0272320BB9E002E595E /* TheFlashViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF7AC0262320BB9E002E595E /* TheFlashViewController.swift */; };
 		DF7F9F2121E37EEB000F4317 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF7F9F2021E37EEB000F4317 /* AppDelegate.swift */; };
@@ -22,6 +19,7 @@
 		DF7F9F4521E37FAA000F4317 /* PageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF7F9F3921E37FA9000F4317 /* PageViewController.swift */; };
 		DF7F9F4721E37FAA000F4317 /* WonderWomanViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF7F9F3B21E37FA9000F4317 /* WonderWomanViewController.swift */; };
 		DF7F9F4B21E37FBB000F4317 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DF7F9F4A21E37FBB000F4317 /* Main.storyboard */; };
+		DF931184250C7D5600870847 /* Trident in Frameworks */ = {isa = PBXBuildFile; productRef = DF931183250C7D5600870847 /* Trident */; };
 		DFD4116121E84011006E8D77 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DFD4116021E84011006E8D77 /* ViewController.swift */; };
 /* End PBXBuildFile section */
 
@@ -42,7 +40,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				DF37AB8D23B9F47D0047FEF9 /* Aquaman.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -84,9 +81,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				DF37AB8C23B9F47D0047FEF9 /* Aquaman.framework in Frameworks */,
-				851E513024F4B9E600C329CA /* BuildFile in Frameworks */,
-				77D9764EB46A55419775F2D6 /* Pods_Aquaman_Demo.framework in Frameworks */,
+				3E70E23AE12A03F719A61B86 /* Pods_Aquaman_Demo.framework in Frameworks */,
+				DF931184250C7D5600870847 /* Trident in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -99,7 +95,6 @@
 				F5EA41D9B5EC67782591227C /* Pods-Aquaman-Demo.debug.xcconfig */,
 				3A86685D0616AED53669BBEF /* Pods-Aquaman-Demo.release.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -198,7 +193,7 @@
 			);
 			name = "Aquaman-Demo";
 			packageProductDependencies = (
-				851E512F24F4B9E600C329CA /* SwiftPackageProductDependency */,
+				DF931183250C7D5600870847 /* Trident */,
 			);
 			productName = "Aquaman-Demo";
 			productReference = DF7F9F1D21E37EEB000F4317 /* Aquaman-Demo.app */;
@@ -233,7 +228,7 @@
 			);
 			mainGroup = DF7F9F1421E37EEB000F4317;
 			packageReferences = (
-				851E512E24F4B9E600C329CA /* RemoteSwiftPackageReference */,
+				DF931182250C7D5600870847 /* XCRemoteSwiftPackageReference "Trident" */,
 			);
 			productRefGroup = DF7F9F1E21E37EEB000F4317 /* Products */;
 			projectDirPath = "";
@@ -582,21 +577,21 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		851E512E24F4B9E600C329CA /* RemoteSwiftPackageReference */ = {
+		DF931182250C7D5600870847 /* XCRemoteSwiftPackageReference "Trident" */ = {
 			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/bugkingK/Aquaman";
+			repositoryURL = "https://github.com/bawn/Trident.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 0.1.2;
+				minimumVersion = 0.7.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		851E512F24F4B9E600C329CA /* SwiftPackageProductDependency */ = {
+		DF931183250C7D5600870847 /* Trident */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 851E512E24F4B9E600C329CA /* RemoteSwiftPackageReference */;
-			productName = Aquaman;
+			package = DF931182250C7D5600870847 /* XCRemoteSwiftPackageReference "Trident" */;
+			productName = Trident;
 		};
 /* End XCSwiftPackageProductDependency section */
 	};

diff --git a/Aquaman.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Aquaman.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -2,12 +2,12 @@
   "object": {
     "pins": [
       {
-        "package": "Aquaman",
-        "repositoryURL": "https://github.com/bugkingK/Aquaman",
+        "package": "Trident",
+        "repositoryURL": "https://github.com/bawn/Trident.git",
         "state": {
           "branch": null,
-          "revision": "40080956650a1aa783093f11cfb15f781d6ca432",
-          "version": "0.1.2"
+          "revision": "2eed75e69815da6fc28b05c91cd642bca1c40610",
+          "version": "0.7.0"
         }
       }
     ]

diff --git a/Package.swift b/Package.swift
@@ -14,6 +14,6 @@ let package = Package(
     targets: [
         .target(
             name: "Aquaman",
-            path: "Aquaman/Aquaman")
+            path: "./Aquaman/Aquaman")
     ]
 )
diff --git a/Podfile b/Podfile
@@ -9,7 +9,7 @@ target 'Aquaman-Demo' do
 
   pod 'SnapKit', '4.2.0'
   pod 'MJRefresh'
-  pod 'Trident'
+#  pod 'Trident'
 #  pod 'Reveal-SDK',    '22', :configurations => ['Debug']
 # Pods for Aquaman-Demo
 

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,25 +1,20 @@
 PODS:
   - MJRefresh (3.5.0)
   - SnapKit (4.2.0)
-  - Trident (0.3.0):
-    - SnapKit (~> 4.2.0)
 
 DEPENDENCIES:
   - MJRefresh
   - SnapKit (= 4.2.0)
-  - Trident
 
 SPEC REPOS:
-  trunk:
+  https://cdn.cocoapods.org/:
     - MJRefresh
     - SnapKit
-    - Trident
 
 SPEC CHECKSUMS:
   MJRefresh: 6afc955813966afb08305477dd7a0d9ad5e79a16
   SnapKit: fe8a619752f3f27075cc9a90244d75c6c3f27e2a
-  Trident: 76516f68f7d1e267b09d4fd0f02badba5ad56582
 
-PODFILE CHECKSUM: dc1920a5b46e3255a81806804a85aaf0dc27e8f7
+PODFILE CHECKSUM: 6ecab50b368fd719f75735e4d61e03b42a41166e
 
 COCOAPODS: 1.9.3