Skip to content

Commit

Permalink
Merge pull request #1709 from LemmyNet/upgrade_deps_6
Browse files Browse the repository at this point in the history 
Upgrading deps
  • Loading branch information
@Nutomic
Nutomic authored Aug 18, 2021
2 parents 28d6370 + b241bb9 commit d8fafc1
Show file tree
Hide file tree
Showing 19 changed files with 185 additions and 228 deletions.
264 changes: 103 additions & 161 deletions Cargo.lock
View file

Large diffs are not rendered by default.

15 changes: 9 additions & 6 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,24 +47,27 @@ lemmy_routes = { version = "=0.11.3", path = "./crates/routes" }
diesel = "1.4.7"
diesel_migrations = "1.4.0"
chrono = { version = "0.4.19", features = ["serde"] }
serde = { version = "1.0.126", features = ["derive"] }
serde = { version = "1.0.127", features = ["derive"] }
actix = "0.12.0"
actix-web = { version = "4.0.0-beta.8", default-features = false, features = ["rustls"] }
log = "0.4.14"
env_logger = "0.8.4"
env_logger = "0.9.0"
strum = "0.21.0"
url = { version = "2.2.2", features = ["serde"] }
openssl = "0.10.35"
openssl = "0.10.36"
http-signature-normalization-actix = { version = "0.5.0-beta.7", default-features = false, features = ["sha-2"] }
tokio = { version = "1.8.0", features = ["sync"] }
anyhow = "1.0.41"
tokio = { version = "1.10.0", features = ["sync"] }
anyhow = "1.0.43"
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.64", features = ["preserve_order"] }
serde_json = { version = "1.0.66", features = ["preserve_order"] }
clokwerk = "0.3.5"

[dev-dependencies.cargo-husky]
version = "1.5.0"
default-features = false # Disable features which are enabled by default
features = ["precommit-hook", "run-cargo-fmt", "run-cargo-clippy"]

[package.metadata.cargo-udeps.ignore]
development = ["cargo-husky"]
16 changes: 8 additions & 8 deletions crates/api/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ lemmy_db_views_actor = { version = "=0.11.3", path = "../db_views_actor" }
lemmy_api_common = { version = "=0.11.3", path = "../api_common" }
lemmy_websocket = { version = "=0.11.3", path = "../websocket" }
diesel = "1.4.7"
bcrypt = "0.10.0"
bcrypt = "0.10.1"
chrono = { version = "0.4.19", features = ["serde"] }
serde_json = { version = "1.0.64", features = ["preserve_order"] }
serde = { version = "1.0.126", features = ["derive"] }
serde_json = { version = "1.0.66", features = ["preserve_order"] }
serde = { version = "1.0.127", features = ["derive"] }
actix = "0.12.0"
actix-web = { version = "4.0.0-beta.8", default-features = false }
actix-rt = { version = "2.2.0", default-features = false }
Expand All @@ -35,18 +35,18 @@ strum = "0.21.0"
strum_macros = "0.21.1"
lazy_static = "1.4.0"
url = { version = "2.2.2", features = ["serde"] }
openssl = "0.10.35"
openssl = "0.10.36"
http = "0.2.4"
http-signature-normalization-actix = { version = "0.5.0-beta.7", default-features = false, features = ["sha-2"] }
base64 = "0.13.0"
tokio = "1.8.0"
futures = "0.3.15"
tokio = "1.10.0"
futures = "0.3.16"
itertools = "0.10.1"
uuid = { version = "0.8.2", features = ["serde", "v4"] }
sha2 = "0.9.5"
async-trait = "0.1.50"
async-trait = "0.1.51"
captcha = "0.0.8"
anyhow = "1.0.41"
anyhow = "1.0.43"
thiserror = "1.0.26"
background-jobs = "0.9.0"
reqwest = { version = "0.11.4", features = ["json"] }
6 changes: 3 additions & 3 deletions crates/api_common/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ lemmy_db_views_moderator = { version = "=0.11.3", path = "../db_views_moderator"
lemmy_db_views_actor = { version = "=0.11.3", path = "../db_views_actor" }
lemmy_db_schema = { version = "=0.11.3", path = "../db_schema" }
lemmy_utils = { version = "=0.11.3", path = "../utils" }
serde = { version = "1.0.126", features = ["derive"] }
serde = { version = "1.0.127", features = ["derive"] }
log = "0.4.14"
diesel = "1.4.7"
actix-web = {version = "4.0.0-beta.8", default-features = false, features = ["cookies"] }
actix-web = { version = "4.0.0-beta.8", default-features = false, features = ["cookies"] }
chrono = { version = "0.4.19", features = ["serde"] }
serde_json = { version = "1.0.64", features = ["preserve_order"] }
serde_json = { version = "1.0.66", features = ["preserve_order"] }
url = "2.2.2"
16 changes: 8 additions & 8 deletions crates/api_crud/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ lemmy_db_views_actor = { version = "=0.11.3", path = "../db_views_actor" }
lemmy_api_common = { version = "=0.11.3", path = "../api_common" }
lemmy_websocket = { version = "=0.11.3", path = "../websocket" }
diesel = "1.4.7"
bcrypt = "0.10.0"
bcrypt = "0.10.1"
chrono = { version = "0.4.19", features = ["serde"] }
serde_json = { version = "1.0.64", features = ["preserve_order"] }
serde = { version = "1.0.126", features = ["derive"] }
serde_json = { version = "1.0.66", features = ["preserve_order"] }
serde = { version = "1.0.127", features = ["derive"] }
actix = "0.12.0"
actix-web = { version = "4.0.0-beta.8", default-features = false }
actix-rt = { version = "2.2.0", default-features = false }
Expand All @@ -30,17 +30,17 @@ strum = "0.21.0"
strum_macros = "0.21.1"
lazy_static = "1.4.0"
url = { version = "2.2.2", features = ["serde"] }
openssl = "0.10.35"
openssl = "0.10.36"
http = "0.2.4"
http-signature-normalization-actix = { version = "0.5.0-beta.7", default-features = false, features = ["sha-2"] }
base64 = "0.13.0"
tokio = "1.8.0"
futures = "0.3.15"
tokio = "1.10.0"
futures = "0.3.16"
itertools = "0.10.1"
uuid = { version = "0.8.2", features = ["serde", "v4"] }
sha2 = "0.9.5"
async-trait = "0.1.50"
anyhow = "1.0.41"
async-trait = "0.1.51"
anyhow = "1.0.43"
thiserror = "1.0.26"
background-jobs = "0.9.0"
reqwest = { version = "0.11.4", features = ["json"] }
17 changes: 8 additions & 9 deletions crates/apub/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ lemmy_api_common = { version = "=0.11.3", path = "../api_common" }
lemmy_websocket = { version = "=0.11.3", path = "../websocket" }
diesel = "1.4.7"
activitystreams = "0.7.0-alpha.11"
bcrypt = "0.10.0"
bcrypt = "0.10.1"
chrono = { version = "0.4.19", features = ["serde"] }
serde_json = { version = "1.0.64", features = ["preserve_order"] }
serde = { version = "1.0.126", features = ["derive"] }
serde_json = { version = "1.0.66", features = ["preserve_order"] }
serde = { version = "1.0.127", features = ["derive"] }
serde_with = "1.9.4"
actix = "0.12.0"
actix-web = { version = "4.0.0-beta.8", default-features = false }
Expand All @@ -36,21 +36,20 @@ strum = "0.21.0"
strum_macros = "0.21.1"
url = { version = "2.2.2", features = ["serde"] }
percent-encoding = "2.1.0"
openssl = "0.10.35"
openssl = "0.10.36"
http = "0.2.4"
http-signature-normalization-actix = { version = "0.5.0-beta.7", default-features = false, features = ["sha-2"] }
http-signature-normalization-reqwest = { version = "0.2.0", default-features = false, features = ["sha-2"] }
base64 = "0.13.0"
tokio = "1.8.0"
futures = "0.3.15"
tokio = "1.10.0"
futures = "0.3.16"
itertools = "0.10.1"
uuid = { version = "0.8.2", features = ["serde", "v4"] }
sha2 = "0.9.5"
async-trait = "0.1.50"
anyhow = "1.0.41"
async-trait = "0.1.51"
anyhow = "1.0.43"
thiserror = "1.0.26"
background-jobs = "0.9.0"
reqwest = { version = "0.11.4", features = ["json"] }
backtrace = "0.3.60"
lazy_static = "1.4.0"

9 changes: 4 additions & 5 deletions crates/apub_lib/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ lemmy_utils = { version = "=0.11.3", path = "../utils" }
lemmy_websocket = { version = "=0.11.3", path = "../websocket" }
lemmy_apub_lib_derive = { version = "=0.11.3", path = "../apub_lib_derive" }
activitystreams = "0.7.0-alpha.11"
activitystreams-ext = "0.1.0-alpha.2"
serde = { version = "1.0.123", features = ["derive"] }
async-trait = "0.1.42"
url = { version = "2.2.1", features = ["serde"] }
serde_json = { version = "1.0.64", features = ["preserve_order"] }
serde = { version = "1.0.127", features = ["derive"] }
async-trait = "0.1.51"
url = { version = "2.2.2", features = ["serde"] }
serde_json = { version = "1.0.66", features = ["preserve_order"] }
8 changes: 4 additions & 4 deletions crates/apub_lib_derive/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ license = "AGPL-3.0"
proc-macro = true

[dev-dependencies]
trybuild = { version = "1.0", features = ["diff"] }
trybuild = { version = "1.0.45", features = ["diff"] }

[dependencies]
proc-macro2 = "1.0"
syn = "1.0"
quote = "1.0"
proc-macro2 = "1.0.28"
syn = "1.0.74"
quote = "1.0.9"
6 changes: 3 additions & 3 deletions crates/db_queries/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ lemmy_db_schema = { version = "=0.11.3", path = "../db_schema" }
diesel = { version = "1.4.7", features = ["postgres","chrono","r2d2","serde_json"] }
diesel_migrations = "1.4.0"
chrono = { version = "0.4.19", features = ["serde"] }
serde = { version = "1.0.126", features = ["derive"] }
serde_json = { version = "1.0.64", features = ["preserve_order"] }
serde = { version = "1.0.127", features = ["derive"] }
serde_json = { version = "1.0.66", features = ["preserve_order"] }
strum = "0.21.0"
strum_macros = "0.21.1"
log = "0.4.14"
sha2 = "0.9.5"
url = { version = "2.2.2", features = ["serde"] }
lazy_static = "1.4.0"
regex = "1.5.4"
bcrypt = "0.10.0"
bcrypt = "0.10.1"

[dev-dependencies]
serial_test = "0.5.1"
4 changes: 2 additions & 2 deletions crates/db_schema/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ doctest = false
[dependencies]
diesel = { version = "1.4.7", features = ["postgres","chrono","r2d2","serde_json"] }
chrono = { version = "0.4.19", features = ["serde"] }
serde = { version = "1.0.126", features = ["derive"] }
serde_json = { version = "1.0.64", features = ["preserve_order"] }
serde = { version = "1.0.127", features = ["derive"] }
serde_json = { version = "1.0.66", features = ["preserve_order"] }
log = "0.4.14"
url = { version = "2.2.2", features = ["serde"] }
diesel-derive-newtype = "0.1.2"
2 changes: 1 addition & 1 deletion crates/db_views/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ doctest = false
lemmy_db_queries = { version = "=0.11.3", path = "../db_queries" }
lemmy_db_schema = { version = "=0.11.3", path = "../db_schema" }
diesel = { version = "1.4.7", features = ["postgres","chrono","r2d2","serde_json"] }
serde = { version = "1.0.126", features = ["derive"] }
serde = { version = "1.0.127", features = ["derive"] }
log = "0.4.14"
url = "2.2.2"

Expand Down
2 changes: 1 addition & 1 deletion crates/db_views_actor/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ doctest = false
lemmy_db_queries = { version = "=0.11.3", path = "../db_queries" }
lemmy_db_schema = { version = "=0.11.3", path = "../db_schema" }
diesel = { version = "1.4.7", features = ["postgres","chrono","r2d2","serde_json"] }
serde = { version = "1.0.126", features = ["derive"] }
serde = { version = "1.0.127", features = ["derive"] }
2 changes: 1 addition & 1 deletion crates/db_views_moderator/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ doctest = false
lemmy_db_queries = { version = "=0.11.3", path = "../db_queries" }
lemmy_db_schema = { version = "=0.11.3", path = "../db_schema" }
diesel = { version = "1.4.7", features = ["postgres","chrono","r2d2","serde_json"] }
serde = { version = "1.0.126", features = ["derive"] }
serde = { version = "1.0.127", features = ["derive"] }
4 changes: 2 additions & 2 deletions crates/routes/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ actix-web = { version = "4.0.0-beta.8", default-features = false, features = ["r
actix-web-actors = { version = "4.0.0-beta.6", default-features = false }
sha2 = "0.9.5"
log = "0.4.14"
anyhow = "1.0.41"
anyhow = "1.0.43"
chrono = { version = "0.4.19", features = ["serde"] }
rss = "1.10.0"
serde = { version = "1.0.126", features = ["derive"] }
serde = { version = "1.0.127", features = ["derive"] }
awc = { version = "3.0.0-beta.7", default-features = false }
url = { version = "2.2.2", features = ["serde"] }
strum = "0.21.0"
Expand Down
16 changes: 8 additions & 8 deletions crates/utils/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,23 @@ log = "0.4.14"
itertools = "0.10.1"
rand = "0.8.4"
percent-encoding = "2.1.0"
serde = { version = "1.0.126", features = ["derive"] }
serde_json = { version = "1.0.64", features = ["preserve_order"] }
serde = { version = "1.0.127", features = ["derive"] }
serde_json = { version = "1.0.66", features = ["preserve_order"] }
thiserror = "1.0.26"
comrak = { version = "0.10.1", default-features = false }
comrak = { version = "0.11.0", default-features = false }
lazy_static = "1.4.0"
openssl = "0.10.35"
openssl = "0.10.36"
url = { version = "2.2.2", features = ["serde"] }
actix-web = { version = "4.0.0-beta.8", default-features = false, features = ["rustls"] }
actix-rt = { version = "2.2.0", default-features = false }
anyhow = "1.0.41"
anyhow = "1.0.43"
reqwest = { version = "0.11.4", features = ["json"] }
tokio = { version = "1.8.0", features = ["sync"] }
tokio = { version = "1.10.0", features = ["sync"] }
strum = "0.21.0"
strum_macros = "0.21.1"
futures = "0.3.15"
futures = "0.3.16"
diesel = "1.4.7"
http = "0.2.4"
jsonwebtoken = "7.2.0"
deser-hjson = "1.0.1"
deser-hjson = "1.0.2"
smart-default = "0.6.0"
8 changes: 4 additions & 4 deletions crates/websocket/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ lemmy_db_views_actor = { version = "=0.11.3", path = "../db_views_actor" }
reqwest = { version = "0.11.4", features = ["json"] }
log = "0.4.14"
rand = "0.8.4"
serde = { version = "1.0.126", features = ["derive"] }
serde_json = { version = "1.0.64", features = ["preserve_order"] }
serde = { version = "1.0.127", features = ["derive"] }
serde_json = { version = "1.0.66", features = ["preserve_order"] }
actix = "0.12.0"
anyhow = "1.0.41"
anyhow = "1.0.43"
diesel = "1.4.7"
background-jobs = "0.9.0"
tokio = "1.8.0"
tokio = "1.10.0"
strum = "0.21.0"
strum_macros = "0.21.1"
chrono = { version = "0.4.19", features = ["serde"] }
Expand Down
2 changes: 1 addition & 1 deletion docker/dev/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ RUN strip ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server
RUN cp ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server /app/lemmy_server

# The alpine runner
FROM alpine:3.12 as lemmy
FROM alpine:3.14 as lemmy

# Install libpq for postgres
RUN apk add libpq
Expand Down
2 changes: 1 addition & 1 deletion docker/prod/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN strip ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server
RUN cp ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server /app/lemmy_server

# The alpine runner
FROM alpine:3.12 as lemmy
FROM alpine:3.14 as lemmy

# Install libpq for postgres
RUN apk add libpq
Expand Down
14 changes: 14 additions & 0 deletions scripts/upgrade_deps.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/bash

pushd ../

# Check unused deps
cargo udeps --all-targets

# Upgrade deps
cargo upgrade --workspace

# Run check
cargo check

popd

0 comments on commit d8fafc1

Please sign in to comment.