mirror of
https://github.com/gitbutlerapp/gitbutler.git
synced 2024-07-14 23:50:29 +03:00
Merge pull request #4219 from gitbutlerapp/bump-tauri-minor-version
bump tauri minor version
This commit is contained in:
commit
ab941cb31f
1047
Cargo.lock
generated
1047
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -63,7 +63,7 @@
|
||||
"@sveltejs/adapter-static": "^3.0.1",
|
||||
"@sveltejs/kit": "^2.5.10",
|
||||
"@sveltejs/vite-plugin-svelte": "^3.1.1",
|
||||
"@tauri-apps/api": "^1.5.5",
|
||||
"@tauri-apps/api": "^1.6.0",
|
||||
"@types/crypto-js": "^4.2.2",
|
||||
"@types/diff": "^5.2.1",
|
||||
"@types/diff-match-patch": "^1.0.36",
|
||||
|
@ -410,10 +410,10 @@ fn reverse_patch(patch: &BStr) -> Option<BString> {
|
||||
return None;
|
||||
}
|
||||
} else if line.starts_with(b"+") {
|
||||
reversed.push_str(&line.replacen(b"+", b"-", 1));
|
||||
reversed.push_str(line.replacen(b"+", b"-", 1));
|
||||
reversed.push(b'\n');
|
||||
} else if line.starts_with(b"-") {
|
||||
reversed.push_str(&line.replacen(b"-", b"+", 1));
|
||||
reversed.push_str(line.replacen(b"-", b"+", 1));
|
||||
reversed.push(b'\n');
|
||||
} else {
|
||||
reversed.push_str(line);
|
||||
|
@ -107,7 +107,7 @@ impl Project {
|
||||
let commit_tree_id = commit_tree_builder.write()?;
|
||||
|
||||
commits_tree_builder.insert(
|
||||
&commit_id.to_string(),
|
||||
commit_id.to_string(),
|
||||
commit_tree_id,
|
||||
FileMode::Tree.into(),
|
||||
)?;
|
||||
|
@ -3739,7 +3739,7 @@ fn update_conflict_markers(
|
||||
}
|
||||
}
|
||||
if !conflicted {
|
||||
conflicts::resolve(project_repository, &file_path.display().to_string()).unwrap();
|
||||
conflicts::resolve(project_repository, file_path.display().to_string()).unwrap();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -25,7 +25,7 @@ async fn workdir_vbranch_restore() -> anyhow::Result<()> {
|
||||
let line_count = round * 20;
|
||||
fs::write(
|
||||
worktree_dir.join(format!("file{round}.txt")),
|
||||
&make_lines(line_count),
|
||||
make_lines(line_count),
|
||||
)?;
|
||||
let branch_id = controller
|
||||
.create_virtual_branch(
|
||||
|
@ -31,6 +31,8 @@ impl Socket for BufStream<UnixStream> {
|
||||
async fn read_line(&mut self) -> Result<String, Self::Error> {
|
||||
let mut buf = String::new();
|
||||
<Self as AsyncBufReadExt>::read_line(self, &mut buf).await?;
|
||||
// TODO: use an array of `char`
|
||||
#[allow(clippy::manual_pattern_char_comparison)]
|
||||
Ok(buf.trim_end_matches(|c| c == '\r' || c == '\n').into())
|
||||
}
|
||||
|
||||
|
@ -14,7 +14,7 @@ path = "src/main.rs"
|
||||
test = false
|
||||
|
||||
[build-dependencies]
|
||||
tauri-build = { version = "1.5", features = [] }
|
||||
tauri-build = { version = "1.5.3", features = [] }
|
||||
|
||||
[dev-dependencies]
|
||||
pretty_assertions = "1.4"
|
||||
@ -51,7 +51,7 @@ gitbutler-watcher.workspace = true
|
||||
open = "5"
|
||||
|
||||
[dependencies.tauri]
|
||||
version = "1.6.8"
|
||||
version = "1.7.0"
|
||||
features = [
|
||||
"http-all", "os-all", "dialog-open", "fs-read-file",
|
||||
"path-all", "process-relaunch", "protocol-asset",
|
||||
|
@ -102,6 +102,8 @@ impl FileIdMap {
|
||||
|
||||
fn dir_scan_depth(is_recursive: bool) -> usize {
|
||||
if is_recursive {
|
||||
// TODO
|
||||
#[allow(clippy::legacy_numeric_constants)]
|
||||
usize::max_value()
|
||||
} else {
|
||||
1
|
||||
|
@ -98,12 +98,14 @@ where
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "crossbeam")]
|
||||
impl DebounceEventHandler for crossbeam_channel::Sender<DebounceEventResult> {
|
||||
fn handle_event(&mut self, event: DebounceEventResult) {
|
||||
let _ = self.send(event);
|
||||
}
|
||||
}
|
||||
// Unlike https://github.com/notify-rs/notify/blob/main/notify-debouncer-full/Cargo.toml#L19 we don't seem to be setting this feature
|
||||
//
|
||||
// #[cfg(feature = "crossbeam")]
|
||||
// impl DebounceEventHandler for crossbeam_channel::Sender<DebounceEventResult> {
|
||||
// fn handle_event(&mut self, event: DebounceEventResult) {
|
||||
// let _ = self.send(event);
|
||||
// }
|
||||
// }
|
||||
|
||||
impl DebounceEventHandler for std::sync::mpsc::Sender<DebounceEventResult> {
|
||||
fn handle_event(&mut self, event: DebounceEventResult) {
|
||||
|
@ -20,6 +20,6 @@
|
||||
"rustfmt": "cargo +nightly fmt -- --config-path rustfmt-nightly.toml"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@tauri-apps/cli": "^1.5.13"
|
||||
"@tauri-apps/cli": "^1.6.0"
|
||||
}
|
||||
}
|
||||
|
102
pnpm-lock.yaml
102
pnpm-lock.yaml
@ -9,8 +9,8 @@ importers:
|
||||
.:
|
||||
devDependencies:
|
||||
'@tauri-apps/cli':
|
||||
specifier: ^1.5.13
|
||||
version: 1.5.14
|
||||
specifier: ^1.6.0
|
||||
version: 1.6.0
|
||||
|
||||
app:
|
||||
dependencies:
|
||||
@ -127,8 +127,8 @@ importers:
|
||||
specifier: ^3.1.1
|
||||
version: 3.1.1(svelte@5.0.0-next.149)(vite@5.2.13(@types/node@20.5.9))
|
||||
'@tauri-apps/api':
|
||||
specifier: ^1.5.5
|
||||
version: 1.5.6
|
||||
specifier: ^1.6.0
|
||||
version: 1.6.0
|
||||
'@types/crypto-js':
|
||||
specifier: ^4.2.2
|
||||
version: 4.2.2
|
||||
@ -2198,72 +2198,72 @@ packages:
|
||||
resolution: {integrity: sha512-zxnDjHHKjOsrIzZm6nO5Xapb/BxqUq1tc7cGkFXsFkGTsSWgCPH1D8mm0XS9weJY2OaR73I3k3S+b7eSzJDfqA==}
|
||||
engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'}
|
||||
|
||||
'@tauri-apps/api@1.5.6':
|
||||
resolution: {integrity: sha512-LH5ToovAHnDVe5Qa9f/+jW28I6DeMhos8bNDtBOmmnaDpPmJmYLyHdeDblAWWWYc7KKRDg9/66vMuKyq0WIeFA==}
|
||||
'@tauri-apps/api@1.6.0':
|
||||
resolution: {integrity: sha512-rqI++FWClU5I2UBp4HXFvl+sBWkdigBkxnpJDQUWttNyG7IZP4FwQGhTNL5EOw0vI8i6eSAJ5frLqO7n7jbJdg==}
|
||||
engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'}
|
||||
|
||||
'@tauri-apps/cli-darwin-arm64@1.5.14':
|
||||
resolution: {integrity: sha512-lxoSOp3KKSqzHJa7iT32dukPGMlfsTuja1xXSgwR8o/fqzpYJY7FY/3ZxesP8HR66FcK+vtqa//HNqeOQ0mHkA==}
|
||||
'@tauri-apps/cli-darwin-arm64@1.6.0':
|
||||
resolution: {integrity: sha512-SNRwUD9nqGxY47mbY1CGTt/jqyQOU7Ps7Mx/mpgahL0FVUDiCEY/5L9QfEPPhEgccgcelEVn7i6aQHIkHyUtCA==}
|
||||
engines: {node: '>= 10'}
|
||||
cpu: [arm64]
|
||||
os: [darwin]
|
||||
|
||||
'@tauri-apps/cli-darwin-x64@1.5.14':
|
||||
resolution: {integrity: sha512-EXSwN1n5spfG8FoXuyc90ACtmDJXzaZ1gxyENaq9xEpQoo7j/Q1vb6qXxmr6azKr8zmqY4h08ZFbv3exh93xJg==}
|
||||
'@tauri-apps/cli-darwin-x64@1.6.0':
|
||||
resolution: {integrity: sha512-g2/uDR/eeH2arvuawA4WwaEOqv/7jDO/ZLNI3JlBjP5Pk8GGb3Kdy0ro1xQzF94mtk2mOnOXa4dMgAet4sUJ1A==}
|
||||
engines: {node: '>= 10'}
|
||||
cpu: [x64]
|
||||
os: [darwin]
|
||||
|
||||
'@tauri-apps/cli-linux-arm-gnueabihf@1.5.14':
|
||||
resolution: {integrity: sha512-Yb8BH/KYR7Tl+de40sZPfrqbhcU3Jlu+UPIrnXt05sjn48xqIps74Xjz8zzVp0TuHxUp8FmIGtCVhQgsbrsvvg==}
|
||||
'@tauri-apps/cli-linux-arm-gnueabihf@1.6.0':
|
||||
resolution: {integrity: sha512-EVwf4oRkQyG8BpSrk0gqO7oA0sDM2MdNDtJpMfleYFEgCxLIOGZKNqaOW3M7U+0Y4qikmG3TtRK+ngc8Ymtrjg==}
|
||||
engines: {node: '>= 10'}
|
||||
cpu: [arm]
|
||||
os: [linux]
|
||||
|
||||
'@tauri-apps/cli-linux-arm64-gnu@1.5.14':
|
||||
resolution: {integrity: sha512-QrKHP4gRaHiup478rPBZ+BmNd88yze9jMmheoNy9mN1K/aECRmTHO+tWhsxv5moFHZzRhO0QDWxxvTtiaPXaGg==}
|
||||
'@tauri-apps/cli-linux-arm64-gnu@1.6.0':
|
||||
resolution: {integrity: sha512-YdpY17cAySrhK9dX4BUVEmhAxE2o+6skIEFg8iN/xrDwRxhaNPI9I80YXPatUTX54Kx55T5++25VJG9+3iw83A==}
|
||||
engines: {node: '>= 10'}
|
||||
cpu: [arm64]
|
||||
os: [linux]
|
||||
|
||||
'@tauri-apps/cli-linux-arm64-musl@1.5.14':
|
||||
resolution: {integrity: sha512-Hb1C1VMxmUcyGjW/K/INKF87zzzgLEVRmWZZnQd7M1P4uue4xPyIwUELSdX12Z2jREPgmLW4AXPD0m6wsNu7iw==}
|
||||
'@tauri-apps/cli-linux-arm64-musl@1.6.0':
|
||||
resolution: {integrity: sha512-4U628tuf2U8pMr4tIBJhEkrFwt+46dwhXrDlpdyWSZtnop5RJAVKHODm0KbWns4xGKfTW1F3r6sSv+2ZxLcISA==}
|
||||
engines: {node: '>= 10'}
|
||||
cpu: [arm64]
|
||||
os: [linux]
|
||||
|
||||
'@tauri-apps/cli-linux-x64-gnu@1.5.14':
|
||||
resolution: {integrity: sha512-kD9v/UwPDuhIgq2TJj/s2/7rqk+vmExVV6xHPKI8vVbIvlNAOZqmx3fpxjej1241vhJ/piGd/m6q6YMWGsL0oQ==}
|
||||
'@tauri-apps/cli-linux-x64-gnu@1.6.0':
|
||||
resolution: {integrity: sha512-AKRzp76fVUaJyXj5KRJT9bJyhwZyUnRQU0RqIRqOtZCT5yr6qGP8rjtQ7YhCIzWrseBlOllc3Qvbgw3Yl0VQcA==}
|
||||
engines: {node: '>= 10'}
|
||||
cpu: [x64]
|
||||
os: [linux]
|
||||
|
||||
'@tauri-apps/cli-linux-x64-musl@1.5.14':
|
||||
resolution: {integrity: sha512-204Drgg9Zx0+THKndqASz4+iPCwqA3gQVF9C0CDIArNXrjPyJjVvW8VP5CHiZYaTNWxlz/ltyxluM6UFWbXNFw==}
|
||||
'@tauri-apps/cli-linux-x64-musl@1.6.0':
|
||||
resolution: {integrity: sha512-0edIdq6aMBTaRMIXddHfyAFL361JqulLLd2Wi2aoOie7DkQ2MYh6gv3hA7NB9gqFwNIGE+xtJ4BkXIP2tSGPlg==}
|
||||
engines: {node: '>= 10'}
|
||||
cpu: [x64]
|
||||
os: [linux]
|
||||
|
||||
'@tauri-apps/cli-win32-arm64-msvc@1.5.14':
|
||||
resolution: {integrity: sha512-sqPSni2MnWNCm+8YZnLdWCclxfSHaYqKuPFSz8q7Tn1G1m/cA9gyPoC1G0esHftY7bu/ZM5lB4kM3I4U0KlLiA==}
|
||||
'@tauri-apps/cli-win32-arm64-msvc@1.6.0':
|
||||
resolution: {integrity: sha512-QwWpWk4ubcwJ1rljsRAmINgB2AwkyzZhpYbalA+MmzyYMREcdXWGkyixWbRZgqc6fEWEBmq5UG73qz5eBJiIKg==}
|
||||
engines: {node: '>= 10'}
|
||||
cpu: [arm64]
|
||||
os: [win32]
|
||||
|
||||
'@tauri-apps/cli-win32-ia32-msvc@1.5.14':
|
||||
resolution: {integrity: sha512-8xN8W0zTs8oFsQmvYLxHFeqhzVI7oTaPK1xQMc5gbpFP45jN41c21aCXfjnvzT+h90EfCHUF9EWj2HTEJSb7Iw==}
|
||||
'@tauri-apps/cli-win32-ia32-msvc@1.6.0':
|
||||
resolution: {integrity: sha512-Vtw0yxO9+aEFuhuxQ57ALG43tjECopRimRuKGbtZYDCriB/ty5TrT3QWMdy0dxBkpDTu3Rqsz30sbDzw6tlP3Q==}
|
||||
engines: {node: '>= 10'}
|
||||
cpu: [ia32]
|
||||
os: [win32]
|
||||
|
||||
'@tauri-apps/cli-win32-x64-msvc@1.5.14':
|
||||
resolution: {integrity: sha512-U0slee5tNM2PYECBpPHavLSwkT3szGMZ+qhcikQQbDan84bQdLn/kHWjyXOgLJs4KSve4+KxcrN+AVqj0VyHnw==}
|
||||
'@tauri-apps/cli-win32-x64-msvc@1.6.0':
|
||||
resolution: {integrity: sha512-h54FHOvGi7+LIfRchzgZYSCHB1HDlP599vWXQQJ/XnwJY+6Rwr2E5bOe/EhqoG8rbGkfK0xX3KPAvXPbUlmggg==}
|
||||
engines: {node: '>= 10'}
|
||||
cpu: [x64]
|
||||
os: [win32]
|
||||
|
||||
'@tauri-apps/cli@1.5.14':
|
||||
resolution: {integrity: sha512-JOSMKymlg116UdEXSj69eg5p1OtZnQkUE0qIGbtNDO1sk3X/KgBN6+oHBW0BzPStp/W0AjBgrMWCqjHPwEpOug==}
|
||||
'@tauri-apps/cli@1.6.0':
|
||||
resolution: {integrity: sha512-DBBpBl6GhTzm8ImMbKkfaZ4fDTykWrC7Q5OXP4XqD91recmDEn2LExuvuiiS3HYe7uP8Eb5B9NPHhqJb+Zo7qQ==}
|
||||
engines: {node: '>= 10'}
|
||||
hasBin: true
|
||||
|
||||
@ -8683,50 +8683,50 @@ snapshots:
|
||||
|
||||
'@tauri-apps/api@1.5.3': {}
|
||||
|
||||
'@tauri-apps/api@1.5.6': {}
|
||||
'@tauri-apps/api@1.6.0': {}
|
||||
|
||||
'@tauri-apps/cli-darwin-arm64@1.5.14':
|
||||
'@tauri-apps/cli-darwin-arm64@1.6.0':
|
||||
optional: true
|
||||
|
||||
'@tauri-apps/cli-darwin-x64@1.5.14':
|
||||
'@tauri-apps/cli-darwin-x64@1.6.0':
|
||||
optional: true
|
||||
|
||||
'@tauri-apps/cli-linux-arm-gnueabihf@1.5.14':
|
||||
'@tauri-apps/cli-linux-arm-gnueabihf@1.6.0':
|
||||
optional: true
|
||||
|
||||
'@tauri-apps/cli-linux-arm64-gnu@1.5.14':
|
||||
'@tauri-apps/cli-linux-arm64-gnu@1.6.0':
|
||||
optional: true
|
||||
|
||||
'@tauri-apps/cli-linux-arm64-musl@1.5.14':
|
||||
'@tauri-apps/cli-linux-arm64-musl@1.6.0':
|
||||
optional: true
|
||||
|
||||
'@tauri-apps/cli-linux-x64-gnu@1.5.14':
|
||||
'@tauri-apps/cli-linux-x64-gnu@1.6.0':
|
||||
optional: true
|
||||
|
||||
'@tauri-apps/cli-linux-x64-musl@1.5.14':
|
||||
'@tauri-apps/cli-linux-x64-musl@1.6.0':
|
||||
optional: true
|
||||
|
||||
'@tauri-apps/cli-win32-arm64-msvc@1.5.14':
|
||||
'@tauri-apps/cli-win32-arm64-msvc@1.6.0':
|
||||
optional: true
|
||||
|
||||
'@tauri-apps/cli-win32-ia32-msvc@1.5.14':
|
||||
'@tauri-apps/cli-win32-ia32-msvc@1.6.0':
|
||||
optional: true
|
||||
|
||||
'@tauri-apps/cli-win32-x64-msvc@1.5.14':
|
||||
'@tauri-apps/cli-win32-x64-msvc@1.6.0':
|
||||
optional: true
|
||||
|
||||
'@tauri-apps/cli@1.5.14':
|
||||
'@tauri-apps/cli@1.6.0':
|
||||
optionalDependencies:
|
||||
'@tauri-apps/cli-darwin-arm64': 1.5.14
|
||||
'@tauri-apps/cli-darwin-x64': 1.5.14
|
||||
'@tauri-apps/cli-linux-arm-gnueabihf': 1.5.14
|
||||
'@tauri-apps/cli-linux-arm64-gnu': 1.5.14
|
||||
'@tauri-apps/cli-linux-arm64-musl': 1.5.14
|
||||
'@tauri-apps/cli-linux-x64-gnu': 1.5.14
|
||||
'@tauri-apps/cli-linux-x64-musl': 1.5.14
|
||||
'@tauri-apps/cli-win32-arm64-msvc': 1.5.14
|
||||
'@tauri-apps/cli-win32-ia32-msvc': 1.5.14
|
||||
'@tauri-apps/cli-win32-x64-msvc': 1.5.14
|
||||
'@tauri-apps/cli-darwin-arm64': 1.6.0
|
||||
'@tauri-apps/cli-darwin-x64': 1.6.0
|
||||
'@tauri-apps/cli-linux-arm-gnueabihf': 1.6.0
|
||||
'@tauri-apps/cli-linux-arm64-gnu': 1.6.0
|
||||
'@tauri-apps/cli-linux-arm64-musl': 1.6.0
|
||||
'@tauri-apps/cli-linux-x64-gnu': 1.6.0
|
||||
'@tauri-apps/cli-linux-x64-musl': 1.6.0
|
||||
'@tauri-apps/cli-win32-arm64-msvc': 1.6.0
|
||||
'@tauri-apps/cli-win32-ia32-msvc': 1.6.0
|
||||
'@tauri-apps/cli-win32-x64-msvc': 1.6.0
|
||||
|
||||
'@testing-library/dom@9.3.4':
|
||||
dependencies:
|
||||
@ -12300,7 +12300,7 @@ snapshots:
|
||||
|
||||
tauri-plugin-context-menu@0.7.0:
|
||||
dependencies:
|
||||
'@tauri-apps/api': 1.5.6
|
||||
'@tauri-apps/api': 1.6.0
|
||||
|
||||
tauri-plugin-log-api@https://codeload.github.com/tauri-apps/tauri-plugin-log/tar.gz/db7255ca2e07fc4d3e6cc5d93f9ccfceacb28901:
|
||||
dependencies:
|
||||
|
@ -1,4 +1,4 @@
|
||||
[toolchain]
|
||||
channel = "nightly-2024-04-03"
|
||||
channel = "nightly-2024-07-01"
|
||||
components = [ "rustfmt", "rustc-dev", "clippy", "rust-src", "llvm-tools-preview" ]
|
||||
profile = "minimal"
|
||||
|
Loading…
Reference in New Issue
Block a user