Merge pull request #367 from xmtp/np/pull-main-beta

Pull main into beta
xmtp · Apr 18, 2024 · 1918078 · 1918078
2 parents f9c3a5f + 41a5463
commit 1918078
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -98,11 +98,10 @@ repositories {
 dependencies {
   implementation project(':expo-modules-core')
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
-  implementation "org.xmtp:android:0.10.0"
+  implementation "org.xmtp:android:0.10.4"
   implementation 'com.google.code.gson:gson:2.10.1'
   implementation 'com.facebook.react:react-native:0.71.3'
   implementation "com.daveanthonythomas.moshipack:moshipack:1.0.1"
-  implementation "org.xmtp:android:0.10.0"
   // xmtp-android local testing setup below (comment org.xmtp:android above)
   // implementation files('<PATH TO XMTP-ANDROID>/xmtp-android/library/build/outputs/aar/library-debug.aar')
   // implementation 'com.google.crypto.tink:tink-android:1.7.0'

diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -56,7 +56,7 @@ PODS:
     - hermes-engine/Pre-built (= 0.71.14)
   - hermes-engine/Pre-built (0.71.14)
   - libevent (2.1.12)
-  - LibXMTP (0.4.3-beta5)
+  - LibXMTP (0.4.4-beta2)
   - Logging (1.0.0)
   - MessagePacker (0.4.7)
   - MMKV (1.3.4):
@@ -449,16 +449,16 @@ PODS:
     - GenericJSON (~> 2.0)
     - Logging (~> 1.0.0)
     - secp256k1.swift (~> 0.1)
-  - XMTP (0.10.1):
+  - XMTP (0.10.3):
     - Connect-Swift (= 0.12.0)
     - GzipSwift
-    - LibXMTP (= 0.4.3-beta5)
+    - LibXMTP (= 0.4.4-beta2)
     - web3.swift
   - XMTPReactNative (0.1.0):
     - ExpoModulesCore
     - MessagePacker
     - secp256k1.swift
-    - XMTP (= 0.10.1)
+    - XMTP (= 0.10.3)
   - Yoga (1.14.0)
 
 DEPENDENCIES:
@@ -711,7 +711,7 @@ SPEC CHECKSUMS:
   GzipSwift: 893f3e48e597a1a4f62fafcb6514220fcf8287fa
   hermes-engine: d7cc127932c89c53374452d6f93473f1970d8e88
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
-  LibXMTP: 9580b03bff217acb4f173c08cd55cf5935d4f3f3
+  LibXMTP: 0c073613451e3850bfcaaab5438b481fe887cd97
   Logging: 9ef4ecb546ad3169398d5a723bc9bea1c46bef26
   MessagePacker: ab2fe250e86ea7aedd1a9ee47a37083edd41fd02
   MMKV: ed58ad794b3f88c24d604a5b74f3fba17fcbaf74
@@ -763,8 +763,8 @@ SPEC CHECKSUMS:
   secp256k1.swift: a7e7a214f6db6ce5db32cc6b2b45e5c4dd633634
   SwiftProtobuf: 407a385e97fd206c4fbe880cc84123989167e0d1
   web3.swift: 2263d1e12e121b2c42ffb63a5a7beb1acaf33959
-  XMTP: 28a385a7390d5df8f39f02c0615dc2ccb11bbbc9
-  XMTPReactNative: a0a01706e94fd35763204cbd6f4d3a43c1a244df
+  XMTP: bf00ef58d4fbcc8ab740145a6303591adf3fb355
+  XMTPReactNative: fae44562e5e457c66fde8e2613e1dfd3c1a71113
   Yoga: e71803b4c1fff832ccf9b92541e00f9b873119b9
 
 PODFILE CHECKSUM: 95d6ace79946933ecf80684613842ee553dd76a2

diff --git a/ios/XMTPModule.swift b/ios/XMTPModule.swift
@@ -890,7 +890,7 @@ public class XMTPModule: Module {
 			}
 			let consentList = try await client.contacts.refreshConsentList()
 
-			return try consentList.entries.compactMap { entry in
+			return try await consentList.entriesManager.map.compactMap { entry in
 				try ConsentWrapper.encode(entry.value)
 			}
 		}
@@ -906,7 +906,7 @@ public class XMTPModule: Module {
 			guard let client = await clientsManager.getClient(key: clientAddress) else {
 				throw Error.noClient
 			}
-			let entries = await client.contacts.consentList.entries
+			let entries = await client.contacts.consentList.entriesManager.map
 
 			return try entries.compactMap { entry in
 				try ConsentWrapper.encode(entry.value)

diff --git a/ios/XMTPReactNative.podspec b/ios/XMTPReactNative.podspec
@@ -26,5 +26,5 @@ Pod::Spec.new do |s|
   s.source_files = "**/*.{h,m,swift}"
   s.dependency 'secp256k1.swift'
 	s.dependency "MessagePacker"
-  s.dependency "XMTP", "= 0.10.1"
+  s.dependency "XMTP", "= 0.10.3"
 end