funman300
fb8b2ac684
Wires the workspace through `cargo apk build`. After this commit `cargo apk build -p solitaire_app --target x86_64-linux-android` produces a debug-signed APK at `target/debug/apk/solitaire-quest.apk` containing all assets and `lib/x86_64/libsolitaire_app.so` — runnable on the AVD or a physical x86_64 device. The five gating points discovered by iterating compile cycles: 1. solitaire_app split into bin + lib. cargo-apk needs a `cdylib` to bundle as `libmain.so`; pure-bin crates panic with "Bin is not compatible with Cdylib". `src/lib.rs` carries the ECS bootstrap as `pub fn run`; `src/main.rs` is a 3-line shim that delegates for the desktop `cargo run` path. 2. `[package.metadata.android]` pins target SDK 34 / min SDK 26 so cargo-apk doesn't probe for whatever default it ships (which on this machine was an uninstalled API 30). `assets = "../assets"` lets the same asset directory feed both desktop and APK. 3. Workspace `bevy` features add `android-native-activity` (the Bevy-side glue that pairs with cargo-apk's NativeActivity wrapper). The feature is target-gated inside bevy_internal so desktop builds compile it out. 4. `arboard` (clipboard, used by Stats's "Copy share link") has no Android backend — `cargo apk build` fails with E0433 on `platform::Clipboard` if unconditional. Target-gated to `cfg(not(target_os = "android"))`; the system surfaces an informational toast on Android until JNI ClipboardManager is wired in the Phase-Android round. 5. `keyring` + `keyring-core` cannot compile for android — the transitive `rpassword` uses `libc::__errno_location` which bionic doesn't expose. Both crates target-gated; `auth_tokens` ships a stub on Android that returns `KeychainUnavailable` for every call, matching how callers already handle a Linux box without Secret Service. Cosmetic post-pass panic: cargo-apk panics AFTER the APK is signed when it tries to also wrap the bin target. The APK on disk is unaffected. Working around this with `cargo apk build --lib` is the next small step. What's verified: - Desktop `cargo build`, `cargo clippy --workspace --all-targets`, and `cargo test --workspace` all clean. - `cargo apk build -p solitaire_app --target x86_64-linux-android` produces 54 MB debug APK with libsolitaire_app.so + assets. What's NOT yet verified: - Whether the APK actually launches on the AVD / a phone (next step: `adb install` + `adb logcat` against the bevy_test AVD). - Whether `dirs::data_dir()` on Android returns a usable path (sync / persistence will surface this if not). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
136 lines
4.3 KiB
TOML
136 lines
4.3 KiB
TOML
[workspace]
|
|
members = [
|
|
"solitaire_core",
|
|
"solitaire_sync",
|
|
"solitaire_data",
|
|
"solitaire_engine",
|
|
"solitaire_server",
|
|
"solitaire_app",
|
|
"solitaire_assetgen",
|
|
"solitaire_wasm",
|
|
]
|
|
resolver = "2"
|
|
|
|
[workspace.package]
|
|
edition = "2024"
|
|
version = "0.1.0"
|
|
license = "MIT"
|
|
rust-version = "1.95"
|
|
|
|
[workspace.dependencies]
|
|
serde = { version = "1", features = ["derive"] }
|
|
serde_json = "1"
|
|
uuid = { version = "1", features = ["v4", "serde"] }
|
|
chrono = { version = "0.4", features = ["serde"] }
|
|
thiserror = "2"
|
|
rand = "0.9"
|
|
async-trait = "0.1"
|
|
tokio = { version = "1", features = ["full"] }
|
|
dirs = "6"
|
|
keyring = "4"
|
|
keyring-core = "1"
|
|
reqwest = { version = "0.13", features = ["json", "rustls", "rustls-native-certs"], default-features = false }
|
|
arboard = { version = "3", default-features = false }
|
|
|
|
solitaire_core = { path = "solitaire_core" }
|
|
solitaire_sync = { path = "solitaire_sync" }
|
|
solitaire_data = { path = "solitaire_data" }
|
|
solitaire_engine = { path = "solitaire_engine" }
|
|
|
|
# Bevy with `default-features = false` to avoid the unused
|
|
# `bevy_audio → rodio + symphonia + cpal 0.15 + alsa 0.9` chain.
|
|
# Audio is handled directly by `kira` in `audio_plugin.rs`, so the
|
|
# `bevy_audio` feature is intentionally omitted. The features below
|
|
# enumerate every leaf of the standard `2d` + `ui` meta-features that
|
|
# we actually use; new features should only be added with a
|
|
# corresponding use site.
|
|
bevy = { version = "0.18", default-features = false, features = [
|
|
# default_app
|
|
"async_executor",
|
|
"bevy_asset",
|
|
"bevy_input_focus",
|
|
"bevy_log",
|
|
"bevy_state",
|
|
"bevy_window",
|
|
"custom_cursor",
|
|
"reflect_auto_register",
|
|
# default_platform (desktop subset)
|
|
"std",
|
|
"bevy_winit",
|
|
"default_font",
|
|
"multi_threaded",
|
|
# winit prefers Wayland when WAYLAND_DISPLAY is set on the
|
|
# session and falls through to X11 otherwise. Without `wayland`,
|
|
# winit-on-Wayland-session falls back to XWayland which renders
|
|
# the game in an X11 frame inside the Wayland compositor.
|
|
"wayland",
|
|
"x11",
|
|
# Android: NativeActivity glue. The feature is target-gated inside
|
|
# bevy_internal — desktop builds compile it out, so leaving it on
|
|
# the always-on list is harmless on Linux/macOS/Windows. Pairs with
|
|
# cargo-apk's NativeActivity wrapper (cargo-apk 0.10+ uses this by
|
|
# default). Switch to `android-game-activity` later if we want
|
|
# AndroidX GameActivity for Google Play Games integration.
|
|
"android-native-activity",
|
|
# common_api
|
|
"bevy_color",
|
|
"bevy_image",
|
|
"bevy_mesh",
|
|
"bevy_shader",
|
|
"bevy_text",
|
|
"png",
|
|
# 2d rendering
|
|
"bevy_camera",
|
|
"bevy_render",
|
|
"bevy_core_pipeline",
|
|
"bevy_sprite",
|
|
"bevy_sprite_render",
|
|
# UI rendering
|
|
"bevy_ui",
|
|
"bevy_ui_render",
|
|
] }
|
|
kira = "0.12"
|
|
|
|
# SVG rasterisation pipeline for the runtime card-theme system.
|
|
# usvg parses + simplifies; resvg renders to a tiny-skia Pixmap;
|
|
# tiny-skia provides the CPU rasteriser. All three are maintained
|
|
# together by the resvg-rs project and version in lockstep.
|
|
usvg = "0.47"
|
|
resvg = "0.47"
|
|
tiny-skia = "0.12"
|
|
|
|
# Theme manifest format. RON keeps the file human-editable while
|
|
# preserving Rust-style structures the importer can validate.
|
|
ron = "0.12"
|
|
|
|
# Importer-only: reads user-supplied theme zip archives, validates
|
|
# their contents, and unpacks them into the user themes directory.
|
|
# Default features are disabled to keep the dependency footprint small;
|
|
# only `deflate` is needed because the importer rejects other
|
|
# compression methods anyway (see Phase 7 spec).
|
|
zip = { version = "8.6", default-features = false, features = ["deflate"] }
|
|
|
|
# Importer-only test dependency: tests build zip archives in a
|
|
# scratch directory so they don't pollute the real user themes path
|
|
# on the developer's machine.
|
|
tempfile = "3.27"
|
|
|
|
axum = "0.8"
|
|
sqlx = { version = "0.8", features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate"] }
|
|
jsonwebtoken = { version = "10", default-features = false, features = ["rust_crypto"] }
|
|
bcrypt = "0.19"
|
|
tower_governor = "0.8"
|
|
tracing = "0.1"
|
|
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
|
dotenvy = "0.15"
|
|
|
|
[profile.dev]
|
|
opt-level = 1
|
|
|
|
[profile.dev.package."*"]
|
|
opt-level = 3
|
|
|
|
[profile.release]
|
|
opt-level = 3
|
|
lto = "thin"
|