add back sec

xmtp · Nov 19, 2024 · de64769 · de64769
1 parent 9c806cd
commit de64769
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 56 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -19,21 +19,21 @@
       }
     },
     {
-      "identity" : "gzipswift",
+      "identity" : "libxmtp-swift",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/1024jp/GzipSwift",
+      "location" : "https://github.com/xmtp/libxmtp-swift.git",
       "state" : {
-        "revision" : "56bf51fdd2fe4b2cf254b2cf34aede3d7caccc6c",
-        "version" : "6.1.0"
+        "revision" : "f495d4feaab40a0a6a48c1d5a99585de8107f5d2",
+        "version" : "3.0.1"
       }
     },
     {
-      "identity" : "libxmtp-swift",
+      "identity" : "secp256k1.swift",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/xmtp/libxmtp-swift.git",
+      "location" : "https://github.com/Boilertalk/secp256k1.swift.git",
       "state" : {
-        "revision" : "f495d4feaab40a0a6a48c1d5a99585de8107f5d2",
-        "version" : "3.0.1"
+        "revision" : "cd187c632fb812fd93711a9f7e644adb7e5f97f0",
+        "version" : "0.1.7"
       }
     },
     {
@@ -108,15 +108,6 @@
         "version" : "1.28.2"
       }
     },
-    {
-      "identity" : "swift-secp256k1",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/21-DOT-DEV/swift-secp256k1",
-      "state" : {
-        "revision" : "57ce9af6db14e0114af631ace25231a9d0ccccbd",
-        "version" : "0.18.0"
-      }
-    },
     {
       "identity" : "swift-system",
       "kind" : "remoteSourceControl",

diff --git a/Package.swift b/Package.swift
@@ -17,7 +17,7 @@ let package = Package(
 		),
 	],
 	dependencies: [
-		.package(url: "https://github.com/21-DOT-DEV/swift-secp256k1", exact: "0.18.0"),
+		.package(url: "https://github.com/Boilertalk/secp256k1.swift", from: "0.1.0"),
 		.package(url: "https://github.com/bufbuild/connect-swift", exact: "1.0.0"),
 		.package(url: "https://github.com/apple/swift-docc-plugin.git", from: "1.4.3"),
 		.package(url: "https://github.com/xmtp/libxmtp-swift.git", exact: "3.0.1"),
@@ -27,7 +27,7 @@ let package = Package(
 		.target(
 			name: "XMTPiOS",
 			dependencies: [
-				.product(name: "secp256k1", package: "swift-secp256k1"),
+				.product(name: "secp256k1", package: "secp256k1.swift"),
 				.product(name: "Connect", package: "connect-swift"),
 				.product(name: "LibXMTP", package: "libxmtp-swift"),
 				.product(name: "CryptoSwift", package: "CryptoSwift")

diff --git a/XMTP.podspec b/XMTP.podspec
@@ -20,6 +20,7 @@ Pod::Spec.new do |spec|
   spec.source_files  	= "Sources/**/*.swift"
   spec.frameworks 		= "CryptoKit", "UIKit"
 
+  spec.dependency 'secp256k1.swift'
   spec.dependency "Connect-Swift", "= 1.0.0"
   spec.dependency 'LibXMTP', '= 3.0.1'
   spec.dependency 'CryptoSwift', '= 1.8.3'

diff --git a/XMTPiOSExample/XMTPiOSExample.xcodeproj/project.pbxproj b/XMTPiOSExample/XMTPiOSExample.xcodeproj/project.pbxproj
@@ -34,7 +34,7 @@
 		A6C0F3862AC1E549008C6AA7 /* Data.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6C0F3852AC1E549008C6AA7 /* Data.swift */; };
 		A6D192D0293A7B97006B49F2 /* ConversationListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6D192CF293A7B97006B49F2 /* ConversationListView.swift */; };
 		E513AEA32CE6AF2700BC31C3 /* CryptoSwift in Frameworks */ = {isa = PBXBuildFile; productRef = E513AEA22CE6AF2700BC31C3 /* CryptoSwift */; };
-		E58362512CEBC4A6003D5D00 /* GZIP in Frameworks */ = {isa = PBXBuildFile; productRef = E58362502CEBC4A6003D5D00 /* GZIP */; };
+		E58362552CEC0B94003D5D00 /* secp256k1 in Frameworks */ = {isa = PBXBuildFile; productRef = E58362542CEC0B94003D5D00 /* secp256k1 */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -85,9 +85,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				E513AEA32CE6AF2700BC31C3 /* CryptoSwift in Frameworks */,
+				E58362552CEC0B94003D5D00 /* secp256k1 in Frameworks */,
 				A6606A1A2B5EE80000E2ED4D /* XMTPiOS in Frameworks */,
 				A6C0F37B2AC1E321008C6AA7 /* Starscream in Frameworks */,
-				E58362512CEBC4A6003D5D00 /* GZIP in Frameworks */,
 				A65F070A297B5E8600C3C76E /* KeychainAccess in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -206,7 +206,7 @@
 				A6C0F37A2AC1E321008C6AA7 /* Starscream */,
 				A6606A192B5EE80000E2ED4D /* XMTPiOS */,
 				E513AEA22CE6AF2700BC31C3 /* CryptoSwift */,
-				E58362502CEBC4A6003D5D00 /* GZIP */,
+				E58362542CEC0B94003D5D00 /* secp256k1 */,
 			);
 			productName = XMTPiOSExample;
 			productReference = A628198F292DC825004B9117 /* XMTPiOSExample.app */;
@@ -240,8 +240,7 @@
 				A65F0708297B5E8600C3C76E /* XCRemoteSwiftPackageReference "KeychainAccess" */,
 				A6C0F3792AC1E321008C6AA7 /* XCRemoteSwiftPackageReference "Starscream" */,
 				E513AEA12CE6AF2700BC31C3 /* XCRemoteSwiftPackageReference "CryptoSwift" */,
-				E5BCC0952CEBA58F00E11814 /* XCRemoteSwiftPackageReference "swift-secp256k1" */,
-				E583624F2CEBC4A6003D5D00 /* XCRemoteSwiftPackageReference "GZIP" */,
+				E58362532CEBFD33003D5D00 /* XCRemoteSwiftPackageReference "secp256k1" */,
 			);
 			productRefGroup = A6281990292DC825004B9117 /* Products */;
 			projectDirPath = "";
@@ -556,20 +555,12 @@
 				minimumVersion = 1.8.3;
 			};
 		};
-		E583624F2CEBC4A6003D5D00 /* XCRemoteSwiftPackageReference "GZIP" */ = {
+		E58362532CEBFD33003D5D00 /* XCRemoteSwiftPackageReference "secp256k1" */ = {
 			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/nicklockwood/GZIP";
+			repositoryURL = "https://github.com/Boilertalk/secp256k1.swift";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 1.3.2;
-			};
-		};
-		E5BCC0952CEBA58F00E11814 /* XCRemoteSwiftPackageReference "swift-secp256k1" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/21-DOT-DEV/swift-secp256k1.git";
-			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 0.18.0;
+				minimumVersion = 0.1.7;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
@@ -594,10 +585,9 @@
 			package = E513AEA12CE6AF2700BC31C3 /* XCRemoteSwiftPackageReference "CryptoSwift" */;
 			productName = CryptoSwift;
 		};
-		E58362502CEBC4A6003D5D00 /* GZIP */ = {
+		E58362542CEC0B94003D5D00 /* secp256k1 */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = E583624F2CEBC4A6003D5D00 /* XCRemoteSwiftPackageReference "GZIP" */;
-			productName = GZIP;
+			productName = secp256k1;
 		};
 /* End XCSwiftPackageProductDependency section */
 	};

diff --git a/...xample/XMTPiOSExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/...xample/XMTPiOSExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -18,15 +18,6 @@
         "version" : "1.8.3"
       }
     },
-    {
-      "identity" : "gzip",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/nicklockwood/GZIP",
-      "state" : {
-        "revision" : "f710a37aa978a93b815a4f64bd504dc4c3256312",
-        "version" : "1.3.2"
-      }
-    },
     {
       "identity" : "keychainaccess",
       "kind" : "remoteSourceControl",
@@ -45,6 +36,15 @@
         "version" : "3.0.1"
       }
     },
+    {
+      "identity" : "secp256k1.swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Boilertalk/secp256k1.swift",
+      "state" : {
+        "revision" : "cd187c632fb812fd93711a9f7e644adb7e5f97f0",
+        "version" : "0.1.7"
+      }
+    },
     {
       "identity" : "starscream",
       "kind" : "remoteSourceControl",
@@ -126,15 +126,6 @@
         "version" : "1.28.2"
       }
     },
-    {
-      "identity" : "swift-secp256k1",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/21-DOT-DEV/swift-secp256k1.git",
-      "state" : {
-        "revision" : "57ce9af6db14e0114af631ace25231a9d0ccccbd",
-        "version" : "0.18.0"
-      }
-    },
     {
       "identity" : "swift-system",
       "kind" : "remoteSourceControl",