Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): avoid duplicate crates #310

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,49 @@ tar = "0.4"
napi = { version = "2.16", default-features = false }
napi-derive = "2.16"
napi-build = "2.1"
cargo-packager = { path = "crates/packager", default-features = false }
cargo-packager-resource-resolver = { path = "crates/resource-resolver" }
cargo-packager-updater = { path = "crates/updater", default-features = false }
cargo-packager-utils = { version = "0.1.1", path = "crates/utils", default-features = false }
cargo_metadata = "0.18"
ctor = "0.2"
dioxus = "0.5"
eframe = "0.27"
flate2 = "1.0"
glob = "0.3"
handlebars = "5.1"
heck = "0.5"
hex = "0.4"
http = "1"
icns = "0.1"
image = "0.25"
log = "0.4"
minisign = "0.7"
minisign-verify = "0.2"
native-tls = "0.2"
os_pipe = "1"
plist = "1"
relative-path = "1.9"
reqwest = { version = "0.12", default-features = false }
sha1 = "0.10"
sha2 = "0.10"
slint = "1.7"
slint-build = "1.7"
strsim = "0.11"
tao = "0.30"
tauri = "=2.0.0-rc.9"
tauri-build = "=2.0.0-rc.8"
tauri-macros = "=2.0.0-rc.7"
tauri-utils = "=2.0.0-rc.8"
tempfile = "3.12"
tiny_http = "0.12"
toml = "0.8"
tracing-subscriber = "0.3"
ureq = { version = "2.10", default-features = false }
url = "2"
walkdir = "2"
wry = "0.43"
zip = { version = "0.6", default-features = false }

[profile.release-size-optimized]
inherits = "release"
Expand Down
2 changes: 1 addition & 1 deletion bindings/packager/nodejs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ crate-type = ["cdylib"]
# Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
napi = { workspace = true, features = ["napi4"] }
napi-derive = { workspace = true }
cargo-packager = { path = "../../../crates/packager/", default-features = false, features = ["cli"] }
cargo-packager = { workspace = true, features = ["cli"] }
tracing = { workspace = true }
serde_json = { workspace = true }

Expand Down
2 changes: 1 addition & 1 deletion bindings/resource-resolver/nodejs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ crate-type = ["cdylib"]
# Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
napi = { workspace = true, features = ["napi4"] }
napi-derive = { workspace = true }
cargo-packager-resource-resolver = { path = "../../../crates/resource-resolver" }
cargo-packager-resource-resolver = { workspace = true }
dunce.workspace = true

[build-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion bindings/updater/nodejs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ crate-type = ["cdylib"]
# Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
napi = { workspace = true, features = ["napi4", "async"] }
napi-derive = { workspace = true }
cargo-packager-updater = { path = "../../../crates/updater/", default-features = false }
cargo-packager-updater = { workspace = true }
serde_json = { workspace = true }
time = { workspace = true, features = ["formatting"] }

Expand Down
2 changes: 1 addition & 1 deletion crates/config-schema-generator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ license.workspace = true
repository.workspace = true

[build-dependencies]
cargo-packager = { path = "../packager", features = ["schema"] }
cargo-packager = { workspace = true, features = ["schema"] }
serde_json = { workspace = true }
schemars = { workspace = true }
46 changes: 21 additions & 25 deletions crates/packager/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,35 +56,31 @@ semver = { workspace = true }
base64 = { workspace = true }
clap = { workspace = true, optional = true, features = ["env"] }
tracing = { workspace = true }
tracing-subscriber = { version = "0.3", optional = true, features = [
"env-filter",
] }
toml = "0.8"
cargo_metadata = "0.18"
ureq = { version = "2.10", default-features = false }
hex = "0.4"
sha1 = "0.10"
sha2 = "0.10"
zip = { version = "0.6", default-features = false, features = ["deflate"] }
handlebars = "5.1"
glob = "0.3"
relative-path = "1.9"
walkdir = "2"
os_pipe = "1"
minisign = "0.7"
tracing-subscriber = { workspace = true, features = ["env-filter"], optional = true }
toml = { workspace = true }
cargo_metadata = { workspace = true }
ureq = { workspace = true }
hex = { workspace = true }
sha1 = { workspace = true }
sha2 = { workspace = true }
zip = { workspace = true, features = ["deflate"] }
handlebars = { workspace = true }
glob = { workspace = true }
relative-path = { workspace = true }
walkdir = { workspace = true }
os_pipe = { workspace = true }
minisign = { workspace = true }
tar = { workspace = true }
flate2 = "1.0"
strsim = "0.11"
flate2 = { workspace = true }
strsim = { workspace = true }
schemars = { workspace = true, optional = true }
native-tls = { version = "0.2", optional = true }
cargo-packager-utils = { version = "0.1.1", path = "../utils", features = [
"serde",
] }
native-tls = { workspace = true, optional = true }
cargo-packager-utils = { workspace = true, features = ["serde"] }
icns = { package = "tauri-icns", version = "0.1" }
time = { workspace = true, features = ["formatting"] }
image = "0.25"
tempfile = "3"
plist = "1"
image = { workspace = true }
tempfile = { workspace = true }
plist = { workspace = true }

[target."cfg(target_os = \"windows\")".dependencies]
winreg = "0.52"
Expand Down
6 changes: 3 additions & 3 deletions crates/resource-resolver/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ features = [ "auto-detect-format" ]

[dependencies]
thiserror = { workspace = true }
cargo-packager-utils = { version = "0.1.1", path = "../utils", default-features = false }
log = "0.4"
heck = "0.5"
cargo-packager-utils = { workspace = true }
log = { workspace = true }
heck = { workspace = true }

[features]
process-relaunch-dangerous-allow-symlink-macos = [ "cargo-packager-utils/process-relaunch-dangerous-allow-symlink-macos" ]
Expand Down
20 changes: 8 additions & 12 deletions crates/updater/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,8 @@ native-tls-vendored = ["reqwest/native-tls-vendored"]
rustls-tls = ["reqwest/rustls-tls-native-roots"]

[dependencies]
cargo-packager-utils = { version = "0.1.1", path = "../utils" }
reqwest = { version = "0.12", default-features = false, features = [
"json",
"stream",
"blocking",
] }
cargo-packager-utils = { workspace = true }
reqwest = { workspace = true, features = ["json", "stream", "blocking"] }
thiserror = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
Expand All @@ -31,15 +27,15 @@ dirs = { workspace = true }
semver = { workspace = true }
base64 = { workspace = true }
time = { workspace = true, features = ["parsing", "formatting"] }
http = "1"
url = { version = "2", features = ["serde"] }
minisign-verify = "0.2"
ctor = "0.2"
tempfile = "3.12"
http = { workspace = true }
url = { workspace = true, features = ["serde"] }
minisign-verify = { workspace = true }
ctor = { workspace = true }
tempfile = { workspace = true }

[target."cfg(target_os = \"macos\")".dependencies]
tar = { workspace = true }
flate2 = "1.0"

[dev-dependencies]
tiny_http = "0.12"
tiny_http = { workspace = true }
2 changes: 1 addition & 1 deletion crates/updater/tests/app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ version = "0.1.0"
edition = "2021"

[dependencies]
cargo-packager-updater = { path = "../.." }
cargo-packager-updater = { workspace = true }
2 changes: 1 addition & 1 deletion crates/utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license = { workspace = true }
repository = { workspace = true }

[dependencies]
ctor = "0.2"
ctor = { workspace = true }
schemars = { workspace = true, optional = true }
clap = { workspace = true, optional = true }
serde = { workspace = true, optional = true }
Expand Down
2 changes: 1 addition & 1 deletion examples/dioxus/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2021"
publish = false

[dependencies]
dioxus = { version = "0.5", features = ["desktop"] }
dioxus = { workspace = true, features = ["desktop"] }

[package.metadata.packager]
before-packaging-command = "dx build --platform desktop --release"
Expand Down
2 changes: 1 addition & 1 deletion examples/egui/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2021"
publish = false

[dependencies]
eframe = "0.27"
eframe = { workspace = true }

[package.metadata.packager]
before-packaging-command = "cargo build --release"
Expand Down
4 changes: 2 additions & 2 deletions examples/slint/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ edition = "2021"
publish = false

[dependencies]
slint = "1.7"
slint = { workspace = true }

[build-dependencies]
slint-build = "1.7"
slint-build = { workspace = true }

[package.metadata.packager]
before-packaging-command = "cargo build --release"
Expand Down
10 changes: 5 additions & 5 deletions examples/tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ edition = "2021"
publish = false

[build-dependencies]
tauri-build = { version = "=2.0.0-rc.8", features = [] }
tauri-build = { workspace = true, features = [] }

[dependencies]
tauri = { version = "=2.0.0-rc.9", features = ["devtools"] }
tauri-utils = { version = "=2.0.0-rc.8", features = [] }
tauri-macros = "=2.0.0-rc.7"
tauri = { workspace = true, features = ["devtools"] }
tauri-utils = { workspace = true, features = [] }
tauri-macros = { workspace = true }
serde.workspace = true
serde_json.workspace = true
cargo-packager-updater = { path = "../../crates/updater" }
cargo-packager-updater = { workspace = true }

[features]
# this feature is used for production builds or when `devPath` points to the filesystem
Expand Down
4 changes: 2 additions & 2 deletions examples/wry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ edition = "2021"
publish = false

[dependencies]
wry = "0.43"
tao = "0.30"
wry = { workspace = true }
tao = { workspace = true }

[package.metadata.packager]
before-packaging-command = "cargo build --release"
Expand Down