Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert latest rust bump #279

Merged
merged 2 commits into from
Mar 8, 2024
Merged

Revert latest rust bump #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5306544
revert the latest rust bump
nplasterer Mar 8, 2024
b2c769c
fix up the tests
nplasterer Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
15 changes: 2 additions & 13 deletions Tests/XMTPTests/GroupTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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)
}
Expand All @@ -457,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()
Expand All @@ -469,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)
}
Expand Down
4 changes: 2 additions & 2 deletions XMTP.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions ...xample/XMTPiOSExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
},
{
Expand Down
Loading