diff --git a/examples/agdk-cpal/Cargo.toml b/examples/agdk-cpal/Cargo.toml index b418a67..8daec8e 100644 --- a/examples/agdk-cpal/Cargo.toml +++ b/examples/agdk-cpal/Cargo.toml @@ -9,15 +9,10 @@ edition = "2021" log = "0.4" android_logger = "0.11.0" android-activity = { path="../../android-activity", features = ["game-activity"] } -cpal = "0.13" +cpal = "0.14" atomic_float = "0.1" anyhow = "1" -# We currently need to use cpal master which doesn't have ndk-glue as a dependency -# and is also updated to ndk 0.7 -[patch.crates-io] -cpal = { git = "https://github.com/RustAudio/cpal", commit = "9b7bb339650" } - [lib] name="main" crate_type=["cdylib"] \ No newline at end of file diff --git a/examples/agdk-eframe/Cargo.lock b/examples/agdk-eframe/Cargo.lock index d259809..006cd6b 100644 --- a/examples/agdk-eframe/Cargo.lock +++ b/examples/agdk-eframe/Cargo.lock @@ -14,9 +14,9 @@ dependencies = [ [[package]] name = "ab_glyph_rasterizer" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363b9b88fad3af3be80bc8f762c9a3f9dfe906fd0327b8e92f1c12e5ae1b8bbb" +checksum = "330223a1aecc308757b9926e9391c9b47f8ef2dbd8aea9df88312aea18c5e8d6" [[package]] name = "adler" @@ -554,7 +554,7 @@ dependencies = [ [[package]] name = "eframe" version = "0.19.0" -source = "git+https://github.com/emilk/egui#c4117066cf85e84cb5a33b358f36a884f858b33a" +source = "git+https://github.com/emilk/egui#311eb66cae5d0a029e2f19dc60b9010872aa25db" dependencies = [ "bytemuck", "egui", @@ -577,7 +577,7 @@ dependencies = [ [[package]] name = "egui" version = "0.19.0" -source = "git+https://github.com/emilk/egui#c4117066cf85e84cb5a33b358f36a884f858b33a" +source = "git+https://github.com/emilk/egui#311eb66cae5d0a029e2f19dc60b9010872aa25db" dependencies = [ "ahash 0.8.0", "epaint", @@ -588,7 +588,7 @@ dependencies = [ [[package]] name = "egui-wgpu" version = "0.19.0" -source = "git+https://github.com/emilk/egui#c4117066cf85e84cb5a33b358f36a884f858b33a" +source = "git+https://github.com/emilk/egui#311eb66cae5d0a029e2f19dc60b9010872aa25db" dependencies = [ "bytemuck", "egui", @@ -602,7 +602,7 @@ dependencies = [ [[package]] name = "egui-winit" version = "0.19.0" -source = "git+https://github.com/emilk/egui#c4117066cf85e84cb5a33b358f36a884f858b33a" +source = "git+https://github.com/emilk/egui#311eb66cae5d0a029e2f19dc60b9010872aa25db" dependencies = [ "arboard", "egui", @@ -616,7 +616,7 @@ dependencies = [ [[package]] name = "egui_demo_lib" version = "0.19.0" -source = "git+https://github.com/emilk/egui#c4117066cf85e84cb5a33b358f36a884f858b33a" +source = "git+https://github.com/emilk/egui#311eb66cae5d0a029e2f19dc60b9010872aa25db" dependencies = [ "egui", "egui_extras", @@ -628,7 +628,7 @@ dependencies = [ [[package]] name = "egui_extras" version = "0.19.0" -source = "git+https://github.com/emilk/egui#c4117066cf85e84cb5a33b358f36a884f858b33a" +source = "git+https://github.com/emilk/egui#311eb66cae5d0a029e2f19dc60b9010872aa25db" dependencies = [ "egui", ] @@ -636,7 +636,7 @@ dependencies = [ [[package]] name = "egui_glow" version = "0.19.0" -source = "git+https://github.com/emilk/egui#c4117066cf85e84cb5a33b358f36a884f858b33a" +source = "git+https://github.com/emilk/egui#311eb66cae5d0a029e2f19dc60b9010872aa25db" dependencies = [ "bytemuck", "egui", @@ -650,7 +650,7 @@ dependencies = [ [[package]] name = "emath" version = "0.19.0" -source = "git+https://github.com/emilk/egui#c4117066cf85e84cb5a33b358f36a884f858b33a" +source = "git+https://github.com/emilk/egui#311eb66cae5d0a029e2f19dc60b9010872aa25db" dependencies = [ "bytemuck", ] @@ -678,9 +678,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" +checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" dependencies = [ "atty", "humantime", @@ -692,7 +692,7 @@ dependencies = [ [[package]] name = "epaint" version = "0.19.0" -source = "git+https://github.com/emilk/egui#c4117066cf85e84cb5a33b358f36a884f858b33a" +source = "git+https://github.com/emilk/egui#311eb66cae5d0a029e2f19dc60b9010872aa25db" dependencies = [ "ab_glyph", "ahash 0.8.0", @@ -1108,9 +1108,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.132" +version = "0.2.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" +checksum = "c0f80d65747a3e43d1596c7c5492d95d5edddaabd45a7fcdb02b95f644164966" [[package]] name = "libloading" @@ -1762,9 +1762,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "1.0.99" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" +checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e" dependencies = [ "proc-macro2", "quote", @@ -1898,9 +1898,9 @@ checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd" [[package]] name = "unicode-normalization" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] @@ -2322,6 +2322,7 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "winit" version = "0.27.2" +source = "git+https://github.com/rib/winit?branch=android-activity#c6e5e409f47d59d1c4c881a6b5316eaf4e4a228e" dependencies = [ "android-activity", "bitflags", diff --git a/examples/agdk-egui/Cargo.lock b/examples/agdk-egui/Cargo.lock index 56d4897..52352ec 100644 --- a/examples/agdk-egui/Cargo.lock +++ b/examples/agdk-egui/Cargo.lock @@ -14,9 +14,9 @@ dependencies = [ [[package]] name = "ab_glyph_rasterizer" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363b9b88fad3af3be80bc8f762c9a3f9dfe906fd0327b8e92f1c12e5ae1b8bbb" +checksum = "330223a1aecc308757b9926e9391c9b47f8ef2dbd8aea9df88312aea18c5e8d6" [[package]] name = "adler" @@ -551,9 +551,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" +checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" dependencies = [ "atty", "humantime", @@ -833,9 +833,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.132" +version = "0.2.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" +checksum = "c0f80d65747a3e43d1596c7c5492d95d5edddaabd45a7fcdb02b95f644164966" [[package]] name = "libloading" @@ -1354,9 +1354,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.99" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" +checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e" dependencies = [ "proc-macro2", "quote", @@ -1823,7 +1823,7 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "winit" version = "0.27.2" -source = "git+https://github.com/rib/winit?branch=android-activity#988828857de90185958cd3a867f6ce7efb2a7bb5" +source = "git+https://github.com/rib/winit?branch=android-activity#c6e5e409f47d59d1c4c881a6b5316eaf4e4a228e" dependencies = [ "android-activity", "bitflags", diff --git a/examples/agdk-winit-wgpu/Cargo.lock b/examples/agdk-winit-wgpu/Cargo.lock index 4a16c92..4829f0f 100644 --- a/examples/agdk-winit-wgpu/Cargo.lock +++ b/examples/agdk-winit-wgpu/Cargo.lock @@ -14,9 +14,9 @@ dependencies = [ [[package]] name = "ab_glyph_rasterizer" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363b9b88fad3af3be80bc8f762c9a3f9dfe906fd0327b8e92f1c12e5ae1b8bbb" +checksum = "330223a1aecc308757b9926e9391c9b47f8ef2dbd8aea9df88312aea18c5e8d6" [[package]] name = "adler" @@ -28,7 +28,7 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" name = "agdk-winit-wgpu" version = "0.1.0" dependencies = [ - "android-activity 0.3.0", + "android-activity", "android_logger", "env_logger", "log", @@ -57,24 +57,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "android-activity" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac8e25635cc5a86ffcb1aee51aac02052149410e133a73a999a0c72d5c2cfa9b" -dependencies = [ - "android-properties", - "bitflags", - "cc", - "jni-sys", - "libc", - "log", - "ndk", - "ndk-context", - "ndk-sys", - "num_enum", -] - [[package]] name = "android-activity" version = "0.3.0" @@ -195,6 +177,25 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" +[[package]] +name = "block-sys" +version = "0.1.0-beta.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146" +dependencies = [ + "objc-sys", +] + +[[package]] +name = "block2" +version = "0.2.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42" +dependencies = [ + "block-sys", + "objc2-encode", +] + [[package]] name = "bumpalo" version = "3.11.0" @@ -247,37 +248,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" -[[package]] -name = "cocoa" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63902e9223530efb4e26ccd0cf55ec30d592d3b42e21a28defc42a9586e832" -dependencies = [ - "bitflags", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" -dependencies = [ - "bitflags", - "block", - "core-foundation", - "core-graphics-types", - "foreign-types", - "libc", - "objc", -] - [[package]] name = "codespan-reporting" version = "0.11.1" @@ -384,9 +354,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "env_logger" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" +checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" dependencies = [ "atty", "humantime", @@ -592,9 +562,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.132" +version = "0.2.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" +checksum = "c0f80d65747a3e43d1596c7c5492d95d5edddaabd45a7fcdb02b95f644164966" [[package]] name = "libloading" @@ -810,6 +780,32 @@ dependencies = [ "objc_exception", ] +[[package]] +name = "objc-sys" +version = "0.2.0-beta.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" + +[[package]] +name = "objc2" +version = "0.3.0-beta.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe31e5425d3d0b89a15982c024392815da40689aceb34bad364d58732bcfd649" +dependencies = [ + "block2", + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +version = "2.0.0-pre.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" +dependencies = [ + "objc-sys", +] + [[package]] name = "objc_exception" version = "0.1.2" @@ -1069,9 +1065,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.99" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" +checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e" dependencies = [ "proc-macro2", "quote", @@ -1502,12 +1498,11 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "winit" -version = "0.27.2" -source = "git+https://github.com/rib/winit?branch=android-activity-0.27#1198cb0f18f19e0a50f0aef78a3cb37d6ab7a938" +version = "0.27.3" +source = "git+https://github.com/rib/winit?branch=android-activity-0.27#9b3b3b0ba6c5e89a3475c26adc8581e9ca499f8f" dependencies = [ - "android-activity 0.2.0", + "android-activity", "bitflags", - "cocoa", "core-foundation", "core-graphics", "dispatch", @@ -1516,7 +1511,7 @@ dependencies = [ "log", "mio", "ndk", - "objc", + "objc2", "once_cell", "percent-encoding", "raw-window-handle 0.4.3", diff --git a/examples/na-winit-wgpu/Cargo.lock b/examples/na-winit-wgpu/Cargo.lock index 752a569..1cae06a 100644 --- a/examples/na-winit-wgpu/Cargo.lock +++ b/examples/na-winit-wgpu/Cargo.lock @@ -549,9 +549,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.132" +version = "0.2.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" +checksum = "c0f80d65747a3e43d1596c7c5492d95d5edddaabd45a7fcdb02b95f644164966" [[package]] name = "libloading" @@ -1065,9 +1065,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.99" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" +checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e" dependencies = [ "proc-macro2", "quote",