diff --git a/Cargo.lock b/Cargo.lock index 9c567fd..320a299 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -266,9 +266,30 @@ dependencies = [ "jni-sys", "libc", "log", - "ndk", + "ndk 0.8.0", "ndk-context", - "ndk-sys", + "ndk-sys 0.5.0+25.2.9519653", + "num_enum", + "thiserror", +] + +[[package]] +name = "android-activity" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" +dependencies = [ + "android-properties", + "bitflags 2.5.0", + "cc", + "cesu8", + "jni", + "jni-sys", + "libc", + "log", + "ndk 0.9.0", + "ndk-context", + "ndk-sys 0.6.0+11769913", "num_enum", "thiserror", ] @@ -3408,7 +3429,7 @@ dependencies = [ name = "grim" version = "0.1.0" dependencies = [ - "android-activity", + "android-activity 0.6.0", "android_logger", "anyhow", "arboard", @@ -5266,13 +5287,27 @@ dependencies = [ "bitflags 2.5.0", "jni-sys", "log", - "ndk-sys", + "ndk-sys 0.5.0+25.2.9519653", "num_enum", "raw-window-handle 0.5.2", "raw-window-handle 0.6.1", "thiserror", ] +[[package]] +name = "ndk" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" +dependencies = [ + "bitflags 2.5.0", + "jni-sys", + "log", + "ndk-sys 0.6.0+11769913", + "num_enum", + "thiserror", +] + [[package]] name = "ndk-context" version = "0.1.1" @@ -5288,6 +5323,15 @@ dependencies = [ "jni-sys", ] +[[package]] +name = "ndk-sys" +version = "0.6.0+11769913" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" +dependencies = [ + "jni-sys", +] + [[package]] name = "neli" version = "0.6.4" @@ -10003,7 +10047,7 @@ dependencies = [ "log", "metal", "naga", - "ndk-sys", + "ndk-sys 0.5.0+25.2.9519653", "objc", "once_cell", "parking_lot 0.12.1", @@ -10344,7 +10388,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" dependencies = [ "ahash", - "android-activity", + "android-activity 0.5.2", "atomic-waker", "bitflags 2.5.0", "bytemuck", @@ -10358,8 +10402,8 @@ dependencies = [ "libc", "log", "memmap2", - "ndk", - "ndk-sys", + "ndk 0.8.0", + "ndk-sys 0.5.0+25.2.9519653", "objc2 0.4.1", "once_cell", "orbclient", diff --git a/Cargo.toml b/Cargo.toml index 98875e5..5f13005 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -85,7 +85,7 @@ image = "0.25.1" [target.'cfg(target_os = "android")'.dependencies] android_logger = "0.13.1" jni = "0.21.1" -android-activity = "0.5.2" +android-activity = { version = "0.6.0", features = ["game-activity"] } wgpu = "0.19" -winit = { version = "0.29", features = [ "android-game-activity" ] } -eframe = { version = "0.27.2", features = [ "wgpu", "android-game-activity" ] } \ No newline at end of file +winit = { version = "0.29", features = ["android-game-activity"] } +eframe = { version = "0.27.2", features = ["wgpu", "android-game-activity"] } \ No newline at end of file