Skip to content

Commit

Permalink
add taplo.toml
Browse files Browse the repository at this point in the history
  • Loading branch information
amrbashir committed Aug 26, 2024
1 parent 80fa84f commit 6702efa
Show file tree
Hide file tree
Showing 14 changed files with 27 additions and 97 deletions.
5 changes: 1 addition & 4 deletions core/tauri-build/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ rustdoc-args = ["--cfg", "docsrs"]
anyhow = "1"
quote = { version = "1", optional = true }
tauri-codegen = { version = "2.0.0-rc.6", path = "../tauri-codegen", optional = true }
tauri-utils = { version = "2.0.0-rc.6", path = "../tauri-utils", features = [
"build",
"resources",
] }
tauri-utils = { version = "2.0.0-rc.6", path = "../tauri-utils", features = ["build", "resources"] }
cargo_toml = "0.17"
serde = "1"
serde_json = "1"
Expand Down
8 changes: 2 additions & 6 deletions core/tauri-codegen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,10 @@ quote = "1"
syn = "2"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
tauri-utils = { version = "2.0.0-rc.6", path = "../tauri-utils", features = [
"build",
] }
tauri-utils = { version = "2.0.0-rc.6", path = "../tauri-utils", features = ["build"] }
thiserror = "1"
walkdir = "2"
brotli = { version = "6", optional = true, default-features = false, features = [
"std",
] }
brotli = { version = "6", optional = true, default-features = false, features = ["std"] }
regex = { version = "1", optional = true }
uuid = { version = "1", features = ["v4"] }
semver = "1"
Expand Down
6 changes: 1 addition & 5 deletions core/tauri-runtime-wry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,7 @@ jni = "0.21"

[features]
devtools = ["wry/devtools", "tauri-runtime/devtools"]
macos-private-api = [
"wry/fullscreen",
"wry/transparent",
"tauri-runtime/macos-private-api",
]
macos-private-api = ["wry/fullscreen", "wry/transparent", "tauri-runtime/macos-private-api"]
objc-exception = ["wry/objc-exception"]
linux-protocol-body = ["wry/linux-body", "webkit2gtk/v2_40"]
tracing = ["dep:tracing", "wry/tracing"]
Expand Down
4 changes: 1 addition & 3 deletions core/tauri-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@ serde = { version = "1", features = ["derive"] }
serde_json = "1"
thiserror = "1"
phf = { version = "0.11", features = ["macros"] }
brotli = { version = "6", optional = true, default-features = false, features = [
"std",
] }
brotli = { version = "6", optional = true, default-features = false, features = ["std"] }
url = { version = "2", features = ["serde"] }
html5ever = "0.26"
kuchiki = { package = "kuchikiki", version = "0.8" }
Expand Down
40 changes: 8 additions & 32 deletions core/tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,34 +45,23 @@ development = ["quickcheck_macros"]
[dependencies]
serde_json = { version = "1.0", features = ["raw_value"] }
serde = { version = "1.0", features = ["derive", "rc"] }
tokio = { version = "1", features = [
"rt",
"rt-multi-thread",
"sync",
"fs",
"io-util",
] }
tokio = { version = "1", features = ["rt", "rt-multi-thread", "sync", "fs", "io-util"] }
futures-util = "0.3"
uuid = { version = "1", features = ["v4"], optional = true }
url = "2"
anyhow = "1.0"
thiserror = "1.0"
tauri-runtime = { version = "2.0.0-rc.6", path = "../tauri-runtime" }
tauri-macros = { version = "2.0.0-rc.5", path = "../tauri-macros" }
tauri-utils = { version = "2.0.0-rc.6", features = [
"resources",
], path = "../tauri-utils" }
tauri-utils = { version = "2.0.0-rc.6", features = ["resources"], path = "../tauri-utils" }
tauri-runtime-wry = { version = "2.0.0-rc.6", path = "../tauri-runtime-wry", optional = true }
getrandom = "0.2"
serde_repr = "0.1"
state = "0.6"
http = "1.1"
dirs = "5"
percent-encoding = "2.3"
reqwest = { version = "0.12", default-features = false, features = [
"json",
"stream",
] }
reqwest = { version = "0.12", default-features = false, features = ["json", "stream"] }
bytes = { version = "1", features = ["serde"] }
raw-window-handle = { version = "0.6", features = ["std"] }
glob = "0.3"
Expand All @@ -93,9 +82,7 @@ specta = { version = "^2.0.0-rc.16", optional = true, default-features = false,

[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\", target_os = \"windows\", target_os = \"macos\"))".dependencies]
muda = { version = "0.14", default-features = false, features = ["serde"] }
tray-icon = { version = "0.15", default-features = false, features = [
"serde",
], optional = true }
tray-icon = { version = "0.15", default-features = false, features = ["serde"], optional = true }

[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
gtk = { version = "0.18", features = ["v3_24"] }
Expand Down Expand Up @@ -127,9 +114,7 @@ swift-rs = "1.0.6"
[build-dependencies]
heck = "0.5"
tauri-build = { path = "../tauri-build/", default-features = false, version = "2.0.0-rc.6" }
tauri-utils = { path = "../tauri-utils/", version = "2.0.0-rc.6", features = [
"build",
] }
tauri-utils = { path = "../tauri-utils/", version = "2.0.0-rc.6", features = ["build"] }

[dev-dependencies]
proptest = "1.4.0"
Expand All @@ -145,20 +130,14 @@ http-range = "0.1.5"
[features]
default = ["wry", "compression", "objc-exception", "common-controls-v6"]
unstable = ["tauri-runtime-wry/unstable"]
common-controls-v6 = [
"tray-icon?/common-controls-v6",
"muda/common-controls-v6",
]
common-controls-v6 = ["tray-icon?/common-controls-v6", "muda/common-controls-v6"]
tray-icon = ["dep:tray-icon"]
tracing = ["dep:tracing", "tauri-macros/tracing", "tauri-runtime-wry/tracing"]
test = []
compression = ["tauri-macros/compression", "tauri-utils/compression"]
wry = ["tauri-runtime-wry"]
objc-exception = ["tauri-runtime-wry/objc-exception"]
linux-ipc-protocol = [
"tauri-runtime-wry/linux-protocol-body",
"webkit2gtk/v2_40",
]
linux-ipc-protocol = ["tauri-runtime-wry/linux-protocol-body", "webkit2gtk/v2_40"]
linux-libxdo = ["tray-icon/libxdo", "muda/libxdo"]
isolation = ["tauri-utils/isolation", "tauri-macros/isolation", "uuid"]
custom-protocol = ["tauri-macros/custom-protocol"]
Expand All @@ -169,10 +148,7 @@ devtools = ["tauri-runtime/devtools", "tauri-runtime-wry/devtools"]
process-relaunch-dangerous-allow-symlink-macos = [
"tauri-utils/process-relaunch-dangerous-allow-symlink-macos",
]
macos-private-api = [
"tauri-runtime/macos-private-api",
"tauri-runtime-wry/macos-private-api",
]
macos-private-api = ["tauri-runtime/macos-private-api", "tauri-runtime-wry/macos-private-api"]
webview-data-url = ["data-url"]
protocol-asset = ["http-range"]
config-json5 = ["tauri-macros/config-json5"]
Expand Down
5 changes: 1 addition & 4 deletions examples/api/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ name = "api_lib"
crate-type = ["staticlib", "cdylib", "lib"]

[build-dependencies]
tauri-build = { path = "../../../core/tauri-build", features = [
"codegen",
"isolation",
] }
tauri-build = { path = "../../../core/tauri-build", features = ["codegen", "isolation"] }

[dependencies]
serde_json = "1.0"
Expand Down
7 changes: 1 addition & 6 deletions examples/api/src-tauri/Cross.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@
# ISOLATION_VOLUME: absolute path to the isolation dist folder
# WORKSPACE_VOLUME: absolute path to the workspace
# this can be done running `$ . .setup-cross.sh` in the examples/api folder
volumes = [
"ICONS_VOLUME",
"DIST_VOLUME",
"ISOLATION_VOLUME",
"WORKSPACE_VOLUME",
]
volumes = ["ICONS_VOLUME", "DIST_VOLUME", "ISOLATION_VOLUME", "WORKSPACE_VOLUME"]

[target.aarch64-unknown-linux-gnu]
image = "aarch64-unknown-linux-gnu:latest"
Expand Down
3 changes: 3 additions & 0 deletions taplo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[formatting]
allowed_blank_lines = 1
column_width = 100
4 changes: 1 addition & 3 deletions tooling/bench/tests/cpu_intensive/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ edition = "2021"
rust-version = "1.70"

[build-dependencies]
tauri-build = { path = "../../../../../core/tauri-build", features = [
"codegen",
] }
tauri-build = { path = "../../../../../core/tauri-build", features = ["codegen"] }

[dependencies]
serde_json = "1.0"
Expand Down
4 changes: 1 addition & 3 deletions tooling/bench/tests/files_transfer/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ edition = "2021"
rust-version = "1.70"

[build-dependencies]
tauri-build = { path = "../../../../../core/tauri-build", features = [
"codegen",
] }
tauri-build = { path = "../../../../../core/tauri-build", features = ["codegen"] }

[dependencies]
serde_json = "1.0"
Expand Down
4 changes: 1 addition & 3 deletions tooling/bench/tests/helloworld/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ edition = "2021"
rust-version = "1.70"

[build-dependencies]
tauri-build = { path = "../../../../../core/tauri-build", features = [
"codegen",
] }
tauri-build = { path = "../../../../../core/tauri-build", features = ["codegen"] }

[dependencies]
serde_json = "1.0"
Expand Down
13 changes: 3 additions & 10 deletions tooling/bundler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ workspace = {}
[package]
name = "tauri-bundler"
version = "2.0.1-rc.5"
authors = [
"George Burton <[email protected]>",
"Tauri Programme within The Commons Conservancy",
]
authors = ["George Burton <[email protected]>", "Tauri Programme within The Commons Conservancy"]
categories = ["command-line-utilities", "development-tools::cargo-plugins"]
license = "Apache-2.0 OR MIT"
keywords = ["bundle", "cargo", "tauri"]
Expand All @@ -17,9 +14,7 @@ rust-version = "1.70"
exclude = ["CHANGELOG.md", "/target", "rustfmt.toml"]

[dependencies]
tauri-utils = { version = "2.0.0-rc.6", path = "../../core/tauri-utils", features = [
"resources",
] }
tauri-utils = { version = "2.0.0-rc.6", path = "../../core/tauri-utils", features = ["resources"] }
image = "0.25.0"
flate2 = "1.0"
anyhow = "1.0"
Expand All @@ -34,9 +29,7 @@ tempfile = "3.10.1"
log = { version = "0.4.21", features = ["kv"] }
dirs = "5"
os_pipe = "1"
ureq = { version = "2.9.6", default-features = false, features = [
"socks-proxy",
] }
ureq = { version = "2.9.6", default-features = false, features = ["socks-proxy"] }
native-tls = { version = "0.2", optional = true }
hex = "0.4"
semver = "1"
Expand Down
12 changes: 2 additions & 10 deletions tooling/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,7 @@ insta = "1"

[target."cfg(windows)".dependencies.windows-sys]
version = "0.59"
features = [
"Win32_Storage_FileSystem",
"Win32_System_IO",
"Win32_System_Console",
]
features = ["Win32_Storage_FileSystem", "Win32_System_IO", "Win32_System_Console"]

[target."cfg(unix)".dependencies]
libc = "0.2"
Expand All @@ -133,11 +129,7 @@ tauri-macos-sign = { version = "0.1.1-rc.0", path = "../macos-sign" }

[features]
default = ["rustls"]
native-tls = [
"tauri-bundler/native-tls",
"cargo-mobile2/native-tls",
"ureq/native-tls",
]
native-tls = ["tauri-bundler/native-tls", "cargo-mobile2/native-tls", "ureq/native-tls"]
native-tls-vendored = ["native-tls", "tauri-bundler/native-tls-vendored"]
rustls = ["tauri-bundler/rustls", "cargo-mobile2/rustls", "ureq/tls"]

Expand Down
9 changes: 1 addition & 8 deletions tooling/webdriver/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,7 @@ rust-version = "1.60"

[dependencies]
anyhow = "1"
hyper = { version = "0.14", features = [
"client",
"http1",
"runtime",
"server",
"stream",
"tcp",
] }
hyper = { version = "0.14", features = ["client", "http1", "runtime", "server", "stream", "tcp"] }
futures = "0.3"
futures-util = "0.3"
pico-args = "0.4"
Expand Down

0 comments on commit 6702efa

Please sign in to comment.