From 64d850f04c0e1cf0105cafd8c0d6a4a3ed6857e9 Mon Sep 17 00:00:00 2001 From: kele-leanes Date: Wed, 17 Jan 2024 12:23:41 -0300 Subject: [PATCH 1/3] Update XMTP dependency version to 0.7.6-alpha0 --- ios/XMTPReactNative.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/XMTPReactNative.podspec b/ios/XMTPReactNative.podspec index 03b6f12d8..80abd67ad 100644 --- 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.7.5-alpha0" + s.dependency "XMTP", "= 0.7.6-alpha0" end From ced7d508e98295a5d186a58b7bfa7ea086121b01 Mon Sep 17 00:00:00 2001 From: kele-leanes Date: Wed, 17 Jan 2024 12:30:20 -0300 Subject: [PATCH 2/3] Update org.xmtp:android dependency to version 0.7.4 --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 121aaac24..047ab05bf 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -98,7 +98,7 @@ repositories { dependencies { implementation project(':expo-modules-core') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}" - implementation "org.xmtp:android:0.7.3" + implementation "org.xmtp:android:0.7.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" From 06d9ff9a7c30a66ee8fe680ac3e36989b8bac3ed Mon Sep 17 00:00:00 2001 From: Naomi Plasterer Date: Thu, 18 Jan 2024 14:00:41 -0800 Subject: [PATCH 3/3] fix: bump both to latest versions --- android/build.gradle | 2 +- .../expo/modules/xmtpreactnativesdk/XMTPModule.kt | 13 ++++++------- example/ios/Podfile.lock | 8 ++++---- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 047ab05bf..3c1817e5c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -98,7 +98,7 @@ repositories { dependencies { implementation project(':expo-modules-core') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}" - implementation "org.xmtp:android:0.7.4" + implementation "org.xmtp:android:0.7.5" 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" diff --git a/android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt b/android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt index d235ed027..4e79d8979 100644 --- a/android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt +++ b/android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt @@ -26,7 +26,6 @@ import kotlinx.coroutines.suspendCancellableCoroutine import org.json.JSONObject import org.xmtp.android.library.Client import org.xmtp.android.library.ClientOptions -import org.xmtp.android.library.ConsentState import org.xmtp.android.library.Conversation import org.xmtp.android.library.PreEventCallback import org.xmtp.android.library.PreparedMessage @@ -156,9 +155,9 @@ class XMTPModule : Module() { val reactSigner = ReactNativeSigner(module = this@XMTPModule, address = address) signer = reactSigner - if (hasCreateIdentityCallback == true) + if (hasCreateIdentityCallback == true) preCreateIdentityCallbackDeferred = CompletableDeferred() - if (hasEnableIdentityCallback == true) + if (hasEnableIdentityCallback == true) preEnableIdentityCallbackDeferred = CompletableDeferred() val preCreateIdentityCallback: PreEventCallback? = preCreateIdentityCallback.takeIf { hasCreateIdentityCallback == true } @@ -185,9 +184,9 @@ class XMTPModule : Module() { logV("createRandom") val privateKey = PrivateKeyBuilder() - if (hasCreateIdentityCallback == true) + if (hasCreateIdentityCallback == true) preCreateIdentityCallbackDeferred = CompletableDeferred() - if (hasEnableIdentityCallback == true) + if (hasEnableIdentityCallback == true) preEnableIdentityCallbackDeferred = CompletableDeferred() val preCreateIdentityCallback: PreEventCallback? = preCreateIdentityCallback.takeIf { hasCreateIdentityCallback == true } @@ -476,7 +475,7 @@ class XMTPModule : Module() { } } val encodedContent = EncodedContent.parseFrom(encodedContentDataBytes) - + val prepared = conversation.prepareMessage( encodedContent = encodedContent, ) @@ -643,7 +642,7 @@ class XMTPModule : Module() { preCreateIdentityCallbackDeferred?.complete(Unit) } - Function("preEnableIdentityCallbackCompleted") { + Function("preEnableIdentityCallbackCompleted") { logV("preEnableIdentityCallbackCompleted") preEnableIdentityCallbackDeferred?.complete(Unit) } diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index b7f326bc8..0f6f7fe92 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -411,7 +411,7 @@ PODS: - GenericJSON (~> 2.0) - Logging (~> 1.0.0) - secp256k1.swift (~> 0.1) - - XMTP (0.7.5-alpha0): + - XMTP (0.7.6-alpha0): - Connect-Swift (= 0.3.0) - GzipSwift - web3.swift @@ -420,7 +420,7 @@ PODS: - ExpoModulesCore - MessagePacker - secp256k1.swift - - XMTP (= 0.7.5-alpha0) + - XMTP (= 0.7.6-alpha0) - XMTPRust (0.3.7-beta0) - Yoga (1.14.0) @@ -668,8 +668,8 @@ SPEC CHECKSUMS: secp256k1.swift: a7e7a214f6db6ce5db32cc6b2b45e5c4dd633634 SwiftProtobuf: b02b5075dcf60c9f5f403000b3b0c202a11b6ae1 web3.swift: 2263d1e12e121b2c42ffb63a5a7beb1acaf33959 - XMTP: aa137f3c8ac7b61ecfb3de0973f2dc2e672a9ec1 - XMTPReactNative: e4a325b0b51dedf1a2785cad53ca3bceb1149b86 + XMTP: 61788f11954c6f5fdc01ad585c5b0f756f02cb0e + XMTPReactNative: 0c00005c08b587cff9a6c16123da1f97ecc3edd5 XMTPRust: 8848a2ba761b2c961d666632f2ad27d1082faa93 Yoga: e71803b4c1fff832ccf9b92541e00f9b873119b9