Skip to content

Commit

Permalink
update ios ref
Browse files Browse the repository at this point in the history
  • Loading branch information
cameronvoell committed Feb 14, 2025
1 parent 39eb4cc commit a11fd22
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 16 deletions.
4 changes: 4 additions & 0 deletions example/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ target 'xmtpreactnativesdkexample' do
# See https://github.com/margelo/react-native-quick-crypto/issues/189#issuecomment-1711561970
pod "OpenSSL-Universal", "1.1.2200"

# Override XMTP pod to use specific commit
pod 'XMTP', :git => 'https://github.com/xmtp/xmtp-ios.git', :commit => '77940ee4790390154248d0fed0a2d5316fd99b3b'


use_react_native!(
:path => config[:reactNativePath],
:hermes_enabled => podfile_properties['expo.jsEngine'] == nil || podfile_properties['expo.jsEngine'] == 'hermes',
Expand Down
30 changes: 19 additions & 11 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ PODS:
- hermes-engine/Pre-built (= 0.71.14)
- hermes-engine/Pre-built (0.71.14)
- libevent (2.1.12)
- LibXMTP (3.0.24)
- LibXMTP (3.0.26)
- MessagePacker (0.4.7)
- MMKV (2.0.2):
- MMKVCore (~> 2.0.2)
Expand Down Expand Up @@ -448,18 +448,18 @@ PODS:
- SQLCipher/standard (4.5.7):
- SQLCipher/common
- SwiftProtobuf (1.28.2)
- XMTP (3.0.28):
- XMTP (3.0.29):
- Connect-Swift (= 1.0.0)
- CryptoSwift (= 1.8.3)
- CSecp256k1 (~> 0.2)
- LibXMTP (= 3.0.24)
- LibXMTP (= 3.0.26)
- SQLCipher (= 4.5.7)
- XMTPReactNative (3.1.11):
- XMTPReactNative (3.1.12):
- CSecp256k1 (~> 0.2)
- ExpoModulesCore
- MessagePacker
- SQLCipher (= 4.5.7)
- XMTP (= 3.0.28)
- XMTP (= 3.0.29)
- Yoga (1.14.0)

DEPENDENCIES:
Expand Down Expand Up @@ -530,6 +530,7 @@ DEPENDENCIES:
- RNFS (from `../node_modules/react-native-fs`)
- RNScreens (from `../node_modules/react-native-screens`)
- RNSVG (from `../node_modules/react-native-svg`)
- XMTP (from `https://github.com/xmtp/xmtp-ios.git`, commit `77940ee4790390154248d0fed0a2d5316fd99b3b`)
- XMTPReactNative (from `../../ios`)
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)

Expand All @@ -548,7 +549,6 @@ SPEC REPOS:
- OpenSSL-Universal
- SQLCipher
- SwiftProtobuf
- XMTP

EXTERNAL SOURCES:
boost:
Expand Down Expand Up @@ -679,13 +679,21 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native-screens"
RNSVG:
:path: "../node_modules/react-native-svg"
XMTP:
:commit: 77940ee4790390154248d0fed0a2d5316fd99b3b
:git: https://github.com/xmtp/xmtp-ios.git
XMTPReactNative:
:path: "../../ios"
Yoga:
:path: "../node_modules/react-native/ReactCommon/yoga"

CHECKOUT OPTIONS:
XMTP:
:commit: 77940ee4790390154248d0fed0a2d5316fd99b3b
:git: https://github.com/xmtp/xmtp-ios.git

SPEC CHECKSUMS:
boost: 57d2868c099736d80fcd648bf211b4431e51a558
boost: 7dcd2de282d72e344012f7d6564d024930a6a440
CoinbaseWalletSDK: ea1f37512bbc69ebe07416e3b29bf840f5cc3152
CoinbaseWalletSDKExpo: c79420eb009f482f768c23b6768fc5b2d7c98777
Connect-Swift: 84e043b904f63dc93a2c01c6c125da25e765b50d
Expand All @@ -711,7 +719,7 @@ SPEC CHECKSUMS:
glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
hermes-engine: d7cc127932c89c53374452d6f93473f1970d8e88
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
LibXMTP: e4e1c00d52e8e52599a26859d0bbaba2ffe21e77
LibXMTP: e80c8c226e67d8c820e81c5a2bfa1934ab5d263c
MessagePacker: ab2fe250e86ea7aedd1a9ee47a37083edd41fd02
MMKV: 3eacda84cd1c4fc95cf848d3ecb69d85ed56006c
MMKVCore: 508b4d3a8ce031f1b5c8bd235f0517fb3f4c73a9
Expand Down Expand Up @@ -762,10 +770,10 @@ SPEC CHECKSUMS:
RNSVG: d00c8f91c3cbf6d476451313a18f04d220d4f396
SQLCipher: 5e6bfb47323635c8b657b1b27d25c5f1baf63bf5
SwiftProtobuf: 4dbaffec76a39a8dc5da23b40af1a5dc01a4c02d
XMTP: 569955fba75477fe6fa1dadbc33e097e425f03ce
XMTPReactNative: aa9f398f42d888439ff58c1fab653d0c42bdd27c
XMTP: 5815a5886b5a698e910d7eb49c11681e9001c931
XMTPReactNative: 68152197c8135a6e0fe03637e7cde6bdd896d75c
Yoga: e71803b4c1fff832ccf9b92541e00f9b873119b9

PODFILE CHECKSUM: 0e6fe50018f34e575d38dc6a1fdf1f99c9596cdd
PODFILE CHECKSUM: bb988e1a087fa2d3c0bc34c187128b2c7c6b2e58

COCOAPODS: 1.15.2
7 changes: 3 additions & 4 deletions example/src/tests/contentTypeTests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ test('multi remote attachments should work', async () => {

await delayToPropogate()

// // Now we should see the remote attachment message.
// Now we should see the remote attachment message.
const messages = await convo.messages()
if (messages.length !== 1) {
throw new Error('Expected 1 message')
Expand All @@ -387,7 +387,7 @@ test('multi remote attachments should work', async () => {
throw new Error('Expected correctly formatted typeId')
}
if (!message.content()) {
throw new Error('Expected remoteAttachment')
throw new Error('Expected multiRemoteAttachment')
}

const multiRemoteAttachment =
Expand All @@ -405,7 +405,7 @@ test('multi remote attachments should work', async () => {
'Expected url to match'
)

// // Show how when we can convert a multiRemoteAttachment back into decrypted encoded content
// Show how when we can convert a multiRemoteAttachment back into decrypted encoded content

Check warning on line 408 in example/src/tests/contentTypeTests.ts

View workflow job for this annotation

GitHub Actions / lint

Insert `·`

const files: string[] = []
for (const attachment of multiRemoteAttachment.attachments) {
Expand Down Expand Up @@ -435,7 +435,6 @@ test('multi remote attachments should work', async () => {
'utf8'
)
files.push(text)
// break;
}

assert(files[0] === 'hello world 1', 'Expected text to match')
Expand Down
2 changes: 1 addition & 1 deletion ios/XMTPReactNative.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Pod::Spec.new do |s|
s.source_files = "**/*.{h,m,swift}"

s.dependency "MessagePacker"
s.dependency "XMTP", "= 3.0.28"
s.dependency "XMTP", "= 3.0.29"
s.dependency 'CSecp256k1', '~> 0.2'
s.dependency "SQLCipher", "= 4.5.7"
end

0 comments on commit a11fd22

Please sign in to comment.