From 5cc798a14694a4bae98af3f56ddc0901139d2c33 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sat, 15 Jun 2024 15:12:10 -0400 Subject: [PATCH 1/2] Version 0.19.5-alpha.1 --- Cargo.lock | 76 +++++++++++++++++++++++++++++---------- Cargo.toml | 24 ++++++------- crates/utils/translations | 2 +- 3 files changed, 70 insertions(+), 32 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index de33fa443..a53ae1bc9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -760,7 +760,7 @@ dependencies = [ "bitflags 2.5.0", "cexpr", "clang-sys", - "itertools 0.10.5", + "itertools 0.12.1", "lazy_static", "lazycell", "log", @@ -1120,13 +1120,26 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "console-api" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a257c22cd7e487dd4a13d413beabc512c5052f0bc048db0da6a84c3d8a6142fd" +dependencies = [ + "futures-core", + "prost 0.12.6", + "prost-types", + "tonic 0.11.0", + "tracing-core", +] + [[package]] name = "console-subscriber" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7481d4c57092cd1c19dd541b92bdce883de840df30aa5d03fd48a3935c01842e" dependencies = [ - "console-api", + "console-api 0.6.0", "crossbeam-channel", "crossbeam-utils", "futures-task", @@ -1144,6 +1157,31 @@ dependencies = [ "tracing-subscriber", ] +[[package]] +name = "console-subscriber" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31c4cc54bae66f7d9188996404abdf7fdfa23034ef8e43478c8810828abad758" +dependencies = [ + "console-api 0.7.0", + "crossbeam-channel", + "crossbeam-utils", + "futures-task", + "hdrhistogram", + "humantime", + "prost 0.12.6", + "prost-types", + "serde", + "serde_json", + "thread_local", + "tokio", + "tokio-stream", + "tonic 0.11.0", + "tracing", + "tracing-core", + "tracing-subscriber", +] + [[package]] name = "const-oid" version = "0.9.6" @@ -2833,7 +2871,7 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "lemmy_api" -version = "0.19.4" +version = "0.19.5-alpha.1" dependencies = [ "activitypub_federation", "actix-web", @@ -2862,7 +2900,7 @@ dependencies = [ [[package]] name = "lemmy_api_common" -version = "0.19.4" +version = "0.19.5-alpha.1" dependencies = [ "activitypub_federation", "actix-web", @@ -2900,7 +2938,7 @@ dependencies = [ [[package]] name = "lemmy_api_crud" -version = "0.19.4" +version = "0.19.5-alpha.1" dependencies = [ "accept-language", "activitypub_federation", @@ -2923,7 +2961,7 @@ dependencies = [ [[package]] name = "lemmy_apub" -version = "0.19.4" +version = "0.19.5-alpha.1" dependencies = [ "activitypub_federation", "actix-web", @@ -2961,7 +2999,7 @@ dependencies = [ [[package]] name = "lemmy_db_perf" -version = "0.19.4" +version = "0.19.5-alpha.1" dependencies = [ "anyhow", "clap", @@ -2976,7 +3014,7 @@ dependencies = [ [[package]] name = "lemmy_db_schema" -version = "0.19.4" +version = "0.19.5-alpha.1" dependencies = [ "activitypub_federation", "anyhow", @@ -3017,7 +3055,7 @@ dependencies = [ [[package]] name = "lemmy_db_views" -version = "0.19.4" +version = "0.19.5-alpha.1" dependencies = [ "actix-web", "chrono", @@ -3039,7 +3077,7 @@ dependencies = [ [[package]] name = "lemmy_db_views_actor" -version = "0.19.4" +version = "0.19.5-alpha.1" dependencies = [ "chrono", "diesel", @@ -3060,7 +3098,7 @@ dependencies = [ [[package]] name = "lemmy_db_views_moderator" -version = "0.19.4" +version = "0.19.5-alpha.1" dependencies = [ "diesel", "diesel-async", @@ -3072,7 +3110,7 @@ dependencies = [ [[package]] name = "lemmy_federate" -version = "0.19.4" +version = "0.19.5-alpha.1" dependencies = [ "activitypub_federation", "anyhow", @@ -3097,7 +3135,7 @@ dependencies = [ [[package]] name = "lemmy_routes" -version = "0.19.4" +version = "0.19.5-alpha.1" dependencies = [ "activitypub_federation", "actix-web", @@ -3122,7 +3160,7 @@ dependencies = [ [[package]] name = "lemmy_server" -version = "0.19.4" +version = "0.19.5-alpha.1" dependencies = [ "activitypub_federation", "actix-cors", @@ -3131,7 +3169,7 @@ dependencies = [ "chrono", "clap", "clokwerk", - "console-subscriber", + "console-subscriber 0.3.0", "diesel", "diesel-async", "futures-util", @@ -3165,7 +3203,7 @@ dependencies = [ [[package]] name = "lemmy_utils" -version = "0.19.4" +version = "0.19.5-alpha.1" dependencies = [ "actix-web", "anyhow", @@ -3243,7 +3281,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -4124,7 +4162,7 @@ dependencies = [ "clap", "color-eyre", "config", - "console-subscriber", + "console-subscriber 0.2.0", "dashmap", "diesel", "diesel-async", @@ -4427,7 +4465,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools 0.12.1", "proc-macro2", "quote", "syn 2.0.66", diff --git a/Cargo.toml b/Cargo.toml index b085773c5..7fa44655a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "0.19.4" +version = "0.19.5-alpha.1" edition = "2021" description = "A link aggregator for the fediverse" license = "AGPL-3.0" @@ -88,17 +88,17 @@ unused_self = "deny" unwrap_used = "deny" [workspace.dependencies] -lemmy_api = { version = "=0.19.4", path = "./crates/api" } -lemmy_api_crud = { version = "=0.19.4", path = "./crates/api_crud" } -lemmy_apub = { version = "=0.19.4", path = "./crates/apub" } -lemmy_utils = { version = "=0.19.4", path = "./crates/utils", default-features = false } -lemmy_db_schema = { version = "=0.19.4", path = "./crates/db_schema" } -lemmy_api_common = { version = "=0.19.4", path = "./crates/api_common" } -lemmy_routes = { version = "=0.19.4", path = "./crates/routes" } -lemmy_db_views = { version = "=0.19.4", path = "./crates/db_views" } -lemmy_db_views_actor = { version = "=0.19.4", path = "./crates/db_views_actor" } -lemmy_db_views_moderator = { version = "=0.19.4", path = "./crates/db_views_moderator" } -lemmy_federate = { version = "=0.19.4", path = "./crates/federate" } +lemmy_api = { version = "=0.19.5-alpha.1", path = "./crates/api" } +lemmy_api_crud = { version = "=0.19.5-alpha.1", path = "./crates/api_crud" } +lemmy_apub = { version = "=0.19.5-alpha.1", path = "./crates/apub" } +lemmy_utils = { version = "=0.19.5-alpha.1", path = "./crates/utils", default-features = false } +lemmy_db_schema = { version = "=0.19.5-alpha.1", path = "./crates/db_schema" } +lemmy_api_common = { version = "=0.19.5-alpha.1", path = "./crates/api_common" } +lemmy_routes = { version = "=0.19.5-alpha.1", path = "./crates/routes" } +lemmy_db_views = { version = "=0.19.5-alpha.1", path = "./crates/db_views" } +lemmy_db_views_actor = { version = "=0.19.5-alpha.1", path = "./crates/db_views_actor" } +lemmy_db_views_moderator = { version = "=0.19.5-alpha.1", path = "./crates/db_views_moderator" } +lemmy_federate = { version = "=0.19.5-alpha.1", path = "./crates/federate" } activitypub_federation = { version = "0.5.6", default-features = false, features = [ "actix-web", ] } diff --git a/crates/utils/translations b/crates/utils/translations index b3bdd9cf7..c3594b4fc 160000 --- a/crates/utils/translations +++ b/crates/utils/translations @@ -1 +1 @@ -Subproject commit b3bdd9cf78a234438dcc7ccb904739280eda5915 +Subproject commit c3594b4fc024c2ac6a8dab7a97fda5350a5d77e1 From 32b7ee76e3574e0d85469138cdb90bb419f5cb8d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 19:30:34 +0000 Subject: [PATCH 2/2] Update dependency ts-jest to v29.1.5 (#4834) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- api_tests/pnpm-lock.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api_tests/pnpm-lock.yaml b/api_tests/pnpm-lock.yaml index 07b59a59f..7b3d4cbcb 100644 --- a/api_tests/pnpm-lock.yaml +++ b/api_tests/pnpm-lock.yaml @@ -40,7 +40,7 @@ importers: version: 3.3.2 ts-jest: specifier: ^29.1.0 - version: 29.1.4(@babel/core@7.23.9)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(jest@29.7.0(@types/node@20.14.2))(typescript@5.4.5) + version: 29.1.5(@babel/core@7.23.9)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(jest@29.7.0(@types/node@20.14.2))(typescript@5.4.5) typescript: specifier: ^5.4.4 version: 5.4.5 @@ -1509,8 +1509,8 @@ packages: peerDependencies: typescript: '>=4.2.0' - ts-jest@29.1.4: - resolution: {integrity: sha512-YiHwDhSvCiItoAgsKtoLFCuakDzDsJ1DLDnSouTaTmdOcOwIkSzbLXduaQ6M5DRVhuZC/NYaaZ/mtHbWMv/S6Q==} + ts-jest@29.1.5: + resolution: {integrity: sha512-UuClSYxM7byvvYfyWdFI+/2UxMmwNyJb0NPkZPQE2hew3RurV7l7zURgOHAd/1I1ZdPpe3GUsXNXAcN8TFKSIg==} engines: {node: ^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -3359,7 +3359,7 @@ snapshots: dependencies: typescript: 5.4.5 - ts-jest@29.1.4(@babel/core@7.23.9)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(jest@29.7.0(@types/node@20.14.2))(typescript@5.4.5): + ts-jest@29.1.5(@babel/core@7.23.9)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(jest@29.7.0(@types/node@20.14.2))(typescript@5.4.5): dependencies: bs-logger: 0.2.6 fast-json-stable-stringify: 2.1.0