Skip to content

Commit

Permalink
updated cargo
Browse files Browse the repository at this point in the history
  • Loading branch information
mariotaku committed May 23, 2024
1 parent 22f3d89 commit a7f2a33
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 79 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ jobs:
shell: bash
run: |
# TODO: Remove this once patches are merged
cargo install --git https://github.com/mariotaku/tauri.git --branch devman tauri-cli
cargo install --git https://github.com/mariotaku/tauri.git --rev 1ec4cb57 tauri-cli --force
npm run tauri android init
npm run tauri android build -- --aab
if [ -n "$AAB_SIGNING_KEYSTORE" ]; then
Expand Down
107 changes: 32 additions & 75 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ cc = { git = "https://github.com/mariotaku/cc-rs.git", rev = "01a3414" }
r2d2 = { git = "https://github.com/mariotaku/r2d2.git", rev = "aaa2a2b" }
# TODO: remove this patch when this branch is merged
tauri-build = { git = "https://github.com/mariotaku/tauri.git", branch = "feature/android-version-info" }
# TODO: remove when a new version is released
wry = { git = "https://github.com/tauri-apps/wry.git", rev = "50ec050" }
3 changes: 0 additions & 3 deletions src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,6 @@ optional = true
[target.'cfg(target_os="android")'.dependencies]
android_logger = "0.13.3"

# Temporary workaround for https://github.com/tauri-apps/tauri/issues/9502
wry = { git = "https://github.com/mariotaku/wry.git", rev = "0f4b8490" }

[features]
# by default Tauri runs in production mode
# when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL
Expand Down

0 comments on commit a7f2a33

Please sign in to comment.