diff --git a/Cargo.lock b/Cargo.lock index f3a7a42c..21d3b233 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4128,9 +4128,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "swift-rs" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2706dd533c2a96dfdbe942221fe0d3bb24857257aac26f938537f197c543b27e" +checksum = "2eab55f44d02ced20ffa22fd5b4bd083ab59c940c7637d37fec4426b1a01d769" dependencies = [ "base64 0.21.0", "serde", @@ -4246,8 +4246,9 @@ dependencies = [ [[package]] name = "tauri" -version = "2.0.0-alpha.3" -source = "git+https://github.com/tauri-apps/tauri?branch=next#5bc8322f7d95b88fd7f9248f8e570dbd4008d244" +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#5bc8322f7d95b88fd7f9248f8e570dbd4008d244" +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#5bc8322f7d95b88fd7f9248f8e570dbd4008d244" +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#5bc8322f7d95b88fd7f9248f8e570dbd4008d244" +version = "2.0.0-alpha.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adedb0845af0d5840b54410f83135bb285ab372956678e0b12046a87999486fb" dependencies = [ "heck", "proc-macro2", @@ -4573,8 +4577,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.13.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#5bc8322f7d95b88fd7f9248f8e570dbd4008d244" +version = "0.13.0-alpha.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11c9ce3ab30f6a95a09131510a624d5de24455ba9e8fcae6a6fe9e0922f833c8" dependencies = [ "gtk", "http", @@ -4594,8 +4599,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "0.13.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#5bc8322f7d95b88fd7f9248f8e570dbd4008d244" +version = "0.13.0-alpha.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e176af0987e4ced285bec0faf56eed0f13a1b3851d9176fa6758181f867cdc3" dependencies = [ "cocoa", "gtk", @@ -4614,8 +4620,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#5bc8322f7d95b88fd7f9248f8e570dbd4008d244" +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 a7f742f8..c3062f87 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" diff --git a/plugins/log/.gitignore b/plugins/log/.gitignore index b512c09d..28fd5eff 100644 --- a/plugins/log/.gitignore +++ b/plugins/log/.gitignore @@ -1 +1,2 @@ -node_modules \ No newline at end of file +node_modules +/.tauri 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..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.