diff --git a/Cargo.lock b/Cargo.lock index 5d6234d..223f658 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -92,15 +92,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "arbitrary" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1" -dependencies = [ - "derive_arbitrary", -] - [[package]] name = "assert_cmd" version = "2.2.2" @@ -130,11 +121,11 @@ checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da" [[package]] name = "block-buffer" -version = "0.10.4" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa" dependencies = [ - "generic-array", + "hybrid-array", ] [[package]] @@ -202,7 +193,7 @@ dependencies = [ "sha2", "tempfile", "thiserror 2.0.19", - "toml_edit 0.23.10+spec-1.0.0", + "toml_edit", "uuid", ] @@ -290,11 +281,17 @@ dependencies = [ "memchr", ] +[[package]] +name = "const-oid" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" + [[package]] name = "cpufeatures" -version = "0.2.17" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" +checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" dependencies = [ "libc", ] @@ -310,23 +307,11 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "derive_arbitrary" -version = "1.4.2" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" +checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.119", + "hybrid-array", ] [[package]] @@ -337,11 +322,12 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] name = "digest" -version = "0.10.7" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" dependencies = [ "block-buffer", + "const-oid", "crypto-common", ] @@ -483,16 +469,6 @@ dependencies = [ "slab", ] -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - [[package]] name = "getrandom" version = "0.2.17" @@ -533,6 +509,15 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hybrid-array" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707114b52a152fa7bdb290cd7cd5912d9467273b6d74e21b8d81aca1f8533f6b" +dependencies = [ + "typenum", +] + [[package]] name = "icu_collections" version = "2.2.0" @@ -995,7 +980,7 @@ version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f" dependencies = [ - "toml_edit 0.25.13+spec-1.1.0", + "toml_edit", ] [[package]] @@ -1325,9 +1310,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.9" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" +checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4" dependencies = [ "cfg-if", "cpufeatures", @@ -1500,26 +1485,17 @@ dependencies = [ [[package]] name = "toml" -version = "0.9.12+spec-1.1.0" +version = "1.1.4+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863" +checksum = "3aace63f4bbcdfc2c965b059de67119c89c4017a70d633be6c104910f67056f5" dependencies = [ "indexmap", "serde_core", "serde_spanned", - "toml_datetime 0.7.5+spec-1.1.0", + "toml_datetime", "toml_parser", "toml_writer", - "winnow 0.7.15", -] - -[[package]] -name = "toml_datetime" -version = "0.7.5+spec-1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" -dependencies = [ - "serde_core", + "winnow", ] [[package]] @@ -1531,19 +1507,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "toml_edit" -version = "0.23.10+spec-1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269" -dependencies = [ - "indexmap", - "toml_datetime 0.7.5+spec-1.1.0", - "toml_parser", - "toml_writer", - "winnow 0.7.15", -] - [[package]] name = "toml_edit" version = "0.25.13+spec-1.1.0" @@ -1551,9 +1514,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6975367e4d2ef766d86af01ffad14b622fecc8d4357a998fbc4deb6e9bacaf9b" dependencies = [ "indexmap", - "toml_datetime 1.1.1+spec-1.1.0", + "toml_datetime", "toml_parser", - "winnow 1.0.4", + "toml_writer", + "winnow", ] [[package]] @@ -1562,7 +1526,7 @@ version = "1.1.3+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d38ac1cf9b95face32296c0a3ede1fdc270627c9d9c02a7274dd6d960dc4d56" dependencies = [ - "winnow 1.0.4", + "winnow", ] [[package]] @@ -1571,6 +1535,12 @@ version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d56353a2a665ad0f41a421187180aab746c8c325620617ad883a99a1cbe66d2" +[[package]] +name = "typed-path" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e28f89b80c87b8fb0cf04ab448d5dd0dd0ade2f8891bae878de66a75a28600e" + [[package]] name = "typenum" version = "1.20.1" @@ -1620,12 +1590,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - [[package]] name = "wait-timeout" version = "0.2.1" @@ -1742,15 +1706,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "winnow" -version = "0.7.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945" -dependencies = [ - "memchr", -] - [[package]] name = "winnow" version = "1.0.4" @@ -1845,15 +1800,15 @@ dependencies = [ [[package]] name = "zip" -version = "6.0.0" +version = "8.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2a05c7c36fde6c09b08576c9f7fb4cda705990f73b58fe011abf7dfb24168b" +checksum = "2d04a6b5381502aa6087c94c669499eb1602eb9c5e8198e534de571f7154809b" dependencies = [ - "arbitrary", "crc32fast", "flate2", "indexmap", "memchr", + "typed-path", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 9abe8d3..cdb64ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,10 +36,10 @@ schemars = { version = "1.0.4", features = ["semver1"] } semver = { version = "1.0.26", features = ["serde"] } serde = { version = "1.0.219", features = ["derive"] } serde_json = "1.0.140" -sha2 = "0.10.9" +sha2 = "0.11.0" tempfile = "3.20.0" thiserror = "2.0.12" -toml = "0.9.2" +toml = "1.1.4" url = { version = "2.5.4", features = ["serde"] } uuid = { version = "1.17.0", features = ["serde", "v4"] } windows-sys = { version = "0.61.2", features = [ diff --git a/LICENSES/cargo-dependencies.json b/LICENSES/cargo-dependencies.json index 105a3e6..2e33a21 100644 --- a/LICENSES/cargo-dependencies.json +++ b/LICENSES/cargo-dependencies.json @@ -72,14 +72,6 @@ "source": "registry+https://github.com/rust-lang/crates.io-index", "version": "3.0.11" }, - { - "checksum": "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1", - "license": "MIT OR Apache-2.0", - "name": "arbitrary", - "repository": "https://github.com/rust-fuzz/arbitrary/", - "source": "registry+https://github.com/rust-lang/crates.io-index", - "version": "1.4.2" - }, { "checksum": "2aa3a22042e45de04255c7bf3626e239f450200fd0493c1e382263544b20aea6", "license": "MIT OR Apache-2.0", @@ -105,12 +97,12 @@ "version": "2.13.1" }, { - "checksum": "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71", + "checksum": "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa", "license": "MIT OR Apache-2.0", "name": "block-buffer", "repository": "https://github.com/RustCrypto/utils", "source": "registry+https://github.com/rust-lang/crates.io-index", - "version": "0.10.4" + "version": "0.12.1" }, { "checksum": "1f7dc094d718f2e1c1559ad110e27eeaae14a5465d3d56dd6dbd793079fbd530", @@ -233,12 +225,20 @@ "version": "4.6.7" }, { - "checksum": "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280", + "checksum": "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c", + "license": "Apache-2.0 OR MIT", + "name": "const-oid", + "repository": "https://github.com/RustCrypto/formats", + "source": "registry+https://github.com/rust-lang/crates.io-index", + "version": "0.10.2" + }, + { + "checksum": "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201", "license": "MIT OR Apache-2.0", "name": "cpufeatures", "repository": "https://github.com/RustCrypto/utils", "source": "registry+https://github.com/rust-lang/crates.io-index", - "version": "0.2.17" + "version": "0.3.0" }, { "checksum": "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511", @@ -249,20 +249,12 @@ "version": "1.5.0" }, { - "checksum": "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a", + "checksum": "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453", "license": "MIT OR Apache-2.0", "name": "crypto-common", "repository": "https://github.com/RustCrypto/traits", "source": "registry+https://github.com/rust-lang/crates.io-index", - "version": "0.1.7" - }, - { - "checksum": "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a", - "license": "MIT OR Apache-2.0", - "name": "derive_arbitrary", - "repository": "https://github.com/rust-fuzz/arbitrary", - "source": "registry+https://github.com/rust-lang/crates.io-index", - "version": "1.4.2" + "version": "0.2.2" }, { "checksum": "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8", @@ -273,12 +265,12 @@ "version": "0.4.0" }, { - "checksum": "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292", + "checksum": "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2", "license": "MIT OR Apache-2.0", "name": "digest", "repository": "https://github.com/RustCrypto/traits", "source": "registry+https://github.com/rust-lang/crates.io-index", - "version": "0.10.7" + "version": "0.11.3" }, { "checksum": "16f5094c54661b38d03bd7e50df373292118db60b585c08a411c6d840017fe7d", @@ -408,14 +400,6 @@ "source": "registry+https://github.com/rust-lang/crates.io-index", "version": "0.3.33" }, - { - "checksum": "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a", - "license": "MIT", - "name": "generic-array", - "repository": "https://github.com/fizyk20/generic-array.git", - "source": "registry+https://github.com/rust-lang/crates.io-index", - "version": "0.14.7" - }, { "checksum": "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0", "license": "MIT OR Apache-2.0", @@ -456,6 +440,14 @@ "source": "registry+https://github.com/rust-lang/crates.io-index", "version": "0.4.3" }, + { + "checksum": "707114b52a152fa7bdb290cd7cd5912d9467273b6d74e21b8d81aca1f8533f6b", + "license": "MIT OR Apache-2.0", + "name": "hybrid-array", + "repository": "https://github.com/RustCrypto/hybrid-array", + "source": "registry+https://github.com/rust-lang/crates.io-index", + "version": "0.4.14" + }, { "checksum": "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c", "license": "Unicode-3.0", @@ -1049,12 +1041,12 @@ "version": "1.1.1" }, { - "checksum": "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283", + "checksum": "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4", "license": "MIT OR Apache-2.0", "name": "sha2", "repository": "https://github.com/RustCrypto/hashes", "source": "registry+https://github.com/rust-lang/crates.io-index", - "version": "0.10.9" + "version": "0.11.0" }, { "checksum": "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba", @@ -1209,20 +1201,12 @@ "version": "0.8.3" }, { - "checksum": "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863", + "checksum": "3aace63f4bbcdfc2c965b059de67119c89c4017a70d633be6c104910f67056f5", "license": "MIT OR Apache-2.0", "name": "toml", "repository": "https://github.com/toml-rs/toml", "source": "registry+https://github.com/rust-lang/crates.io-index", - "version": "0.9.12+spec-1.1.0" - }, - { - "checksum": "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347", - "license": "MIT OR Apache-2.0", - "name": "toml_datetime", - "repository": "https://github.com/toml-rs/toml", - "source": "registry+https://github.com/rust-lang/crates.io-index", - "version": "0.7.5+spec-1.1.0" + "version": "1.1.4+spec-1.1.0" }, { "checksum": "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7", @@ -1232,14 +1216,6 @@ "source": "registry+https://github.com/rust-lang/crates.io-index", "version": "1.1.1+spec-1.1.0" }, - { - "checksum": "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269", - "license": "MIT OR Apache-2.0", - "name": "toml_edit", - "repository": "https://github.com/toml-rs/toml", - "source": "registry+https://github.com/rust-lang/crates.io-index", - "version": "0.23.10+spec-1.0.0" - }, { "checksum": "6975367e4d2ef766d86af01ffad14b622fecc8d4357a998fbc4deb6e9bacaf9b", "license": "MIT OR Apache-2.0", @@ -1264,6 +1240,14 @@ "source": "registry+https://github.com/rust-lang/crates.io-index", "version": "1.1.2+spec-1.1.0" }, + { + "checksum": "8e28f89b80c87b8fb0cf04ab448d5dd0dd0ade2f8891bae878de66a75a28600e", + "license": "MIT OR Apache-2.0", + "name": "typed-path", + "repository": "https://github.com/chipsenkbeil/typed-path", + "source": "registry+https://github.com/rust-lang/crates.io-index", + "version": "0.12.3" + }, { "checksum": "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20", "license": "MIT OR Apache-2.0", @@ -1312,14 +1296,6 @@ "source": "registry+https://github.com/rust-lang/crates.io-index", "version": "1.24.0" }, - { - "checksum": "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a", - "license": "MIT/Apache-2.0", - "name": "version_check", - "repository": "https://github.com/SergioBenitez/version_check", - "source": "registry+https://github.com/rust-lang/crates.io-index", - "version": "0.9.5" - }, { "checksum": "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11", "license": "MIT/Apache-2.0", @@ -1424,14 +1400,6 @@ "source": "registry+https://github.com/rust-lang/crates.io-index", "version": "0.61.2" }, - { - "checksum": "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945", - "license": "MIT", - "name": "winnow", - "repository": "https://github.com/winnow-rs/winnow", - "source": "registry+https://github.com/rust-lang/crates.io-index", - "version": "0.7.15" - }, { "checksum": "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81", "license": "MIT", @@ -1505,12 +1473,12 @@ "version": "0.11.3" }, { - "checksum": "eb2a05c7c36fde6c09b08576c9f7fb4cda705990f73b58fe011abf7dfb24168b", + "checksum": "2d04a6b5381502aa6087c94c669499eb1602eb9c5e8198e534de571f7154809b", "license": "MIT", "name": "zip", - "repository": "https://github.com/zip-rs/zip2.git", + "repository": "https://github.com/zip-rs/zip2", "source": "registry+https://github.com/rust-lang/crates.io-index", - "version": "6.0.0" + "version": "8.6.0" }, { "checksum": "b142a20ec14a91d5bc708c1dc21b080c550113d8aa77afa29635673a65dd02c5", diff --git a/crates/cargo-ferry/Cargo.toml b/crates/cargo-ferry/Cargo.toml index aa85a09..a3d71be 100644 --- a/crates/cargo-ferry/Cargo.toml +++ b/crates/cargo-ferry/Cargo.toml @@ -41,7 +41,7 @@ serde_json.workspace = true sha2.workspace = true tempfile.workspace = true thiserror.workspace = true -toml_edit = "0.23.7" +toml_edit = "0.25.13" uuid.workspace = true [dev-dependencies] diff --git a/crates/cargo-ferry/src/deployment/logs.rs b/crates/cargo-ferry/src/deployment/logs.rs index 39a38c9..c282c6b 100644 --- a/crates/cargo-ferry/src/deployment/logs.rs +++ b/crates/cargo-ferry/src/deployment/logs.rs @@ -896,8 +896,8 @@ mod tests { #[test] fn system_stream_delivers_android_and_simulator_entries_incrementally() { - let (_temporary, tool) = fake_log_tool(); - let android = LogService::new(SystemExecutor, ".").with_tools(&tool, &tool); + let (_temporary_android, android_tool) = fake_log_tool(); + let android = LogService::new(SystemExecutor, ".").with_tools(&android_tool, &android_tool); let mut android_entries = Vec::new(); let outcome = android .stream( @@ -911,7 +911,9 @@ mod tests { assert_eq!(outcome.entries, 1); assert_eq!(android_entries[0].message, "android ready"); - let simulator = LogService::new(SystemExecutor, ".").with_tools(&tool, &tool); + let (_temporary_simulator, simulator_tool) = fake_log_tool(); + let simulator = + LogService::new(SystemExecutor, ".").with_tools(&simulator_tool, &simulator_tool); let mut simulator_entries = Vec::new(); let outcome = simulator .stream( diff --git a/crates/rustferry-android/Cargo.toml b/crates/rustferry-android/Cargo.toml index de621c0..fce9f12 100644 --- a/crates/rustferry-android/Cargo.toml +++ b/crates/rustferry-android/Cargo.toml @@ -33,7 +33,7 @@ serde_json.workspace = true sha2.workspace = true thiserror.workspace = true uuid.workspace = true -zip = { version = "6.0.0", default-features = false, features = ["deflate-flate2-zlib-rs"] } +zip = { version = "8.6.0", default-features = false, features = ["deflate-flate2-zlib-rs"] } [dev-dependencies] tempfile.workspace = true