Skip to content
This repository has been archived by the owner on Sep 27, 2024. It is now read-only.

Commit

Permalink
Update uniffi version to 0.24.1 (#745)
Browse files Browse the repository at this point in the history
* 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 <jonnya@element.io>
  • Loading branch information
aringenbach and jonnyandrew authored Jul 26, 2023
1 parent 91a6756 commit 710228c
Show file tree
Hide file tree
Showing 14 changed files with 373 additions and 234 deletions.
2 changes: 2 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[alias]
uniffi-bindgen = "run --package uniffi-bindgen --"
9 changes: 1 addition & 8 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 2 additions & 12 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading

0 comments on commit 710228c

Please sign in to comment.