From 9330e0539839ae065f8f62ba89c1f30e33d8f4e3 Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Sat, 18 Mar 2023 11:31:55 -0300 Subject: [PATCH 1/3] chore(deps): update tauri, adjust iOS plugin --- Cargo.lock | 42 +++++++++++++---------------------- plugins/log/.gitignore | 3 ++- plugins/log/ios/.gitignore | 1 - plugins/log/ios/Package.swift | 2 +- 4 files changed, 19 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5810e68b..fe2541d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -245,21 +245,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "attohttpc" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d9a9bf8b79a749ee0b911b91b671cc2b6c670bdbc7e3dfd537576ddc94bb2a2" -dependencies = [ - "flate2", - "http", - "log", - "serde", - "serde_json", - "serde_urlencoded", - "url", -] - [[package]] name = "atty" version = "0.2.14" @@ -462,6 +447,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" @@ -4140,9 +4128,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "swift-rs" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806ff0904302a8a91644422fcfeee4828c3a9dbcfd1757ba495f1a755c2ac873" +checksum = "2eab55f44d02ced20ffa22fd5b4bd083ab59c940c7637d37fec4426b1a01d769" dependencies = [ "base64 0.21.0", "serde", @@ -4259,10 +4247,10 @@ dependencies = [ [[package]] name = "tauri" version = "2.0.0-alpha.3" -source = "git+https://github.com/tauri-apps/tauri?branch=next#5d94eaa3bc9f1e5cf3e0fa64fba5801d494c2541" +source = "git+https://github.com/tauri-apps/tauri?branch=next#56b528e4817235f51a699bb8716927d6d38081a3" dependencies = [ "anyhow", - "attohttpc", + "bytes 1.4.0", "cocoa", "dirs-next", "embed_plist", @@ -4283,6 +4271,7 @@ dependencies = [ "percent-encoding", "rand 0.8.5", "raw-window-handle", + "reqwest", "semver 1.0.16", "serde", "serde_json", @@ -4309,7 +4298,7 @@ dependencies = [ [[package]] name = "tauri-build" version = "2.0.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#5d94eaa3bc9f1e5cf3e0fa64fba5801d494c2541" +source = "git+https://github.com/tauri-apps/tauri?branch=next#56b528e4817235f51a699bb8716927d6d38081a3" dependencies = [ "anyhow", "cargo_toml", @@ -4328,7 +4317,7 @@ dependencies = [ [[package]] name = "tauri-codegen" version = "2.0.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#5d94eaa3bc9f1e5cf3e0fa64fba5801d494c2541" +source = "git+https://github.com/tauri-apps/tauri?branch=next#56b528e4817235f51a699bb8716927d6d38081a3" dependencies = [ "base64 0.21.0", "brotli", @@ -4353,7 +4342,7 @@ dependencies = [ [[package]] name = "tauri-macros" version = "2.0.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#5d94eaa3bc9f1e5cf3e0fa64fba5801d494c2541" +source = "git+https://github.com/tauri-apps/tauri?branch=next#56b528e4817235f51a699bb8716927d6d38081a3" dependencies = [ "heck", "proc-macro2", @@ -4574,7 +4563,7 @@ dependencies = [ [[package]] name = "tauri-runtime" version = "0.13.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#5d94eaa3bc9f1e5cf3e0fa64fba5801d494c2541" +source = "git+https://github.com/tauri-apps/tauri?branch=next#56b528e4817235f51a699bb8716927d6d38081a3" dependencies = [ "gtk", "http", @@ -4595,7 +4584,7 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" version = "0.13.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#5d94eaa3bc9f1e5cf3e0fa64fba5801d494c2541" +source = "git+https://github.com/tauri-apps/tauri?branch=next#56b528e4817235f51a699bb8716927d6d38081a3" dependencies = [ "cocoa", "gtk", @@ -4615,7 +4604,7 @@ dependencies = [ [[package]] name = "tauri-utils" version = "2.0.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#5d94eaa3bc9f1e5cf3e0fa64fba5801d494c2541" +source = "git+https://github.com/tauri-apps/tauri?branch=next#56b528e4817235f51a699bb8716927d6d38081a3" dependencies = [ "brotli", "ctor", @@ -5669,7 +5658,8 @@ dependencies = [ [[package]] name = "wry" version = "0.27.0" -source = "git+https://github.com/tauri-apps/wry?branch=dev#7795356a45b1bd015fad0e9973fc5af58c8c339b" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26712b3ea99abb29c3b0067b284515e2ccdf5d6df7ac5e21129d71550eb9c3e6" dependencies = [ "base64 0.13.1", "block", diff --git a/plugins/log/.gitignore b/plugins/log/.gitignore index b512c09d..1740956b 100644 --- a/plugins/log/.gitignore +++ b/plugins/log/.gitignore @@ -1 +1,2 @@ -node_modules \ No newline at end of file +node_modules +/tauri-api diff --git a/plugins/log/ios/.gitignore b/plugins/log/ios/.gitignore index 7d98e3ad..5922fdaa 100644 --- a/plugins/log/ios/.gitignore +++ b/plugins/log/ios/.gitignore @@ -8,4 +8,3 @@ DerivedData/ .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata .netrc Package.resolved -/tauri-api diff --git a/plugins/log/ios/Package.swift b/plugins/log/ios/Package.swift index 5b818823..4b465577 100644 --- a/plugins/log/ios/Package.swift +++ b/plugins/log/ios/Package.swift @@ -16,7 +16,7 @@ let package = Package( targets: ["tauri-plugin-log"]), ], dependencies: [ - .package(name: "Tauri", path: "tauri-api") + .package(name: "Tauri", path: "../tauri-api") ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. From e53788240c166372af8b345f6328ed28ffa1d3ee Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Sun, 19 Mar 2023 08:51:44 -0300 Subject: [PATCH 2/3] chore(deps): update tauri --- Cargo.lock | 14 +++++++------- plugins/log/.gitignore | 2 +- plugins/log/ios/Package.swift | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fe2541d2..926ca69a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4247,7 +4247,7 @@ dependencies = [ [[package]] name = "tauri" version = "2.0.0-alpha.3" -source = "git+https://github.com/tauri-apps/tauri?branch=next#56b528e4817235f51a699bb8716927d6d38081a3" +source = "git+https://github.com/tauri-apps/tauri?branch=next#9c8276fe030183c6c0698331588a54948bc549f9" dependencies = [ "anyhow", "bytes 1.4.0", @@ -4298,7 +4298,7 @@ dependencies = [ [[package]] name = "tauri-build" version = "2.0.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#56b528e4817235f51a699bb8716927d6d38081a3" +source = "git+https://github.com/tauri-apps/tauri?branch=next#9c8276fe030183c6c0698331588a54948bc549f9" dependencies = [ "anyhow", "cargo_toml", @@ -4317,7 +4317,7 @@ dependencies = [ [[package]] name = "tauri-codegen" version = "2.0.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#56b528e4817235f51a699bb8716927d6d38081a3" +source = "git+https://github.com/tauri-apps/tauri?branch=next#9c8276fe030183c6c0698331588a54948bc549f9" dependencies = [ "base64 0.21.0", "brotli", @@ -4342,7 +4342,7 @@ dependencies = [ [[package]] name = "tauri-macros" version = "2.0.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#56b528e4817235f51a699bb8716927d6d38081a3" +source = "git+https://github.com/tauri-apps/tauri?branch=next#9c8276fe030183c6c0698331588a54948bc549f9" dependencies = [ "heck", "proc-macro2", @@ -4563,7 +4563,7 @@ dependencies = [ [[package]] name = "tauri-runtime" version = "0.13.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#56b528e4817235f51a699bb8716927d6d38081a3" +source = "git+https://github.com/tauri-apps/tauri?branch=next#9c8276fe030183c6c0698331588a54948bc549f9" dependencies = [ "gtk", "http", @@ -4584,7 +4584,7 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" version = "0.13.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#56b528e4817235f51a699bb8716927d6d38081a3" +source = "git+https://github.com/tauri-apps/tauri?branch=next#9c8276fe030183c6c0698331588a54948bc549f9" dependencies = [ "cocoa", "gtk", @@ -4604,7 +4604,7 @@ dependencies = [ [[package]] name = "tauri-utils" version = "2.0.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#56b528e4817235f51a699bb8716927d6d38081a3" +source = "git+https://github.com/tauri-apps/tauri?branch=next#9c8276fe030183c6c0698331588a54948bc549f9" dependencies = [ "brotli", "ctor", diff --git a/plugins/log/.gitignore b/plugins/log/.gitignore index 1740956b..28fd5eff 100644 --- a/plugins/log/.gitignore +++ b/plugins/log/.gitignore @@ -1,2 +1,2 @@ node_modules -/tauri-api +/.tauri diff --git a/plugins/log/ios/Package.swift b/plugins/log/ios/Package.swift index 4b465577..4f736418 100644 --- a/plugins/log/ios/Package.swift +++ b/plugins/log/ios/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.7 +// swift-tools-version:5.3 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription @@ -16,7 +16,7 @@ let package = Package( targets: ["tauri-plugin-log"]), ], dependencies: [ - .package(name: "Tauri", path: "../tauri-api") + .package(name: "Tauri", path: "../.tauri/tauri-api") ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. From 39b144df42e6f3e485beef4d0d31101f13d4c24e Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Mon, 20 Mar 2023 09:02:13 -0300 Subject: [PATCH 3/3] chore(deps): update tauri to 2.0.0-alpha.4, tauri-build to 2.0.0-alpha.2 --- Cargo.lock | 35 +++++++++++++++++++++-------------- Cargo.toml | 4 ++-- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 926ca69a..3555c1a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4246,8 +4246,9 @@ dependencies = [ [[package]] name = "tauri" -version = "2.0.0-alpha.3" -source = "git+https://github.com/tauri-apps/tauri?branch=next#9c8276fe030183c6c0698331588a54948bc549f9" +version = "2.0.0-alpha.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e113835bb47f8cab6d1fb3b1a2e3d96ddd64730248638a5ab3f46a598c02a81c" dependencies = [ "anyhow", "bytes 1.4.0", @@ -4297,8 +4298,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.0.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#9c8276fe030183c6c0698331588a54948bc549f9" +version = "2.0.0-alpha.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "383f94e1b46fb4e249e4eafbd0589ffbe02b241b49dadebd47640598a17e584e" dependencies = [ "anyhow", "cargo_toml", @@ -4316,8 +4318,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#9c8276fe030183c6c0698331588a54948bc549f9" +version = "2.0.0-alpha.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5914e68c4ba4d9b761373dcce86f6721de78c2ffd84f376b1e0fee9321c0fc7e" dependencies = [ "base64 0.21.0", "brotli", @@ -4341,8 +4344,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#9c8276fe030183c6c0698331588a54948bc549f9" +version = "2.0.0-alpha.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adedb0845af0d5840b54410f83135bb285ab372956678e0b12046a87999486fb" dependencies = [ "heck", "proc-macro2", @@ -4562,8 +4566,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.13.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#9c8276fe030183c6c0698331588a54948bc549f9" +version = "0.13.0-alpha.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11c9ce3ab30f6a95a09131510a624d5de24455ba9e8fcae6a6fe9e0922f833c8" dependencies = [ "gtk", "http", @@ -4583,8 +4588,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "0.13.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#9c8276fe030183c6c0698331588a54948bc549f9" +version = "0.13.0-alpha.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e176af0987e4ced285bec0faf56eed0f13a1b3851d9176fa6758181f867cdc3" dependencies = [ "cocoa", "gtk", @@ -4603,8 +4609,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#9c8276fe030183c6c0698331588a54948bc549f9" +version = "2.0.0-alpha.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a488bb0c60e2ce9efbe8283a11299675e01f55caf12304889f8639b3c35713c" dependencies = [ "brotli", "ctor", diff --git a/Cargo.toml b/Cargo.toml index 46b0ee6a..bbc07433 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,8 +5,8 @@ resolver = "2" [workspace.dependencies] serde = { version = "1", features = ["derive"] } log = "0.4" -tauri = { git = "https://github.com/tauri-apps/tauri", branch = "next" } -tauri-build = { git = "https://github.com/tauri-apps/tauri", branch = "next" } +tauri = "2.0.0-alpha.4" +tauri-build = "2.0.0-alpha.2" serde_json = "1" thiserror = "1"