Merge pull request #33 from Walther/2024-01-16-chores

2024-01-16 chores
Walther · Jan 16, 2024 · 27caad1 · 27caad1
2 parents 8c977ae + 08ede00
commit 27caad1
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 85 deletions.
diff --git a/clovers-back/Cargo.toml b/clovers-back/Cargo.toml
@@ -6,23 +6,23 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.75"
+anyhow = "1.0.79"
 aws-config = "0.56.1"
 aws-sdk-s3 = "0.34.0"
 axum = { version = "0.6.20", features = ["macros", "ws"] }
 clovers-svc-common = { path = "../clovers-svc-common" }
 dotenv = "0.15.0"
-futures = "0.3.28"
+futures = "0.3.30"
 redis = { version = "0.22.3", features = ["tokio-comp", "connection-manager"] }
 serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0.105"
-sqlx = { version = "0.6", features = [
+serde_json = "1.0.111"
+sqlx = { version = "^0.6.3", features = [
   "postgres",
   "runtime-tokio-rustls",
   "json",
 ] }
-tokio = { version = "1.32", features = ["full"] }
-tower-http = { version = "0.4.3", features = ["trace", "cors"] }
+tokio = { version = "1.35", features = ["full"] }
+tower-http = { version = "0.4.4", features = ["trace", "cors"] }
 tower_governor = "0.1.0"
 tracing = "0.1"
-tracing-subscriber = { version = "0.3.17", features = ["env-filter", "time"] }
+tracing-subscriber = { version = "0.3.18", features = ["env-filter", "time"] }
diff --git a/clovers-back/Dockerfile b/clovers-back/Dockerfile
@@ -1,6 +1,6 @@
 # Based on https://github.com/LukeMathWalker/cargo-chef
 
-FROM lukemathwalker/cargo-chef:latest-rust-1.73 AS chef
+FROM lukemathwalker/cargo-chef:latest-rust-1.75 AS chef
 WORKDIR /app
 
 FROM chef AS planner

diff --git a/clovers-back/dev.Dockerfile b/clovers-back/dev.Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.73 as rust-hotreload
+FROM rust:1.75 as rust-hotreload
 WORKDIR /app
 
 RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash

diff --git a/clovers-batch/Cargo.toml b/clovers-batch/Cargo.toml
@@ -6,20 +6,20 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.75"
+anyhow = "1.0.79"
 aws-config = "0.56.1"
 aws-sdk-s3 = "0.34.0"
 clovers-svc-common = { path = "../clovers-svc-common" }
 dotenv = "0.15.0"
-image = "0.24.7"
+image = "0.24.8"
 redis = { version = "0.22.3", features = ["tokio-comp", "connection-manager"] }
 serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0.105"
-sqlx = { version = "0.6", features = [
+serde_json = "1.0.111"
+sqlx = { version = "^0.6.3", features = [
   "postgres",
   "runtime-tokio-rustls",
   "json",
 ] }
-tokio = { version = "1.32", features = ["full"] }
+tokio = { version = "1.35", features = ["full"] }
 tracing = "0.1"
-tracing-subscriber = { version = "0.3.17", features = ["env-filter", "time"] }
+tracing-subscriber = { version = "0.3.18", features = ["env-filter", "time"] }
diff --git a/clovers-batch/Dockerfile b/clovers-batch/Dockerfile
@@ -1,6 +1,6 @@
 # Based on https://github.com/LukeMathWalker/cargo-chef
 
-FROM lukemathwalker/cargo-chef:latest-rust-1.73 AS chef
+FROM lukemathwalker/cargo-chef:latest-rust-1.75 AS chef
 WORKDIR /app
 
 FROM chef AS planner

diff --git a/clovers-batch/dev.Dockerfile b/clovers-batch/dev.Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.73 as rust-hotreload
+FROM rust:1.75 as rust-hotreload
 WORKDIR /app
 
 RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash

diff --git a/clovers-front/src/Objects/FlipFace.tsx b/clovers-front/src/Objects/FlipFace.tsx
diff --git a/clovers-front/src/Objects/SceneObject.tsx b/clovers-front/src/Objects/SceneObject.tsx
@@ -3,7 +3,6 @@ import { ReactElement, useId, useState } from "react";
 import { Button } from "../Inputs/Button";
 import { Boxy, BoxyForm } from "./Boxy";
 import { ConstantMedium, ConstantMediumForm } from "./ConstantMedium";
-import { FlipFace, FlipFaceForm } from "./FlipFace";
 import { MovingSphere, MovingSphereForm } from "./MovingSphere";
 import { Quad, QuadForm } from "./Quad";
 import { RotateY, RotateYForm } from "./RotateY";
@@ -15,7 +14,6 @@ import { Triangle, TriangleForm } from "./Triangle";
 export type SceneObject =
   | Boxy
   | ConstantMedium
-  | FlipFace
   | MovingSphere
   | Quad
   | RotateY
@@ -27,7 +25,6 @@ export type SceneObject =
 export const SceneObjectNames = [
   "Boxy",
   "ConstantMedium",
-  "FlipFace",
   "MovingSphere",
   "Quad",
   "RotateY",
@@ -83,14 +80,6 @@ export const ObjectForm = ({
           path={path}
         />
       );
-    case "FlipFace":
-      return (
-        <FlipFaceForm
-          object={object as FlipFace}
-          setState={setState}
-          path={path}
-        />
-      );
     case "MovingSphere":
       return (
         <MovingSphereForm

diff --git a/clovers-preview/Cargo.toml b/clovers-preview/Cargo.toml
@@ -6,18 +6,18 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.75"
+anyhow = "1.0.79"
 clovers-svc-common = { path = "../clovers-svc-common" }
 dotenv = "0.15.0"
-image = "0.24.7"
+image = "0.24.8"
 redis = { version = "0.22.3", features = ["tokio-comp", "connection-manager"] }
 serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0.105"
-sqlx = { version = "0.6", features = [
+serde_json = "1.0.111"
+sqlx = { version = "^0.6.3", features = [
   "postgres",
   "runtime-tokio-rustls",
   "json",
 ] }
-tokio = { version = "1.32", features = ["full"] }
+tokio = { version = "1.35", features = ["full"] }
 tracing = "0.1"
-tracing-subscriber = { version = "0.3.17", features = ["env-filter", "time"] }
+tracing-subscriber = { version = "0.3.18", features = ["env-filter", "time"] }
diff --git a/clovers-preview/Dockerfile b/clovers-preview/Dockerfile
@@ -1,6 +1,6 @@
 # Based on https://github.com/LukeMathWalker/cargo-chef
 
-FROM lukemathwalker/cargo-chef:latest-rust-1.73 AS chef
+FROM lukemathwalker/cargo-chef:latest-rust-1.75 AS chef
 WORKDIR /app
 
 FROM chef AS planner

diff --git a/clovers-preview/dev.Dockerfile b/clovers-preview/dev.Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.73 as rust-hotreload
+FROM rust:1.75 as rust-hotreload
 WORKDIR /app
 
 RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash

diff --git a/clovers-svc-common/Cargo.toml b/clovers-svc-common/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.75"
+anyhow = "1.0.79"
 aws-config = "0.56.1"
 aws-sdk-s3 = "0.34.0"
 clovers = { git = "https://github.com/Walther/clovers/", rev = "c1d1f41bc764db50ce79eec7d75d464d2943b815", default-features = false, features = [
@@ -17,15 +17,15 @@ clovers = { git = "https://github.com/Walther/clovers/", rev = "c1d1f41bc764db50
 dotenv = "0.15.0"
 palette = { version = "0.7.3", features = ["serializing"] }
 rand = { version = "0.8.5", features = ["small_rng"], default-features = false }
-rayon = "1.7.0"
+rayon = "1.8.0"
 redis = { version = "0.22.3", features = ["tokio-comp", "connection-manager"] }
 serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0.105"
-sqlx = { version = "0.6", features = [
+serde_json = "1.0.111"
+sqlx = { version = "^0.6.3", features = [
   "postgres",
   "uuid",
   "runtime-tokio-rustls",
   "json",
 ] }
 tracing = "0.1"
-uuid = { version = "1.4.1", features = ["v4", "serde"] }
+uuid = { version = "1.6.1", features = ["v4", "serde"] }