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.

Sign up for GitHub

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

Bump deps #1984

Merged
merged 1 commit into from
Sep 2, 2024
Merged

Bump deps #1984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions 3rd/if-watch/src/apple.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#![allow(clippy::all)]

use crate::{IfEvent, IpNet, Ipv4Net, Ipv6Net};
use core_foundation::array::CFArray;
use core_foundation::runloop::{kCFRunLoopCommonModes, CFRunLoop};
Expand Down
57 changes: 54 additions & 3 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion exo/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ tempfile = "3.12.0"
thiserror = "1.0.63"
tokio = { version = "1.40.0", features = ["macros"], default-features = false }
url = "2.5.2"
zip = { version = "0.6.6", features = ["deflate"], default-features = false }
zip = { version = "2.2.0", features = ["deflate"], default-features = false }
8 changes: 4 additions & 4 deletions exo/src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use exocore_core::{
};
use exocore_protos::{apps::Manifest, core::CellApplicationConfig};
use tempfile::{tempdir_in, TempDir};
use zip::write::FileOptions;
use zip::write::SimpleFileOptions;

use crate::{
term::{print_action, print_error, print_info, print_success, print_warning, style_value},
Expand Down Expand Up @@ -110,15 +110,15 @@ fn cmd_package(_ctx: &Context, _app_opts: &AppOptions, pkg_opts: &PackageOptions
let mut zip_archive = zip::ZipWriter::new(zip_file_buf);

zip_archive
.start_file("app.yaml", FileOptions::default())
.start_file("app.yaml", SimpleFileOptions::default())
.expect("Couldn't start zip file");
manifest
.write_yaml(&mut zip_archive)
.expect("Couldn't write manifest to zip");

if let Some(module) = &manifest.module {
zip_archive
.start_file(&module.file, FileOptions::default())
.start_file(&module.file, SimpleFileOptions::default())
.expect("Couldn't start zip file");

let mut module_file = File::open(&module.file).expect("Couldn't open app module");
Expand All @@ -128,7 +128,7 @@ fn cmd_package(_ctx: &Context, _app_opts: &AppOptions, pkg_opts: &PackageOptions
for schema in &manifest.schemas {
if let Some(exocore_protos::apps::manifest_schema::Source::File(file)) = &schema.source {
zip_archive
.start_file(file, FileOptions::default())
.start_file(file, SimpleFileOptions::default())
.expect("Couldn't start zip file");

let abs_file = app_dir.join(file);
Expand Down
Loading