Update uniffi version to 0.24.1 (#745)

* Use a built-in version of Uniffi and update to 0.24.1 * Remove now useless make `setup` task & add tasks for android/ios targets setup * Revert ffi crate rename as it breaks Android build * Remove make setup from GitHub workflows * Fix Android Rust build config (#746) * Fix Android Rust config * Fix mention test * Use custom uniffi-rs with alternative symbols * Add commentary about custom Uniffi --------- Co-authored-by: jonnyandrew <[email protected]>
matrix-org · Jul 26, 2023 · 710228c · 710228c
1 parent 91a6756
commit 710228c
Show file tree

Hide file tree

Showing 14 changed files with 373 additions and 234 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -0,0 +1,2 @@
+[alias]
+uniffi-bindgen = "run --package uniffi-bindgen --"
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -44,15 +44,8 @@ jobs:
         with:
           cache-on-failure: true
 
-      - name: Install Rust & Uniffi
-        run: make setup
-
       - name: Install Rust targets
-        run: |
-          rustup target add i686-linux-android
-          rustup target add x86_64-linux-android
-          rustup target add armv7-linux-androideabi
-          rustup target add aarch64-linux-android
+        run: make targets-android
 
       - name: Setup Gradle & Build test cases
         uses: gradle/gradle-build-action@v2

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -41,10 +41,7 @@ jobs:
         override: true
 
     - name: Install targets
-      run: |
-        rustup target add aarch64-apple-ios
-        rustup target add aarch64-apple-ios-sim
-        rustup target add x86_64-apple-ios
+      run: make targets-ios
 
     - name: Set XCode 14.2
       run: sudo xcode-select -switch /Applications/Xcode_14.2.app

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -33,10 +33,7 @@ jobs:
           override: true
 
       - name: Install targets
-        run: |
-          rustup target add aarch64-apple-ios
-          rustup target add aarch64-apple-ios-sim
-          rustup target add x86_64-apple-ios
+        run: make targets-ios
 
       - name: Set XCode 14.2
         run: sudo xcode-select -switch /Applications/Xcode_14.2.app
@@ -73,15 +70,8 @@ jobs:
         with:
           cache-on-failure: true
 
-      - name: 🦀 Install Rust toolchain & Uniffi
-        run: make setup
-
       - name: 🦀 Install Rust targets
-        run: |
-          rustup target add i686-linux-android
-          rustup target add x86_64-linux-android
-          rustup target add armv7-linux-androideabi
-          rustup target add aarch64-linux-android
+        run: make targets-android
 
       - name: ⬆️ Publish to Sonatype
         uses: gradle/gradle-build-action@v2