diff --git a/.github/workflows/ci-v1.yml b/.github/workflows/ci-v1.yml index 37e29bba..dd9e59f9 100644 --- a/.github/workflows/ci-v1.yml +++ b/.github/workflows/ci-v1.yml @@ -70,7 +70,7 @@ jobs: sudo apt-get install -y libwebkit2gtk-4.0-dev protobuf-compiler - uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.73.0 # MSRV + toolchain: 1.78.0 # MSRV - uses: Swatinem/rust-cache@v2 - run: cargo check --manifest-path crates/v1/Cargo.toml --tests diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9a57579e..620e00c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,7 +66,7 @@ jobs: sudo apt-get install -y webkit2gtk-4.1 protobuf-compiler - uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.73.0 # MSRV + toolchain: 1.78.0 # MSRV - uses: Swatinem/rust-cache@v2 - run: cargo check --workspace --tests diff --git a/Cargo.lock b/Cargo.lock index 789af790..07ed313f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1211,19 +1211,6 @@ dependencies = [ "x11", ] -[[package]] -name = "generator" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "windows 0.48.0", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -1912,7 +1899,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -1965,21 +1952,6 @@ version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" -[[package]] -name = "loom" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" -dependencies = [ - "cfg-if", - "generator", - "scoped-tls", - "serde", - "serde_json", - "tracing", - "tracing-subscriber", -] - [[package]] name = "mac" version = "0.1.1" @@ -2074,16 +2046,17 @@ dependencies = [ [[package]] name = "muda" -version = "0.14.1" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba8ac4080fb1e097c2c22acae467e46e4da72d941f02e82b67a87a2a89fa38b1" +checksum = "b8123dfd4996055ac9b15a60ad263b44b01e539007523ad7a4a533a3d93b0591" dependencies = [ - "cocoa 0.26.0", "crossbeam-channel", "dpi", "gtk", "keyboard-types", - "objc", + "objc2", + "objc2-app-kit", + "objc2-foundation", "once_cell", "png", "serde", @@ -3140,6 +3113,7 @@ dependencies = [ "serde", "serde_json", "url", + "uuid", ] [[package]] @@ -3154,12 +3128,6 @@ dependencies = [ "syn 2.0.66", ] -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - [[package]] name = "scopeguard" version = "1.2.0" @@ -3471,15 +3439,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "state" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8" -dependencies = [ - "loom", -] - [[package]] name = "string_cache" version = "0.8.7" @@ -3587,9 +3546,9 @@ dependencies = [ [[package]] name = "tao" -version = "0.30.0" +version = "0.30.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a93f2c6b8fdaeb7f417bda89b5bc767999745c3052969664ae1fa65892deb7e" +checksum = "06e48d7c56b3f7425d061886e8ce3b6acfab1993682ed70bef50fd133d721ee6" dependencies = [ "bitflags 2.6.0", "cocoa 0.26.0", @@ -3618,7 +3577,7 @@ dependencies = [ "tao-macros", "unicode-segmentation", "url", - "windows 0.58.0", + "windows", "windows-core 0.58.0", "windows-version", "x11-dl", @@ -3643,13 +3602,12 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tauri" -version = "2.0.0-rc.10" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6327f79726c508efbbc3826b343fd7d39ebce786bdeff5881077b35d335d9e0" +checksum = "3c9c08beea86d5095b6f5fb1c788fe8759b23c3f71927c66a69e725a91d089cd" dependencies = [ "anyhow", "bytes", - "cocoa 0.26.0", "dirs", "dunce", "embed_plist", @@ -3664,15 +3622,17 @@ dependencies = [ "log", "mime", "muda", - "objc", + "objc2", + "objc2-app-kit", + "objc2-foundation", "percent-encoding", + "plist", "raw-window-handle", "reqwest 0.12.4", "serde", "serde_json", "serde_repr", "serialize-to-javascript", - "state", "swift-rs", "tauri-build", "tauri-macros", @@ -3688,14 +3648,14 @@ dependencies = [ "webkit2gtk", "webview2-com", "window-vibrancy", - "windows 0.58.0", + "windows", ] [[package]] name = "tauri-build" -version = "2.0.0-rc.9" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7938a610d1474435fa38dfba66c95ce9be7f17b500672b6e00072bca5e52fef3" +checksum = "93bb649a284aec2ab43e8df6831b8c8060d231ec8ddf05bf021d58cb67570e1f" dependencies = [ "anyhow", "cargo_toml", @@ -3715,9 +3675,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0-rc.9" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "467d3e95b57c860bea13b7c812820d9e7425e4b700e5e69b358d906f22022007" +checksum = "a4511912612ba0da11aeb300e18e18b2c7067fd14aa886eac46bdcc43b4fa3ee" dependencies = [ "base64 0.22.1", "brotli", @@ -3755,9 +3715,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-rc.8" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4585a906bd96bf57d063c3d60c52577ccc5de592d08f9d112e873ada79af9b9" +checksum = "62ee976578a14b779996d7b6879d7e625c8ce674bc87e223953664f37def2eef" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -3769,9 +3729,9 @@ dependencies = [ [[package]] name = "tauri-plugin" -version = "2.0.0-rc.9" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b905ecef194245bb35baba0447703f9fe40e4c03e946c7aba54c21c23e3452c7" +checksum = "774d084450b7ec8e445ad119079307f935b7bf3d736da139a8664eb1d4909aa5" dependencies = [ "anyhow", "glob", @@ -3786,7 +3746,7 @@ dependencies = [ [[package]] name = "tauri-plugin-devtools" -version = "2.0.0-rc.1" +version = "2.0.0" dependencies = [ "async-stream", "bytes", @@ -3811,9 +3771,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.0.0-rc.9" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72cd110a6699ef44963504d4fa4f6c535677bb0177da2d178f4f822a53058ed" +checksum = "2570e1f33f332a2d2d9967ebb3903bc4e1f92b9c47e4d1b302c10ea4153fcdbb" dependencies = [ "dpi", "gtk", @@ -3825,20 +3785,22 @@ dependencies = [ "tauri-utils", "thiserror", "url", - "windows 0.58.0", + "windows", ] [[package]] name = "tauri-runtime-wry" -version = "2.0.0-rc.9" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eb325cca17496ccbb469e7e2fef7f3e31a1005ab0c658dc3331c7781a573401" +checksum = "8147d8f9ed418d83a90af3d64fbdca5e0e924ae28e5351da88f9568169db8665" dependencies = [ - "cocoa 0.26.0", "gtk", "http 1.1.0", "jni", "log", + "objc2", + "objc2-app-kit", + "objc2-foundation", "percent-encoding", "raw-window-handle", "softbuffer", @@ -3849,15 +3811,15 @@ dependencies = [ "url", "webkit2gtk", "webview2-com", - "windows 0.58.0", + "windows", "wry", ] [[package]] name = "tauri-utils" -version = "2.0.0-rc.9" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6746b87c4755f493b94920622e245aef2d771f001ddeffc203e315872d323e1c" +checksum = "f87856e9d7fa91fd710362f3c73fccbf6bfd036934908791e65bd803d54dc8a8" dependencies = [ "brotli", "cargo_metadata", @@ -3885,6 +3847,7 @@ dependencies = [ "toml 0.8.2", "url", "urlpattern", + "uuid", "walkdir", ] @@ -4321,9 +4284,9 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.17.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "044d7738b3d50f288ddef035b793228740ad4d927f5466b0af55dc15e7e03cfe" +checksum = "533fc2d4105e0e3d96ce1c71f2d308c9fbbe2ef9c587cab63dd627ab5bde218f" dependencies = [ "core-graphics 0.24.0", "crossbeam-channel", @@ -4469,6 +4432,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "getrandom 0.2.15", + "serde", ] [[package]] @@ -4698,7 +4662,7 @@ checksum = "6f61ff3d9d0ee4efcb461b14eb3acfda2702d10dc329f339303fc3e57215ae2c" dependencies = [ "webview2-com-macros", "webview2-com-sys", - "windows 0.58.0", + "windows", "windows-core 0.58.0", "windows-implement", "windows-interface", @@ -4722,7 +4686,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3a3e2eeb58f82361c93f9777014668eb3d07e7d174ee4c819575a9208011886" dependencies = [ "thiserror", - "windows 0.58.0", + "windows", "windows-core 0.58.0", ] @@ -4770,15 +4734,6 @@ dependencies = [ "windows-version", ] -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - [[package]] name = "windows" version = "0.58.0" @@ -5106,9 +5061,9 @@ dependencies = [ [[package]] name = "wry" -version = "0.43.1" +version = "0.44.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4d715cf5fe88e9647f3d17b207b6d060d4a88e7171d4ccb2d2c657dd1d44728" +checksum = "440600584cfbd8b0d28eace95c1f2c253db05dae43780b79380aa1e868f04c73" dependencies = [ "base64 0.22.1", "block", @@ -5139,7 +5094,7 @@ dependencies = [ "webkit2gtk", "webkit2gtk-sys", "webview2-com", - "windows 0.58.0", + "windows", "windows-core 0.58.0", "windows-version", "x11-dl", diff --git a/Cargo.toml b/Cargo.toml index c98f4a09..bf1b5a6b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ exclude = ["crates/devtools-v1", "crates/devtools", "examples/tauri-v1"] [workspace.package] authors = ["CrabNebula "] edition = "2021" -rust-version = "1.73.0" +rust-version = "1.78.0" license = "MIT OR Apache-2.0" repository = "https://github.com/crabnebula-dev/devtools" @@ -21,9 +21,9 @@ tracing-core = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } thiserror = "1.0" tokio-stream = "0.1" -tauri = { version = "2.0.0-rc.10", features = ["tracing"] } -tauri-build = "2.0.0-rc.9" -tauri-plugin = "2.0.0-rc.9" +tauri = { version = "2.0.0", features = ["tracing"] } +tauri-build = "2.0.0" +tauri-plugin = "2.0.0" tonic = "0.10" prost = "0.12" prost-types = "0.12" diff --git a/README.md b/README.md index 63cfeec3..611270c8 100644 --- a/README.md +++ b/README.md @@ -55,17 +55,17 @@ And that’s it! If you run your app now (cargo tauri dev), you will notice the Ensure you have [Tauri](https://v2.tauri.app/guides/create/) set up correctly. Then install the Rust instrumentation from crates.io: ```sh -cargo add tauri-plugin-devtools@2.0.0-rc +cargo add tauri-plugin-devtools@2.0.0 ``` -You also have to use Tauri **2.0.0-rc.0** (or later) so your `Cargo.toml` file should look as follows: +You also have to use Tauri **2.0** so your `Cargo.toml` file should look as follows: ```toml [dependencies] -tauri-plugin-devtools = "2.0.0-rc" -tauri = "2.0.0-rc" +tauri-plugin-devtools = "2.0.0" +tauri = "2.0.0" [build-dependencies] -tauri-build = "2.0.0-rc" +tauri-build = "2.0.0" ``` Then add the following snippet to your tauri initialization code: diff --git a/crates/devtools-core/src/aggregator.rs b/crates/devtools-core/src/aggregator.rs index 41e4eee5..279b0d42 100644 --- a/crates/devtools-core/src/aggregator.rs +++ b/crates/devtools-core/src/aggregator.rs @@ -153,7 +153,7 @@ impl Aggregator { } => { self.logs.push_overwrite(LogEvent { at: Some(self.base_time.to_timestamp(at)), - metadata_id: metadata as *const _ as u64, + metadata_id: std::ptr::from_ref(metadata) as u64, message, fields, parent: maybe_parent.map(|id| id.into_u64()), diff --git a/crates/devtools-core/src/bridge_layer.rs b/crates/devtools-core/src/bridge_layer.rs index d64c43b5..79feeadf 100644 --- a/crates/devtools-core/src/bridge_layer.rs +++ b/crates/devtools-core/src/bridge_layer.rs @@ -26,7 +26,7 @@ where fn on_event(&self, event: &tracing_core::Event<'_>, _ctx: Context<'_, S>) { let metadata = event.metadata(); - let mut visitor = EventVisitor::new(metadata as *const _ as u64); + let mut visitor = EventVisitor::new(std::ptr::from_ref(metadata) as u64); event.record(&mut visitor); let (message, _fields) = visitor.result(); diff --git a/crates/devtools-core/src/layer.rs b/crates/devtools-core/src/layer.rs index 36c151d5..9fa4c0e0 100644 --- a/crates/devtools-core/src/layer.rs +++ b/crates/devtools-core/src/layer.rs @@ -82,7 +82,7 @@ where ) { let span = ctx.span(id).expect("Span not in context, probably a bug"); let metadata = span.metadata(); - let mut visitor = FieldVisitor::new(metadata as *const _ as u64); + let mut visitor = FieldVisitor::new(std::ptr::from_ref(metadata) as u64); values.record(&mut visitor); let fields = visitor.result(); @@ -102,7 +102,7 @@ where let metadata = span.metadata(); let maybe_parent = span.parent().map(|s| s.id()); - let mut visitor = FieldVisitor::new(metadata as *const _ as u64); + let mut visitor = FieldVisitor::new(std::ptr::from_ref(metadata) as u64); attrs.record(&mut visitor); let fields = visitor.result(); @@ -125,7 +125,7 @@ where }); self.send_event(&self.shared.dropped_log_events, || { - let mut visitor = EventVisitor::new(metadata as *const _ as u64); + let mut visitor = EventVisitor::new(std::ptr::from_ref(metadata) as u64); event.record(&mut visitor); let (message, fields) = visitor.result(); diff --git a/crates/devtools/Cargo.toml b/crates/devtools/Cargo.toml index 4fbc2d92..9fd8afbe 100644 --- a/crates/devtools/Cargo.toml +++ b/crates/devtools/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-devtools" -version = "2.0.0-rc.1" +version = "2.0.0" description = "CrabNebula devtools for Tauri: Inspect, monitor, and understand your application with ease." authors.workspace = true edition.workspace = true diff --git a/crates/devtools/README.md b/crates/devtools/README.md index 6ef614ca..9d720993 100644 --- a/crates/devtools/README.md +++ b/crates/devtools/README.md @@ -11,7 +11,7 @@ Inspect, monitor, and understand your [Tauri](https://tauri.app) application wit Ensure you have [Tauri](https://tauri.app/v1/guides/getting-started/setup/) set up correctly. Then install the Rust instrumentation from crates.io: ```sh -cargo add tauri-plugin-devtools@2.0.0-rc +cargo add tauri-plugin-devtools ``` Then add the following snippet to your tauri initialization code: diff --git a/crates/v1/crates/devtools/Cargo.toml b/crates/v1/crates/devtools/Cargo.toml index fa720cfd..5b98c263 100644 --- a/crates/v1/crates/devtools/Cargo.toml +++ b/crates/v1/crates/devtools/Cargo.toml @@ -4,7 +4,7 @@ authors = ["CrabNebula "] edition = "2021" version = "0.3.3" description = "CrabNebula devtools for Tauri: Inspect, monitor, and understand your application with ease." -rust-version = "1.73.0" +rust-version = "1.78.0" license = "MIT OR Apache-2.0" repository = "https://github.com/crabnebula-dev/devtools" diff --git a/crates/wire/src/common.rs b/crates/wire/src/common.rs index 6038c438..e25b8927 100644 --- a/crates/wire/src/common.rs +++ b/crates/wire/src/common.rs @@ -51,7 +51,7 @@ impl<'a> From<&'a tracing_core::Metadata<'a>> for Metadata { impl From<&'static tracing_core::Metadata<'static>> for NewMetadata { fn from(value: &'static tracing_core::Metadata<'static>) -> Self { NewMetadata { - id: Some(value as *const _ as u64), + id: Some(std::ptr::from_ref(value) as u64), metadata: Some(value.into()), } } diff --git a/crates/wire/src/spans.rs b/crates/wire/src/spans.rs index a3a9fd80..910f7625 100644 --- a/crates/wire/src/spans.rs +++ b/crates/wire/src/spans.rs @@ -20,7 +20,7 @@ impl SpanEvent { Self { event: Some(span_event::Event::NewSpan(span_event::Span { id: id.into_u64(), - metadata_id: metadata as *const _ as u64, + metadata_id: std::ptr::from_ref(metadata) as u64, fields, at: Some(at), parent: parent.map(|id| id.into_u64()), diff --git a/examples/tauri/package.json b/examples/tauri/package.json index fb9b3fab..6213aba5 100644 --- a/examples/tauri/package.json +++ b/examples/tauri/package.json @@ -8,7 +8,7 @@ "dev": "http-server src/ --port 1430" }, "devDependencies": { - "@tauri-apps/cli": "^2.0.0-rc.0", + "@tauri-apps/cli": "^2.0.0", "http-server": "^14.1.1" } } diff --git a/examples/tauri/pnpm-lock.yaml b/examples/tauri/pnpm-lock.yaml index 22fca5d6..068c43da 100644 --- a/examples/tauri/pnpm-lock.yaml +++ b/examples/tauri/pnpm-lock.yaml @@ -9,76 +9,76 @@ importers: .: devDependencies: '@tauri-apps/cli': - specifier: ^2.0.0-rc.0 - version: 2.0.0-rc.0 + specifier: ^2.0.0 + version: 2.0.0 http-server: specifier: ^14.1.1 version: 14.1.1 packages: - '@tauri-apps/cli-darwin-arm64@2.0.0-rc.0': - resolution: {integrity: sha512-jpQc++6ESFUuBpoXvJNPTRtrmToMIByOynZ4K5SAwI9RkKUikSaDmlRZV0GisOVPT7TT08khk7MPtAQeFyjqwA==} + '@tauri-apps/cli-darwin-arm64@2.0.0': + resolution: {integrity: sha512-+agYqg2c77imaMfKw7mzqecVIDGcwr6bZMdglJ808O2UjTFzMwnAam1sU26YBYU+IyIjwOu00fm9Azpal+N/Ew==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] - '@tauri-apps/cli-darwin-x64@2.0.0-rc.0': - resolution: {integrity: sha512-EnqsgcNUwH29YjQ4JdBID5kILQQdIJgZ36VQgtju/BBvnd1lr+6Bswdk1/4y41hhAVz9WyHeMCnTH33CSKvNxw==} + '@tauri-apps/cli-darwin-x64@2.0.0': + resolution: {integrity: sha512-keN2PLTTcZmbWwFMup/NGcshmvyLnhRPChO8lbm9C5a0IY7zUNQUD7/o/zIulQdLJqDxkdpWJ1j2jTycAtvtKQ==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] - '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-rc.0': - resolution: {integrity: sha512-YKg/qThAmQYRToiV8lx/DvMf0VaUJAutIfv8ALq9Or4zdg7mZlAlKvF+7lZQQRmKhQ62+0gnoJS2HyN8feaagw==} + '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0': + resolution: {integrity: sha512-FQJNrlCUBb9E7Fhp5ARy+Or8lSvorG41aVrfi0cGNvv1QlIGSj77TN7SKK+L1jAGzKj1Bl2kCZIESF6Zi8N/+Q==} engines: {node: '>= 10'} cpu: [arm] os: [linux] - '@tauri-apps/cli-linux-arm64-gnu@2.0.0-rc.0': - resolution: {integrity: sha512-UnflWuNhH/u41GSmG1jm6qhWUM4o1AB463QCaf2fAjLo5GWiI78U6rJOOXZvOOmWIQuzsmAUZjNDORWW13+osA==} + '@tauri-apps/cli-linux-arm64-gnu@2.0.0': + resolution: {integrity: sha512-TK3VrZG5LK1NGueKwnZA1/3gj/qkwry001MNCHXjT6394dwrDv+digCc9Qc569h+xeH/FF71jyoiRIu3gRE6iA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tauri-apps/cli-linux-arm64-musl@2.0.0-rc.0': - resolution: {integrity: sha512-sWRaDyb332gtHWHr0KvoLzkzvXqRpZ0vpQYxKF2/mIZtaUuMtU56GmRwFVX4VjQYgWb3yWmzTr+tEKjCjXbjng==} + '@tauri-apps/cli-linux-arm64-musl@2.0.0': + resolution: {integrity: sha512-E3hRmS/0m8YUYMTKZtBExpk/284CTi2nymks0dK0L1j+3KjffL7DiilnIfNFmTvWBgMrs0cVCtoaN/ba/A9mNA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tauri-apps/cli-linux-x64-gnu@2.0.0-rc.0': - resolution: {integrity: sha512-1dokW+9ZfhwzwYz42jYR5A0/VnGoEGVW7HyN1N6KvHeL1FpSbh0LoTsDODjVjZSjXd62+Aac/stbJqBZChQWbA==} + '@tauri-apps/cli-linux-x64-gnu@2.0.0': + resolution: {integrity: sha512-veX4BJp5xnW8KmxVjchWt4oZEIvKGhuSR7qU1WpqTR21e/eTe/ksGsdXPsqOKQvv/w1X6jhqmlPvhnFmDwUJ/w==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tauri-apps/cli-linux-x64-musl@2.0.0-rc.0': - resolution: {integrity: sha512-7tb34p3vLEGS4pGRpmxcz7eq37yD7DVe4XFfgj8ZO0KsaRBVivzNK2snNDLnd0dVZcx/lJjZc8Cf0B5W1/x/Jw==} + '@tauri-apps/cli-linux-x64-musl@2.0.0': + resolution: {integrity: sha512-9Eso/8wbsWbOyd9PZEIzN/48ZQJrUGQqGZtglcjUku0lO76mnX0fOnit4nQ57Oj0wezJPhv4mgSseG1OsTIVzw==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tauri-apps/cli-win32-arm64-msvc@2.0.0-rc.0': - resolution: {integrity: sha512-Ilw3Gro8ZBew9yfBXcaET9lLj0g4jehWDMH6j2Wdje1rnvBbQShMaSn3WNMfJypyet5nqM88nGA3YipzmVcIBA==} + '@tauri-apps/cli-win32-arm64-msvc@2.0.0': + resolution: {integrity: sha512-ky8vWAuDUf8WGt9+a0G/EbU0OhdIkogelh9qjIYGHbyEYAJqXfN5P40aHUEg3y8ngQ0YGwRX5ePsQsSZiiR5PQ==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] - '@tauri-apps/cli-win32-ia32-msvc@2.0.0-rc.0': - resolution: {integrity: sha512-AWzgDlvv0BssWH3aNsDXLRkKbGynWdm5X6DenSQKtZm5dmDBZsNlZRMgkyPb8WSHK/7ARznKs2OdnkuHWuh9ww==} + '@tauri-apps/cli-win32-ia32-msvc@2.0.0': + resolution: {integrity: sha512-uD45cLZ/EBaT8o4a27tHW7t5UKFplnvDLt/uSUaCpJ3NyOTV6nMXOUrJBe+hH9hSBohqNAF7LEyYo1p932DWFg==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] - '@tauri-apps/cli-win32-x64-msvc@2.0.0-rc.0': - resolution: {integrity: sha512-zmXDUkBmzZ6lk6jT6AoOAE2w+kmkLX5uf/vaJHHzE6WsrZ6UymH0HTLwbRXhaplvpnzXGVyLuSlv3/BK6Q69aQ==} + '@tauri-apps/cli-win32-x64-msvc@2.0.0': + resolution: {integrity: sha512-oFlo14YMsvyhJHmmHgRuOpJ1L9w15193c1Nfj1DksS2LHj6tLzirI7YrAF9inY/XjHFjNHzYPmBpABibkf/9wQ==} engines: {node: '>= 10'} cpu: [x64] os: [win32] - '@tauri-apps/cli@2.0.0-rc.0': - resolution: {integrity: sha512-X9N/R7e3zeTpU0HgQi2kaNYncMFoSTzXstnUyGOcKrJcCkR4ebbA2nYqhGvIPfglLKHNFRTZwfPNhixx2Ftxxg==} + '@tauri-apps/cli@2.0.0': + resolution: {integrity: sha512-xxmPllRa6w/LRRcPczST3yHrYoi8l6ZZmzwabEmM0cgDdhVDmX+Y4oDJkiKD+8cVdxwwEzIuIKuaCwsX8iNsgA==} engines: {node: '>= 10'} hasBin: true @@ -253,48 +253,48 @@ packages: snapshots: - '@tauri-apps/cli-darwin-arm64@2.0.0-rc.0': + '@tauri-apps/cli-darwin-arm64@2.0.0': optional: true - '@tauri-apps/cli-darwin-x64@2.0.0-rc.0': + '@tauri-apps/cli-darwin-x64@2.0.0': optional: true - '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-rc.0': + '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0': optional: true - '@tauri-apps/cli-linux-arm64-gnu@2.0.0-rc.0': + '@tauri-apps/cli-linux-arm64-gnu@2.0.0': optional: true - '@tauri-apps/cli-linux-arm64-musl@2.0.0-rc.0': + '@tauri-apps/cli-linux-arm64-musl@2.0.0': optional: true - '@tauri-apps/cli-linux-x64-gnu@2.0.0-rc.0': + '@tauri-apps/cli-linux-x64-gnu@2.0.0': optional: true - '@tauri-apps/cli-linux-x64-musl@2.0.0-rc.0': + '@tauri-apps/cli-linux-x64-musl@2.0.0': optional: true - '@tauri-apps/cli-win32-arm64-msvc@2.0.0-rc.0': + '@tauri-apps/cli-win32-arm64-msvc@2.0.0': optional: true - '@tauri-apps/cli-win32-ia32-msvc@2.0.0-rc.0': + '@tauri-apps/cli-win32-ia32-msvc@2.0.0': optional: true - '@tauri-apps/cli-win32-x64-msvc@2.0.0-rc.0': + '@tauri-apps/cli-win32-x64-msvc@2.0.0': optional: true - '@tauri-apps/cli@2.0.0-rc.0': + '@tauri-apps/cli@2.0.0': optionalDependencies: - '@tauri-apps/cli-darwin-arm64': 2.0.0-rc.0 - '@tauri-apps/cli-darwin-x64': 2.0.0-rc.0 - '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0-rc.0 - '@tauri-apps/cli-linux-arm64-gnu': 2.0.0-rc.0 - '@tauri-apps/cli-linux-arm64-musl': 2.0.0-rc.0 - '@tauri-apps/cli-linux-x64-gnu': 2.0.0-rc.0 - '@tauri-apps/cli-linux-x64-musl': 2.0.0-rc.0 - '@tauri-apps/cli-win32-arm64-msvc': 2.0.0-rc.0 - '@tauri-apps/cli-win32-ia32-msvc': 2.0.0-rc.0 - '@tauri-apps/cli-win32-x64-msvc': 2.0.0-rc.0 + '@tauri-apps/cli-darwin-arm64': 2.0.0 + '@tauri-apps/cli-darwin-x64': 2.0.0 + '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0 + '@tauri-apps/cli-linux-arm64-gnu': 2.0.0 + '@tauri-apps/cli-linux-arm64-musl': 2.0.0 + '@tauri-apps/cli-linux-x64-gnu': 2.0.0 + '@tauri-apps/cli-linux-x64-musl': 2.0.0 + '@tauri-apps/cli-win32-arm64-msvc': 2.0.0 + '@tauri-apps/cli-win32-ia32-msvc': 2.0.0 + '@tauri-apps/cli-win32-x64-msvc': 2.0.0 ansi-styles@4.3.0: dependencies: diff --git a/examples/tauri/src-tauri/Cargo.toml b/examples/tauri/src-tauri/Cargo.toml index c45c938a..557cdb3e 100644 --- a/examples/tauri/src-tauri/Cargo.toml +++ b/examples/tauri/src-tauri/Cargo.toml @@ -17,7 +17,7 @@ tauri-build.workspace = true [dependencies] tauri.workspace = true -tauri-plugin-devtools = { path = "../../../crates/devtools", version = "2.0.0-rc.1" } +tauri-plugin-devtools = { path = "../../../crates/devtools", version = "2.0.0" } tracing.workspace = true tokio = { workspace = true, features = ["time"] } reqwest = { version = "0.11", default-features = false, features = [