diff --git a/.envrc b/.envrc index bdb5bd0e..c994b0c0 100644 --- a/.envrc +++ b/.envrc @@ -1,7 +1,7 @@ #!/usr/bin/env bash -if ! has nix_direnv_version || ! nix_direnv_version 2.4.0; then - source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.4.0/direnvrc" "sha256-XQzUAvL6pysIJnRJyR7uVpmUSZfc7LSgWQwq/4mBr1U=" +if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then + source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4=" fi if "${NIX_BIN_PREFIX}nix" --extra-experimental-features '' --version 2>/dev/null >&2; then diff --git a/.github/workflows/lints.yaml b/.github/workflows/lints.yaml index 3187612d..c7d3eb6d 100644 --- a/.github/workflows/lints.yaml +++ b/.github/workflows/lints.yaml @@ -72,7 +72,7 @@ jobs: fetch-depth: 0 - name: Run commitlint - uses: wagoid/commitlint-github-action@v5.4.4 + uses: wagoid/commitlint-github-action@v5.4.5 with: firstParent: false diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml index a4a1a6c3..d5afd6b2 100644 --- a/.github/workflows/rust.yaml +++ b/.github/workflows/rust.yaml @@ -63,7 +63,7 @@ jobs: rm -rf ~/.cargo/registry/index/ ~/.cargo/registry/cache/ ~/.cargo/git/db/ - name: Cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.cargo/registry/index/ @@ -103,7 +103,7 @@ jobs: rm -rf ~/.cargo/registry/index/ ~/.cargo/registry/cache/ ~/.cargo/git/db/ - name: Cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.cargo/registry/index/ @@ -140,7 +140,7 @@ jobs: rm -rf ~/.cargo/registry/index/ ~/.cargo/registry/cache/ ~/.cargo/git/db/ - name: Cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.cargo/registry/index/ diff --git a/Cargo.lock b/Cargo.lock index 181a3c2e..38702238 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -49,9 +49,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.5" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" dependencies = [ "anstyle", "anstyle-parse", @@ -156,7 +156,7 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" dependencies = [ - "async-lock 3.2.0", + "async-lock 3.3.0", "async-task", "concurrent-queue", "fastrand 2.0.1", @@ -198,18 +198,18 @@ dependencies = [ [[package]] name = "async-io" -version = "2.2.2" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7" +checksum = "fb41eb19024a91746eba0773aa5e16036045bbf45733766661099e182ea6a744" dependencies = [ - "async-lock 3.2.0", + "async-lock 3.3.0", "cfg-if", "concurrent-queue", "futures-io", "futures-lite 2.2.0", "parking", - "polling 3.3.1", - "rustix 0.38.28", + "polling 3.3.2", + "rustix 0.38.30", "slab", "tracing", "windows-sys 0.52.0", @@ -226,9 +226,9 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" dependencies = [ "event-listener 4.0.3", "event-listener-strategy", @@ -248,7 +248,7 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.28", + "rustix 0.38.30", "windows-sys 0.48.0", ] @@ -269,13 +269,13 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io 2.2.2", + "async-io 2.3.0", "async-lock 2.8.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.28", + "rustix 0.38.30", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -373,12 +373,12 @@ dependencies = [ [[package]] name = "axum" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d09dbe0e490df5da9d69b36dca48a76635288a82f92eca90024883a56202026d" +checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e" dependencies = [ "async-trait", - "axum-core 0.4.2", + "axum-core 0.4.3", "bytes", "futures-util", "http 1.0.0", @@ -424,9 +424,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c8503f93e6d144ee5690907ba22db7ba79ab001a932ab99034f0fe836b3df" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" dependencies = [ "async-trait", "bytes", @@ -460,9 +460,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.6" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79fed4cdb43e993fcdadc7e58a09fd0e3e649c4436fa11da71c9f1f3ee7feb9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "beef" @@ -493,9 +493,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "block" @@ -519,7 +519,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ "async-channel", - "async-lock 3.2.0", + "async-lock 3.3.0", "async-task", "fastrand 2.0.1", "futures-io", @@ -607,9 +607,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.13" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52bdc885e4cacc7f7c9eedc1ef6da641603180c783c41a15c264944deeaab642" +checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" dependencies = [ "clap_builder", "clap_derive", @@ -617,9 +617,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.12" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9" +checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" dependencies = [ "anstream", "anstyle", @@ -629,11 +629,11 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.4.6" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97aeaa95557bd02f23fbb662f981670c3d20c5a26e69f7354b28f57092437fcd" +checksum = "eaf7dcb7c21d8ca1a2482ee0f1d341f437c9a7af6ca6da359dc5e1b164e98215" dependencies = [ - "clap 4.4.13", + "clap 4.4.18", ] [[package]] @@ -676,7 +676,7 @@ dependencies = [ [[package]] name = "clipcat-base" -version = "0.16.1" +version = "0.16.2" dependencies = [ "bytes", "directories", @@ -696,7 +696,7 @@ dependencies = [ [[package]] name = "clipcat-cli" -version = "0.16.1" +version = "0.16.2" dependencies = [ "serde", "serde_with", @@ -707,7 +707,7 @@ dependencies = [ [[package]] name = "clipcat-client" -version = "0.16.1" +version = "0.16.2" dependencies = [ "async-trait", "clipcat-base", @@ -725,7 +725,7 @@ dependencies = [ [[package]] name = "clipcat-clipboard" -version = "0.16.1" +version = "0.16.2" dependencies = [ "arboard", "bytes", @@ -744,7 +744,7 @@ dependencies = [ [[package]] name = "clipcat-dbus-variant" -version = "0.16.1" +version = "0.16.2" dependencies = [ "clipcat-base", "mime", @@ -755,7 +755,7 @@ dependencies = [ [[package]] name = "clipcat-external-editor" -version = "0.16.1" +version = "0.16.2" dependencies = [ "clipcat-base", "snafu 0.8.0", @@ -764,9 +764,9 @@ dependencies = [ [[package]] name = "clipcat-menu" -version = "0.16.1" +version = "0.16.2" dependencies = [ - "clap 4.4.13", + "clap 4.4.18", "clap_complete", "clipcat-base", "clipcat-cli", @@ -788,10 +788,10 @@ dependencies = [ [[package]] name = "clipcat-metrics" -version = "0.16.1" +version = "0.16.2" dependencies = [ "async-trait", - "axum 0.7.3", + "axum 0.7.4", "bytes", "lazy_static", "mime", @@ -804,9 +804,9 @@ dependencies = [ [[package]] name = "clipcat-notify" -version = "0.16.1" +version = "0.16.2" dependencies = [ - "clap 4.4.13", + "clap 4.4.18", "clap_complete", "clipcat-base", "clipcat-server", @@ -821,7 +821,7 @@ dependencies = [ [[package]] name = "clipcat-proto" -version = "0.16.1" +version = "0.16.2" dependencies = [ "clipcat-base", "mime", @@ -835,7 +835,7 @@ dependencies = [ [[package]] name = "clipcat-server" -version = "0.16.1" +version = "0.16.2" dependencies = [ "async-trait", "bincode", @@ -871,10 +871,10 @@ dependencies = [ [[package]] name = "clipcatctl" -version = "0.16.1" +version = "0.16.2" dependencies = [ "bytes", - "clap 4.4.13", + "clap 4.4.18", "clap_complete", "clipcat-base", "clipcat-cli", @@ -898,9 +898,9 @@ dependencies = [ [[package]] name = "clipcatd" -version = "0.16.1" +version = "0.16.2" dependencies = [ - "clap 4.4.13", + "clap 4.4.18", "clap_complete", "clipcat-base", "clipcat-cli", @@ -1498,9 +1498,9 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209098dd6dfc4445aa6111f0e98653ac323eaa4dfd212c9ca3931bf9955c31bd" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ "simd-adler32", ] @@ -1758,9 +1758,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", @@ -1789,7 +1789,7 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "libc", "libgit2-sys", "log", @@ -1798,9 +1798,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.22" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ "bytes", "fnv", @@ -1817,9 +1817,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d308f63daf4181410c242d34c11f928dcb3aa105852019e043c9d1f4e4368a" +checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943" dependencies = [ "bytes", "fnv", @@ -1881,9 +1881,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" [[package]] name = "hex" @@ -2003,7 +2003,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.3.22", + "h2 0.3.24", "http 0.2.11", "http-body 0.4.6", "httparse", @@ -2026,7 +2026,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.0", + "h2 0.4.2", "http 1.0.0", "http-body 1.0.0", "httparse", @@ -2107,9 +2107,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.7" +version = "0.24.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23" dependencies = [ "bytemuck", "byteorder", @@ -2117,7 +2117,6 @@ dependencies = [ "exr", "gif", "jpeg-decoder", - "num-rational", "num-traits", "png", "qoi", @@ -2181,7 +2180,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi 0.3.4", "libc", "windows-sys 0.48.0", ] @@ -2218,18 +2217,18 @@ dependencies = [ [[package]] name = "jpeg-decoder" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" dependencies = [ "rayon", ] [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" dependencies = [ "wasm-bindgen", ] @@ -2306,16 +2305,16 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "libc", "redox_syscall", ] [[package]] name = "libz-sys" -version = "1.1.13" +version = "1.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f526fdd09d99e19742883e43de41e1aa9e36db0c7ab7f935165d611c5cccc66" +checksum = "295c17e837573c8c821dbaeb3cceb3d745ad082f7572191409e69cbc1b3fd050" dependencies = [ "cc", "libc", @@ -2354,9 +2353,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" @@ -2538,7 +2537,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "crossbeam-channel", "filetime", "fsevent-sys", @@ -2574,27 +2573,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-traits" version = "0.2.17" @@ -2610,7 +2588,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi 0.3.4", "libc", ] @@ -2805,15 +2783,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" +checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" [[package]] name = "png" -version = "0.17.10" +version = "0.17.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -2840,14 +2818,14 @@ dependencies = [ [[package]] name = "polling" -version = "3.3.1" +version = "3.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +checksum = "545c980a3880efd47b2e262f6a4bb6daad6555cf3367aa9c4e52895f69537a41" dependencies = [ "cfg-if", "concurrent-queue", "pin-project-lite", - "rustix 0.38.28", + "rustix 0.38.30", "tracing", "windows-sys 0.52.0", ] @@ -3027,9 +3005,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" dependencies = [ "either", "rayon-core", @@ -3037,9 +3015,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -3135,14 +3113,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.28" +version = "0.38.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "errno", "libc", - "linux-raw-sys 0.4.12", + "linux-raw-sys 0.4.13", "windows-sys 0.52.0", ] @@ -3311,9 +3289,9 @@ dependencies = [ [[package]] name = "shadow-rs" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "878cb1e3162d98ee1016b832efbb683ad6302b462a2894c54f488dc0bd96f11c" +checksum = "3e5c5c8276991763b44ede03efaf966eaa0412fafbf299e6380704678ca3b997" dependencies = [ "const_format", "git2", @@ -3410,9 +3388,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "snafu" @@ -3553,7 +3531,7 @@ dependencies = [ "cfg-if", "fastrand 2.0.1", "redox_syscall", - "rustix 0.38.28", + "rustix 0.38.30", "windows-sys 0.52.0", ] @@ -3570,9 +3548,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -3615,9 +3593,9 @@ dependencies = [ [[package]] name = "tiff" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" dependencies = [ "flate2", "jpeg-decoder", @@ -3801,7 +3779,7 @@ dependencies = [ "base64", "bytes", "flate2", - "h2 0.3.22", + "h2 0.3.24", "http 0.2.11", "http-body 0.4.6", "hyper 0.14.28", @@ -3852,13 +3830,12 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09e12e6351354851911bdf8c2b8f2ab15050c567d70a8b9a37ae7b8301a4080d" +checksum = "0da193277a4e2c33e59e09b5861580c33dd0a637c3883d0fa74ba40c0374af2e" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "bytes", - "futures-util", "http 1.0.0", "http-body 1.0.0", "http-body-util", @@ -4031,9 +4008,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -4151,9 +4128,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4161,9 +4138,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" dependencies = [ "bumpalo", "log", @@ -4176,9 +4153,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4186,9 +4163,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" dependencies = [ "proc-macro2", "quote", @@ -4199,9 +4176,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" [[package]] name = "wayland-backend" @@ -4223,7 +4200,7 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "nix 0.26.4", "wayland-backend", "wayland-scanner", @@ -4235,7 +4212,7 @@ version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "wayland-backend", "wayland-client", "wayland-scanner", @@ -4247,7 +4224,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "wayland-backend", "wayland-client", "wayland-protocols", @@ -4291,7 +4268,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.28", + "rustix 0.38.30", ] [[package]] @@ -4496,9 +4473,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.33" +version = "0.5.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7520bbdec7211caa7c4e682eb1fbe07abe20cee6756b6e00f537c82c11816aa" +checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" dependencies = [ "memchr", ] @@ -4543,7 +4520,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" dependencies = [ "gethostname 0.4.3", - "rustix 0.38.28", + "rustix 0.38.30", "x11rb-protocol 0.13.0", ] diff --git a/Cargo.toml b/Cargo.toml index 46411d4c..f18edb48 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,14 +1,15 @@ [workspace.package] -version = "0.16.1" -authors = ["xrelkd <46590321+xrelkd@users.noreply.github.com>"] -homepage = "https://github.com/xrelkd/clipcat" -repository = "https://github.com/xrelkd/clipcat" -readme = "README.md" -license = "GPL-3.0-only" -edition = "2021" -description = "Clipboard manager written in Rust Programming Language." -categories = ["clipboard manager"] -keywords = ["clipboard"] +version = "0.16.2" +authors = ["xrelkd <46590321+xrelkd@users.noreply.github.com>"] +homepage = "https://github.com/xrelkd/clipcat" +repository = "https://github.com/xrelkd/clipcat" +readme = "README.md" +license = "GPL-3.0-only" +edition = "2021" +rust-version = "1.70" +description = "Clipboard manager written in Rust Programming Language." +categories = ["clipboard manager"] +keywords = ["clipboard"] [workspace] resolver = "2" diff --git a/clipcat-menu/Cargo.toml b/clipcat-menu/Cargo.toml index 2074430c..390bdd1f 100644 --- a/clipcat-menu/Cargo.toml +++ b/clipcat-menu/Cargo.toml @@ -1,15 +1,16 @@ [package] -name = "clipcat-menu" -description = "Clipcat Menu" -version.workspace = true -authors.workspace = true -homepage.workspace = true -readme.workspace = true -repository.workspace = true -license.workspace = true -edition.workspace = true -categories.workspace = true -keywords.workspace = true +name = "clipcat-menu" +description = "Clipcat Menu" +version.workspace = true +authors.workspace = true +homepage.workspace = true +readme.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +rust-version.workspace = true +categories.workspace = true +keywords.workspace = true [dependencies] tracing = "0.1" diff --git a/clipcat-notify/Cargo.toml b/clipcat-notify/Cargo.toml index 25a16087..8e8df579 100644 --- a/clipcat-notify/Cargo.toml +++ b/clipcat-notify/Cargo.toml @@ -1,15 +1,16 @@ [package] -name = "clipcat-notify" -description = "Clipcat Notification tool" -version.workspace = true -authors.workspace = true -homepage.workspace = true -readme.workspace = true -repository.workspace = true -license.workspace = true -edition.workspace = true -categories.workspace = true -keywords.workspace = true +name = "clipcat-notify" +description = "Clipcat Notification tool" +version.workspace = true +authors.workspace = true +homepage.workspace = true +readme.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +rust-version.workspace = true +categories.workspace = true +keywords.workspace = true [dependencies] serde = { version = "1", features = ["derive"] } diff --git a/clipcatctl/Cargo.toml b/clipcatctl/Cargo.toml index 0a51bbbe..1e946444 100644 --- a/clipcatctl/Cargo.toml +++ b/clipcatctl/Cargo.toml @@ -1,15 +1,16 @@ [package] -name = "clipcatctl" -description = "Clipcat command line interface" -version.workspace = true -authors.workspace = true -homepage.workspace = true -readme.workspace = true -repository.workspace = true -license.workspace = true -edition.workspace = true -categories.workspace = true -keywords.workspace = true +name = "clipcatctl" +description = "Clipcat command line interface" +version.workspace = true +authors.workspace = true +homepage.workspace = true +readme.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +rust-version.workspace = true +categories.workspace = true +keywords.workspace = true [dependencies] tracing = "0.1" diff --git a/clipcatd/Cargo.toml b/clipcatd/Cargo.toml index c1cc1d96..69fe836f 100644 --- a/clipcatd/Cargo.toml +++ b/clipcatd/Cargo.toml @@ -1,15 +1,16 @@ [package] -name = "clipcatd" -description = "Clipcat Daemon" -version.workspace = true -authors.workspace = true -homepage.workspace = true -readme.workspace = true -repository.workspace = true -license.workspace = true -edition.workspace = true -categories.workspace = true -keywords.workspace = true +name = "clipcatd" +description = "Clipcat Daemon" +version.workspace = true +authors.workspace = true +homepage.workspace = true +readme.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +rust-version.workspace = true +categories.workspace = true +keywords.workspace = true [dependencies] tracing = "0.1" diff --git a/crates/base/Cargo.toml b/crates/base/Cargo.toml index 35864443..5c85288c 100644 --- a/crates/base/Cargo.toml +++ b/crates/base/Cargo.toml @@ -1,15 +1,16 @@ [package] -name = "clipcat-base" -description = "Clipcat" -version.workspace = true -authors.workspace = true -homepage.workspace = true -readme.workspace = true -repository.workspace = true -license.workspace = true -edition.workspace = true -categories.workspace = true -keywords.workspace = true +name = "clipcat-base" +description = "Clipcat" +version.workspace = true +authors.workspace = true +homepage.workspace = true +readme.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +rust-version.workspace = true +categories.workspace = true +keywords.workspace = true [dependencies] serde = { version = "1", features = ["derive"] } diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index ade43eca..fd419d4f 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -1,15 +1,16 @@ [package] -name = "clipcat-cli" -description = "Clipcat CLI common library" -version.workspace = true -authors.workspace = true -homepage.workspace = true -readme.workspace = true -repository.workspace = true -license.workspace = true -edition.workspace = true -categories.workspace = true -keywords.workspace = true +name = "clipcat-cli" +description = "Clipcat CLI common library" +version.workspace = true +authors.workspace = true +homepage.workspace = true +readme.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +rust-version.workspace = true +categories.workspace = true +keywords.workspace = true [dependencies] serde = { version = "1", features = ["derive"] } diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml index da7416ad..4ec3dc6b 100644 --- a/crates/client/Cargo.toml +++ b/crates/client/Cargo.toml @@ -1,15 +1,16 @@ [package] -name = "clipcat-client" -description = "Clipcat client" -version.workspace = true -authors.workspace = true -homepage.workspace = true -readme.workspace = true -repository.workspace = true -license.workspace = true -edition.workspace = true -categories.workspace = true -keywords.workspace = true +name = "clipcat-client" +description = "Clipcat client" +version.workspace = true +authors.workspace = true +homepage.workspace = true +readme.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +rust-version.workspace = true +categories.workspace = true +keywords.workspace = true [dependencies] tracing = "0.1" diff --git a/crates/clipboard/Cargo.toml b/crates/clipboard/Cargo.toml index 7a0ebb86..fe010671 100644 --- a/crates/clipboard/Cargo.toml +++ b/crates/clipboard/Cargo.toml @@ -1,15 +1,16 @@ [package] -name = "clipcat-clipboard" -description = "Clipcat clipboard" -version.workspace = true -authors.workspace = true -homepage.workspace = true -readme.workspace = true -repository.workspace = true -license.workspace = true -edition.workspace = true -categories.workspace = true -keywords.workspace = true +name = "clipcat-clipboard" +description = "Clipcat clipboard" +version.workspace = true +authors.workspace = true +homepage.workspace = true +readme.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +rust-version.workspace = true +categories.workspace = true +keywords.workspace = true autoexamples = false diff --git a/crates/dbus-variant/Cargo.toml b/crates/dbus-variant/Cargo.toml index ed301d98..2f035b88 100644 --- a/crates/dbus-variant/Cargo.toml +++ b/crates/dbus-variant/Cargo.toml @@ -1,15 +1,16 @@ [package] -name = "clipcat-dbus-variant" -description = "Clipcat D-Bus variant" -version.workspace = true -authors.workspace = true -homepage.workspace = true -readme.workspace = true -repository.workspace = true -license.workspace = true -edition.workspace = true -categories.workspace = true -keywords.workspace = true +name = "clipcat-dbus-variant" +description = "Clipcat D-Bus variant" +version.workspace = true +authors.workspace = true +homepage.workspace = true +readme.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +rust-version.workspace = true +categories.workspace = true +keywords.workspace = true [dependencies] serde = { version = "1", features = ["derive"] } diff --git a/crates/external-editor/Cargo.toml b/crates/external-editor/Cargo.toml index 8766ea88..fbbcfcb5 100644 --- a/crates/external-editor/Cargo.toml +++ b/crates/external-editor/Cargo.toml @@ -1,15 +1,16 @@ [package] -name = "clipcat-external-editor" -description = "Clipcat external editor" -version.workspace = true -authors.workspace = true -homepage.workspace = true -readme.workspace = true -repository.workspace = true -license.workspace = true -edition.workspace = true -categories.workspace = true -keywords.workspace = true +name = "clipcat-external-editor" +description = "Clipcat external editor" +version.workspace = true +authors.workspace = true +homepage.workspace = true +readme.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +rust-version.workspace = true +categories.workspace = true +keywords.workspace = true [dependencies] tokio = { version = "1", features = ["fs", "process", "rt-multi-thread"] } diff --git a/crates/metrics/Cargo.toml b/crates/metrics/Cargo.toml index 108134cb..98ca906e 100644 --- a/crates/metrics/Cargo.toml +++ b/crates/metrics/Cargo.toml @@ -1,15 +1,16 @@ [package] -name = "clipcat-metrics" -description = "Clipcat metrics utilities" -version.workspace = true -authors.workspace = true -homepage.workspace = true -repository.workspace = true -readme.workspace = true -license.workspace = true -edition.workspace = true -categories.workspace = true -keywords.workspace = true +name = "clipcat-metrics" +description = "Clipcat metrics utilities" +version.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +readme.workspace = true +license.workspace = true +edition.workspace = true +rust-version.workspace = true +categories.workspace = true +keywords.workspace = true [dependencies] async-trait = "0.1" diff --git a/crates/proto/Cargo.toml b/crates/proto/Cargo.toml index 33384cd1..c53e5d46 100644 --- a/crates/proto/Cargo.toml +++ b/crates/proto/Cargo.toml @@ -1,15 +1,16 @@ [package] -name = "clipcat-proto" -description = "Clipcat protobuf" -version.workspace = true -authors.workspace = true -homepage.workspace = true -readme.workspace = true -repository.workspace = true -license.workspace = true -edition.workspace = true -categories.workspace = true -keywords.workspace = true +name = "clipcat-proto" +description = "Clipcat protobuf" +version.workspace = true +authors.workspace = true +homepage.workspace = true +readme.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +rust-version.workspace = true +categories.workspace = true +keywords.workspace = true [dependencies] prost = "0.12" diff --git a/crates/server/Cargo.toml b/crates/server/Cargo.toml index 9cbfe4b2..7f0a3777 100644 --- a/crates/server/Cargo.toml +++ b/crates/server/Cargo.toml @@ -1,15 +1,16 @@ [package] -name = "clipcat-server" -description = "Clipcat server" -version.workspace = true -authors.workspace = true -homepage.workspace = true -readme.workspace = true -repository.workspace = true -license.workspace = true -edition.workspace = true -categories.workspace = true -keywords.workspace = true +name = "clipcat-server" +description = "Clipcat server" +version.workspace = true +authors.workspace = true +homepage.workspace = true +readme.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +rust-version.workspace = true +categories.workspace = true +keywords.workspace = true [dependencies] tracing = "0.1" diff --git a/dev-support/containers/docker-bake.hcl b/dev-support/containers/docker-bake.hcl index 3ab23c85..98518792 100644 --- a/dev-support/containers/docker-bake.hcl +++ b/dev-support/containers/docker-bake.hcl @@ -2,19 +2,10 @@ group "default" { targets = ["clipcat", "clipcat-distroless"] } -variable "TAG" { - default = "develop" -} - -variable "CONTAINER_REGISTRY" { - default = "ghcr.io/xrelkd" -} - target "clipcat" { dockerfile = "dev-support/containers/alpine/Containerfile" platforms = ["linux/amd64"] target = "clipcat" - tags = ["${CONTAINER_REGISTRY}/clipcat:${TAG}"] contexts = { sccache = "docker-image://ghcr.io/thxnet/ci-containers/sccache:0.5.4" rust = "docker-image://docker.io/library/rust:1.74.0-alpine3.18" @@ -42,7 +33,6 @@ target "clipcat-distroless" { dockerfile = "dev-support/containers/distroless/Containerfile" platforms = ["linux/amd64"] target = "clipcat" - tags = ["${CONTAINER_REGISTRY}/clipcat:${TAG}-distroless"] contexts = { sccache = "docker-image://ghcr.io/thxnet/ci-containers/sccache:0.5.4" rust = "docker-image://docker.io/library/rust:1.74-slim-buster" diff --git a/flake.lock b/flake.lock index d427964b..7c911828 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1703439018, - "narHash": "sha256-VT+06ft/x3eMZ1MJxWzQP3zXFGcrxGo5VR2rB7t88hs=", + "lastModified": 1705625727, + "narHash": "sha256-naMq6+TNLpEiBBjc0XaCbMLYJxJXWTZz4JGSpYGgIOM=", "owner": "ipetkov", "repo": "crane", - "rev": "afdcd41180e3dfe4dac46b5ee396e3b12ccc967a", + "rev": "8f515142e805dc377cf8edb0ff75d14a11307f89", "type": "github" }, "original": { @@ -28,11 +28,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1704003651, - "narHash": "sha256-bA3d4E1CX5G7TVbKwJOm9jZfVOGOPp6u5CKEUzNsE8E=", + "lastModified": 1705645424, + "narHash": "sha256-bSw0GDnWBvMSvW4oxdFMyhs7i3rNN0LAcreFDJmw3ks=", "owner": "nix-community", "repo": "fenix", - "rev": "c6d82e087ac96f24b90c5787a17e29a72566c2b4", + "rev": "e514ed523707ec423d34f0748e6e6f18adadf42d", "type": "github" }, "original": { @@ -46,11 +46,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -61,11 +61,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703637592, - "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", + "lastModified": 1705496572, + "narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", + "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19", "type": "github" }, "original": { @@ -86,11 +86,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1703965384, - "narHash": "sha256-3iyouqkBvhh/E48TkBlt4JmmcIEyfQwY7pokKBx9WNg=", + "lastModified": 1705592412, + "narHash": "sha256-jhqkrAhd+lTLmnszaYHKf3Fr/fNXXdeVDwvsPwmmlD8=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "e872f5085cf5b0e44558442365c1c033d486eff2", + "rev": "3f4c6dac3d5e34ccf56587419c2077aec799e60c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f3159875..5e2f6b6c 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ outputs = { self, nixpkgs, flake-utils, fenix, crane }: let name = "clipcat"; - version = "0.16.1"; + version = "0.16.2"; in (flake-utils.lib.eachDefaultSystem (system: