resolve conflicts

xmtp · Oct 8, 2024 · 28a2493 · 28a2493
2 parents 6f55da2 + a7f2e3c
commit 28a2493
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 4 deletions.
diff --git a/library/src/main/java/README.md b/library/src/main/java/README.md
@@ -7,12 +7,12 @@ Kotlin code emitted by the `bindings_ffi` crate in [libxmtp](https://github.com/
 1. From repo [libxmtp](https://github.com/xmtp/libxmtp) run the [kotlin release action](https://github.com/xmtp/libxmtp/actions/workflows/release-kotlin-bindings.yml) for the branch you desire 
 2. Create a new branch in the `xmtp-android` repo
    With `libxmtp` repo and `xmtp-android` (this repo) cloned locally in sibling directories, and `libxmtp` checked out to the correct release commit, run the script:
-   `./bindings_ffi/gen_kotlin.sh`
+   `./gen_kotlin.sh` within the `bindings_ffi` folder.
 3. Run format (cmd + opt + l) function to keep the code format consistent and diff small for `xmtp-android/library/src/main/java/xmtpv3.kt`
 4. Navigate to the [latest release](https://github.com/xmtp/libxmtp/releases) once the action completes
 5. Download the `LibXMTPKotlinFFI.zip` assets
 6. Unzip and then copy the jniLibs to `xmtp-android/library/src/main/jniLibs`
 7. All instances of `value.forEach` should be changed to `value.iterator().forEach` to be compatible with API 23
 8. NOTE: sometimes the library name gets updated and will cause failures the library name must be `uniffi_xmtpv3` not `xmtpv3` -- search for `findLibraryName` and make sure the correct name is returned.
 
-You should now be on the latest libxmtp. Tests will fail if the jniLibs do not match the version of xmtpv3.
+You should now be on the latest libxmtp. Tests will fail if the jniLibs do not match the version of xmtpv3.
diff --git a/library/src/main/java/libxmtp-version.txt b/library/src/main/java/libxmtp-version.txt
@@ -1,3 +1,3 @@
-Version: 9f366f20
+Version: 137062e8
 Branch: main
-Date: 2024-10-03 21:05:44 +0000
+Date: 2024-10-08 19:58:58 +0000
diff --git a/library/src/main/jniLibs/arm64-v8a/libuniffi_xmtpv3.so b/library/src/main/jniLibs/arm64-v8a/libuniffi_xmtpv3.so
diff --git a/library/src/main/jniLibs/armeabi-v7a/libuniffi_xmtpv3.so b/library/src/main/jniLibs/armeabi-v7a/libuniffi_xmtpv3.so
diff --git a/library/src/main/jniLibs/x86/libuniffi_xmtpv3.so b/library/src/main/jniLibs/x86/libuniffi_xmtpv3.so
diff --git a/library/src/main/jniLibs/x86_64/libuniffi_xmtpv3.so b/library/src/main/jniLibs/x86_64/libuniffi_xmtpv3.so