apple-codesign: zip 0.6 -> 2.2

Required a minor code change due to an API change.
indygreg · Nov 2, 2024 · 49b92a2 · 49b92a2
1 parent 52a77fc
commit 49b92a2
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apple-codesign/CHANGELOG.md b/apple-codesign/CHANGELOG.md
@@ -34,6 +34,7 @@ Released on ReleaseDate.
 * `widestring` 1.0 -> 1.1.
 * `x509-certificate` 0.23 -> 0.24.
 * `zeroize` 1.7 -> 1.8.
+* `zip` 0.6 -> 2.2.
 
 ## 0.27.0
 

diff --git a/apple-codesign/Cargo.toml b/apple-codesign/Cargo.toml
@@ -83,7 +83,7 @@ xml-rs = "0.8.22"
 yasna = "0.5.2"
 yubikey = { version = "0.8.0", optional = true, features = ["untested"] }
 zeroize = { version = "1.8.1", features = ["zeroize_derive"] }
-zip = { version = "0.6.6", default-features = false, features = ["deflate"] }
+zip = { version = "2.2.0", default-features = false, features = ["deflate"] }
 zip_structs = "0.2.1"
 
 [dependencies.app-store-connect]
@@ -117,7 +117,7 @@ indoc = "2.0.5"
 simple-file-manifest = "0.11.0"
 tar = "0.4.43"
 trycmd-indygreg-fork = "0.14.20"
-zip = { version = "0.6.6", default-features = false }
+zip = { version = "2.2.0", default-features = false }
 
 [features]
 default = ["notarize"]

diff --git a/apple-codesign/src/notarization.rs b/apple-codesign/src/notarization.rs
@@ -73,7 +73,7 @@ pub fn bundle_to_zip(bundle: &DirectoryBundle) -> Result<Vec<u8>, AppleCodesignE
         let name =
             format!("{}/{}", bundle.name(), file.relative_path().display()).replace('\\', "/");
 
-        let options = zip::write::FileOptions::default();
+        let options = zip::write::SimpleFileOptions::default();
 
         let options = if entry.link_target().is_some() {
             symlinks.push(name.as_bytes().to_vec());
@@ -432,7 +432,9 @@ impl Notarizer {
         Ok(status)
     }
 
-    pub fn list_submissions(&self) -> Result<notary_api::ListSubmissionResponse, AppleCodesignError> {
+    pub fn list_submissions(
+        &self,
+    ) -> Result<notary_api::ListSubmissionResponse, AppleCodesignError> {
         Ok(self.client()?.list_submissions()?)
     }
 }