Diesel 2.0.0 upgrade (#2452)

[lemmy.git] / Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
index 6e8b3e7fc58fe3e5322e227b6a49f76166151496..18cf4eb39170cb34b9cbe18d8fffea82c362bab9 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,11 +1,12 @@
 [package]
 name = "lemmy_server"
-version = "0.14.2-rc.1"
-edition = "2018"
+version = "0.16.5"
+edition = "2021"
 description = "A link aggregator for the fediverse"
 license = "AGPL-3.0"
 homepage = "https://join-lemmy.org/"
 documentation = "https://join-lemmy.org/docs/en/index.html"
+rust-version = "1.57"
 
 [lib]
 doctest = false
@@ -13,13 +14,16 @@ doctest = false
 [profile.dev]
 debug = 0
 
+[features]
+console = ["console-subscriber", "opentelemetry", "opentelemetry-otlp", "tracing-opentelemetry",
+    "reqwest-tracing/opentelemetry_0_16"]
+default = []
+
 [workspace]
 members = [
     "crates/api",
     "crates/api_crud",
     "crates/api_common",
-    "crates/apub_lib",
-    "crates/apub_lib_derive",
     "crates/apub",
     "crates/utils",
     "crates/db_schema",
@@ -31,46 +35,34 @@ members = [
 ]
 
 [dependencies]
-lemmy_api = { version = "=0.14.2-rc.1", path = "./crates/api" }
-lemmy_api_crud = { version = "=0.14.2-rc.1", path = "./crates/api_crud" }
-lemmy_apub = { version = "=0.14.2-rc.1", path = "./crates/apub" }
-lemmy_apub_lib = { version = "=0.14.2-rc.1", path = "./crates/apub_lib" }
-lemmy_utils = { version = "=0.14.2-rc.1", path = "./crates/utils" }
-lemmy_db_schema = { version = "=0.14.2-rc.1", path = "./crates/db_schema" }
-lemmy_db_views = { version = "=0.14.2-rc.1", path = "./crates/db_views" }
-lemmy_db_views_moderator = { version = "=0.14.2-rc.1", path = "./crates/db_views_moderator" }
-lemmy_db_views_actor = { version = "=0.14.2-rc.1", path = "./crates/db_views_actor" }
-lemmy_api_common = { version = "=0.14.2-rc.1", path = "crates/api_common" }
-lemmy_websocket = { version = "=0.14.2-rc.1", path = "./crates/websocket" }
-lemmy_routes = { version = "=0.14.2-rc.1", path = "./crates/routes" }
-diesel = "1.4.8"
-diesel_migrations = "1.4.0"
-chrono = { version = "0.4.19", features = ["serde"] }
-serde = { version = "1.0.130", features = ["derive"] }
-actix = "0.12.0"
-actix-web = { version = "4.0.0-beta.9", default-features = false, features = ["rustls"] }
-tracing = "0.1.29"
-tracing-actix-web = "0.5.0-beta.2"
+lemmy_api = { version = "=0.16.5", path = "./crates/api" }
+lemmy_api_crud = { version = "=0.16.5", path = "./crates/api_crud" }
+lemmy_apub = { version = "=0.16.5", path = "./crates/apub" }
+lemmy_utils = { version = "=0.16.5", path = "./crates/utils" }
+lemmy_db_schema = { version = "=0.16.5", path = "./crates/db_schema" }
+lemmy_api_common = { version = "=0.16.5", path = "crates/api_common" }
+lemmy_websocket = { version = "=0.16.5", path = "./crates/websocket" }
+lemmy_routes = { version = "=0.16.5", path = "./crates/routes" }
+activitypub_federation = "0.2.0"
+diesel = "2.0.0"
+diesel_migrations = "2.0.0"
+serde = { version = "1.0.145", features = ["derive"] }
+actix = "0.13.0"
+actix-web = { version = "4.2.1", default-features = false, features = ["macros", "rustls"] }
+tracing = "0.1.36"
+tracing-actix-web = { version = "0.6.1", default-features = false }
 tracing-error = "0.2.0"
-tracing-log = "0.1.2"
-tracing-subscriber = { version = "0.3.2", features = ["env-filter"] }
-strum = "0.21.0"
-url = { version = "2.2.2", features = ["serde"] }
-openssl = "0.10.36"
-http-signature-normalization-actix = { version = "0.5.0-beta.10", default-features = false, features = ["sha-2"] }
-tokio = { version = "1.12.0", features = ["sync"] }
-anyhow = "1.0.44"
-reqwest = { version = "0.11.4", features = ["json"] }
-activitystreams = "0.7.0-alpha.11"
-actix-rt = { version = "2.2.0", default-features = false }
-serde_json = { version = "1.0.68", features = ["preserve_order"] }
+tracing-log = "0.1.3"
+tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
+url = { version = "2.3.1", features = ["serde"] }
+reqwest = { version = "0.11.12", features = ["json"] }
+reqwest-middleware = "0.1.6"
+reqwest-tracing = "0.3.1"
 clokwerk = "0.3.5"
-doku = "0.10.1"
-
-[dev-dependencies.cargo-husky]
-version = "1.5.0"
-default-features = false # Disable features which are enabled by default
-features = ["user-hooks"]
-
-[package.metadata.cargo-udeps.ignore]
-development = ["cargo-husky"]
+doku = { version = "0.12.0", features = ["url-2"] }
+parking_lot = "0.12.1"
+reqwest-retry = "0.1.5"
+console-subscriber = { version = "0.1.8", optional = true }
+opentelemetry = { version = "0.17.0", features = ["rt-tokio"], optional = true }
+opentelemetry-otlp = { version = "0.10.0", optional = true }
+tracing-opentelemetry = { version = "0.17.2", optional = true }