From 34641c9a398f9a637572a078d85e6529e5cdb8a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Dec 2023 21:42:07 +0000 Subject: [PATCH 01/13] Bump taiki-e/install-action from 2.21.26 to 2.22.1 (#167) --- .github/workflows/CD.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CD.yaml b/.github/workflows/CD.yaml index c330358f..59a86999 100644 --- a/.github/workflows/CD.yaml +++ b/.github/workflows/CD.yaml @@ -67,7 +67,7 @@ jobs: targets: ${{ matrix.target }} - name: Install cross if: ${{ matrix.use-cross }} - uses: taiki-e/install-action@v2.21.26 + uses: taiki-e/install-action@v2.22.1 with: tool: cross - name: Cache build artifacts From 623272dc4d66ecbbc1acb5aa54243b19c05e7bd4 Mon Sep 17 00:00:00 2001 From: Shun Sakai Date: Fri, 15 Dec 2023 02:26:34 +0900 Subject: [PATCH 02/13] Update `justfile` --- justfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/justfile b/justfile index fcc3a890..bee703be 100644 --- a/justfile +++ b/justfile @@ -71,7 +71,7 @@ clang-tidy: setup-meson # Run the formatter for the README @fmt-readme: - npx prettier -w README.md crates/*/README.md + npx prettier -w crates/*/README.md # Build the book @build-book: From 37c8c1ba5bfc5cff70ab4eb7f4819382a9205255 Mon Sep 17 00:00:00 2001 From: Shun Sakai Date: Sat, 16 Dec 2023 02:30:55 +0900 Subject: [PATCH 03/13] Change to use `bump-my-version` --- .bumpversion-capi.cfg | 8 -------- .bumpversion-capi.cfg.license | 3 --- .bumpversion-capi.toml | 15 +++++++++++++++ .bumpversion-lib.cfg | 10 ---------- .bumpversion-lib.cfg.license | 3 --- .bumpversion-lib.toml | 18 ++++++++++++++++++ justfile | 4 ++-- 7 files changed, 35 insertions(+), 26 deletions(-) delete mode 100644 .bumpversion-capi.cfg delete mode 100644 .bumpversion-capi.cfg.license create mode 100644 .bumpversion-capi.toml delete mode 100644 .bumpversion-lib.cfg delete mode 100644 .bumpversion-lib.cfg.license create mode 100644 .bumpversion-lib.toml diff --git a/.bumpversion-capi.cfg b/.bumpversion-capi.cfg deleted file mode 100644 index b4bfefdb..00000000 --- a/.bumpversion-capi.cfg +++ /dev/null @@ -1,8 +0,0 @@ -[bumpversion] -current_version = 0.2.3 - -[bumpversion:file:crates/capi/examples/meson.build] - -[bumpversion:file:crates/capi/examples/version.cpp] - -[bumpversion:file:crates/capi/src/lib.rs] diff --git a/.bumpversion-capi.cfg.license b/.bumpversion-capi.cfg.license deleted file mode 100644 index 90382fef..00000000 --- a/.bumpversion-capi.cfg.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2023 Shun Sakai - -SPDX-License-Identifier: Apache-2.0 OR MIT diff --git a/.bumpversion-capi.toml b/.bumpversion-capi.toml new file mode 100644 index 00000000..35cc895d --- /dev/null +++ b/.bumpversion-capi.toml @@ -0,0 +1,15 @@ +# SPDX-FileCopyrightText: 2023 Shun Sakai +# +# SPDX-License-Identifier: Apache-2.0 OR MIT + +[tool.bumpversion] +current_version = "0.2.3" + +[[tool.bumpversion.files]] +filename = "crates/capi/examples/meson.build" + +[[tool.bumpversion.files]] +filename = "crates/capi/examples/version.cpp" + +[[tool.bumpversion.files]] +filename = "crates/capi/src/lib.rs" diff --git a/.bumpversion-lib.cfg b/.bumpversion-lib.cfg deleted file mode 100644 index a494d800..00000000 --- a/.bumpversion-lib.cfg +++ /dev/null @@ -1,10 +0,0 @@ -[bumpversion] -current_version = 0.2.8 - -[bumpversion:file:crates/abcrypt/README.md] - -[bumpversion:file:crates/abcrypt/src/lib.rs] - -[bumpversion:file:docs/book/modules/lib/pages/usage.adoc] - -[bumpversion:file:docs/FORMAT.adoc] diff --git a/.bumpversion-lib.cfg.license b/.bumpversion-lib.cfg.license deleted file mode 100644 index 90382fef..00000000 --- a/.bumpversion-lib.cfg.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2023 Shun Sakai - -SPDX-License-Identifier: Apache-2.0 OR MIT diff --git a/.bumpversion-lib.toml b/.bumpversion-lib.toml new file mode 100644 index 00000000..03ea6d70 --- /dev/null +++ b/.bumpversion-lib.toml @@ -0,0 +1,18 @@ +# SPDX-FileCopyrightText: 2023 Shun Sakai +# +# SPDX-License-Identifier: Apache-2.0 OR MIT + +[tool.bumpversion] +current_version = "0.2.8" + +[[tool.bumpversion.files]] +filename = "crates/abcrypt/README.md" + +[[tool.bumpversion.files]] +filename = "crates/abcrypt/src/lib.rs" + +[[tool.bumpversion.files]] +filename = "docs/book/modules/lib/pages/usage.adoc" + +[[tool.bumpversion.files]] +filename = "docs/FORMAT.adoc" diff --git a/justfile b/justfile index bee703be..aabd86f7 100644 --- a/justfile +++ b/justfile @@ -79,7 +79,7 @@ clang-tidy: setup-meson # Increment the version of the library @bump-lib part: - bump2version --config-file .bumpversion-lib.cfg {{part}} + bump-my-version bump --config-file .bumpversion-lib.toml {{part}} cargo set-version --bump {{part}} -p abcrypt # Increment the version of the command-line utility @@ -88,5 +88,5 @@ clang-tidy: setup-meson # Increment the version of the C API @bump-capi part: - bump2version --config-file .bumpversion-capi.cfg {{part}} + bump-my-version bump --config-file .bumpversion-capi.toml {{part}} cargo set-version --bump {{part}} -p abcrypt-capi From db57b3dce2ff2ae37d56d09d3e780f70cbed1caf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Dec 2023 10:17:48 +0000 Subject: [PATCH 04/13] Bump actions/upload-artifact from 3 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/CD.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CD.yaml b/.github/workflows/CD.yaml index 59a86999..950c3714 100644 --- a/.github/workflows/CD.yaml +++ b/.github/workflows/CD.yaml @@ -143,7 +143,7 @@ jobs: fi rm -rv abcrypt-*/ - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "abcrypt-${{ steps.extracted_version.outputs.version }}-${{ matrix.target }}" path: "abcrypt-*.*" From e5af41578b44f15baff512edfc1f983930435567 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Dec 2023 10:48:58 +0000 Subject: [PATCH 05/13] Bump taiki-e/install-action from 2.22.1 to 2.22.4 (#170) --- .github/workflows/CD.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CD.yaml b/.github/workflows/CD.yaml index 59a86999..28f4f6c1 100644 --- a/.github/workflows/CD.yaml +++ b/.github/workflows/CD.yaml @@ -67,7 +67,7 @@ jobs: targets: ${{ matrix.target }} - name: Install cross if: ${{ matrix.use-cross }} - uses: taiki-e/install-action@v2.22.1 + uses: taiki-e/install-action@v2.22.4 with: tool: cross - name: Cache build artifacts From 924707a846a61057ffbf0455414f576fd44e7faa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Dec 2023 10:17:52 +0000 Subject: [PATCH 06/13] Bump actions/download-artifact from 3 to 4 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/CD.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CD.yaml b/.github/workflows/CD.yaml index 950c3714..6df4dee7 100644 --- a/.github/workflows/CD.yaml +++ b/.github/workflows/CD.yaml @@ -154,7 +154,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Download artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 - name: Calculate checksums run: | mv abcrypt-*/* . From af3b22419e40dd34ea151dc02334db21a511cd58 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Dec 2023 11:19:15 +0000 Subject: [PATCH 07/13] Bump byte-unit from 5.0.3 to 5.0.4 (#171) --- Cargo.lock | 46 +++++++++++++++++++++---------------------- crates/cli/Cargo.toml | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6af45ede..da8d5d66 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -64,9 +64,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" dependencies = [ "anstyle", "anstyle-parse", @@ -93,9 +93,9 @@ dependencies = [ [[package]] name = "anstyle-query" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3a318f1f38d2418400f8209655bfd825785afd25aa30bb7ba6cc792e4596748" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ "windows-sys 0.52.0", ] @@ -204,9 +204,9 @@ dependencies = [ [[package]] name = "byte-unit" -version = "5.0.3" +version = "5.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc40af92e0f7f964b7ab1ebc81315cce78fc484802d534143321c956f58d7be3" +checksum = "3b5d3e0076fe99e4739fb5dc79407eb5a3ac1b3aaec14f294eef66ca836009d8" dependencies = [ "rust_decimal", "serde", @@ -323,7 +323,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.41", ] [[package]] @@ -506,9 +506,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "lazy_static" @@ -518,9 +518,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "linux-raw-sys" @@ -717,9 +717,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.26" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ "bitflags 2.4.1", "errno", @@ -730,9 +730,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "serde" @@ -751,7 +751,7 @@ checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.41", ] [[package]] @@ -805,9 +805,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" dependencies = [ "proc-macro2", "quote", @@ -851,22 +851,22 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.41", ] [[package]] diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index c67dd6e2..19525bb4 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -26,7 +26,7 @@ path = "src/main.rs" [dependencies] abcrypt = { version = "0.2.8", path = "../abcrypt", features = ["serde"] } anyhow.workspace = true -byte-unit = "5.0.3" +byte-unit = "5.0.4" clap = { workspace = true, features = ["wrap_help"] } clap_complete = "4.4.4" clap_complete_nushell = "4.4.2" From 503399efa23109e036e883055f3baa13e9f49bcc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 21:10:55 +0000 Subject: [PATCH 08/13] Bump taiki-e/install-action from 2.22.4 to 2.22.6 (#172) --- .github/workflows/CD.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CD.yaml b/.github/workflows/CD.yaml index 69da0d13..e15973cb 100644 --- a/.github/workflows/CD.yaml +++ b/.github/workflows/CD.yaml @@ -67,7 +67,7 @@ jobs: targets: ${{ matrix.target }} - name: Install cross if: ${{ matrix.use-cross }} - uses: taiki-e/install-action@v2.22.4 + uses: taiki-e/install-action@v2.22.6 with: tool: cross - name: Cache build artifacts From b1c170720ee2765a53d9b809d3343c2ec98823c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 21:11:08 +0000 Subject: [PATCH 09/13] Bump byte-unit from 5.0.4 to 5.1.2 (#173) --- Cargo.lock | 316 +++++++++++++++++++++++++++++++++++++++++- crates/cli/Cargo.toml | 2 +- 2 files changed, 313 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index da8d5d66..b222028a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -53,6 +53,17 @@ dependencies = [ "generic-array", ] +[[package]] +name = "ahash" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + [[package]] name = "aho-corasick" version = "1.1.2" @@ -173,6 +184,18 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + [[package]] name = "blake2" version = "0.10.6" @@ -191,6 +214,30 @@ dependencies = [ "generic-array", ] +[[package]] +name = "borsh" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d4d6dafc1a3bb54687538972158f07b2c948bc57d5890df22c0739098b3028" +dependencies = [ + "borsh-derive", + "cfg_aliases", +] + +[[package]] +name = "borsh-derive" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4918709cc4dd777ad2b6303ed03cb37f3ca0ccede8c1b0d28ac6db8f4710e0" +dependencies = [ + "once_cell", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.41", + "syn_derive", +] + [[package]] name = "bstr" version = "1.8.0" @@ -204,15 +251,43 @@ dependencies = [ [[package]] name = "byte-unit" -version = "5.0.4" +version = "5.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b5d3e0076fe99e4739fb5dc79407eb5a3ac1b3aaec14f294eef66ca836009d8" +checksum = "d405b41420a161b4e1dd5a52e3349f41b4dae9a39be02aff1d67fe53256430ac" dependencies = [ "rust_decimal", "serde", "utf8-width", ] +[[package]] +name = "bytecheck" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" +dependencies = [ + "bytecheck_derive", + "ptr_meta", + "simdutf8", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + [[package]] name = "cbindgen" version = "0.26.0" @@ -220,7 +295,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da6bc11b07529f16944307272d5bd9b22530bc7d05751717c9d416586cedab49" dependencies = [ "heck", - "indexmap", + "indexmap 1.9.3", "log", "proc-macro2", "quote", @@ -237,6 +312,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "chacha20" version = "0.9.1" @@ -418,6 +499,12 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" version = "0.3.8" @@ -443,6 +530,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + [[package]] name = "generic-array" version = "0.14.7" @@ -469,6 +562,15 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "heck" @@ -483,7 +585,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown 0.14.3", ] [[package]] @@ -555,6 +667,12 @@ dependencies = [ "autocfg", ] +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + [[package]] name = "opaque-debug" version = "0.3.0" @@ -620,6 +738,39 @@ dependencies = [ "termtree", ] +[[package]] +name = "proc-macro-crate" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" +dependencies = [ + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + [[package]] name = "proc-macro2" version = "1.0.70" @@ -629,6 +780,26 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "ptr_meta" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "quote" version = "1.0.33" @@ -638,12 +809,19 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + [[package]] name = "rand" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ + "libc", "rand_chacha", "rand_core", ] @@ -705,6 +883,44 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +[[package]] +name = "rend" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" +dependencies = [ + "bytecheck", +] + +[[package]] +name = "rkyv" +version = "0.7.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "527a97cdfef66f65998b5f3b637c26f5a5ec09cc52a3f9932313ac645f4190f5" +dependencies = [ + "bitvec", + "bytecheck", + "bytes", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5c462a1328c8e67e4d6dbad1eb0355dd43e8ab432c6e227a43657f16ade5033" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "rust_decimal" version = "1.33.1" @@ -712,7 +928,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06676aec5ccb8fc1da723cc8c0f9a46549f21ebb8753d3915c6c41db1e7f1dc4" dependencies = [ "arrayvec", + "borsh", + "bytes", "num-traits", + "rand", + "rkyv", + "serde", + "serde_json", ] [[package]] @@ -734,6 +956,12 @@ version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + [[package]] name = "serde" version = "1.0.193" @@ -780,6 +1008,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" +[[package]] +name = "simdutf8" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + [[package]] name = "strsim" version = "0.10.0" @@ -814,12 +1048,30 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.41", +] + [[package]] name = "sysexits" version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "863d0ebf4f8f10e7e33c82f7fe18e2a09952028011bf0cc7a9a3b8df9bb1cf56" +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + [[package]] name = "tempfile" version = "3.8.1" @@ -869,6 +1121,21 @@ dependencies = [ "syn 2.0.41", ] +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + [[package]] name = "toml" version = "0.5.11" @@ -878,6 +1145,23 @@ dependencies = [ "serde", ] +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" + +[[package]] +name = "toml_edit" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +dependencies = [ + "indexmap 2.1.0", + "toml_datetime", + "winnow", +] + [[package]] name = "typenum" version = "1.17.0" @@ -918,6 +1202,12 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +[[package]] +name = "uuid" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" + [[package]] name = "version_check" version = "0.9.4" @@ -1137,6 +1427,24 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +[[package]] +name = "winnow" +version = "0.5.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2" +dependencies = [ + "memchr", +] + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + [[package]] name = "zeroize" version = "1.7.0" diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 19525bb4..7d5f561c 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -26,7 +26,7 @@ path = "src/main.rs" [dependencies] abcrypt = { version = "0.2.8", path = "../abcrypt", features = ["serde"] } anyhow.workspace = true -byte-unit = "5.0.4" +byte-unit = "5.1.2" clap = { workspace = true, features = ["wrap_help"] } clap_complete = "4.4.4" clap_complete_nushell = "4.4.2" From 114d238cbdfa3578873d75523cbd60f0a5fc30a6 Mon Sep 17 00:00:00 2001 From: Shun Sakai Date: Wed, 20 Dec 2023 09:00:45 +0900 Subject: [PATCH 10/13] Add screenshot --- README.adoc | 2 ++ crates/cli/README.md | 2 ++ crates/cli/assets/screenshot.webp | Bin 0 -> 28196 bytes crates/cli/assets/screenshot.webp.license | 3 +++ docs/book/modules/ROOT/images/screenshot.webp | 1 + docs/book/modules/ROOT/pages/index.adoc | 2 ++ docs/book/modules/cli/images/screenshot.webp | 1 + docs/book/modules/cli/pages/index.adoc | 2 ++ 8 files changed, 13 insertions(+) create mode 100644 crates/cli/assets/screenshot.webp create mode 100644 crates/cli/assets/screenshot.webp.license create mode 120000 docs/book/modules/ROOT/images/screenshot.webp create mode 120000 docs/book/modules/cli/images/screenshot.webp diff --git a/README.adoc b/README.adoc index 6765645b..015a351e 100644 --- a/README.adoc +++ b/README.adoc @@ -25,6 +25,8 @@ image:{ci-badge}[CI,link={ci-url}] *abcrypt* is a simple, modern and secure file encryption tool, file format and Rust library. +image::crates/cli/assets/screenshot.webp[Screenshot of abcrypt] + == Crates |=== diff --git a/crates/cli/README.md b/crates/cli/README.md index 723b1ae6..5686e823 100644 --- a/crates/cli/README.md +++ b/crates/cli/README.md @@ -13,6 +13,8 @@ SPDX-License-Identifier: GPL-3.0-or-later **abcrypt** ([`abcrypt-cli`][version-url]) is a command-line utility for encrypt and decrypt files using the [abcrypt format]. +![Screenshot of abcrypt](assets/screenshot.webp) + ## Installation ### From source diff --git a/crates/cli/assets/screenshot.webp b/crates/cli/assets/screenshot.webp new file mode 100644 index 0000000000000000000000000000000000000000..c1544368edc8af30a2b3920bf20270e8e3786ce2 GIT binary patch literal 28196 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 Date: Wed, 20 Dec 2023 11:17:48 +0900 Subject: [PATCH 11/13] Format JSON in documents --- crates/cli/README.md | 8 ++++++-- docs/book/modules/cli/pages/usage.adoc | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/crates/cli/README.md b/crates/cli/README.md index 5686e823..9dff743b 100644 --- a/crates/cli/README.md +++ b/crates/cli/README.md @@ -67,13 +67,17 @@ Parameters used: m_cost = 32; t_cost = 3; p_cost = 4; Output as JSON: ```sh -abcrypt information -j data.txt.abcrypt +abcrypt information -j data.txt.abcrypt | jq ``` Output: ```json -{"m_cost":32,"t_cost":3,"p_cost":4} +{ + "m_cost": 32, + "t_cost": 3, + "p_cost": 4 +} ``` ### Generate shell completion diff --git a/docs/book/modules/cli/pages/usage.adoc b/docs/book/modules/cli/pages/usage.adoc index 14452127..7c1b0cd6 100644 --- a/docs/book/modules/cli/pages/usage.adoc +++ b/docs/book/modules/cli/pages/usage.adoc @@ -34,13 +34,17 @@ Parameters used: m_cost = 32; t_cost = 3; p_cost = 4; .Output as JSON [source,shell] ---- -abcrypt information -j data.txt.abcrypt +abcrypt information -j data.txt.abcrypt | jq ---- .Output [source,json] ---- -{"m_cost":32,"t_cost":3,"p_cost":4} +{ + "m_cost": 32, + "t_cost": 3, + "p_cost": 4 +} ---- == Generate shell completion From b247333611b91ba8e9d99e3a2ac0358047d65ed0 Mon Sep 17 00:00:00 2001 From: Shun Sakai Date: Wed, 20 Dec 2023 14:11:38 +0900 Subject: [PATCH 12/13] Update tests --- crates/cli/tests/integration.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/cli/tests/integration.rs b/crates/cli/tests/integration.rs index bc0ec209..4631a050 100644 --- a/crates/cli/tests/integration.rs +++ b/crates/cli/tests/integration.rs @@ -539,7 +539,8 @@ fn information_command_without_default_feature() { .arg("data/data.txt.abcrypt") .assert() .failure() - .code(2); + .code(2) + .stderr(predicate::str::contains("unexpected argument '-j' found")); } #[cfg(feature = "json")] From 4663ca59f87c24cbbf26409c6b52f12dcbe572c9 Mon Sep 17 00:00:00 2001 From: Shun Sakai Date: Thu, 21 Dec 2023 01:35:32 +0900 Subject: [PATCH 13/13] Update version of `abcrypt-cli` to 0.2.8 --- Cargo.lock | 6 +- crates/cli/CHANGELOG.adoc | 6 ++ crates/cli/Cargo.toml | 2 +- package-lock.json | 158 +++++++++++++++++++------------------- package.json | 4 +- 5 files changed, 91 insertions(+), 85 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b222028a..bede6dc2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,7 +28,7 @@ dependencies = [ [[package]] name = "abcrypt-cli" -version = "0.2.7" +version = "0.2.8" dependencies = [ "abcrypt", "anyhow", @@ -1429,9 +1429,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.28" +version = "0.5.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2" +checksum = "9b5c3db89721d50d0e2a673f5043fc4722f76dcc352d7b1ab8b8288bed4ed2c5" dependencies = [ "memchr", ] diff --git a/crates/cli/CHANGELOG.adoc b/crates/cli/CHANGELOG.adoc index 85765b97..3ff35a6e 100644 --- a/crates/cli/CHANGELOG.adoc +++ b/crates/cli/CHANGELOG.adoc @@ -14,6 +14,12 @@ All notable changes to this project will be documented in this file. The format is based on https://keepachangelog.com/[Keep a Changelog], and this project adheres to https://semver.org/[Semantic Versioning]. +== {compare-url}/abcrypt-cli-v0.2.7\...abcrypt-cli-v0.2.8[0.2.8] - 2023-12-20 + +=== Added + +* Add screenshot ({pull-request-url}/174[#174]) + == {compare-url}/abcrypt-cli-v0.2.6\...abcrypt-cli-v0.2.7[0.2.7] - 2023-12-07 === Changed diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 7d5f561c..e6c63748 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -4,7 +4,7 @@ [package] name = "abcrypt-cli" -version = "0.2.7" +version = "0.2.8" authors.workspace = true edition.workspace = true rust-version.workspace = true diff --git a/package-lock.json b/package-lock.json index 958e21da..d3a6bef5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,18 +9,18 @@ "version": "1.0.0", "license": "CC-BY-4.0", "devDependencies": { - "@antora/cli": "^3.1.5", - "@antora/site-generator": "^3.1.5", + "@antora/cli": "^3.1.6", + "@antora/site-generator": "^3.1.6", "@djencks/asciidoctor-mathjax": "^0.0.9" } }, "node_modules/@antora/asciidoc-loader": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-3.1.5.tgz", - "integrity": "sha512-gWqoNL0Sm5dzFGgUFw6xF4bDtZDJDMoWfckbROn5l8hb7CrnXOsoLLydDxya8dvEYIXlq9lOngpolEKjO1RHew==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-3.1.6.tgz", + "integrity": "sha512-Tqy4QFuZiKe/yX+3H8+vTLE6HH+VDm9OkKwq3G769jcC+40wz6y3poV4r4t1XJFAWwa/AKGM99ZcnJcJ3rtW+A==", "dev": true, "dependencies": { - "@antora/logger": "3.1.5", + "@antora/logger": "3.1.6", "@antora/user-require-helper": "~2.0", "@asciidoctor/core": "~2.2" }, @@ -29,13 +29,13 @@ } }, "node_modules/@antora/cli": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/@antora/cli/-/cli-3.1.5.tgz", - "integrity": "sha512-vuKSdhlxtlwZq+JGi97lEzs26m9girNxPyGfCcZLQ9J+sYWvB1cxEbj22ZUQlWnprZUyysNyPZIglLNLBOZgqg==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/@antora/cli/-/cli-3.1.6.tgz", + "integrity": "sha512-aJLN6JyXYUfMfMVr/6JEenxnnG8evKfyp01wd/Cj7mkJXD/lj/Gqws2bXyP/hjUEl/HuX4/P9AcIfMLT/vfQJw==", "dev": true, "dependencies": { - "@antora/logger": "3.1.5", - "@antora/playbook-builder": "3.1.5", + "@antora/logger": "3.1.6", + "@antora/playbook-builder": "3.1.6", "@antora/user-require-helper": "~2.0", "commander": "~10.0" }, @@ -47,13 +47,13 @@ } }, "node_modules/@antora/content-aggregator": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-3.1.5.tgz", - "integrity": "sha512-1KfbfjND/ox/EwM/GG6ri60nb0TA+aUO3Y2XAHr/hvnJaWcHMqT4NOIHwl8KyHYmem8WYf97q9w2lKV4usP+hA==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-3.1.6.tgz", + "integrity": "sha512-kOKWn/1gBvd9XOp00/wFzH4lb3yCa5u65ZKmfe9VwC7uOl5Tg9zT0lxMa7miEbPAmfhcOr0zRYXa2ybsoKBWNw==", "dev": true, "dependencies": { "@antora/expand-path-helper": "~2.0", - "@antora/logger": "3.1.5", + "@antora/logger": "3.1.6", "@antora/user-require-helper": "~2.0", "braces": "~3.0", "cache-directory": "~2.0", @@ -73,13 +73,13 @@ } }, "node_modules/@antora/content-classifier": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-3.1.5.tgz", - "integrity": "sha512-yFBjJfNuDcC0ioh2Czx4ggTFyc776gZfaL8cKIboDGlCP7b8NyAusTgtt35l99nyVpe2KhvO2p/4KViMOsfXSw==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-3.1.6.tgz", + "integrity": "sha512-e5Fs38Cfbl2kecxpRLFftflphbjg2wPfWlwjLZjs8d0R5ISSCM38q8ecDKCQHQlrYJkSrxiSpWqg0irNqAHnLw==", "dev": true, "dependencies": { - "@antora/asciidoc-loader": "3.1.5", - "@antora/logger": "3.1.5", + "@antora/asciidoc-loader": "3.1.6", + "@antora/logger": "3.1.6", "mime-types": "~2.1", "vinyl": "~2.2" }, @@ -88,12 +88,12 @@ } }, "node_modules/@antora/document-converter": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/@antora/document-converter/-/document-converter-3.1.5.tgz", - "integrity": "sha512-YjuYPWp9ejo6KWw1yp2T+m927n/tiY8V8Q4jdt3x8XhjjfkUqSx/Sd7wgc6pGLCLM7L2V31Lpd2lZWe4ANtHQA==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/@antora/document-converter/-/document-converter-3.1.6.tgz", + "integrity": "sha512-bdzlkwq1WMnfdc6FUZNcO58LwjMqYmv3m9dI/eAJryGiKa9ChBFskwA1ob7rB87Qxjzu6UHcNucbt910hjEOAw==", "dev": true, "dependencies": { - "@antora/asciidoc-loader": "3.1.5" + "@antora/asciidoc-loader": "3.1.6" }, "engines": { "node": ">=16.0.0" @@ -109,9 +109,9 @@ } }, "node_modules/@antora/file-publisher": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/@antora/file-publisher/-/file-publisher-3.1.5.tgz", - "integrity": "sha512-C4Ikpv5X6MQ/SzYcatggVj84fgM7RbYZCZCWsnaDv8ax7mpsf4zK9W/kd5uQ8GqBqNWYLCiSqsdOCvUrZkQX9A==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/@antora/file-publisher/-/file-publisher-3.1.6.tgz", + "integrity": "sha512-UPTyFWY7lrG/Qj6SBxgoVBg1fW3JemJzW62y6pKuGHF59TEKJiaVTUlHEaVgkbpkCngn2os+VOX7fHK0jsBU9A==", "dev": true, "dependencies": { "@antora/expand-path-helper": "~2.0", @@ -125,9 +125,9 @@ } }, "node_modules/@antora/logger": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/@antora/logger/-/logger-3.1.5.tgz", - "integrity": "sha512-DGIxiv/rsWRWxFTRD4Hu2TXiFUHOqCpiu4Rf7LxOPdKkuF6i167fw8BuZeFfTzvOE2W2FhB4sopI0EiAZ1D/vQ==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/@antora/logger/-/logger-3.1.6.tgz", + "integrity": "sha512-36kU8gMbPslcPu8u9EbXsz6+9G9+LWPKhO7n8mEQqxlcCqmChwgetK6VbsL102rynpgPsstX6IAKg2wbptJK5g==", "dev": true, "dependencies": { "@antora/expand-path-helper": "~2.0", @@ -140,24 +140,24 @@ } }, "node_modules/@antora/navigation-builder": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-3.1.5.tgz", - "integrity": "sha512-xv/Bqje4q1JhPf7GKK9/S79PdaiXJG34WDIefKNLMetsJ+r/7+Mk1ZodYjkogGiCPWQ+E71cr8/uhICpGTljLA==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-3.1.6.tgz", + "integrity": "sha512-0iqktzBKQ4kgOM+pbm1bYdGUlN6Blw5zAxURr+W7X96b45mUHCTNz1nZrsDvBLbVXpSTk//ih85Ioh0RU4RJTw==", "dev": true, "dependencies": { - "@antora/asciidoc-loader": "3.1.5" + "@antora/asciidoc-loader": "3.1.6" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@antora/page-composer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/@antora/page-composer/-/page-composer-3.1.5.tgz", - "integrity": "sha512-63ld9s7exXvYtds0cj1ZBwinRnZCvnFkYPuHhCaD7uirRes922kuYXeowO1MKqQQ4Cqcx3OWIjU73W0Q2d1AGQ==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/@antora/page-composer/-/page-composer-3.1.6.tgz", + "integrity": "sha512-zl2UXVmHEy23zWsGzz3ZpnqtzTVfYvAVS7osPZpSyto3unwtQUI0dR+JpWndElsEDt71JJedbsXa/y/tNC2ZOQ==", "dev": true, "dependencies": { - "@antora/logger": "3.1.5", + "@antora/logger": "3.1.6", "handlebars": "~4.7", "require-from-string": "~2.0" }, @@ -166,9 +166,9 @@ } }, "node_modules/@antora/playbook-builder": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-3.1.5.tgz", - "integrity": "sha512-h3zD1FkN8BVnsmHSgB3CTatVu5Q8E8lqZs7Zfsh7uN5eQHhxsPjOvVByeM1RhCpQuY+o2hERY2XexoLb8V89TQ==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-3.1.6.tgz", + "integrity": "sha512-bZcDastZViAgPVPNvvbbw7ci63gL5YnyG5X7NuHJoORgzyGQAsMYEjzfa9yfNfXubUmXv/oSteUSxbACjdjzWg==", "dev": true, "dependencies": { "@iarna/toml": "~2.2", @@ -181,9 +181,9 @@ } }, "node_modules/@antora/redirect-producer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-3.1.5.tgz", - "integrity": "sha512-BM5qk3Daj81wGu3sJ+wCyZGV7P9EC8nxK9stRzrTqUOGa9MriaZGZ+B3Xvakucj5jQTaFo0w7m3udxBOYicvgQ==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-3.1.6.tgz", + "integrity": "sha512-tzlrJa2vny0HPBtIAgEM/xCMTfOi4z2CYUt4Ctz7rV8PBv6NOjlLkbu7Goc57CpR9wmJ3C4AGJcVHN0tah0FmA==", "dev": true, "dependencies": { "vinyl": "~2.2" @@ -193,24 +193,24 @@ } }, "node_modules/@antora/site-generator": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/@antora/site-generator/-/site-generator-3.1.5.tgz", - "integrity": "sha512-HNkzmPVDU/GBG962O9OnfIJWSC/L2LMDZ59H0T4LXRGKdDrPjaEQqv9AgxaCI0DQ+Cg9sHE3m/ISwkd0+FZabg==", - "dev": true, - "dependencies": { - "@antora/asciidoc-loader": "3.1.5", - "@antora/content-aggregator": "3.1.5", - "@antora/content-classifier": "3.1.5", - "@antora/document-converter": "3.1.5", - "@antora/file-publisher": "3.1.5", - "@antora/logger": "3.1.5", - "@antora/navigation-builder": "3.1.5", - "@antora/page-composer": "3.1.5", - "@antora/playbook-builder": "3.1.5", - "@antora/redirect-producer": "3.1.5", - "@antora/site-mapper": "3.1.5", - "@antora/site-publisher": "3.1.5", - "@antora/ui-loader": "3.1.5", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/@antora/site-generator/-/site-generator-3.1.6.tgz", + "integrity": "sha512-NKRTVDGB7CuzEBx68iQGweSTDXLvqccExEfBiudPEhyagcn4U+fwef+0LjE4A2imcpD/QQC7l5U8VaNObQYnRQ==", + "dev": true, + "dependencies": { + "@antora/asciidoc-loader": "3.1.6", + "@antora/content-aggregator": "3.1.6", + "@antora/content-classifier": "3.1.6", + "@antora/document-converter": "3.1.6", + "@antora/file-publisher": "3.1.6", + "@antora/logger": "3.1.6", + "@antora/navigation-builder": "3.1.6", + "@antora/page-composer": "3.1.6", + "@antora/playbook-builder": "3.1.6", + "@antora/redirect-producer": "3.1.6", + "@antora/site-mapper": "3.1.6", + "@antora/site-publisher": "3.1.6", + "@antora/ui-loader": "3.1.6", "@antora/user-require-helper": "~2.0" }, "engines": { @@ -218,12 +218,12 @@ } }, "node_modules/@antora/site-mapper": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-3.1.5.tgz", - "integrity": "sha512-rSMFkOfq/yebJBRsT/P95YIW0Ig7WmaCNAg56CilYPh2QfzjNWZIuEOSeQcoIQ0t48W4KKo+KVjp32KERyz9wg==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-3.1.6.tgz", + "integrity": "sha512-Jc5AqY2uS3wO21iwEFyJuXOspTLN6UdNnZP/Os2oguR+cSsjwUx+l6+X7lquIndq+dXUQS3tMQkwNkhLgfcsrw==", "dev": true, "dependencies": { - "@antora/content-classifier": "3.1.5", + "@antora/content-classifier": "3.1.6", "vinyl": "~2.2" }, "engines": { @@ -231,21 +231,21 @@ } }, "node_modules/@antora/site-publisher": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-3.1.5.tgz", - "integrity": "sha512-xf2r5Ey9Wu0rYktN80svKSYdHfc9lu/POrL7w9sauZFENx8G9H5KzMN8Qpgxg0dLqaWCXfKqldnklIVwXUBaYg==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-3.1.6.tgz", + "integrity": "sha512-AOpM12gmMJeucebEGneHvOJAXQgco0lAg7Vx9CH7slHVeJy6mM74Mcut7KkKlv3AOJJKgYfdYkJndvq9dqbWmQ==", "dev": true, "dependencies": { - "@antora/file-publisher": "3.1.5" + "@antora/file-publisher": "3.1.6" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@antora/ui-loader": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-3.1.5.tgz", - "integrity": "sha512-CB3Apkf4gyj/Tf4f14EcMkI0KBtIEhE+yV9yVEnQYNEZERGpXP66W0FVk3nT2Y7iur4d9xgsBf1j4qpk9RvSuw==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-3.1.6.tgz", + "integrity": "sha512-IivfKW7fCaV7GpXIOxyk8X2mJiYoM6U0CDaFzWiKerJeDikW1Oi9KGxCMe2+onYBJrgzQxAZsIzjr9fXUcDZWw==", "dev": true, "dependencies": { "@antora/expand-path-helper": "~2.0", @@ -1658,9 +1658,9 @@ } }, "node_modules/pino-abstract-transport/node_modules/readable-stream": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.2.tgz", - "integrity": "sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.1.tgz", + "integrity": "sha512-uQjbf34vmf/asGnOHQEw07Q4llgMACQZTWWa4MmICS0IKJoHbLwKCy71H3eR99Dw5iYejc6W+pqZZEeqRtUFAw==", "dev": true, "dependencies": { "abort-controller": "^3.0.0", @@ -1699,9 +1699,9 @@ } }, "node_modules/pino-pretty/node_modules/readable-stream": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.2.tgz", - "integrity": "sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.1.tgz", + "integrity": "sha512-uQjbf34vmf/asGnOHQEw07Q4llgMACQZTWWa4MmICS0IKJoHbLwKCy71H3eR99Dw5iYejc6W+pqZZEeqRtUFAw==", "dev": true, "dependencies": { "abort-controller": "^3.0.0", diff --git a/package.json b/package.json index 74e4539e..aacd5549 100644 --- a/package.json +++ b/package.json @@ -14,8 +14,8 @@ "url": "https://github.com/sorairolake/abcrypt/issues" }, "devDependencies": { - "@antora/cli": "^3.1.5", - "@antora/site-generator": "^3.1.5", + "@antora/cli": "^3.1.6", + "@antora/site-generator": "^3.1.6", "@djencks/asciidoctor-mathjax": "^0.0.9" } }