From adda3637989586877c3b927eac48c52089d47d6a Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Tue, 4 Apr 2023 15:18:32 -0300 Subject: [PATCH] update to latest tauri --- Cargo.lock | 28 +- Cargo.toml | 4 +- plugins/camera/android/.gitignore | 2 +- .../android/src/main/AndroidManifest.xml | 2 +- .../camera/examples/tauri-app/package.json | 2 +- .../examples/tauri-app/src-tauri/Cargo.lock | 809 ++++++++++++++++-- .../examples/tauri-app/src-tauri/Cargo.toml | 2 +- .../src-tauri/gen/android/app/.gitignore | 5 +- .../gen/android/app/app/proguard-tauri.pro | 8 +- .../app/app/src/main/AndroidManifest.xml | 2 - .../app/src/main/jniLibs/arm64-v8a/libapp.so | 1 - .../app/app/src/main/jniLibs/x86/libapp.so | 1 - .../app/app/src/main/res/values/strings.xml | 4 +- .../android/app/app/tauri.build.gradle.kts | 1 - .../java/app/tauri/app/kotlin/BuildTask.kt | 23 +- .../src-tauri/gen/android/app/settings.gradle | 2 +- .../gen/android/app/tauri.settings.gradle | 4 +- plugins/camera/examples/tauri-app/yarn.lock | 116 +-- 18 files changed, 866 insertions(+), 150 deletions(-) delete mode 120000 plugins/camera/examples/tauri-app/src-tauri/gen/android/app/app/src/main/jniLibs/arm64-v8a/libapp.so delete mode 120000 plugins/camera/examples/tauri-app/src-tauri/gen/android/app/app/src/main/jniLibs/x86/libapp.so diff --git a/Cargo.lock b/Cargo.lock index 21d3b233..5355ccc8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4246,9 +4246,9 @@ dependencies = [ [[package]] name = "tauri" -version = "2.0.0-alpha.4" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113835bb47f8cab6d1fb3b1a2e3d96ddd64730248638a5ab3f46a598c02a81c" +checksum = "e87f379b9abbfb5e5d79682f910eebc30ca82aedd4f23d8ea8f18f9b39859542" dependencies = [ "anyhow", "bytes 1.4.0", @@ -4298,9 +4298,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.0.0-alpha.2" +version = "2.0.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "383f94e1b46fb4e249e4eafbd0589ffbe02b241b49dadebd47640598a17e584e" +checksum = "ae08b0f8601a4871495373419208aebb881d03065ec1b78d634dd0f1950c9ca3" dependencies = [ "anyhow", "cargo_toml", @@ -4318,9 +4318,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0-alpha.2" +version = "2.0.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5914e68c4ba4d9b761373dcce86f6721de78c2ffd84f376b1e0fee9321c0fc7e" +checksum = "c8975226524feaccd0676c24b53b1058f5242f3ba17d9efc802ceb23f6d8c48e" dependencies = [ "base64 0.21.0", "brotli", @@ -4344,9 +4344,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-alpha.2" +version = "2.0.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adedb0845af0d5840b54410f83135bb285ab372956678e0b12046a87999486fb" +checksum = "22d81e435c16c49f6f8c0ecc1e64b39b870a0cf526fd66e183dda5c147cd47c3" dependencies = [ "heck", "proc-macro2", @@ -4577,9 +4577,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.13.0-alpha.2" +version = "0.13.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11c9ce3ab30f6a95a09131510a624d5de24455ba9e8fcae6a6fe9e0922f833c8" +checksum = "d3fd1f35ab7f14f17b357e9bce2e227e5f0ba866a9d9b9b2329614083773c2d3" dependencies = [ "gtk", "http", @@ -4599,9 +4599,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "0.13.0-alpha.2" +version = "0.13.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e176af0987e4ced285bec0faf56eed0f13a1b3851d9176fa6758181f867cdc3" +checksum = "77145b9aa717f6435848f7fe93b68de18d66ef571a9d44aa08875957046e11fc" dependencies = [ "cocoa", "gtk", @@ -4620,9 +4620,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-alpha.2" +version = "2.0.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a488bb0c60e2ce9efbe8283a11299675e01f55caf12304889f8639b3c35713c" +checksum = "a9e8414397543d0d1f2f462094f8b54cc5d522b048c3bd323e8eea274d0271e8" dependencies = [ "brotli", "ctor", diff --git a/Cargo.toml b/Cargo.toml index c3062f87..1dc46dc3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,8 +5,8 @@ resolver = "2" [workspace.dependencies] serde = { version = "1", features = ["derive"] } log = "0.4" -tauri = "2.0.0-alpha.4" -tauri-build = "2.0.0-alpha.2" +tauri = "2.0.0-alpha.6" +tauri-build = "2.0.0-alpha.3" serde_json = "1" thiserror = "1" diff --git a/plugins/camera/android/.gitignore b/plugins/camera/android/.gitignore index fb9b198b..c0f21ec2 100644 --- a/plugins/camera/android/.gitignore +++ b/plugins/camera/android/.gitignore @@ -1,2 +1,2 @@ /build -/tauri-api +/.tauri diff --git a/plugins/camera/android/src/main/AndroidManifest.xml b/plugins/camera/android/src/main/AndroidManifest.xml index 34c16cf9..2da9cbd5 100644 --- a/plugins/camera/android/src/main/AndroidManifest.xml +++ b/plugins/camera/android/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/plugins/camera/examples/tauri-app/package.json b/plugins/camera/examples/tauri-app/package.json index a6cc8e02..8748e752 100644 --- a/plugins/camera/examples/tauri-app/package.json +++ b/plugins/camera/examples/tauri-app/package.json @@ -15,7 +15,7 @@ }, "devDependencies": { "@sveltejs/vite-plugin-svelte": "^1.0.1", - "@tauri-apps/cli": "^2.0.0-alpha.0", + "@tauri-apps/cli": "^2.0.0-alpha.6", "internal-ip": "^7.0.0", "svelte": "^3.49.0", "vite": "^3.0.2" diff --git a/plugins/camera/examples/tauri-app/src-tauri/Cargo.lock b/plugins/camera/examples/tauri-app/src-tauri/Cargo.lock index fcefd289..6b231401 100644 --- a/plugins/camera/examples/tauri-app/src-tauri/Cargo.lock +++ b/plugins/camera/examples/tauri-app/src-tauri/Cargo.lock @@ -45,10 +45,114 @@ dependencies = [ "serde", "serde_json", "tauri", - "tauri-build", + "tauri-build 2.0.0-alpha.1", "tauri-plugin-camera", ] +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] + +[[package]] +name = "async-executor" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand", + "futures-lite", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock", + "autocfg", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite", + "log", + "parking", + "polling", + "rustix", + "slab", + "socket2", + "waker-fn", +] + +[[package]] +name = "async-lock" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +dependencies = [ + "event-listener", +] + +[[package]] +name = "async-recursion" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b015a331cc64ebd1774ba119538573603427eaace0a1950c423ab971f903796" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "async-task" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" + +[[package]] +name = "async-trait" +version = "0.1.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b84f9ebcc6c1f5b8cb160f6990096a5c127f423fcb6e1ccc46c370cbdfb75dfc" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "atk" version = "0.16.0" @@ -74,19 +178,10 @@ dependencies = [ ] [[package]] -name = "attohttpc" -version = "0.24.1" +name = "atomic-waker" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d9a9bf8b79a749ee0b911b91b671cc2b6c670bdbc7e3dfd537576ddc94bb2a2" -dependencies = [ - "flate2", - "http", - "log", - "serde", - "serde_json", - "serde_urlencoded", - "url", -] +checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599" [[package]] name = "autocfg" @@ -127,6 +222,20 @@ dependencies = [ "generic-array", ] +[[package]] +name = "blocking" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "atomic-waker", + "fastrand", + "futures-lite", +] + [[package]] name = "brotli" version = "3.3.4" @@ -181,6 +290,9 @@ name = "bytes" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +dependencies = [ + "serde", +] [[package]] name = "cairo-rs" @@ -302,6 +414,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "concurrent-queue" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "convert_case" version = "0.4.0" @@ -475,14 +596,14 @@ dependencies = [ ] [[package]] -name = "dbus" -version = "0.9.7" +name = "derivative" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "libc", - "libdbus-sys", - "winapi", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -508,6 +629,15 @@ dependencies = [ "crypto-common", ] +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys", +] + [[package]] name = "dirs-next" version = "2.0.0" @@ -518,6 +648,17 @@ dependencies = [ "dirs-sys-next", ] +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + [[package]] name = "dirs-sys-next" version = "0.1.2" @@ -571,6 +712,54 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "enumflags2" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e75d4cd21b95383444831539909fbb14b9dc3fdceb2a6f5d36577329a1f55ccb" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "errno" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + [[package]] name = "fastrand" version = "1.9.0" @@ -586,7 +775,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" dependencies = [ - "memoffset", + "memoffset 0.6.5", "rustc_version 0.3.3", ] @@ -684,6 +873,21 @@ version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" +[[package]] +name = "futures-lite" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + [[package]] name = "futures-macro" version = "0.3.26" @@ -695,6 +899,12 @@ dependencies = [ "syn", ] +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + [[package]] name = "futures-task" version = "0.3.26" @@ -708,8 +918,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" dependencies = [ "futures-core", + "futures-io", "futures-macro", + "futures-sink", "futures-task", + "memchr", "pin-project-lite", "pin-utils", "slab", @@ -1020,6 +1233,25 @@ dependencies = [ "syn", ] +[[package]] +name = "h2" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -1050,6 +1282,18 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + [[package]] name = "html5ever" version = "0.25.2" @@ -1075,12 +1319,59 @@ dependencies = [ "itoa 1.0.5", ] +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + [[package]] name = "http-range" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + +[[package]] +name = "hyper" +version = "0.14.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa 1.0.5", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + [[package]] name = "ico" version = "0.3.0" @@ -1166,6 +1457,23 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "io-lifetimes" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" +dependencies = [ + "hermit-abi 0.3.1", + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "ipnet" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" + [[package]] name = "itoa" version = "0.4.8" @@ -1266,15 +1574,6 @@ version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" -[[package]] -name = "libdbus-sys" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f8d7ae751e1cb825c840ae5e682f59b098cdfd213c350ac268b61449a5f58a0" -dependencies = [ - "pkg-config", -] - [[package]] name = "line-wrap" version = "0.1.1" @@ -1284,6 +1583,12 @@ dependencies = [ "safemem", ] +[[package]] +name = "linux-raw-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" + [[package]] name = "lock_api" version = "0.4.9" @@ -1390,6 +1695,21 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + [[package]] name = "miniz_oxide" version = "0.6.2" @@ -1399,6 +1719,18 @@ dependencies = [ "adler", ] +[[package]] +name = "mio" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.45.0", +] + [[package]] name = "ndk" version = "0.6.0" @@ -1433,6 +1765,20 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" +[[package]] +name = "nix" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +dependencies = [ + "bitflags", + "cfg-if", + "libc", + "memoffset 0.7.1", + "pin-utils", + "static_assertions", +] + [[package]] name = "nodrop" version = "0.1.14" @@ -1454,9 +1800,10 @@ version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "260208751689b605138bb55ab6af43ad75f628619a7e0b818d63bf6629e59467" dependencies = [ - "dbus", "mac-notification-sys", + "serde", "tauri-winrt-notification", + "zbus", ] [[package]] @@ -1505,7 +1852,7 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi", + "hermit-abi 0.2.6", "libc", ] @@ -1594,6 +1941,16 @@ dependencies = [ "windows-sys 0.42.0", ] +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + [[package]] name = "os_info" version = "3.5.0" @@ -1647,6 +2004,12 @@ dependencies = [ "system-deps", ] +[[package]] +name = "parking" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" + [[package]] name = "parking_lot" version = "0.12.1" @@ -1834,6 +2197,22 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "polling" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa" +dependencies = [ + "autocfg", + "bitflags", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.45.0", +] + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -2067,6 +2446,42 @@ dependencies = [ "winapi", ] +[[package]] +name = "reqwest" +version = "0.11.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" +dependencies = [ + "base64 0.21.0", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "winreg", +] + [[package]] name = "rfd" version = "0.11.1" @@ -2108,6 +2523,20 @@ dependencies = [ "semver 1.0.16", ] +[[package]] +name = "rustix" +version = "0.37.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b24138615de35e32031d041a09032ef3487a616d901ca4db224e7d557efae2" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.45.0", +] + [[package]] name = "rustversion" version = "1.0.11" @@ -2302,6 +2731,17 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + [[package]] name = "sha2" version = "0.10.6" @@ -2353,6 +2793,16 @@ version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "soup3" version = "0.3.2" @@ -2396,6 +2846,12 @@ dependencies = [ "loom", ] +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "string_cache" version = "0.8.4" @@ -2459,6 +2915,17 @@ dependencies = [ "serde_json", ] +[[package]] +name = "swift-rs" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eab55f44d02ced20ffa22fd5b4bd083ab59c940c7637d37fec4426b1a01d769" +dependencies = [ + "base64 0.21.0", + "serde", + "serde_json", +] + [[package]] name = "syn" version = "1.0.107" @@ -2554,11 +3021,12 @@ dependencies = [ [[package]] name = "tauri" -version = "2.0.0-alpha.3" -source = "git+https://github.com/tauri-apps/tauri?branch=next#037d488dee091730c8c01d9d09affcaa2386a463" +version = "2.0.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e87f379b9abbfb5e5d79682f910eebc30ca82aedd4f23d8ea8f18f9b39859542" dependencies = [ "anyhow", - "attohttpc", + "bytes", "cocoa", "dirs-next", "embed_plist", @@ -2584,6 +3052,7 @@ dependencies = [ "rand 0.8.5", "raw-window-handle", "regex", + "reqwest", "rfd", "semver 1.0.16", "serde", @@ -2592,13 +3061,13 @@ dependencies = [ "serialize-to-javascript", "shared_child", "state", - "swift-rs", + "swift-rs 1.0.3", "tar", - "tauri-build", + "tauri-build 2.0.0-alpha.3", "tauri-macros", "tauri-runtime", "tauri-runtime-wry", - "tauri-utils", + "tauri-utils 2.0.0-alpha.3", "tempfile", "thiserror", "tokio", @@ -2622,16 +3091,37 @@ dependencies = [ "semver 1.0.16", "serde", "serde_json", - "swift-rs", - "tauri-utils", + "swift-rs 0.3.0", + "tauri-utils 2.0.0-alpha.1", + "tauri-winres", + "walkdir", +] + +[[package]] +name = "tauri-build" +version = "2.0.0-alpha.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae08b0f8601a4871495373419208aebb881d03065ec1b78d634dd0f1950c9ca3" +dependencies = [ + "anyhow", + "cargo_toml", + "filetime", + "heck 0.4.1", + "json-patch", + "semver 1.0.16", + "serde", + "serde_json", + "swift-rs 1.0.3", + "tauri-utils 2.0.0-alpha.3", "tauri-winres", "walkdir", ] [[package]] name = "tauri-codegen" -version = "2.0.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#037d488dee091730c8c01d9d09affcaa2386a463" +version = "2.0.0-alpha.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8975226524feaccd0676c24b53b1058f5242f3ba17d9efc802ceb23f6d8c48e" dependencies = [ "base64 0.21.0", "brotli", @@ -2646,7 +3136,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "tauri-utils", + "tauri-utils 2.0.0-alpha.3", "thiserror", "time", "url", @@ -2656,15 +3146,16 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#037d488dee091730c8c01d9d09affcaa2386a463" +version = "2.0.0-alpha.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22d81e435c16c49f6f8c0ecc1e64b39b870a0cf526fd66e183dda5c147cd47c3" dependencies = [ "heck 0.4.1", "proc-macro2", "quote", "syn", "tauri-codegen", - "tauri-utils", + "tauri-utils 2.0.0-alpha.3", ] [[package]] @@ -2674,14 +3165,15 @@ dependencies = [ "serde", "serde_json", "tauri", - "tauri-build", + "tauri-build 2.0.0-alpha.3", "thiserror", ] [[package]] name = "tauri-runtime" -version = "0.13.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#037d488dee091730c8c01d9d09affcaa2386a463" +version = "0.13.0-alpha.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fd1f35ab7f14f17b357e9bce2e227e5f0ba866a9d9b9b2329614083773c2d3" dependencies = [ "gtk", "http", @@ -2691,7 +3183,7 @@ dependencies = [ "raw-window-handle", "serde", "serde_json", - "tauri-utils", + "tauri-utils 2.0.0-alpha.3", "thiserror", "url", "uuid", @@ -2701,8 +3193,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "0.13.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#037d488dee091730c8c01d9d09affcaa2386a463" +version = "0.13.0-alpha.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77145b9aa717f6435848f7fe93b68de18d66ef571a9d44aa08875957046e11fc" dependencies = [ "cocoa", "gtk", @@ -2711,7 +3204,7 @@ dependencies = [ "rand 0.8.5", "raw-window-handle", "tauri-runtime", - "tauri-utils", + "tauri-utils 2.0.0-alpha.3", "uuid", "webkit2gtk", "webview2-com", @@ -2723,6 +3216,33 @@ dependencies = [ name = "tauri-utils" version = "2.0.0-alpha.1" source = "git+https://github.com/tauri-apps/tauri?branch=next#037d488dee091730c8c01d9d09affcaa2386a463" +dependencies = [ + "ctor", + "glob", + "heck 0.4.1", + "html5ever", + "infer", + "json-patch", + "kuchiki", + "memchr", + "phf 0.10.1", + "proc-macro2", + "quote", + "semver 1.0.16", + "serde", + "serde_json", + "serde_with", + "thiserror", + "url", + "walkdir", + "windows 0.44.0", +] + +[[package]] +name = "tauri-utils" +version = "2.0.0-alpha.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e8414397543d0d1f2f462094f8b54cc5d522b048c3bd323e8eea274d0271e8" dependencies = [ "brotli", "ctor", @@ -2862,12 +3382,29 @@ checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" dependencies = [ "autocfg", "bytes", + "libc", "memchr", + "mio", "num_cpus", "pin-project-lite", + "socket2", "windows-sys 0.42.0", ] +[[package]] +name = "tokio-util" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + [[package]] name = "toml" version = "0.5.11" @@ -2894,6 +3431,12 @@ dependencies = [ "toml_datetime", ] +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + [[package]] name = "tracing" version = "0.1.37" @@ -2965,6 +3508,12 @@ dependencies = [ "serde_json", ] +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + [[package]] name = "typenum" version = "1.16.0" @@ -2977,6 +3526,16 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" +[[package]] +name = "uds_windows" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +dependencies = [ + "tempfile", + "winapi", +] + [[package]] name = "unicode-bidi" version = "0.3.10" @@ -3049,6 +3608,12 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + [[package]] name = "walkdir" version = "2.3.2" @@ -3060,6 +3625,16 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "want" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +dependencies = [ + "log", + "try-lock", +] + [[package]] name = "wasi" version = "0.9.0+wasi-snapshot-preview1" @@ -3138,6 +3713,19 @@ version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +[[package]] +name = "wasm-streams" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "web-sys" version = "0.3.61" @@ -3440,10 +4028,20 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi", +] + [[package]] name = "wry" -version = "0.27.0" -source = "git+https://github.com/tauri-apps/wry?branch=dev#7795356a45b1bd015fad0e9973fc5af58c8c339b" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b958a84f347bf8ec2e882b3f767bdb3f7797e89867bb9d6f0d1fe3df26754fe9" dependencies = [ "base64 0.13.1", "block", @@ -3457,6 +4055,7 @@ dependencies = [ "gtk", "html5ever", "http", + "javascriptcore-rs", "kuchiki", "libc", "log", @@ -3506,3 +4105,105 @@ checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" dependencies = [ "libc", ] + +[[package]] +name = "zbus" +version = "3.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dc29e76f558b2cb94190e8605ecfe77dd40f5df8c072951714b4b71a97f5848" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io", + "async-lock", + "async-recursion", + "async-task", + "async-trait", + "byteorder", + "derivative", + "dirs", + "enumflags2", + "event-listener", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix", + "once_cell", + "ordered-stream", + "rand 0.8.5", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "winapi", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "3.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62a80fd82c011cd08459eaaf1fd83d3090c1b61e6d5284360074a7475af3a85d" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "regex", + "syn", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f34f314916bd89bdb9934154627fab152f4f28acdda03e7c4c68181b214fe7e3" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zvariant" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46fe4914a985446d6fd287019b5fceccce38303d71407d9e6e711d44954a05d8" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34c20260af4b28b3275d6676c7e2a6be0d4332e8e0aba4616d34007fd84e462a" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53b22993dbc4d128a17a3b6c92f1c63872dd67198537ee728d8b5d7c40640a8b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/plugins/camera/examples/tauri-app/src-tauri/Cargo.toml b/plugins/camera/examples/tauri-app/src-tauri/Cargo.toml index aa341f89..6cedbe03 100644 --- a/plugins/camera/examples/tauri-app/src-tauri/Cargo.toml +++ b/plugins/camera/examples/tauri-app/src-tauri/Cargo.toml @@ -19,7 +19,7 @@ tauri-build = { git = "https://github.com/tauri-apps/tauri", branch = "next", fe [dependencies] serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } -tauri = { git = "https://github.com/tauri-apps/tauri", branch = "next", features = ["api-all"] } +tauri = { version = "2.0.0-alpha.6", features = ["api-all"] } tauri-plugin-camera = { path = "../../../" } [features] diff --git a/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/.gitignore b/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/.gitignore index 671e5074..5390e9b2 100644 --- a/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/.gitignore +++ b/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/.gitignore @@ -9,10 +9,11 @@ /.idea/assetWizardSettings.xml .DS_Store build +/buildSrc/src/main/java/app/tauri/app/kotlin/BuildTask.kt +/buildSrc/src/main/java/app/tauri/app/kotlin/RustPlugin.kt /captures .externalNativeBuild .cxx local.properties -/tauri-plugins -/tauri-api +/.tauri diff --git a/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/app/proguard-tauri.pro b/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/app/proguard-tauri.pro index b4eb481e..f70b56a3 100644 --- a/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/app/proguard-tauri.pro +++ b/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/app/proguard-tauri.pro @@ -1,6 +1,10 @@ # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. --keep class app.tauri.app.TauriActivity { +-keep class app.tauri.app.* { + native ; +} + +-keepclassmembers class app.tauri.app.TauriActivity { getAppClass(...); getVersion(); } @@ -22,3 +26,5 @@ -keep class app.tauri.app.MainActivity { public getPluginManager(); } + +-keep class androidx.appcompat.app.AppCompatActivity { } diff --git a/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/app/src/main/AndroidManifest.xml b/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/app/src/main/AndroidManifest.xml index 36df901f..dadb02a0 100644 --- a/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/app/src/main/AndroidManifest.xml +++ b/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/app/src/main/AndroidManifest.xml @@ -1,8 +1,6 @@ - - - Tauri Camera - Camera + app + app \ No newline at end of file diff --git a/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/app/tauri.build.gradle.kts b/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/app/tauri.build.gradle.kts index 27d35939..624ca6bc 100644 --- a/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/app/tauri.build.gradle.kts +++ b/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/app/tauri.build.gradle.kts @@ -3,6 +3,5 @@ val implementation by configurations dependencies { - implementation(project(":tauri-plugin-camera")) } diff --git a/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/buildSrc/src/main/java/app/tauri/app/kotlin/BuildTask.kt b/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/buildSrc/src/main/java/app/tauri/app/kotlin/BuildTask.kt index 4ced88d4..2e777156 100644 --- a/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/buildSrc/src/main/java/app/tauri/app/kotlin/BuildTask.kt +++ b/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/buildSrc/src/main/java/app/tauri/app/kotlin/BuildTask.kt @@ -1,6 +1,7 @@ package app.tauri import java.io.File +import org.apache.tools.ant.taskdefs.condition.Os import org.gradle.api.DefaultTask import org.gradle.api.GradleException import org.gradle.api.logging.LogLevel @@ -21,13 +22,28 @@ open class BuildTask : DefaultTask() { @TaskAction fun build() { + val executable = """yarn"""; + try { + runTauriCli(executable) + } catch (e: Exception){ + if (Os.isFamily(Os.FAMILY_WINDOWS)) { + runTauriCli("$executable.cmd") + } else { + throw e; + } + } + } + + fun runTauriCli(executable: String) { val rootDirRel = rootDirRel ?: throw GradleException("rootDirRel cannot be null") val target = target ?: throw GradleException("target cannot be null") val release = release ?: throw GradleException("release cannot be null") + val args = listOf("tauri", "android", "android-studio-script"); + project.exec { workingDir(File(project.projectDir, rootDirRel.path)) - executable("""cargo""") - args(listOf("tauri", "android", "android-studio-script")) + executable(executable) + args(args) if (project.logger.isEnabled(LogLevel.DEBUG)) { args("-vv") } else if (project.logger.isEnabled(LogLevel.INFO)) { @@ -39,5 +55,4 @@ open class BuildTask : DefaultTask() { args(listOf("--target", target)) }.assertNormalExitValue() } -} - +} \ No newline at end of file diff --git a/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/settings.gradle b/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/settings.gradle index a1a06b10..b179eac8 100644 --- a/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/settings.gradle +++ b/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/settings.gradle @@ -1,6 +1,6 @@ include ':app' include ':tauri-android' -project(':tauri-android').projectDir = new File('./tauri-api') +project(':tauri-android').projectDir = new File('./.tauri/tauri-api') apply from: 'tauri.settings.gradle' diff --git a/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/tauri.settings.gradle b/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/tauri.settings.gradle index d07d8e7f..edbde458 100644 --- a/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/tauri.settings.gradle +++ b/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/tauri.settings.gradle @@ -1,3 +1 @@ -// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -include ':tauri-plugin-camera' -project(':tauri-plugin-camera').projectDir = new File('./tauri-plugins/tauri-plugin-camera') \ No newline at end of file +// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. \ No newline at end of file diff --git a/plugins/camera/examples/tauri-app/yarn.lock b/plugins/camera/examples/tauri-app/yarn.lock index d883596a..13a87079 100644 --- a/plugins/camera/examples/tauri-app/yarn.lock +++ b/plugins/camera/examples/tauri-app/yarn.lock @@ -34,65 +34,65 @@ resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-2.0.0-alpha.0.tgz#901abbaf3b9515ba0437716ac0383de549e4e3bc" integrity sha512-PQdy1Ao6JwKwW2/C11nP+IqnrWHB7+UgbM71zbzA1W3+1yyd9Zg+K7rzZ7f3yhvD7kdxmXUN3KgSfGeiDFzZ2A== -"@tauri-apps/cli-darwin-arm64@2.0.0-alpha.2": - version "2.0.0-alpha.2" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-2.0.0-alpha.2.tgz#0af2c077b80778ac4d138a0d42a5f406fcc205ee" - integrity sha512-Wu5QdZUgh0DEE0b3EKdJRkZzFoVngezxgvncQlMdXNaiKjdT767K2fB0XvQps+ycbtVLbUlG15jAwPZbWqRYGw== - -"@tauri-apps/cli-darwin-x64@2.0.0-alpha.2": - version "2.0.0-alpha.2" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-2.0.0-alpha.2.tgz#e82f01e53dabb23c700f82e904e36ac0ee635f38" - integrity sha512-e5VLsT/exSW1swUWkhCEAQ/fM8mZaUMoGeyESYtO7VfTNVglS0j+VfQ9a8taRxtOkajDZmqMDvmii4tA5I1Bbw== - -"@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-alpha.2": - version "2.0.0-alpha.2" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-2.0.0-alpha.2.tgz#866000663c66abd8ae88682c0f6cf03734ca7c6e" - integrity sha512-+/emaFpDPuqnTIyh+WcDqCbzc/SoREFfLDyumqdnFjRU1Uvc2Z9Eo/sMVnfuUw5vDMc2EPzYtT3uiZGez65ZTA== - -"@tauri-apps/cli-linux-arm64-gnu@2.0.0-alpha.2": - version "2.0.0-alpha.2" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-2.0.0-alpha.2.tgz#157a893fa2d36e56ec16de213ed2d0a9b209833c" - integrity sha512-UHAyqt8fFbp9MEbUHSiEKjJC98w/Dta3r9auE70K+/uNpt9pnP/lGturDWWAJagRIFwYKPyqSEqL5qFcKadYqw== - -"@tauri-apps/cli-linux-arm64-musl@2.0.0-alpha.2": - version "2.0.0-alpha.2" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.0.0-alpha.2.tgz#452fb06b5c563500206ba4a8cd5d979b1a3c71de" - integrity sha512-3euwm11RWvmTX+ISR/Y+N0TaWTJCRIj1pDgB+r2ZptRKlVTMNTJZDTXQlyJKcWEpi1azlbdxAzRvhN8NrgDmyA== - -"@tauri-apps/cli-linux-x64-gnu@2.0.0-alpha.2": - version "2.0.0-alpha.2" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-2.0.0-alpha.2.tgz#155c7ab8c4c2b319bca38580e77bc6f6ffc2d664" - integrity sha512-ijJ8Wij5mVd9p6lXQ+pXoFlx3Iv1JS1KQTeySICds43xzE8esGp5+HXRXDwWqQLdVmtI77P5VRIe2ssXiaeDUg== - -"@tauri-apps/cli-linux-x64-musl@2.0.0-alpha.2": - version "2.0.0-alpha.2" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-2.0.0-alpha.2.tgz#9965b076965bc8faf5623c9f67724ebeb9a197e7" - integrity sha512-sg8OTQfG/zJ4+6MA/+hk08hVb57iJn5VZDzBb3o6IpJ0cwtM8YDNv5C+6HWttBuxsn4oEoYxGml/FvowMfsOCg== - -"@tauri-apps/cli-win32-ia32-msvc@2.0.0-alpha.2": - version "2.0.0-alpha.2" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-2.0.0-alpha.2.tgz#808447504cdb22a2d998ac79810cf1035c710a03" - integrity sha512-R1AmO3GEm97ptM0tjxZjZ1fLnxzN3ZeOEKc85nR7ayqVqKVhMu+dhq5lKa/Y3GdMUR6Yj9GoCnaLp2xy4bV6JQ== - -"@tauri-apps/cli-win32-x64-msvc@2.0.0-alpha.2": - version "2.0.0-alpha.2" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-2.0.0-alpha.2.tgz#f7890a94cd8a0cc70faa831046ca8d8576a357d9" - integrity sha512-cLJJWxCdvvQP+I0B4h6h0TMMNYISoatQu57QVxPqypbkC/lK/ljjrbD5nu7M9wTFBkLkCTGyMC7N99esCmgIBQ== - -"@tauri-apps/cli@^2.0.0-alpha.0": - version "2.0.0-alpha.2" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-2.0.0-alpha.2.tgz#bef242ce3c8b286f0ab74595c5e069b0ce7c5b4f" - integrity sha512-M5o2ESOv9jGr7oIDl3sR3Q5++DXSW4xyfxzKCyu1JVGlOc+C9Q4y0dbKhlpd0wPCAxRa0ikbfu7z8qfEhHSpVQ== +"@tauri-apps/cli-darwin-arm64@2.0.0-alpha.6": + version "2.0.0-alpha.6" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-2.0.0-alpha.6.tgz#d4fd5aa715bb3df7513f321636b3bcbade81fe06" + integrity sha512-Oc6EUaXRsAXCapl5EdEqkzMUkCpqQ9ELXhLORwgVTDNYjq11xpe/VxYlVoao/FuEp9DnHvcdZVlgNrEgWb8whQ== + +"@tauri-apps/cli-darwin-x64@2.0.0-alpha.6": + version "2.0.0-alpha.6" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-2.0.0-alpha.6.tgz#55455274f6860f2412f99a1b2603bffcdce691e7" + integrity sha512-HhF4XFTsznCzAVXQJd1e+yi1DdVD5PHOXVl2ZjeqmALvci4X/yCZEj4sCg4+Qukvs8BVnDYRvGs7M8cjbJZJoQ== + +"@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-alpha.6": + version "2.0.0-alpha.6" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-2.0.0-alpha.6.tgz#88bce2a4714530447d43a0e8bf3bebbc6162980b" + integrity sha512-diHDgkBtx1exs/vlouy0B0MrUkJL0ojCJZcoq3rR76kMk2Gmsxz43AsoQfgziE9BCS2luIwilMuofgKOY4s+Zg== + +"@tauri-apps/cli-linux-arm64-gnu@2.0.0-alpha.6": + version "2.0.0-alpha.6" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-2.0.0-alpha.6.tgz#388bfa33cf7dc4ce6676f3be7ebe34fdbab7dfa2" + integrity sha512-g8SpZ3rVUdVIfuuosdnq3U359KF48R374b1G3xUUyebJAwWZ5Bay0P94RW0JNoqbM9Z4UpSedrCgIPcunnmZHw== + +"@tauri-apps/cli-linux-arm64-musl@2.0.0-alpha.6": + version "2.0.0-alpha.6" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.0.0-alpha.6.tgz#90059465acfd397aeba0d6a12d2bb6fbd6f0fc06" + integrity sha512-RD5u0MoBKruMZK7jp4tcQ9JUU6wx25+m0HfT+WSC3YGV8waRxVT/yxyxH5FEPhsxsT0LUQohOUF2S3oB4/bYIg== + +"@tauri-apps/cli-linux-x64-gnu@2.0.0-alpha.6": + version "2.0.0-alpha.6" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-2.0.0-alpha.6.tgz#6d0e6e371168ee38c0657e519f227d01e8e9f181" + integrity sha512-AWJbXJ8bZgwWDorHnCLdLKdz7j9sQqnhKaP+GTNZ2bBUuM03rVYfB5GAOmteqSAXOWfzT/LCLIZIQaZ+Y36vHg== + +"@tauri-apps/cli-linux-x64-musl@2.0.0-alpha.6": + version "2.0.0-alpha.6" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-2.0.0-alpha.6.tgz#ad4d978c8babaea424b502e901bf1be20eea2241" + integrity sha512-0+FoSopNCHdwEWmdYdlY+G8WXa2ojFXAqs1vIiJlQ4Z6e1Lv6dmPww+FmhNChW4bSi/HH1PbdPX0FB0WEFnM2g== + +"@tauri-apps/cli-win32-ia32-msvc@2.0.0-alpha.6": + version "2.0.0-alpha.6" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-2.0.0-alpha.6.tgz#5db864a62beecfa446db0e9af6afc152d8bdec32" + integrity sha512-JsdlWyP2szDvOXhNMSbDUMxb0t5ppl80AAtUjtNM47nyM2/QtoMYPZ6eIjxmKnss/ZbRCF5eCEgP1v5/x+W/gw== + +"@tauri-apps/cli-win32-x64-msvc@2.0.0-alpha.6": + version "2.0.0-alpha.6" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-2.0.0-alpha.6.tgz#7404db576ee00bbbf99399905b9fedaec48159f2" + integrity sha512-RY4aCCIyiwuD0iDxzwvqDSyoMoz6xgoGzWS4Xy2wKvoi/ptUAPRn8uhI3JTLFH4U+qky0KXO1oonBfOTF/pWQw== + +"@tauri-apps/cli@^2.0.0-alpha.6": + version "2.0.0-alpha.6" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-2.0.0-alpha.6.tgz#bcfef07161f9cf695485488f54559ae02f61c992" + integrity sha512-5apIpCGSuf5fUKYW1Jw0Qi1AAMvlUfr7jX41lhIrpXYeOD+Q8HKlpgpRpUScONfA9TThJBUuOfSVPbEkYMsyfw== optionalDependencies: - "@tauri-apps/cli-darwin-arm64" "2.0.0-alpha.2" - "@tauri-apps/cli-darwin-x64" "2.0.0-alpha.2" - "@tauri-apps/cli-linux-arm-gnueabihf" "2.0.0-alpha.2" - "@tauri-apps/cli-linux-arm64-gnu" "2.0.0-alpha.2" - "@tauri-apps/cli-linux-arm64-musl" "2.0.0-alpha.2" - "@tauri-apps/cli-linux-x64-gnu" "2.0.0-alpha.2" - "@tauri-apps/cli-linux-x64-musl" "2.0.0-alpha.2" - "@tauri-apps/cli-win32-ia32-msvc" "2.0.0-alpha.2" - "@tauri-apps/cli-win32-x64-msvc" "2.0.0-alpha.2" + "@tauri-apps/cli-darwin-arm64" "2.0.0-alpha.6" + "@tauri-apps/cli-darwin-x64" "2.0.0-alpha.6" + "@tauri-apps/cli-linux-arm-gnueabihf" "2.0.0-alpha.6" + "@tauri-apps/cli-linux-arm64-gnu" "2.0.0-alpha.6" + "@tauri-apps/cli-linux-arm64-musl" "2.0.0-alpha.6" + "@tauri-apps/cli-linux-x64-gnu" "2.0.0-alpha.6" + "@tauri-apps/cli-linux-x64-musl" "2.0.0-alpha.6" + "@tauri-apps/cli-win32-ia32-msvc" "2.0.0-alpha.6" + "@tauri-apps/cli-win32-x64-msvc" "2.0.0-alpha.6" cross-spawn@^7.0.3: version "7.0.3"