From 8e9133092f955198300be0a16bba55323205af0b Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <sebastian.thiel@icloud.com>
Date: Sat, 30 Mar 2024 11:01:58 +0100
Subject: [PATCH] minimize app-crate dependencies

After the library was removed, it needs less as well.
---
 Cargo.lock               | 102 ++++++++++++++-------------------------
 gitbutler-app/Cargo.toml |  32 +-----------
 2 files changed, 39 insertions(+), 95 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e8ddbaed3..70c61d166 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -276,7 +276,7 @@ dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps 6.1.1",
+ "system-deps 6.2.0",
 ]
 
 [[package]]
@@ -625,7 +625,7 @@ checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8"
 dependencies = [
  "glib-sys",
  "libc",
- "system-deps 6.1.1",
+ "system-deps 6.2.0",
 ]
 
 [[package]]
@@ -676,9 +676,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-expr"
-version = "0.15.4"
+version = "0.15.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9"
+checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d"
 dependencies = [
  "smallvec",
  "target-lexicon",
@@ -1451,9 +1451,9 @@ dependencies = [
 
 [[package]]
 name = "fiat-crypto"
-version = "0.2.1"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d"
+checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382"
 
 [[package]]
 name = "field-offset"
@@ -1670,9 +1670,9 @@ checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-timer"
-version = "3.0.2"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
+checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
 
 [[package]]
 name = "futures-util"
@@ -1740,7 +1740,7 @@ dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps 6.1.1",
+ "system-deps 6.2.0",
 ]
 
 [[package]]
@@ -1757,7 +1757,7 @@ dependencies = [
  "libc",
  "pango-sys",
  "pkg-config",
- "system-deps 6.1.1",
+ "system-deps 6.2.0",
 ]
 
 [[package]]
@@ -1771,7 +1771,7 @@ dependencies = [
  "gobject-sys",
  "libc",
  "pkg-config",
- "system-deps 6.1.1",
+ "system-deps 6.2.0",
 ]
 
 [[package]]
@@ -1783,7 +1783,7 @@ dependencies = [
  "gdk-sys",
  "glib-sys",
  "libc",
- "system-deps 6.1.1",
+ "system-deps 6.2.0",
  "x11",
 ]
 
@@ -1875,7 +1875,7 @@ dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps 6.1.1",
+ "system-deps 6.2.0",
  "winapi 0.3.9",
 ]
 
@@ -1963,47 +1963,25 @@ dependencies = [
  "async-trait",
  "backoff",
  "backtrace",
- "bstr 1.9.1",
- "byteorder",
  "chrono",
  "console-subscriber",
- "diffy",
- "filetime",
- "fslock",
  "futures",
  "git2",
- "git2-hooks",
  "gitbutler",
- "gitbutler-git",
  "governor",
  "itertools 0.12.1",
- "lazy_static",
  "log",
- "md5",
  "nonzero_ext",
  "notify",
  "notify-debouncer-full",
- "num_cpus",
  "once_cell",
  "pretty_assertions",
- "r2d2",
- "r2d2_sqlite",
- "rand 0.8.5",
- "refinery",
- "regex",
  "reqwest 0.12.2",
- "resolve-path",
- "rusqlite",
  "sentry",
  "sentry-tracing",
  "serde",
  "serde_json",
- "sha1",
- "sha2",
- "similar",
  "slug",
- "ssh-key",
- "ssh2",
  "tauri",
  "tauri-build",
  "tauri-plugin-context-menu",
@@ -2015,15 +1993,9 @@ dependencies = [
  "thiserror",
  "tokio",
  "tokio-util",
- "toml 0.8.12",
  "tracing",
  "tracing-appender",
  "tracing-subscriber",
- "url",
- "urlencoding",
- "uuid",
- "walkdir",
- "zip",
 ]
 
 [[package]]
@@ -2091,7 +2063,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4"
 dependencies = [
  "libc",
- "system-deps 6.1.1",
+ "system-deps 6.2.0",
 ]
 
 [[package]]
@@ -2121,7 +2093,7 @@ checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a"
 dependencies = [
  "glib-sys",
  "libc",
- "system-deps 6.1.1",
+ "system-deps 6.2.0",
 ]
 
 [[package]]
@@ -2193,7 +2165,7 @@ dependencies = [
  "gobject-sys",
  "libc",
  "pango-sys",
- "system-deps 6.1.1",
+ "system-deps 6.2.0",
 ]
 
 [[package]]
@@ -2287,11 +2259,11 @@ dependencies = [
 
 [[package]]
 name = "hdrhistogram"
-version = "7.5.2"
+version = "7.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f19b9f54f7c7f55e31401bb647626ce0cf0f67b0004982ce815b3ee72a02aa8"
+checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.21.3",
  "byteorder",
  "flate2",
  "nom",
@@ -3055,9 +3027,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
 
 [[package]]
 name = "matchit"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef"
+checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
 
 [[package]]
 name = "md5"
@@ -3445,9 +3417,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.64"
+version = "0.10.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
+checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671"
 dependencies = [
  "bitflags 2.4.0",
  "cfg-if",
@@ -3590,7 +3562,7 @@ dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps 6.1.1",
+ "system-deps 6.2.0",
 ]
 
 [[package]]
@@ -4047,9 +4019,9 @@ dependencies = [
 
 [[package]]
 name = "prost"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d"
+checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -4057,9 +4029,9 @@ dependencies = [
 
 [[package]]
 name = "prost-derive"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32"
+checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e"
 dependencies = [
  "anyhow",
  "itertools 0.11.0",
@@ -4070,9 +4042,9 @@ dependencies = [
 
 [[package]]
 name = "prost-types"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf"
+checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e"
 dependencies = [
  "prost",
 ]
@@ -5476,14 +5448,14 @@ dependencies = [
 
 [[package]]
 name = "system-deps"
-version = "6.1.1"
+version = "6.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3"
+checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331"
 dependencies = [
- "cfg-expr 0.15.4",
+ "cfg-expr 0.15.7",
  "heck 0.4.1",
  "pkg-config",
- "toml 0.7.6",
+ "toml 0.8.12",
  "version-compare 0.1.1",
 ]
 
@@ -6005,9 +5977,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -6587,7 +6559,7 @@ dependencies = [
  "pango-sys",
  "pkg-config",
  "soup2-sys",
- "system-deps 6.1.1",
+ "system-deps 6.2.0",
 ]
 
 [[package]]
diff --git a/gitbutler-app/Cargo.toml b/gitbutler-app/Cargo.toml
index 81f9248a2..292fa3ad0 100644
--- a/gitbutler-app/Cargo.toml
+++ b/gitbutler-app/Cargo.toml
@@ -18,52 +18,31 @@ test = false
 tauri-build = { version = "1.5", features = [] }
 
 [dev-dependencies]
-once_cell = "1.19"
+#once_cell = "1.19"
 pretty_assertions = "1.4"
+tempfile = "3.10"
 
 [dependencies]
-toml = "0.8.12"
 anyhow = "1.0.81"
 async-trait = "0.1.79"
 backoff = "0.4.0"
 backtrace = { version = "0.3.71", optional = true }
-bstr = "1.9.1"
-byteorder = "1.5.0"
 chrono = { version = "0.4.37", features = ["serde"] }
 console-subscriber = "0.2.0"
-diffy = "0.3.0"
-filetime = "0.2.23"
-fslock = "0.2.1"
 futures = "0.3"
 git2.workspace = true
-git2-hooks = "0.3"
 governor = "0.6.3"
 itertools = "0.12"
-lazy_static = "1.4.0"
-md5 = "0.7.0"
 nonzero_ext = "0.3.0"
 notify = { version = "6.0.1" }
 notify-debouncer-full = "0.3.1"
-num_cpus = "1.16.0"
 once_cell = "1.19"
-r2d2 = "0.8.10"
-r2d2_sqlite = "0.22.0"
-rand = "0.8.5"
-refinery = { version = "0.8", features = [ "rusqlite" ] }
-regex = "1.10"
 reqwest = { version = "0.12.2", features = ["json"] }
-resolve-path = "0.1.0"
-rusqlite.workspace = true
 sentry = { version = "0.32", optional = true, features = ["backtrace", "contexts", "panic", "transport", "anyhow", "debug-images", "reqwest", "native-tls" ] }
 sentry-tracing = "0.32.0"
 serde.workspace = true
 serde_json = { version = "1.0", features = [ "std", "arbitrary_precision" ] }
-sha1 = "0.10.6"
-sha2 = "0.10.8"
-similar = { version = "2.4.0", features = ["unicode"] }
 slug = "0.1.5"
-ssh-key = { version = "0.6.5", features = [ "alloc", "ed25519" ] }
-ssh2 = { version = "0.9.4", features = ["vendored-openssl"] }
 tauri = { version = "1.6.1", features = [ "http-all", "os-all", "dialog-open", "fs-read-file", "path-all", "process-relaunch", "protocol-asset", "shell-open", "window-maximize", "window-start-dragging", "window-unmaximize"] }
 tauri-plugin-context-menu = { git = "https://github.com/c2r0b/tauri-plugin-context-menu", branch = "main" }
 tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
@@ -77,13 +56,6 @@ tokio-util = "0.7.10"
 tracing = "0.1.40"
 tracing-appender = "0.2.3"
 tracing-subscriber = "0.3.17"
-url = "2.5"
-urlencoding = "2.1.3"
-uuid.workspace = true
-walkdir = "2.5.0"
-zip = "0.6.5"
-tempfile = "3.10"
-gitbutler-git = { path = "../gitbutler-git" }
 gitbutler = { path = "../" }
 
 [lints.clippy]