Bump Zip from "0.6.6" to "2.1.3" (#1142)

* Bump Zip from "0.6.6" to "2.1.3"

Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net>

* Zip 2.1.3 needs rust 1.73.0

Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net>

* update Rust minimal version from 1.70 to 1.73

Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net>

---------

Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net>
Signed-off-by: Felix Obenhuber <flxo@users.noreply.github.com>
Co-authored-by: Felix Obenhuber <flxo@users.noreply.github.com>

.github/workflows/ci.yml

@@ -78,7 +78,7 @@ jobs:
       matrix:
         rust:
           - stable
-          - 1.70.0
+          - 1.73.0
     steps:
       - uses: actions-rs/toolchain@v1
         with:

Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 license = "Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/esrlabs/northstar"
-rust-version = "1.70.0"
+rust-version = "1.73.0"
 
 [workspace]
 members = [

README.md

@@ -109,7 +109,7 @@ subsystems and features:
 ## Quickstart
 
 Northstar is written in [Rust](https://www.rust-lang.org). The minimum supported
-Rust version (MSRV) is *1.70.0*. Rust is best installed and managed by the rustup
+Rust version (MSRV) is *1.73.0*. Rust is best installed and managed by the rustup
 tool. Rust has a 6-week rapid release process and supports a great number of
 platforms, so there are many builds of Rust available at any time. rustup
 manages these builds in a consistent way on every platform that Rust supports,

northstar-runtime/Cargo.toml

@@ -61,7 +61,7 @@ url = { version = "2.5.0", features = ["serde"], optional = true }
 uuid = { version = "1.9.1", features = ["v4"], optional = true }
 validator = { version = "0.16.1", features = ["derive"] }
 zeroize = { version = "1.8.1", optional = true }
-zip = { version = "0.6.6", default-features = false, optional = true }
+zip = { version = "2.1.3", default-features = false, optional = true }
 
 [features]
 api = ["bytes", "futures", "npk", "pkg-version", "serde_json", "tokio", "tokio-util"]

northstar-runtime/src/npk/npk.rs

@@ -490,8 +490,8 @@ impl<'a> NpkBuilder<'a> {
         let manifest = me.get_manifest()?;
 
         // Create zip.
-        let options =
-            zip::write::FileOptions::default().compression_method(zip::CompressionMethod::Stored);
+        let options = zip::write::SimpleFileOptions::default()
+            .compression_method(zip::CompressionMethod::Stored);
         let mut zip = zip::ZipWriter::new(writer);
 
         // Write meta data to zip comment.
@@ -544,7 +544,10 @@ impl<'a> NpkBuilder<'a> {
         // 'extra data' to inflate the header of the ZIP file.
         // See chapter 4.3.6 of APPNOTE.TXT
         // (https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT)
-        zip.start_file_aligned(FS_IMG_NAME, options, BLOCK_SIZE as u16)
+        let options_aligned = zip::write::SimpleFileOptions::default()
+            .with_alignment(BLOCK_SIZE as u16)
+            .compression_method(zip::CompressionMethod::Stored);
+        zip.start_file(FS_IMG_NAME, options_aligned)
             .context("failed to create aligned zip-file")?;
         fsimage
             .seek(SeekFrom::Start(0))

northstar-sextant/Cargo.toml

@@ -15,4 +15,4 @@ colored = "2.1.0"
 env_logger = "0.10.2"
 northstar-runtime = { version = "^0.9.2-pre", path = "../northstar-runtime", features = ["npk"] }
 tempfile = "3.10.1"
-zip = { version = "0.6.6", default-features = false }
+zip = { version = "2.1.3", default-features = false }

northstar-tests/Cargo.toml

@@ -24,4 +24,4 @@ regex = "1.10.4"
 tempfile = "3.10.1"
 tokio = { version = "1.32.0", features = ["fs", "time"] }
 url = "2.5.0"
-zip = { version = "0.6.6", default-features = false }
+zip = { version = "2.1.3", default-features = false }