Squashed commit of the following:

commit ffb40f2
Author: Nicholas Molnar <65710+neekolas@users.noreply.github.com>
Date:   Thu Feb 5 14:08:38 2026 -0800

    Prerelease releases

commit f868a82
Merge: 0724e8b fc4c27b
Author: Nicholas Molnar <65710+neekolas@users.noreply.github.com>
Date:   Thu Feb 5 14:08:02 2026 -0800

    Merge branch 'nm/android-release-testing' of github.com:xmtp/libxmtp into nm/android-release-testing

commit 0724e8b
Author: Nicholas Molnar <65710+neekolas@users.noreply.github.com>
Date:   Thu Feb 5 13:31:17 2026 -0800

    Normalize versions

commit fc4c27b
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Date:   Thu Feb 5 21:22:35 2026 +0000

    release: iOS SDK 4.9.0-dev.02d365e [skip ci]

commit 02d365e
Merge: c273deb 7a88f71
Author: Nicholas Molnar <65710+neekolas@users.noreply.github.com>
Date:   Thu Feb 5 13:16:32 2026 -0800

    Merge branch 'nm/android-release-testing' of github.com:xmtp/libxmtp into nm/android-release-testing

commit c273deb
Author: Nicholas Molnar <65710+neekolas@users.noreply.github.com>
Date:   Thu Feb 5 13:16:10 2026 -0800

    Fix podspec

commit 7a88f71
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Date:   Thu Feb 5 21:15:05 2026 +0000

    release: iOS SDK 4.9.0-dev.4f1b2db-dev.dfd0fb5 [skip ci]

commit dfd0fb5
Author: Nicholas Molnar <65710+neekolas@users.noreply.github.com>
Date:   Thu Feb 5 13:09:43 2026 -0800

    add xmtpv3.swift

commit 42b816c
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Date:   Thu Feb 5 20:49:26 2026 +0000

    release: iOS SDK 4.9.0-dev.4f1b2db [skip ci]

commit 4f1b2db
Author: Nicholas Molnar <65710+neekolas@users.noreply.github.com>
Date:   Thu Feb 5 12:40:02 2026 -0800

    Switch back to 4.9.0

commit 290d5b3
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Date:   Thu Feb 5 20:09:01 2026 +0000

    release: iOS SDK 4.9.0-dev.9d92e9b [skip ci]

commit 9d92e9b
Author: Nicholas Molnar <65710+neekolas@users.noreply.github.com>
Date:   Thu Feb 5 12:02:50 2026 -0800

    Remove podspec changes

commit fef9be4
Merge: f980cf3 8880538
Author: Nicholas Molnar <65710+neekolas@users.noreply.github.com>
Date:   Thu Feb 5 12:02:16 2026 -0800

    Merge branch 'nm/android-release-testing' of github.com:xmtp/libxmtp into nm/android-release-testing

commit f980cf3
Author: Nicholas Molnar <65710+neekolas@users.noreply.github.com>
Date:   Thu Feb 5 12:00:03 2026 -0800

    Fix permissions

commit 8880538
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Date:   Thu Feb 5 19:43:32 2026 +0000

    release: iOS SDK 4.9.0-dev.50f0f4a [skip ci]

commit 50f0f4a
Author: Nicholas Molnar <65710+neekolas@users.noreply.github.com>
Date:   Thu Feb 5 11:36:30 2026 -0800

    Update podspec

commit 9ded6c5
Merge: 9cf82d4 318fb81
Author: Nicholas Molnar <65710+neekolas@users.noreply.github.com>
Date:   Thu Feb 5 11:35:45 2026 -0800

    Merge branch 'nm/android-release-testing' of github.com:xmtp/libxmtp into nm/android-release-testing

commit 9cf82d4
Author: Nicholas Molnar <65710+neekolas@users.noreply.github.com>
Date:   Thu Feb 5 11:35:14 2026 -0800

    Delete xmtpv3.swift

commit 318fb81
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Date:   Thu Feb 5 19:31:29 2026 +0000

    release: iOS SDK 4.9.0-dev.e2c9b3f [skip ci]

commit e2c9b3f
Author: Nicholas Molnar <65710+neekolas@users.noreply.github.com>
Date:   Thu Feb 5 11:18:51 2026 -0800

    Don't need fetch depth for computing the version

commit 2b16646
Author: Nicholas Molnar <65710+neekolas@users.noreply.github.com>
Date:   Thu Feb 5 11:16:47 2026 -0800

    Fix artifact cleanup

commit 5e4a58a
Merge: 0839c72 719f35e
Author: Nicholas Molnar <65710+neekolas@users.noreply.github.com>
Date:   Thu Feb 5 10:49:35 2026 -0800

    Merge branch 'main' into nm/android-release-testing

commit 719f35e
Author: Dakota Brink <779390+codabrink@users.noreply.github.com>
Date:   Thu Feb 5 13:33:55 2026 -0500

    Add missing indexes (#3121)

    Improve queries on commit log tables and group messages expiry.

    Before:
    <img width="2429" height="1227" alt="image"
    src="https://github.com/user-attachments/assets/2a121cd6-5a6d-45ef-8ac8-c25739d191a6"
    />

    After:
    <img width="1300" height="317" alt="image"
    src="https://github.com/user-attachments/assets/6b10905b-1bbc-4e57-aaa5-92b2f9c322f2"
    />

commit 0839c72
Author: Nicholas Molnar <65710+neekolas@users.noreply.github.com>
Date:   Thu Feb 5 10:23:08 2026 -0800

    Update Cargo.toml package version

commit df7ae78
Author: Dakota Brink <779390+codabrink@users.noreply.github.com>
Date:   Thu Feb 5 13:07:50 2026 -0500

    Fix Metric Timeouts (#3131)

    Metrics would by default wait for either a notify or a timeout to
    resolve. But the notify would never come if the condition was already
    met. This creates a future that resolves instantly if the condition is
    already met, avoiding timeouts on WASM test that are metric check-heavy.

commit 6f88529
Author: Nicholas Molnar <65710+neekolas@users.noreply.github.com>
Date:   Thu Feb 5 07:51:23 2026 -0800

    fix(android): update SDK for new FFI bindings API

    ## Summary

    Fixed all Android SDK build errors caused by API changes in the uniffi bindings.

    ### Changes Made

    **7 files modified:**

    | File | Changes |
    |------|---------|
    | **Client.kt** | Added `DbOptions` import; wrapped `db` and `encryptionKey` parameters in `DbOptions` record for both ephemeral and real client creation |
    | **Conversations.kt** | Changed `FfiSubscribeException` → `FfiException`; renamed `createGroup()` → `createGroupByIdentity()` for identity-based calls; renamed `createGroupWithInboxIds()` → `createGroup()` for inbox ID calls; renamed `findOrCreateDm()` → `findOrCreateDmByIdentity()` for identity-based calls; renamed `findOrCreateDmByInboxId()` → `findOrCreateDm()` for inbox ID calls |
    | **Dm.kt** | Changed `FfiSubscribeException` → `FfiException` in callback |
    | **Group.kt** | Changed `FfiSubscribeException` → `FfiException`; renamed `addMembers()` → `addMembersByIdentity()` for identity-based calls; renamed `removeMembers()` → `removeMembersByIdentity()` for identity-based calls; renamed `addMembersByInboxId()` → `addMembers()` for inbox ID calls; renamed `removeMembersByInboxId()` → `removeMembers()` for inbox ID calls |
    | **PrivatePreferences.kt** | Changed `FfiSubscribeException` → `FfiException` in callbacks |
    | **MultiRemoteAttachmentCodec.kt** | Changed `FfiRemoteAttachmentInfo` → `FfiRemoteAttachment` |
    | **DecodedMessageV2.kt** | Removed unused `FfiRemoteAttachmentInfo` import; changed `mapRemoteAttachmentInfo` parameter type to `FfiRemoteAttachment`; fixed nullable `contentLength` field |

    **Additional changes:**
    - Applied `spotlessApply` to fix code formatting
    - Updated lint baseline to account for pre-existing NewApi warnings in generated uniffi bindings

commit 3a3ab20
Author: Nicholas Molnar <65710+neekolas@users.noreply.github.com>
Date:   Thu Feb 5 00:45:23 2026 -0800

    fix(release-tools): address code review findings

    - Add fetch-depth to compute-version checkout for consistency
    - Make gradle.properties regex handle whitespace around equals
    - Add Android support to publish-release.yml workflow
    - Add test for whitespace handling

Author: neekolas

.github/actions/setup-release-tools/action.yml

@@ -0,0 +1,26 @@
+name: "Setup Release Tools"
+description: "Install release tools and make xmtp-release available in PATH"
+runs:
+  using: "composite"
+  steps:
+    - uses: ./.github/actions/setup-node
+    - name: Install release tools
+      working-directory: dev/release-tools
+      shell: bash
+      run: yarn install
+    - name: Add xmtp-release to PATH
+      shell: bash
+      run: |
+        BIN_DIR="$RUNNER_TEMP/xmtp-release-bin"
+        mkdir -p "$BIN_DIR"
+        cat > "$BIN_DIR/xmtp-release" << 'WRAPPER'
+        #!/usr/bin/env bash
+        cd "$GITHUB_WORKSPACE/dev/release-tools" && exec yarn cli "$@"
+        WRAPPER
+        chmod +x "$BIN_DIR/xmtp-release"
+        echo "$BIN_DIR" >> "$GITHUB_PATH"
+    - name: Configure git user
+      shell: bash
+      run: |
+        git config user.name "github-actions[bot]"
+        git config user.email "github-actions[bot]@users.noreply.github.com"

.github/workflows/create-release-branch.yml

@@ -45,10 +45,7 @@ jobs:
         with:
           ref: ${{ inputs.base-ref }}
           fetch-depth: 0
-      - uses: ./.github/actions/setup-node
-      - name: Install release tools
-        working-directory: dev/release-tools
-        run: yarn install
+      - uses: ./.github/actions/setup-release-tools
       - name: Create release branch
         env:
           RELEASE_VERSION: ${{ inputs.version }}
@@ -59,13 +56,11 @@ jobs:
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
 
-          cd dev/release-tools
-          yarn cli create-release-branch \
+          xmtp-release create-release-branch \
             --version "$RELEASE_VERSION" \
             --base "$BASE_REF" \
             --ios "$IOS_BUMP" \
             --android "$ANDROID_BUMP"
-          cd ../..
 
           git push -u origin "release/${RELEASE_VERSION}"
       - name: Create pull request

.github/workflows/noop.yml

@@ -14,12 +14,16 @@ on:
       - "!.github/workflows/lint-wasm-bindings.yml"
       - "!.github/workflows/lint-ios.yml"
       - "!.github/workflows/lint-toml.yml"
+      - "!.github/workflows/test-android.yml"
+      - "!.github/workflows/lint-android.yml"
       - "!.github/workflows/check-ios-android-bindings.yml"
       # Source paths that trigger real test/lint workflows
       - "!bindings/**"
       - "!crates/**"
       - "!apps/mls_validation_service/**"
       - "!sdks/ios/**"
+      - "!sdks/android/**"
+      - "!nix/**"
       - "!dev/up"
       - "!dev/docker/**"
       - "!Package.swift"

.github/workflows/release-android.yml

@@ -21,71 +21,42 @@ on:
         value: ${{ jobs.publish.outputs.version }}
 
 jobs:
-  compute-version:
-    runs-on: ubuntu-latest
+  publish:
+    runs-on: warp-ubuntu-latest-x64-16x
     outputs:
       version: ${{ steps.version.outputs.version }}
     steps:
       - uses: actions/checkout@v6
         with:
           ref: ${{ inputs.ref }}
           fetch-depth: 0
-      - uses: ./.github/actions/setup-node
-      - name: Install release tools
-        working-directory: dev/release-tools
-        run: yarn install
+      - uses: ./.github/actions/setup-release-tools
+      - uses: ./.github/actions/setup-nix
+        with:
+          github-token: ${{ github.token }}
+          cachix-auth-token: ${{ secrets.CACHIX_AUTH_TOKEN }}
+
       - name: Compute version
         id: version
-        working-directory: dev/release-tools
         run: |
           if [ "${{ inputs.release-type }}" = "rc" ]; then
-            VERSION=$(yarn cli compute-version --sdk android --release-type rc --rc-number ${{ inputs.rc-number }})
+            VERSION=$(xmtp-release compute-version --sdk android --release-type rc --rc-number ${{ inputs.rc-number }})
           elif [ "${{ inputs.release-type }}" = "dev" ]; then
-            VERSION=$(yarn cli compute-version --sdk android --release-type dev)
+            VERSION=$(xmtp-release compute-version --sdk android --release-type dev)
           else
-            VERSION=$(yarn cli compute-version --sdk android --release-type final)
+            VERSION=$(xmtp-release compute-version --sdk android --release-type final)
           fi
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
           echo "Computed version: $VERSION"
 
-  publish:
-    needs: [compute-version]
-    runs-on: warp-ubuntu-latest-arm64-8x
-    outputs:
-      version: ${{ needs.compute-version.outputs.version }}
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          ref: ${{ inputs.ref }}
-          fetch-depth: 0
-      - uses: ./.github/actions/setup-node
-      - uses: ./.github/actions/setup-nix
-        with:
-          github-token: ${{ github.token }}
-          cachix-auth-token: ${{ secrets.CACHIX_AUTH_TOKEN }}
-
-      - name: Install release tools
-        working-directory: dev/release-tools
-        run: yarn install
-
       - name: Set version in gradle.properties
-        working-directory: dev/release-tools
         env:
-          VERSION: ${{ needs.compute-version.outputs.version }}
-        run: yarn cli set-manifest-version --sdk android --version "$VERSION"
+          VERSION: ${{ steps.version.outputs.version }}
+        run: xmtp-release set-manifest-version --sdk android --version "$VERSION"
 
       - name: Build Android bindings
         run: ./sdks/android/dev/bindings
 
-      - name: Configure JDK
-        uses: actions/setup-java@v4
-        with:
-          distribution: "adopt"
-          java-version: "17"
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
-
       - name: Build and publish
         working-directory: sdks/android
         env:
@@ -94,26 +65,9 @@ jobs:
           SIGN_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
           SIGN_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
           MAVEN_PROFILE_ID: ${{ secrets.MAVEN_PROFILE_ID }}
-        run: ./gradlew build publishToSonatype closeAndReleaseSonatypeStagingRepository
-
-      - name: Commit and tag (final releases only)
-        if: inputs.release-type == 'final'
-        env:
-          VERSION: ${{ needs.compute-version.outputs.version }}
-        run: |
-          TAG="android-${VERSION}"
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          git tag "$TAG"
-          git push origin HEAD "$TAG"
+        run: nix develop .#android --command ./gradlew build publishToSonatype closeAndReleaseSonatypeStagingRepository
 
-      - name: Tag only (dev/rc releases)
-        if: inputs.release-type != 'final'
+      - name: Tag release
         env:
-          VERSION: ${{ needs.compute-version.outputs.version }}
-        run: |
-          TAG="android-${VERSION}"
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          git tag "$TAG"
-          git push origin "$TAG"
+          VERSION: ${{ steps.version.outputs.version }}
+        run: xmtp-release tag-release --sdk android --version "$VERSION" --push-branch