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

Jump to bottom

Bump Rust Version #174

Merged
merged 3 commits into from
Oct 11, 2023
Merged

Bump Rust Version #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f925b8a
bump the spm and pod to the latest rust
nplasterer Oct 11, 2023
59e96a9
change to has prefix
nplasterer Oct 11, 2023
5a2a1ed
change up the error
nplasterer Oct 11, 2023
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", from: "0.3.0"),
.package(url: "https://github.com/apple/swift-docc-plugin.git", from: "1.0.0"),
.package(url: "https://github.com/xmtp/xmtp-rust-swift", from: "0.3.1-beta0"),
.package(url: "https://github.com/xmtp/xmtp-rust-swift", from: "0.3.5-beta0"),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bumping this for anyone using SPM as well.

],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
Expand Down
4 changes: 2 additions & 2 deletions Sources/XMTP/Codecs/RemoteAttachmentCodec.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public struct RemoteAttachment {

func ensureSchemeMatches() throws {
if !url.hasPrefix(scheme.rawValue) {
throw RemoteAttachmentError.invalidScheme("scheme must be https://")
throw RemoteAttachmentError.invalidScheme("scheme must be https")
}
}

Expand Down Expand Up @@ -174,7 +174,7 @@ public struct RemoteAttachmentCodec: ContentCodec {
throw RemoteAttachmentError.invalidScheme("no scheme parameter")
}

if (!schemeString.starts(with: "https")) {
if (!schemeString.hasPrefix(RemoteAttachment.Scheme.https.rawValue)) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed this to hasPrefix since that seems to be more inline with how swift would do this.

throw RemoteAttachmentError.invalidScheme("invalid scheme value. must start with https")
}

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.5.14-alpha0"
spec.version = "0.6.0-alpha0"
spec.summary = "XMTP SDK Cocoapod"

# This description is used to generate tags and improve search results.
Expand Down Expand Up @@ -44,7 +44,7 @@ Pod::Spec.new do |spec|
spec.dependency "web3.swift"
spec.dependency "GzipSwift"
spec.dependency "Connect-Swift"
spec.dependency 'XMTPRust', '= 0.3.4-beta0'
spec.dependency 'XMTPRust', '= 0.3.5-beta0'

spec.xcconfig = {'VALID_ARCHS' => 'arm64' }
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 @@ -176,8 +176,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/xmtp/xmtp-rust-swift",
"state" : {
"revision" : "4a76e5401fa780c40610e2f0d248f695261d08dd",
"version" : "0.3.1-beta0"
"revision" : "d1aaac47fc7c57645a6fe9e06972b957b3efa33c",
"version" : "0.3.5-beta0"
}
}
],
Expand Down