diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e2370a46..6bcc58e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -88,14 +88,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' || diff --git a/xbuild/src/gradle/mod.rs b/xbuild/src/gradle/mod.rs index ec27f1e0..cca5b21d 100644 --- a/xbuild/src/gradle/mod.rs +++ b/xbuild/src/gradle/mod.rs @@ -26,8 +26,8 @@ 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); + std::env::set_var("WRY_ANDROID_LIBRARY", name); // TODO: Should this be the crate name? std::env::set_var("WRY_ANDROID_KOTLIN_FILES_OUT_DIR", wry); } Ok(()) diff --git a/xbuild/template/Cargo_toml b/xbuild/template/Cargo_toml index 12980ca0..051867d9 100644 --- a/xbuild/template/Cargo_toml +++ b/xbuild/template/Cargo_toml @@ -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"