CalvinBackup/tauri-plugins-workspace
1
0
Fork 0
mirror of https://github.com/tauri-apps/plugins-workspace.git synced 2026-06-10 14:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into feat/camera

Browse Source
This commit is contained in:
Lucas Nogueira
2023-04-04 15:04:21 -03:00
parent b5e33203f9 39b144df42
commit 0782a6eb48
5 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+23 -16
View File
@@ -4128,9 +4128,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
[[package]] [[package]]
name = "swift-rs" name = "swift-rs"
version = "1.0.2" version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2706dd533c2a96dfdbe942221fe0d3bb24857257aac26f938537f197c543b27e" checksum = "2eab55f44d02ced20ffa22fd5b4bd083ab59c940c7637d37fec4426b1a01d769"
dependencies = [ dependencies = [
"base64 0.21.0", "base64 0.21.0",
"serde", "serde",
@@ -4246,8 +4246,9 @@ dependencies = [
[[package]] [[package]]
name = "tauri" name = "tauri"
version = "2.0.0-alpha.3" version = "2.0.0-alpha.4"
source = "git+https://github.com/tauri-apps/tauri?branch=next#5bc8322f7d95b88fd7f9248f8e570dbd4008d244" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e113835bb47f8cab6d1fb3b1a2e3d96ddd64730248638a5ab3f46a598c02a81c"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bytes 1.4.0", "bytes 1.4.0",
@@ -4297,8 +4298,9 @@ dependencies = [
[[package]] [[package]]
name = "tauri-build" name = "tauri-build"
version = "2.0.0-alpha.1" version = "2.0.0-alpha.2"
source = "git+https://github.com/tauri-apps/tauri?branch=next#5bc8322f7d95b88fd7f9248f8e570dbd4008d244" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "383f94e1b46fb4e249e4eafbd0589ffbe02b241b49dadebd47640598a17e584e"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"cargo_toml", "cargo_toml",
@@ -4316,8 +4318,9 @@ dependencies = [
[[package]] [[package]]
name = "tauri-codegen" name = "tauri-codegen"
version = "2.0.0-alpha.1" version = "2.0.0-alpha.2"
source = "git+https://github.com/tauri-apps/tauri?branch=next#5bc8322f7d95b88fd7f9248f8e570dbd4008d244" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5914e68c4ba4d9b761373dcce86f6721de78c2ffd84f376b1e0fee9321c0fc7e"
dependencies = [ dependencies = [
"base64 0.21.0", "base64 0.21.0",
"brotli", "brotli",
@@ -4341,8 +4344,9 @@ dependencies = [
[[package]] [[package]]
name = "tauri-macros" name = "tauri-macros"
version = "2.0.0-alpha.1" version = "2.0.0-alpha.2"
source = "git+https://github.com/tauri-apps/tauri?branch=next#5bc8322f7d95b88fd7f9248f8e570dbd4008d244" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adedb0845af0d5840b54410f83135bb285ab372956678e0b12046a87999486fb"
dependencies = [ dependencies = [
"heck", "heck",
"proc-macro2", "proc-macro2",
@@ -4573,8 +4577,9 @@ dependencies = [
[[package]] [[package]]
name = "tauri-runtime" name = "tauri-runtime"
version = "0.13.0-alpha.1" version = "0.13.0-alpha.2"
source = "git+https://github.com/tauri-apps/tauri?branch=next#5bc8322f7d95b88fd7f9248f8e570dbd4008d244" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11c9ce3ab30f6a95a09131510a624d5de24455ba9e8fcae6a6fe9e0922f833c8"
dependencies = [ dependencies = [
"gtk", "gtk",
"http", "http",
@@ -4594,8 +4599,9 @@ dependencies = [
[[package]] [[package]]
name = "tauri-runtime-wry" name = "tauri-runtime-wry"
version = "0.13.0-alpha.1" version = "0.13.0-alpha.2"
source = "git+https://github.com/tauri-apps/tauri?branch=next#5bc8322f7d95b88fd7f9248f8e570dbd4008d244" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e176af0987e4ced285bec0faf56eed0f13a1b3851d9176fa6758181f867cdc3"
dependencies = [ dependencies = [
"cocoa", "cocoa",
"gtk", "gtk",
@@ -4614,8 +4620,9 @@ dependencies = [
[[package]] [[package]]
name = "tauri-utils" name = "tauri-utils"
version = "2.0.0-alpha.1" version = "2.0.0-alpha.2"
source = "git+https://github.com/tauri-apps/tauri?branch=next#5bc8322f7d95b88fd7f9248f8e570dbd4008d244" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3a488bb0c60e2ce9efbe8283a11299675e01f55caf12304889f8639b3c35713c"
dependencies = [ dependencies = [
"brotli", "brotli",
"ctor", "ctor",
Cargo.toml
+2 -2
View File
@@ -5,8 +5,8 @@ resolver = "2"
[workspace.dependencies] [workspace.dependencies]
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
log = "0.4" log = "0.4"
tauri = { git = "https://github.com/tauri-apps/tauri", branch = "next" } tauri = "2.0.0-alpha.4"
tauri-build = { git = "https://github.com/tauri-apps/tauri", branch = "next" } tauri-build = "2.0.0-alpha.2"
serde_json = "1" serde_json = "1"
thiserror = "1" thiserror = "1"
plugins/log/.gitignore
+2 -1
View File
@@ -1 +1,2 @@
node_modules node_modules
/.tauri
plugins/log/ios/.gitignore
-1
View File
@@ -8,4 +8,3 @@ DerivedData/
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
.netrc .netrc
Package.resolved Package.resolved
/tauri-api
plugins/log/ios/Package.swift
+2 -2
View File
@@ -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. // The swift-tools-version declares the minimum version of Swift required to build this package.
import PackageDescription import PackageDescription
@@ -16,7 +16,7 @@ let package = Package(
targets: ["tauri-plugin-log"]), targets: ["tauri-plugin-log"]),
], ],
dependencies: [ dependencies: [
.package(name: "Tauri", path: "tauri-api") .package(name: "Tauri", path: "../.tauri/tauri-api")
], ],
targets: [ targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite. // Targets are the basic building blocks of a package. A target can define a module or a test suite.