Merge branch 'patch-2'

GitoxideLabs · Aug 24, 2024 · a64d94e · a64d94e
2 parents c3a7dcf + 77e808b
commit a64d94e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml
@@ -30,6 +30,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: extractions/setup-just@v2
       - run: |
-          rustup toolchain install ${{ env.rust_version }} --profile minimal --no-self-update
+          rustup toolchain install ${{ env.rust_version }} nightly --profile minimal --no-self-update
           rustup default ${{ env.rust_version }}
+          cargo +nightly update -Zminimal-versions
       - run: just ci-check-msrv
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/gix-archive/Cargo.toml b/gix-archive/Cargo.toml
@@ -30,7 +30,7 @@ gix-object = { version = "^0.44.0", path = "../gix-object" }
 gix-path = { version = "^0.10.10", path = "../gix-path", optional = true }
 gix-date = { version = "^0.9.0", path = "../gix-date" }
 
-flate2 = { version = "1.0.26", optional = true }
+flate2 = { version = "1.0.33", optional = true }
 zip = { version = "2.1.0", optional = true, default-features = false, features = ["deflate"] }
 jiff = { version = "0.1.2", default-features = false, features = ["std"] }
 

diff --git a/gix-features/Cargo.toml b/gix-features/Cargo.toml
@@ -143,7 +143,7 @@ bytesize = { version = "1.0.1", optional = true }
 bytes = { version = "1.0.0", optional = true }
 
 # zlib module
-flate2 = { version = "1.0.25", optional = true, default-features = false }
+flate2 = { version = "1.0.33", optional = true, default-features = false }
 thiserror = { version = "1.0.38", optional = true }
 
 once_cell = { version = "1.13.0", optional = true }

diff --git a/gix-url/Cargo.toml b/gix-url/Cargo.toml
@@ -22,7 +22,7 @@ gix-path = { version = "^0.10.10", path = "../gix-path" }
 
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["std", "derive"] }
 thiserror = "1.0.32"
-url = "2.5.1"
+url = "2.5.2"
 bstr = { version = "1.3.0", default-features = false, features = ["std"] }
 home = "0.5.5"