From: Dessalines <tyhou13@gmx.com>
Date: Wed, 16 Sep 2020 17:35:37 +0000 (-0500)
Subject: Merge branch 'update-deps' into main
X-Git-Url: http://these/git/%24%7B%60data:application/static/%24%7Bsite.site_view.site.icon?a=commitdiff_plain;h=397fc74a5636a7ba1dbf236ca5d01fcfdb79907c;p=lemmy.git

Merge branch 'update-deps' into main
---

397fc74a5636a7ba1dbf236ca5d01fcfdb79907c
diff --cc Cargo.lock
index 8fef254f,582b7b91..9305bdab
--- a/Cargo.lock
+++ b/Cargo.lock
@@@ -1901,22 -1887,6 +1875,19 @@@ dependencies = 
   "uuid 0.8.1",
  ]
  
 +[[package]]
 +name = "lemmy_structs"
 +version = "0.1.0"
 +dependencies = [
 + "actix",
 + "actix-web",
-  "chrono",
 + "diesel",
 + "lemmy_db",
 + "lemmy_utils",
 + "log",
-  "serde 1.0.115",
-  "strum",
-  "strum_macros",
++ "serde 1.0.116",
 +]
 +
  [[package]]
  name = "lemmy_utils"
  version = "0.1.0"
diff --cc Cargo.toml
index dc411a63,7e7704ea..f0486684
--- a/Cargo.toml
+++ b/Cargo.toml
@@@ -17,46 -17,47 +17,47 @@@ members = 
  [dependencies]
  lemmy_utils = { path = "./lemmy_utils" }
  lemmy_db = { path = "./lemmy_db" }
 -lemmy_api_structs = { path = "./lemmy_api_structs" }
 +lemmy_structs = { path = "./lemmy_structs" }
  lemmy_rate_limit = { path = "./lemmy_rate_limit" }
- diesel = "1.4.4"
- diesel_migrations = "1.4.0"
- dotenv = "0.15.0"
+ diesel = "1.4"
+ diesel_migrations = "1.4"
+ dotenv = "0.15"
  activitystreams = "0.7.0-alpha.4"
  activitystreams-ext = "0.1.0-alpha.2"
- bcrypt = "0.8.0"
- chrono = { version = "0.4.7", features = ["serde"] }
- serde_json = { version = "1.0.52", features = ["preserve_order"]}
- serde = { version = "1.0.105", features = ["derive"] }
- actix = "0.10.0"
- actix-web = { version = "3.0.0", default-features = false, features = ["rustls"] }
- actix-files = { version = "0.3.0", default-features = false }
- actix-web-actors = { version = "3.0.0", default-features = false }
- actix-rt = { version = "1.1.1", default-features = false }
- awc = { version = "2.0.0", default-features = false }
- log = "0.4.0"
- env_logger = "0.7.1"
- rand = "0.7.3"
- strum = "0.19.2"
- jsonwebtoken = "7.0.1"
- lazy_static = "1.3.0"
- rss = "1.9.0"
- url = { version = "2.1.1", features = ["serde"] }
- percent-encoding = "2.1.0"
+ bcrypt = "0.8"
+ chrono = { version = "0.4", features = ["serde"] }
+ serde_json = { version = "1.0", features = ["preserve_order"]}
+ serde = { version = "1.0", features = ["derive"] }
+ actix = "0.10"
+ actix-web = { version = "3.0", default-features = false }
+ actix-files = { version = "0.3", default-features = false }
+ actix-web-actors = { version = "3.0", default-features = false }
+ actix-rt = { version = "1.1", default-features = false }
+ awc = { version = "2.0", default-features = false }
+ log = "0.4"
+ env_logger = "0.7"
+ rand = "0.7"
+ strum = "0.19"
+ strum_macros = "0.19"
+ jsonwebtoken = "7.0"
+ lazy_static = "1.3"
+ rss = "1.9"
+ url = { version = "2.1", features = ["serde"] }
+ percent-encoding = "2.1"
  openssl = "0.10"
- http = "0.2.1"
- http-signature-normalization-actix = { version = "0.4.0", default-features = false, features = ["sha-2"] }
- base64 = "0.12.1"
- tokio = "0.2.21"
- futures = "0.3.5"
- itertools = "0.9.0"
+ http = "0.2"
+ http-signature-normalization-actix = { version = "0.4", default-features = false, features = ["sha-2"] }
+ base64 = "0.12"
+ tokio = "0.2"
+ futures = "0.3"
+ itertools = "0.9"
  uuid = { version = "0.8", features = ["serde", "v4"] }
  sha2 = "0.9"
- async-trait = "0.1.40"
- captcha = "0.0.7"
- anyhow = "1.0.32"
- thiserror = "1.0.20"
- background-jobs = " 0.8.0-alpha.2"
+ async-trait = "0.1"
+ captcha = "0.0"
+ anyhow = "1.0"
+ thiserror = "1.0"
+ background-jobs = " 0.8"
  reqwest = { version = "0.10", features = ["json"] }
  
  [dev-dependencies.cargo-husky]
diff --cc lemmy_structs/Cargo.toml
index 25e38109,e2418d36..58658b92
--- a/lemmy_structs/Cargo.toml
+++ b/lemmy_structs/Cargo.toml
@@@ -11,11 -11,7 +11,11 @@@ path = "src/lib.rs
  [dependencies]
  lemmy_db = { path = "../lemmy_db" }
  lemmy_utils = { path = "../lemmy_utils" }
- serde = { version = "1.0.105", features = ["derive"] }
- log = "0.4.0"
- diesel = "1.4.4"
- actix-web = { version = "3.0.0-beta.3", features = ["rustls"] }
- actix = "0.10.0"
- strum = "0.19.2"
- strum_macros = "0.19.2"
- chrono = { version = "0.4.7", features = ["serde"] }
+ serde = { version = "1.0", features = ["derive"] }
+ log = "0.4"
+ diesel = "1.4"
++actix = "0.10"
+ actix-web = { version = "3.0" }
++strum = "0.19"
++strum_macros = "0.19"
++chrono = { version = "0.4", features = ["serde"] }