chore: bump wry from 0.53.5 to 0.54.4 (#5544)

* chore: bump wry from 0.53.5 to 0.54.4

Aligns webkit2gtk-sys pin with =2.0.2, allowing Dioxus desktop
and Tauri 2.x apps to coexist in the same Cargo workspace.

* upgrade to wry 0.55, newest tao

* pin git commit for compile

* link checker

* min version bump

---------

Co-authored-by: Jonathan Kelley <jkelleyrtp@gmail.com>

Author: emilbonnek

Cargo.lock

@@ -344,19 +344,19 @@ form_urlencoded = "1.2.2"
 winnow = "0.7.14"
 
 # desktop
-wry = { version = "0.53.5", default-features = false }
-tao = { version = "0.34.0", features = ["rwh_05"] }
+wry = { version = "0.55.1", default-features = false }
+tao = { version = "0.35.2", features = ["rwh_05"] }
 infer = "0.19.0"
 dunce = "1.0.5"
 percent-encoding = "2.3.2"
-muda = "0.17.0"
+muda = "0.19.1"
 objc2 = { version = "0.6.4", features = ["exception"] }
 objc2-foundation = { version = "0.3.2", default-features = false }
 objc2-ui-kit = { version = "0.3.2", default-features = false }
 objc2-app-kit = { version = "0.3.2", default-features = false }
-tray-icon = "0.21.0"
-open = "5.3.2"
-webbrowser = "1.0"
+tray-icon = "0.24.0"
+open = "5.3.5"
+webbrowser = "1.2.1"
 
 # web
 gloo-dialogs = "0.2.0"

Cargo.toml

@@ -75,7 +75,8 @@ dunce = { workspace = true }
 dirs = { workspace = true }
 reqwest = { workspace = true, default-features = false, features = ["rustls-tls", "json"] }
 tower = { workspace = true }
-git2 = "0.20.4"
+git2 = { version = "=0.20.4" }
+auth-git2 = { version = "=0.5.6" }
 
 # path lookup
 which = { version = "8.0.0" }

packages/cli/Cargo.toml

@@ -70,6 +70,7 @@ android {
 dependencies {
     implementation("androidx.webkit:webkit:1.13.0")
     implementation("androidx.appcompat:appcompat:1.7.1")
+    implementation("androidx.lifecycle:lifecycle-process:2.8.7")
     implementation("com.google.android.material:material:1.13.0")
     {{#each gradle_dependencies}}
     implementation("{{ this }}")

packages/cli/assets/android/gen/app/build.gradle.kts.hbs

@@ -26,7 +26,7 @@
         {{#if large_heap}}android:largeHeap="{{ large_heap }}"{{/if}}
         android:networkSecurityConfig="@xml/network_security_config">
         <activity android:configChanges="orientation|screenLayout|screenSize|keyboardHidden" android:exported="true"
-            android:label="@string/app_name" android:name="dev.dioxus.main.MainActivity">
+            android:label="@string/app_name" android:launchMode="singleTask" android:name="dev.dioxus.main.MainActivity">
             <meta-data android:name="android.app.lib_name" android:value="{{ lib_name }}" />
             <meta-data android:name="android.app.func_name" android:value="ANativeActivity_onCreate" />
             <intent-filter>

packages/cli/assets/android/gen/app/src/main/AndroidManifest.xml.hbs

@@ -53,5 +53,5 @@ The rust [nomicon](https://doc.rust-lang.org/nomicon/data.html) defines the memo
 ## Limitations
 
 - Only constant sized types are supported. This means that you can't serialize a type like `Vec<T>`. These types are difficult to create in const contexts in general
-- Only types with a well defined memory layout are supported (see <https://github.com/rust-lang/rfcs/pull/3727> and <https://onevariable.com/blog/pods-from-scratch>). `repr(Rust)` enums don't have a well defined layout, so they are not supported. `repr(C, u8)` enums can be used instead
+- Only types with a well defined memory layout are supported (see <https://github.com/rust-lang/rfcs/pull/3727>). `repr(Rust)` enums don't have a well defined layout, so they are not supported. `repr(C, u8)` enums can be used instead
 - Const rust does not support mutable references or points, so this crate leans heavily on functional data structures for data processing.

packages/const-serialize/README.md

@@ -27,7 +27,7 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
-wry = { workspace = true, default-features = false, features = ["os-webview", "protocol", "drag-drop"] }
+wry = { workspace = true, default-features = false, features = ["os-webview", "protocol"] }
 futures-channel = { workspace = true }
 tokio = { workspace = true, features = [
   "sync",
@@ -59,7 +59,7 @@ webbrowser = { workspace = true }
 signal-hook = "0.3.18"
 
 [target.'cfg(target_os = "linux")'.dependencies]
-wry = { workspace = true, features = ["os-webview", "protocol", "drag-drop", "linux-body"] }
+wry = { workspace = true, features = ["os-webview", "protocol", "linux-body"] }
 
 [target.'cfg(any(target_os = "windows",target_os = "macos",target_os = "linux",target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))'.dependencies]
 global-hotkey = "0.7.0"

packages/desktop/Cargo.toml

@@ -1,9 +1,11 @@
-/// Expose the `Java_dev_dioxus_main_WryActivity_create` function to the JNI layer.
-/// We hardcode these to have a single trampoline for host Java code to call into.
+/// Expose the `Java_dev_dioxus_main_Rust_*` JNI trampolines that wry's Kotlin layer calls into.
+/// We hardcode the package to `dev.dioxus.main` so host Java/Kotlin always has a single set of
+/// symbols to bind against, without having to plumb the top-level package name down into this crate.
 ///
-/// This saves us from having to plumb the top-level package name all the way down into
-/// this file. This is better for modularity (ie just call dioxus' main to run the app) as
-/// well as cache thrashing since this crate doesn't rely on external env vars.
+/// As of wry 0.55 the Kotlin lifecycle methods (create/start/stop/...) live on a `Rust` object
+/// rather than `WryActivity`'s companion object, so the third arg to `tao::android_binding!` is
+/// `Rust` — passing `WryActivity` would emit the wrong JNI symbol names and crash at startup with
+/// `UnsatisfiedLinkError`.
 ///
 /// The CLI is expecting to find `dev.dioxus.main` in the final library. If you find a need to
 /// change this, you'll need to change the CLI as well.
@@ -15,7 +17,41 @@ pub extern "C" fn start_app() {
     use dioxus_core::{Element, VirtualDom};
     use std::any::Any;
 
-    tao::android_binding!(dev_dioxus, main, WryActivity, wry::android_setup, root, tao);
+    // tao 0.35 dropped its automatic `ndk_context::initialize_android_context` call
+    // (see https://github.com/tauri-apps/tao/issues/1220). Many android-aware crates —
+    // including parts of wry itself — call `ndk_context::android_context()` and panic if
+    // it's uninitialized, which then poisons wry's static mutexes and turns the original
+    // panic into a confusing `PoisonError` at the next JNI callback. Initialize it here
+    // before handing off to wry's own setup.
+    //
+    // Guarded by `Once` because `WryActivity.onCreate` (and therefore this setup) runs
+    // again on activity re-creation — rotation, theme changes, back/foreground cycles —
+    // and `ndk_context::initialize_android_context` asserts `previous.is_none()`, which
+    // would abort the process on every re-entry. The global only needs the JavaVM + an
+    // activity-like Context pointer for consumers to attach a JNI thread; we don't need
+    // to refresh it per-activity.
+    unsafe fn android_setup(
+        package: &str,
+        env: ::wry::prelude::JNIEnv<'_>,
+        looper: &::ndk::looper::ThreadLooper,
+        activity: ::wry::prelude::GlobalRef,
+    ) {
+        static NDK_CONTEXT_INIT: std::sync::Once = std::sync::Once::new();
+        NDK_CONTEXT_INIT.call_once(|| {
+            let vm = env.get_java_vm().unwrap();
+            unsafe {
+                ::ndk_context::initialize_android_context(
+                    vm.get_java_vm_pointer() as *mut _,
+                    activity.as_obj().as_raw() as *mut _,
+                );
+            }
+        });
+        unsafe {
+            wry::android_setup(package, env, looper, activity);
+        }
+    }
+
+    tao::android_binding!(dev_dioxus, main, Rust, android_setup, root, tao);
     wry::android_binding!(dev_dioxus, main, wry);
 
     #[cfg(target_os = "android")]