latest deps other than opentelemetry (#357)

divviup · Jul 31, 2023 · 8982aff · 8982aff
1 parent a63b6b1
commit 8982aff
Show file tree

Hide file tree

Showing 16 changed files with 675 additions and 510 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,20 +25,20 @@ env_logger = "0.10.0"
 fastrand = "2.0.0"
 futures-lite = "1.13.0"
 git-version = "0.3.5"
-janus_messages = "0.5.10"
+janus_messages = "0.5.11"
 log = "0.4.19"
 opentelemetry = { version = "0.19.0", features = ["metrics"] }
 opentelemetry-prometheus = { version = "0.12.0", features = [
     "prometheus-encoding",
 ] }
 querystrong = "0.3.0"
 rand = "0.8.5"
-serde = { version = "1.0.175", features = ["derive"] }
-serde_json = "1.0.103"
+serde = { version = "1.0.179", features = ["derive"] }
+serde_json = "1.0.104"
 serde_path_to_error = "0.1.14"
 sha2 = "0.10.7"
 thiserror = "1.0.44"
-time = { version = "0.3.23", features = ["serde", "serde-well-known"] }
+time = { version = "0.3.24", features = ["serde", "serde-well-known"] }
 tokio = { version = "1.29.1", features = ["full"] }
 tracing = "0.1.37"
 trillium = "0.2.9"
@@ -70,7 +70,7 @@ default-features = false
 features = ["pkce-plain"]
 
 [dependencies.sea-orm]
-version = "0.11.3"
+version = "0.12.1"
 features = [
     "runtime-tokio-rustls",
     "macros",

diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -8,7 +8,7 @@
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.4.3",
     "axios": "^1.4.0",
-    "bootstrap": "^5.3.0",
+    "bootstrap": "^5.3.1",
     "formik": "^2.4.2",
     "humanize-duration": "^3.29.0",
     "luxon": "^3.3.0",
@@ -51,14 +51,14 @@
     "@types/humanize-duration": "^3.27.1",
     "@types/jest": "^29.5.3",
     "@types/luxon": "^3.3.1",
-    "@types/node": "^20.4.4",
-    "@types/react": "^18.2.16",
+    "@types/node": "^20.4.5",
+    "@types/react": "^18.2.17",
     "@types/react-bootstrap": "^0.32.32",
     "@types/react-dom": "^18.2.7",
     "@types/react-router": "^5.1.20",
     "@types/react-router-bootstrap": "^0.26.2",
     "@types/react-router-dom": "^5.3.3",
-    "@vitejs/plugin-react": "^4.0.3",
+    "@vitejs/plugin-react": "^4.0.4",
     "source-map-explorer": "^2.5.3",
     "typescript": "^5.1.6",
     "vite": "^4.4.7"

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -13,16 +13,16 @@ thiserror = "1.0.44"
 divviup-client = { path = "../client" }
 trillium-rustls = "0.4.0"
 trillium-tokio = "0.3.1"
-serde = "1.0.175"
+serde = "1.0.179"
 email_address = "0.2.4"
 humantime = "2.1.0"
 base64 = "0.21.2"
-time = { version = "0.3.23", features = [
+time = { version = "0.3.24", features = [
     "serde",
     "serde-well-known",
     "local-offset",
 ] }
-serde_json = "1.0.103"
+serde_json = "1.0.104"
 serde_yaml = "0.9.25"
 env_logger = "0.10.0"
 colored = "2.0.4"

diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -6,14 +6,14 @@ edition = "2021"
 [dependencies]
 base64 = "0.21.2"
 email_address = "0.2.4"
-serde = { version = "1.0.175", features = ["derive"] }
-serde_json = "1.0.103"
+serde = { version = "1.0.179", features = ["derive"] }
+serde_json = "1.0.104"
 thiserror = "1.0.44"
 trillium-client = { version = "0.4.5", features = ["json"] }
 trillium-http = "0.3.2"
 url = { version = "2.4.0", features = ["serde"] }
 uuid = { version = "1.4.1", features = ["v4", "fast-rng", "serde"] }
-time = { version = "0.3.23", features = ["serde", "serde-well-known"] }
+time = { version = "0.3.24", features = ["serde", "serde-well-known"] }
 log = "0.4.19"
 pad-adapter = "0.1.1"
 

diff --git a/migration/Cargo.toml b/migration/Cargo.toml
@@ -12,16 +12,16 @@ path = "src/lib.rs"
 [dependencies]
 async-std = { version = "1", features = ["attributes", "tokio1"] }
 clap = { version = "4.3.19", features = ["env", "derive"] }
-sea-orm = "0.11.3"
-serde_json = "1.0.103"
+sea-orm = "0.12.1"
+serde_json = "1.0.104"
 thiserror = "1.0.44"
-time = "0.3.23"
+time = "0.3.24"
 tracing = "0.1.37"
 tracing-subscriber = "0.3.17"
 
 [dependencies.sea-orm-migration]
-version = "0.11.3"
+version = "0.12.1"
 features = ["runtime-tokio-rustls", "sqlx-postgres"]
 
 [dev-dependencies]
-sea-orm = { version = "0.11.3", features = ["sqlx-sqlite"] }
+sea-orm = { version = "0.12.1", features = ["sqlx-sqlite"] }
diff --git a/src/entity/queue.rs b/src/entity/queue.rs
@@ -3,7 +3,7 @@ use crate::{
     queue::{EnqueueJob, Job, JobError},
 };
 use sea_orm::{
-    sea_query::{self, all, any, LockBehavior, LockType},
+    sea_query::{all, any, LockBehavior, LockType},
     ActiveModelBehavior, ActiveValue, ColumnTrait, DatabaseTransaction, DbErr, DeriveActiveEnum,
     DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait, EnumIter, PrimaryKeyTrait,
     QueryFilter, QueryOrder, QuerySelect,

diff --git a/src/handler/session_store.rs b/src/handler/session_store.rs
@@ -5,7 +5,7 @@ use async_session::{
     serde_json, Session,
 };
 use sea_orm::{
-    sea_query::{self, any, OnConflict},
+    sea_query::{any, OnConflict},
     ColumnTrait, EntityTrait, IntoActiveModel, QueryFilter,
 };
 use serde_json::json;

diff --git a/src/queue.rs b/src/queue.rs
@@ -7,7 +7,7 @@ use crate::{
     Config, Db, DivviupApi,
 };
 use sea_orm::{
-    sea_query::{self, all, Expr},
+    sea_query::{all, Expr},
     ActiveModelTrait, ActiveValue, ColumnTrait, DbErr, EntityTrait, IntoActiveModel,
     PaginatorTrait, QueryFilter, TransactionTrait,
 };

diff --git a/src/queue/job/v1/queue_cleanup.rs b/src/queue/job/v1/queue_cleanup.rs
@@ -3,7 +3,7 @@ use crate::{
     queue::job::{v1::V1, EnqueueJob, Job, JobError, SharedJobState},
 };
 use sea_orm::{
-    sea_query::{self, all, Expr},
+    sea_query::{all, Expr},
     ColumnTrait, ConnectionTrait, EntityTrait, QueryFilter,
 };
 use serde::{Deserialize, Serialize};

diff --git a/src/queue/job/v1/session_cleanup.rs b/src/queue/job/v1/session_cleanup.rs
@@ -3,7 +3,7 @@ use crate::{
     queue::job::{v1::V1, EnqueueJob, Job, JobError, SharedJobState},
 };
 use sea_orm::{
-    sea_query::{self, all, Expr},
+    sea_query::{all, Expr},
     ColumnTrait, ConnectionTrait, EntityTrait, QueryFilter,
 };
 use serde::{Deserialize, Serialize};

diff --git a/src/routes/aggregators.rs b/src/routes/aggregators.rs
@@ -4,7 +4,7 @@ use crate::{
     Db, Permissions, PermissionsActor,
 };
 use sea_orm::{
-    sea_query::{self, all, any},
+    sea_query::{all, any},
     ActiveModelTrait, ColumnTrait, EntityTrait, QueryFilter,
 };
 use trillium::{Conn, Handler, Status};

diff --git a/src/routes/memberships.rs b/src/routes/memberships.rs
@@ -4,8 +4,8 @@ use crate::{
     Db, Error, PermissionsActor,
 };
 use sea_orm::{
-    sea_query::{self, all},
-    ActiveModelTrait, ColumnTrait, EntityTrait, ModelTrait, QueryFilter, TransactionTrait,
+    sea_query::all, ActiveModelTrait, ColumnTrait, EntityTrait, ModelTrait, QueryFilter,
+    TransactionTrait,
 };
 use trillium::{Conn, Handler, Status};
 use trillium_api::Json;

diff --git a/src/user.rs b/src/user.rs
@@ -3,8 +3,7 @@ use crate::{
     Db,
 };
 use sea_orm::{
-    sea_query::{self, all},
-    ColumnTrait, EntityTrait, PaginatorTrait, QueryFilter, QuerySelect, Select,
+    sea_query::all, ColumnTrait, EntityTrait, PaginatorTrait, QueryFilter, QuerySelect, Select,
 };
 use serde::{Deserialize, Serialize};
 use time::{Duration, OffsetDateTime};

diff --git a/test-support/Cargo.toml b/test-support/Cargo.toml
@@ -6,21 +6,21 @@ publish = false
 
 [dependencies]
 fastrand = "2.0.0"
-time = "0.3.23"
+time = "0.3.24"
 trillium = "0.2.9"
 trillium-macros = "0.0.4"
 trillium-testing = { version = "0.5.0", features = ["tokio"] }
 divviup-api = { version = "*", path = ".." }
-serde = "1.0.175"
-serde_json = "1.0.103"
+serde = "1.0.179"
+serde_json = "1.0.104"
 thiserror = "1.0.44"
 trillium-client = { version = "0.4.5", features = ["json"] }
 trillium-http = "0.3.2"
 trillium-rustls = "0.4.0"
 trillium-tokio = "0.3.1"
 url = "2.4.0"
 uuid = { version = "1.4.1", features = ["v4", "fast-rng", "serde"] }
-sea-orm = { version = "0.11.3", features = ["sqlx-sqlite"] }
+sea-orm = { version = "0.12.1", features = ["sqlx-sqlite"] }
 pretty_assertions = "1.4.0"
 rand = "0.8.5"
 base64 = "0.21.2"