Skip to content

template: Update to dioxus 0.4/wry 0.28 with libwebkit2gtk-4.1-dev #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

template: Update to dioxus 0.4/wry 0.28 with libwebkit2gtk-4.1-dev #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b19048f
template: Update to `dioxus 0.4`/`wry 0.28` with `libwebkit2gtk-4.1-dev`
MarijnS95 Jan 9, 2025
6ef3162
gradle: Update `wry` env var naming
MarijnS95 Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,7 @@ jobs:
fail-fast: false
matrix:
host:
# Disabled until we bump to `dioxus 0.4` with `wry 0.28`. The latest
# Ubuntu provides `libwebkit2gtk-4.1-dev` while these crates still rely
# on `libwebkit2gtk-4.0-dev`:
# - ubuntu-latest
- ubuntu-latest
- macos-latest
- windows-latest
opt:
Expand Down Expand Up @@ -82,14 +79,14 @@ jobs:

- name: install linux dependencies
if: ${{ matrix.host == 'ubuntu-latest' }}
run: sudo apt-get update && sudo apt-get install libwebkit2gtk-4.0-dev libgtk-3-dev squashfs-tools
run: sudo apt-get update && sudo apt-get install libwebkit2gtk-4.1-dev libgtk-3-dev squashfs-tools

- name: create project
run: ./x new template

# only linux can target linux as it is not clear what that even is exactly
# glibc/musl gtk/qt x11/wayland
# windows doesn't support posix symlinks so can't cross compile to macos/ios
# Only linux can target linux as it is not clear what that even is exactly
# (glibc/musl GTK/QT X11/Wayland).
# Windows doesn't support posix symlinks so can't cross compile to MacOS/iOS.
- name: build project
if: >
!(matrix.host == 'macos-latest' && matrix.target.platform == 'linux' ||
Expand Down
5 changes: 3 additions & 2 deletions xbuild/src/gradle/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ pub fn prepare(env: &BuildEnv) -> Result<()> {
std::fs::write(wry.join("MainActivity.kt"), main_activity)?;
}
let (package, name) = package.rsplit_once('.').unwrap();
std::env::set_var("WRY_ANDROID_REVERSED_DOMAIN", package);
std::env::set_var("WRY_ANDROID_APP_NAME_SNAKE_CASE", name);
std::env::set_var("WRY_ANDROID_PACKAGE", package);
// XXX: This should be the library name, which coincidentally happens to be the same as the package name
std::env::set_var("WRY_ANDROID_LIBRARY", name);
std::env::set_var("WRY_ANDROID_KOTLIN_FILES_OUT_DIR", wry);
}
Ok(())
Expand Down
14 changes: 6 additions & 8 deletions xbuild/template/Cargo_toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,16 @@ crate-type = ["cdylib", "rlib"]

[dependencies]
anyhow = "1.0.68"
dioxus = "0.3.1"
dioxus = "0.4"

[target.'cfg(not(target_family = "wasm"))'.dependencies]
dioxus-desktop = "0.3.0"
dioxus-desktop = "0.4"

[target.'cfg(target_os = "android")'.dependencies]
android_logger = "0.11.1"
log = "0.4.17"
ndk-context = "0.1.1"
paste = "1.0.11"
android_logger = "0.11"
log = "0.4"

[target.'cfg(target_family = "wasm")'.dependencies]
console_error_panic_hook = "0.1.7"
dioxus-web = "0.3.0"
wasm-logger = "0.2.0"
dioxus-web = "0.4"
wasm-logger = "0.2"
Loading