Merge "Upgrade rust/crates/zip to 0.5.12" am: 4cb99d8277
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/zip/+/1713389
Change-Id: I3eedcf1268a7270779e57beeb31089ec27cc7858
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 0342b7b..935452f 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
{
"git": {
- "sha1": "08adaa5fbfcc4aae019a15068f3ae56a3fe7a877"
+ "sha1": "88e6f87884a906ee63962d3a2cf87f890878a46d"
}
}
diff --git a/Cargo.toml b/Cargo.toml
index 7831bc5..06baad2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@
[package]
edition = "2018"
name = "zip"
-version = "0.5.11"
+version = "0.5.12"
authors = ["Mathijs van de Nes <git@mathijs.vd-nes.nl>", "Marli Frost <marli@frost.red>", "Ryan Levick <ryan.levick@gmail.com>"]
description = "Library to support the reading and writing of zip files.\n"
keywords = ["zip", "archive"]
@@ -34,7 +34,7 @@
version = "1.0"
[dependencies.flate2]
-version = ">=1.0.0, <=1.0.14"
+version = "1.0.0"
optional = true
default-features = false
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 68fe4ca..b7e0fb8 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
[package]
name = "zip"
-version = "0.5.11"
+version = "0.5.12"
authors = ["Mathijs van de Nes <git@mathijs.vd-nes.nl>", "Marli Frost <marli@frost.red>", "Ryan Levick <ryan.levick@gmail.com>"]
license = "MIT"
repository = "https://github.com/zip-rs/zip.git"
@@ -11,8 +11,7 @@
edition = "2018"
[dependencies]
-# FIXME(#170): flate2 1.0.15 has an MSRV of 1.36.0, breaking ours. We'll update when we know if this will be addressed
-flate2 = { version = ">=1.0.0, <=1.0.14", default-features = false, optional = true }
+flate2 = { version = "1.0.0", default-features = false, optional = true }
time = { version = "0.1", optional = true }
byteorder = "1.3"
bzip2 = { version = "0.3", optional = true }
diff --git a/METADATA b/METADATA
index c0a206d..4fc4c19 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/zip/zip-0.5.11.crate"
+ value: "https://static.crates.io/crates/zip/zip-0.5.12.crate"
}
- version: "0.5.11"
+ version: "0.5.12"
license_type: NOTICE
last_upgrade_date {
year: 2021
- month: 4
- day: 1
+ month: 5
+ day: 19
}
}
diff --git a/README.md b/README.md
index 79d2dcc..f6a28cc 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@
MSRV
----
-Our current Minimum Supported Rust Version is **1.34.0**. When adding features,
+Our current Minimum Supported Rust Version is **1.36.0**. When adding features,
we will follow these guidelines:
- We will always support the latest four minor Rust versions. This gives you a 6