masonry_android: Use masonry_core and its re-exported dependencies

Author: mwcampbell

Cargo.lock

@@ -4,10 +4,8 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-accesskit = "0.21.0"
 accesskit_android = "0.4.0"
 android-view = { path = ".." }
-masonry = { git = "https://github.com/linebender/xilem" }
+masonry_core = { git = "https://github.com/linebender/xilem" }
 pollster = "0.4.0"
 tracing = "0.1.40"
-vello = "0.5.0"

masonry/Cargo.toml

@@ -1,7 +1,7 @@
 // Copyright 2025 the Xilem Authors
 // SPDX-License-Identifier: Apache-2.0
 
-use masonry::{
+use masonry_core::{
     app::RenderRoot,
     core::{ErasedAction, WidgetId},
 };

masonry/src/app_driver.rs

@@ -1,7 +1,6 @@
 // Copyright 2024 the Xilem Authors
 // SPDX-License-Identifier: Apache-2.0
 
-use accesskit::{ActionHandler, ActionRequest, ActivationHandler, TreeUpdate};
 use android_view::{
     jni::{
         JNIEnv,
@@ -10,27 +9,28 @@ use android_view::{
     ndk::{event::Keycode, native_window::NativeWindow},
     *,
 };
-use masonry::{
+use masonry_core::{
+    accesskit::{ActionHandler, ActionRequest, ActivationHandler, TreeUpdate},
     app::{RenderRoot, RenderRootOptions, RenderRootSignal, WindowSizePolicy},
     core::{DefaultProperties, Handled, NewWidget, TextEvent, Widget, WindowEvent},
     dpi::PhysicalSize,
     peniko::Color,
     util::Instant,
+    vello::{
+        self, Renderer, RendererOptions, Scene,
+        kurbo::Affine,
+        util::{RenderContext, RenderSurface},
+        wgpu::{
+            self, PresentMode,
+            rwh::{DisplayHandle, HandleError, HasDisplayHandle, HasWindowHandle, WindowHandle},
+        },
+    },
 };
 use std::sync::{
     Arc,
     mpsc::{self, Receiver},
 };
 use tracing::{debug, info, info_span};
-use vello::{
-    Renderer, RendererOptions, Scene,
-    kurbo::Affine,
-    util::{RenderContext, RenderSurface},
-    wgpu::{
-        self, PresentMode,
-        rwh::{DisplayHandle, HandleError, HasDisplayHandle, HasWindowHandle, WindowHandle},
-    },
-};
 
 mod app_driver;
 pub use app_driver::*;