From 5306544a07eb987aace74e1398712d8fec835d3d Mon Sep 17 00:00:00 2001 From: Naomi Plasterer Date: Fri, 8 Mar 2024 07:09:13 -0800 Subject: [PATCH 1/2] revert the latest rust bump --- Package.swift | 2 +- Tests/XMTPTests/GroupTests.swift | 7 +------ XMTP.podspec | 4 ++-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Package.swift b/Package.swift index 24ac6974..d0861074 100644 --- 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.3.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.2-beta5"), + .package(url: "https://github.com/xmtp/libxmtp-swift", exact: "0.4.2-beta4"), ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. diff --git a/Tests/XMTPTests/GroupTests.swift b/Tests/XMTPTests/GroupTests.swift index b8f8fc69..053125d6 100644 --- a/Tests/XMTPTests/GroupTests.swift +++ b/Tests/XMTPTests/GroupTests.swift @@ -432,7 +432,7 @@ class GroupTests: XCTestCase { let fixtures = try await localFixtures() let expectation1 = expectation(description: "got a conversation") - expectation1.expectedFulfillmentCount = 4 + expectation1.expectedFulfillmentCount = 2 let convo = try await fixtures.bobClient.conversations.newConversation(with: fixtures.alice.address) let group = try await fixtures.bobClient.conversations.newGroup(with: [fixtures.alice.address]) try await fixtures.aliceClient.conversations.sync() @@ -444,11 +444,6 @@ class GroupTests: XCTestCase { _ = try await group.send(content: "hi") _ = try await convo.send(content: "hi") - let group2 = try await fixtures.fredClient.conversations.newGroup(with: [fixtures.alice.address]) - let convo2 = try await fixtures.fredClient.conversations.newConversation(with: fixtures.alice.address) - - _ = try await group2.send(content: "hi") - _ = try await convo2.send(content: "hi") await waitForExpectations(timeout: 3) } diff --git a/XMTP.podspec b/XMTP.podspec index 7426e97b..3d2de512 100644 --- a/XMTP.podspec +++ b/XMTP.podspec @@ -16,7 +16,7 @@ Pod::Spec.new do |spec| # spec.name = "XMTP" - spec.version = "0.8.16" + spec.version = "0.8.17" 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.3.0" - spec.dependency 'LibXMTP', '= 0.4.2-beta5' + spec.dependency 'LibXMTP', '= 0.4.2-beta4' end From b2c769c1189a6bfa30cebf9b29438a711d85b974 Mon Sep 17 00:00:00 2001 From: Naomi Plasterer Date: Fri, 8 Mar 2024 07:17:36 -0800 Subject: [PATCH 2/2] fix up the tests --- Tests/XMTPTests/GroupTests.swift | 8 +------- .../xcshareddata/swiftpm/Package.resolved | 4 ++-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Tests/XMTPTests/GroupTests.swift b/Tests/XMTPTests/GroupTests.swift index 053125d6..8299075c 100644 --- a/Tests/XMTPTests/GroupTests.swift +++ b/Tests/XMTPTests/GroupTests.swift @@ -452,7 +452,7 @@ class GroupTests: XCTestCase { let fixtures = try await localFixtures() let expectation1 = expectation(description: "got a conversation") - expectation1.expectedFulfillmentCount = 4 + expectation1.expectedFulfillmentCount = 2 let convo = try await fixtures.bobClient.conversations.newConversation(with: fixtures.alice.address) let group = try await fixtures.bobClient.conversations.newGroup(with: [fixtures.alice.address]) try await fixtures.aliceClient.conversations.sync() @@ -464,12 +464,6 @@ class GroupTests: XCTestCase { _ = try await group.send(content: "hi") _ = try await convo.send(content: "hi") - - let group2 = try await fixtures.fredClient.conversations.newGroup(with: [fixtures.alice.address]) - let convo2 = try await fixtures.fredClient.conversations.newConversation(with: fixtures.alice.address) - - _ = try await group2.send(content: "hi") - _ = try await convo2.send(content: "hi") await waitForExpectations(timeout: 3) } diff --git a/XMTPiOSExample/XMTPiOSExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/XMTPiOSExample/XMTPiOSExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 223ccc01..42929c12 100644 --- a/XMTPiOSExample/XMTPiOSExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/XMTPiOSExample/XMTPiOSExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -59,8 +59,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/xmtp/libxmtp-swift", "state" : { - "revision" : "a4111b1bb5485e7cd0d1606d8e6fde1a4b6a1783", - "version" : "0.4.2-beta5" + "revision" : "28ee27a4ded8b996a74850e366247e9fe51d782a", + "version" : "0.4.2-beta4" } }, {