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

Merge pre libxmtp into main #223

Merged
merged 7 commits into from
Jan 31, 2024
Merged

Merge pre libxmtp into main #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
179233c
Add Key Material Function (#222)
nplasterer Jan 25, 2024
1448b5b
Merge branch 'main' into pre-libxmtp
cameronvoell Jan 29, 2024
a82cc44
Update podspec LibXMTP ref
cameronvoell Jan 30, 2024
6ebb0fb
Update libxmtp-swift refs
cameronvoell Jan 31, 2024
8899561
Update libxmtp-swift ref
cameronvoell Jan 31, 2024
0bad917
Updated libxmtp-swift ref to tagged release
cameronvoell Jan 31, 2024
8873d9c
Update XMTP.podspec version
cameronvoell Jan 31, 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 @@ -26,7 +26,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", revision: "e5d26a4"),
.package(url: "https://github.com/xmtp/libxmtp-swift", revision: "92274fe"),
// .package(path: "../libxmtp-swift")
],
targets: [
Expand Down
9 changes: 9 additions & 0 deletions Sources/XMTPiOS/Conversation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,15 @@ public enum Conversation: Sendable {
return conversationV2.peerAddress
}
}

public var keyMaterial: Data? {
switch self {
case let .v1(conversationV1):
return nil
case let .v2(conversationV2):
return conversationV2.keyMaterial
}
}

/// An optional string that can specify a different context for a conversation with another account address.
///
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.7.6-alpha0"
spec.version = "0.7.8-alpha0"
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.0.1-timeout0'
spec.dependency 'LibXMTP', '= 0.4.1-beta0'
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" : {
"branch" : "e5d26a4",
"revision" : "e5d26a45966f568829e71cd087952de30234de58"
"branch" : "92274fe",
"revision" : "92274fe0dde1fc7f8f716ebcffa3d252813be56d"
}
},
{
Expand Down
Loading