Merge branch 'main' into ar/consent-proof

xmtp · Apr 24, 2024 · 8fe877c · 8fe877c
2 parents b4d5369 + 2738783
commit 8fe877c
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 187 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -41,8 +41,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/xmtp/libxmtp-swift",
       "state" : {
-        "revision" : "b129e203957b690cbab91c165af90ddb5fa8bdb5",
-        "version" : "0.4.3-beta3"
+        "revision" : "ef7be90fa325f6b087bcf87b95d4c296c6e0a667",
+        "version" : "0.4.4-beta4"
       }
     },
     {
@@ -140,8 +140,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-protobuf.git",
       "state" : {
-        "revision" : "65e8f29b2d63c4e38e736b25c27b83e012159be8",
-        "version" : "1.25.2"
+        "revision" : "9f0c76544701845ad98716f3f6a774a892152bcb",
+        "version" : "1.26.0"
       }
     },
     {

diff --git a/Package.swift b/Package.swift
@@ -25,7 +25,7 @@ let package = Package(
 		.package(url: "https://github.com/1024jp/GzipSwift", from: "5.2.0"),
 		.package(url: "https://github.com/bufbuild/connect-swift", exact: "0.12.0"),
 		.package(url: "https://github.com/apple/swift-docc-plugin.git", from: "1.0.0"),
-		.package(url: "https://github.com/xmtp/libxmtp-swift", exact: "0.4.4-beta3"),
+		.package(url: "https://github.com/xmtp/libxmtp-swift", exact: "0.4.4-beta4"),
 	],
 	targets: [
 		// Targets are the basic building blocks of a package. A target can define a module or a test suite.

diff --git a/Sources/XMTPiOS/Group.swift b/Sources/XMTPiOS/Group.swift
@@ -110,6 +110,14 @@ public struct Group: Identifiable, Equatable, Hashable {
 	public func removeMembers(addresses: [String]) async throws {
 		try await ffiGroup.removeMembers(accountAddresses: addresses)
 	}
+
+    public func groupName() throws -> String {
+        return try ffiGroup.groupName()
+    }
+
+    public func updateGroupName(groupName: String) async throws {
+        try await ffiGroup.updateGroupName(groupName: groupName)
+    }
 
 	public func processMessage(envelopeBytes: Data) async throws -> DecodedMessage {
 		let message = try await ffiGroup.processStreamedGroupMessage(envelopeBytes: envelopeBytes)

diff --git a/Tests/XMTPTests/GroupTests.swift b/Tests/XMTPTests/GroupTests.swift
@@ -585,4 +585,39 @@ class GroupTests: XCTestCase {
 
 		await waitForExpectations(timeout: 3)
 	}
+
+    func testCanUpdateGroupName() async throws {
+        let fixtures = try await localFixtures()
+        let group = try await fixtures.aliceClient.conversations.newGroup(with: [fixtures.bob.address])
+
+        var groupName = try group.groupName()
+
+        XCTAssertEqual(groupName, "New Group")
+
+        try await group.updateGroupName(groupName: "Test Group Name 1")
+
+        groupName = try group.groupName()
+
+        XCTAssertEqual(groupName, "Test Group Name 1")
+
+        let bobConv = try await fixtures.bobClient.conversations.list(includeGroups: true)[0]
+        let bobGroup: Group;
+        switch bobConv {
+            case .v1(_):
+                XCTFail("failed converting conversation to group")
+                return
+            case .v2(_):
+                XCTFail("failed converting conversation to group")
+                return
+            case .group(let group):
+                bobGroup = group
+        }
+        groupName = try bobGroup.groupName()
+        XCTAssertEqual(groupName, "New Group")
+
+        try await bobGroup.sync()
+        groupName = try bobGroup.groupName()
+
+        XCTAssertEqual(groupName, "Test Group Name 1")
+    }
 }
diff --git a/XMTP.podspec b/XMTP.podspec
@@ -16,7 +16,7 @@ Pod::Spec.new do |spec|
   #
 
   spec.name         = "XMTP"
-  spec.version      = "0.10.5"
+  spec.version      = "0.10.6"
   spec.summary      = "XMTP SDK Cocoapod"
 
   # This description is used to generate tags and improve search results.
@@ -44,5 +44,5 @@ Pod::Spec.new do |spec|
   spec.dependency "web3.swift"
   spec.dependency "GzipSwift"
   spec.dependency "Connect-Swift", "= 0.12.0"
-  spec.dependency 'LibXMTP', '= 0.4.4-beta3'
+  spec.dependency 'LibXMTP', '= 0.4.4-beta4'
 end
diff --git a/...xample/XMTPiOSExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/...xample/XMTPiOSExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,23 +1,5 @@
 {
   "pins" : [
-    {
-      "identity" : "bigint",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/attaswift/BigInt",
-      "state" : {
-        "revision" : "0ed110f7555c34ff468e72e1686e59721f2b0da6",
-        "version" : "5.3.0"
-      }
-    },
-    {
-      "identity" : "connect-swift",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/bufbuild/connect-swift",
-      "state" : {
-        "revision" : "1701d3d1b2c4c63fcccfd7094f86a88672fa5acb",
-        "version" : "0.12.0"
-      }
-    },
     {
       "identity" : "cryptoswift",
       "kind" : "remoteSourceControl",
@@ -27,24 +9,6 @@
         "version" : "1.5.1"
       }
     },
-    {
-      "identity" : "generic-json-swift",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/iwill/generic-json-swift",
-      "state" : {
-        "revision" : "0a06575f4038b504e78ac330913d920f1630f510",
-        "version" : "2.0.2"
-      }
-    },
-    {
-      "identity" : "gzipswift",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/1024jp/GzipSwift",
-      "state" : {
-        "revision" : "7a7f17761c76a932662ab77028a4329f67d645a4",
-        "version" : "5.2.0"
-      }
-    },
     {
       "identity" : "keychainaccess",
       "kind" : "remoteSourceControl",
@@ -54,15 +18,6 @@
         "revision" : "e0c7eebc5a4465a3c4680764f26b7a61f567cdaf"
       }
     },
-    {
-      "identity" : "libxmtp-swift",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/xmtp/libxmtp-swift",
-      "state" : {
-        "revision" : "5326f84ed781f766054f0b4dcceaf8c0cca91d1b",
-        "version" : "0.4.4-beta3"
-      }
-    },
     {
       "identity" : "qrcode",
       "kind" : "remoteSourceControl",
@@ -90,114 +45,6 @@
         "version" : "3.1.2"
       }
     },
-    {
-      "identity" : "swift-atomics",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-atomics.git",
-      "state" : {
-        "revision" : "cd142fd2f64be2100422d658e7411e39489da985",
-        "version" : "1.2.0"
-      }
-    },
-    {
-      "identity" : "swift-collections",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-collections.git",
-      "state" : {
-        "revision" : "a902f1823a7ff3c9ab2fba0f992396b948eda307",
-        "version" : "1.0.5"
-      }
-    },
-    {
-      "identity" : "swift-docc-plugin",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-docc-plugin.git",
-      "state" : {
-        "revision" : "26ac5758409154cc448d7ab82389c520fa8a8247",
-        "version" : "1.3.0"
-      }
-    },
-    {
-      "identity" : "swift-docc-symbolkit",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-docc-symbolkit",
-      "state" : {
-        "revision" : "b45d1f2ed151d057b54504d653e0da5552844e34",
-        "version" : "1.0.0"
-      }
-    },
-    {
-      "identity" : "swift-http-types",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-http-types",
-      "state" : {
-        "revision" : "99d066e29effa8845e4761dd3f2f831edfdf8925",
-        "version" : "1.0.0"
-      }
-    },
-    {
-      "identity" : "swift-log",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-log.git",
-      "state" : {
-        "revision" : "532d8b529501fb73a2455b179e0bbb6d49b652ed",
-        "version" : "1.5.3"
-      }
-    },
-    {
-      "identity" : "swift-nio",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-nio.git",
-      "state" : {
-        "revision" : "fc63f0cf4e55a4597407a9fc95b16a2bc44b4982",
-        "version" : "2.64.0"
-      }
-    },
-    {
-      "identity" : "swift-nio-extras",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-nio-extras.git",
-      "state" : {
-        "revision" : "798c962495593a23fdea0c0c63fd55571d8dff51",
-        "version" : "1.20.0"
-      }
-    },
-    {
-      "identity" : "swift-nio-http2",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-nio-http2.git",
-      "state" : {
-        "revision" : "0904bf0feb5122b7e5c3f15db7df0eabe623dd87",
-        "version" : "1.30.0"
-      }
-    },
-    {
-      "identity" : "swift-nio-ssl",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-nio-ssl.git",
-      "state" : {
-        "revision" : "7c381eb6083542b124a6c18fae742f55001dc2b5",
-        "version" : "2.26.0"
-      }
-    },
-    {
-      "identity" : "swift-nio-transport-services",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-nio-transport-services.git",
-      "state" : {
-        "revision" : "ebf8b9c365a6ce043bf6e6326a04b15589bd285e",
-        "version" : "1.20.0"
-      }
-    },
-    {
-      "identity" : "swift-protobuf",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-protobuf.git",
-      "state" : {
-        "revision" : "65e8f29b2d63c4e38e736b25c27b83e012159be8",
-        "version" : "1.25.2"
-      }
-    },
     {
       "identity" : "swift-qrcode-generator",
       "kind" : "remoteSourceControl",
@@ -207,15 +54,6 @@
         "version" : "1.0.3"
       }
     },
-    {
-      "identity" : "swift-system",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-system.git",
-      "state" : {
-        "revision" : "025bcb1165deab2e20d4eaba79967ce73013f496",
-        "version" : "1.2.1"
-      }
-    },
     {
       "identity" : "swiftimagereadwrite",
       "kind" : "remoteSourceControl",
@@ -242,24 +80,6 @@
         "revision" : "addf9a3688ef5e5d9d148ecbb30ca0fd3132b908",
         "version" : "1.9.8"
       }
-    },
-    {
-      "identity" : "web3.swift",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/argentlabs/web3.swift",
-      "state" : {
-        "revision" : "8ca33e700ed8de6137a0e1471017aa3b3c8de0db",
-        "version" : "1.6.0"
-      }
-    },
-    {
-      "identity" : "websocket-kit",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/vapor/websocket-kit.git",
-      "state" : {
-        "revision" : "53fe0639a98903858d0196b699720decb42aee7b",
-        "version" : "2.14.0"
-      }
     }
   ],
   "version" : 2