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.

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

Cocoapods integration #91

Merged
merged 47 commits into from
May 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
7dc3cac
feat: crappy XMTPRustSwift usage
Apr 13, 2023
0f75320
feat: get Rust networking selftest in
Apr 13, 2023
b8a9b91
feat: add gRPC selftest
michaelx11 Apr 14, 2023
085de71
test: grpc test
Apr 14, 2023
2174f24
feat: cleaned up Swift package to use local reference, works great
Apr 15, 2023
6cf43f8
feat: query using gRPC library works
Apr 16, 2023
d39550f
fix: refactor a bit but query still works
Apr 16, 2023
3101d4d
feat: with local_test_only_005 branch, publish/query pass
Apr 16, 2023
163537b
feat: all tests pass with rustClient
Apr 16, 2023
393fd9d
feat: checkpoint - no more GRPC dependency
Apr 16, 2023
c7ac973
Use remote package
neekolas Apr 17, 2023
332eb0a
checkpoint: Getting closer to building, need to fix secp256k1 issues
nakajima Apr 18, 2023
44395a0
wip: commit code calling secp256k1
Apr 18, 2023
35d5688
wip
nakajima Apr 18, 2023
58e893c
wip
nakajima Apr 18, 2023
c3c35fa
Bring in the proto types for now
nakajima Apr 18, 2023
c49e68a
Make version match XMTPRust
nakajima Apr 18, 2023
d484e5e
add swift version
nakajima Apr 18, 2023
a8b13dd
wip
nakajima Apr 19, 2023
bfcc8ea
Integrate xmtp-rust-swift 0.2.0-beta0 (#97)
nakajima May 8, 2023
25353ef
Use Buf to generate proto code (#93)
neekolas May 9, 2023
2b32f5c
fix: remove proto dependency from Package.swift (#101)
michaelx11 May 11, 2023
9201979
fix: local tests failing due to improper mem copying, .bytes extensio…
michaelx11 May 15, 2023
1427b3d
fix: use exact secp256k1 version
May 15, 2023
22f8783
fix: utilize QueryResponse paging info
May 15, 2023
5e97876
fix: use 0.2.2-beta0 XMTPRust
May 15, 2023
76eb443
feat: prep for 0.2.0-alpha0 test release
May 15, 2023
a0b8296
fix: commit updated dependency manifests
May 16, 2023
f47d7e2
fix: make sure to return cursor information from response
May 16, 2023
b1e88e1
style: fix indent in the ApiClient.swift file
May 16, 2023
ff3f48f
test: remove empty no-op gRPC test
May 16, 2023
d531da9
style: fix indents and remove imports
May 16, 2023
8dc40f0
fix: remove unnecessary Data extension and replace with existing for …
May 16, 2023
827e985
test: add a PaginationTest class
May 16, 2023
7c91dfd
test: need to do unused client initializations to upload contact bundles
May 17, 2023
e924c02
fix: remove unnecessary comment and remaining unneeded Data<>RustVec …
May 17, 2023
3f521e2
docs: add comment and flush out podspec description
May 17, 2023
8e90581
style: add spaces to example podfile
May 17, 2023
4e74ede
test: remove extraneous takesAWallet test
May 17, 2023
6221b69
test: remove unnecessary test lines in TestHelper
May 17, 2023
e5dff28
docs: fix comment about empty PublishResponse
May 17, 2023
bca5e5a
test: fix pagination test race condition with duplicate convos
May 17, 2023
9998081
fix: attempt to see if xcode cloud works without cocoapods
May 17, 2023
58e7c3f
fix: attempt to revert example app to main
May 17, 2023
4bbe200
fix: updated Package.resolved
May 18, 2023
1871cde
fix: delete unnecessary new schemes that are missing from main
May 18, 2023
322fc06
test: pagination tests should be local node only
May 18, 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
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
XMTPiOSExample/Pods/
XMTPiOSExample/build

.DS_Store
/.build
/Packages
Expand All @@ -8,5 +11,5 @@ DerivedData/
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
.netrc

Package.resolved
.vscode
XMTPiOSExample/Pods
3 changes: 3 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
excluded:
- Sources/XMTP/Proto

disabled_rules: # rule identifiers turned on by default to exclude from running
- type_name
- identifier_name
Expand Down
14 changes: 12 additions & 2 deletions .swiftpm/xcode/xcshareddata/xcschemes/XMTP.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,24 @@
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
selectedDebuggerIdentifier = ""
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A628198E292DC825004B9117"
BuildableName = "XMTPiOSExample.app"
BlueprintName = "XMTPiOSExample"
ReferencedContainer = "container:XMTPiOSExample/XMTPiOSExample.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
158 changes: 158 additions & 0 deletions Package.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
{
"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" : "6f5afc57f44a3ed15b9a01381ce73f84d15e43db",
"version" : "0.3.0"
}
},
{
"identity" : "generic-json-swift",
"kind" : "remoteSourceControl",
"location" : "https://github.com/zoul/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" : "secp256k1.swift",
"kind" : "remoteSourceControl",
"location" : "https://github.com/GigaBitcoin/secp256k1.swift.git",
"state" : {
"revision" : "48fb20fce4ca3aad89180448a127d5bc16f0e44c",
"version" : "0.10.0"
}
},
{
"identity" : "swift-atomics",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-atomics.git",
"state" : {
"revision" : "919eb1d83e02121cdb434c7bfc1f0c66ef17febe",
"version" : "1.0.2"
}
},
{
"identity" : "swift-collections",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-collections.git",
"state" : {
"revision" : "f504716c27d2e5d4144fa4794b12129301d17729",
"version" : "1.0.3"
}
},
{
"identity" : "swift-docc-plugin",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-docc-plugin.git",
"state" : {
"revision" : "9b1258905c21fc1b97bf03d1b4ca12c4ec4e5fda",
"version" : "1.2.0"
}
},
{
"identity" : "swift-docc-symbolkit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-docc-symbolkit",
"state" : {
"revision" : "b45d1f2ed151d057b54504d653e0da5552844e34",
"version" : "1.0.0"
}
},
{
"identity" : "swift-log",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-log.git",
"state" : {
"revision" : "6fe203dc33195667ce1759bf0182975e4653ba1c",
"version" : "1.4.4"
}
},
{
"identity" : "swift-nio",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio.git",
"state" : {
"revision" : "edfceecba13d68c1c993382806e72f7e96feaa86",
"version" : "2.44.0"
}
},
{
"identity" : "swift-nio-ssl",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-ssl.git",
"state" : {
"revision" : "4fb7ead803e38949eb1d6fabb849206a72c580f3",
"version" : "2.23.0"
}
},
{
"identity" : "swift-nio-transport-services",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-transport-services.git",
"state" : {
"revision" : "c0d9a144cfaec8d3d596aadde3039286a266c15c",
"version" : "1.15.0"
}
},
{
"identity" : "swift-protobuf",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-protobuf.git",
"state" : {
"revision" : "ab3a58b7209a17d781c0d1dbb3e1ff3da306bae8",
"version" : "1.20.3"
}
},
{
"identity" : "web3.swift",
"kind" : "remoteSourceControl",
"location" : "https://github.com/argentlabs/web3.swift",
"state" : {
"revision" : "9da09d639d4e5d06eb59518e636b3ae957e8e9cd",
"version" : "1.3.0"
}
},
{
"identity" : "websocket-kit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/vapor/websocket-kit.git",
"state" : {
"revision" : "2d9d2188a08eef4a869d368daab21b3c08510991",
"version" : "2.6.1"
}
},
{
"identity" : "xmtp-rust-swift",
"kind" : "remoteSourceControl",
"location" : "https://github.com/xmtp/xmtp-rust-swift",
"state" : {
"revision" : "eccfc16bb8f866857ecbb1604c1dab855b1960f7",
"version" : "0.2.2-beta0"
}
}
],
"version" : 2
}
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,24 @@ let package = Package(
// Dependencies declare other packages that this package depends on.
// .package(url: /* package url */, from: "1.0.0"),

.package(url: "https://github.com/xmtp/proto", branch: "main"),
.package(url: "https://github.com/GigaBitcoin/secp256k1.swift.git", exact: "0.10.0"),
.package(url: "https://github.com/argentlabs/web3.swift", from: "1.1.0"),
.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.2.2-beta0"),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
// Targets can depend on other targets in this package, and on products in packages this package depends on.
.target(
name: "XMTP",
dependencies: [
.product(name: "XMTPProto", package: "proto"),
.product(name: "secp256k1", package: "secp256k1.swift"),
"web3.swift",
.product(name: "Gzip", package: "GzipSwift"),
.product(name: "Connect", package: "connect-swift"),
.product(name: "XMTPRust", package: "xmtp-rust-swift"),
]
),
.target(
Expand Down
Loading