chore: updated dependencies

nicolaspernoud · Oct 14, 2024 · 468af03 · 468af03
1 parent 4bf0c3d
commit 468af03
Show file tree

Hide file tree

Showing 11 changed files with 165 additions and 216 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -50,14 +50,15 @@ jobs:
       - name: Export Release Timestamp
         run: echo "APP_VERSION=$(date +'%Y-%m-%d_%H-%m-%S')" >> $GITHUB_ENV
       - name: Set up Java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: "12.x"
+          java-version: "17"
+          distribution: "temurin"
       - name: Set up Flutter
         uses: subosito/flutter-action@v2
         with:
           channel: "stable"
-          flutter-version: "3.24.1"
+          flutter-version: "3.24.3"
       - name: Decode android/key.jks
         run: echo "${{ secrets.KEY_JKS }}" | base64 --decode > android/key.jks
       - name: Decode android/key.properties

diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@
 ###########################
 
 # Set up an environnement to cross-compile the app for musl to create a statically-linked binary
-FROM --platform=$BUILDPLATFORM rust:1.80 AS backend-builder
+FROM --platform=$BUILDPLATFORM rust:1.81 AS backend-builder
 ARG TARGETPLATFORM
 RUN case "$TARGETPLATFORM" in \
       "linux/amd64") echo x86_64-unknown-linux-gnu > /rust_target.txt ;; \
@@ -53,12 +53,11 @@ RUN chown -Rf "${UID}":"${UID}" /myapp
 # Stage 2 : Frontend build #
 ############################
 
-FROM --platform=$BUILDPLATFORM ghcr.io/cirruslabs/flutter:3.24.1 AS frontend-builder
+FROM --platform=$BUILDPLATFORM ghcr.io/cirruslabs/flutter:3.24.3 AS frontend-builder
 WORKDIR /build
 COPY ./frontend .
 RUN flutter pub get
 RUN flutter build web --csp --web-renderer html
-RUN sed -i "s/serviceWorkerVersion = null/serviceWorkerVersion = '$(shuf -i 1000000000-9999999999 -n 1)'/g" ./build/web/init.js
 
 #########################
 # Stage 3 : Final image #

diff --git a/backend/Cargo.toml b/backend/Cargo.toml
@@ -12,49 +12,49 @@ path = "src/main.rs"
 name = "atrium"
 
 [dependencies]
-anyhow = { default-features = false, version = "1.0.86" }
+anyhow = { default-features = false, version = "1.0.89" }
 argon2 = { features = ["alloc", "password-hash"], default-features = false, version = "0.5.3" }
 async_zip = { features = ["deflate", "tokio"], default-features = false, version = "0.0.17" }
-async-stream = "0.3.5"
+async-stream = "0.3.6"
 async-walkdir = "2.0.0"
-axum = { version = "0.7.5", features = ["http2", "json", "query", "tokio"], default-features = false }
-axum-extra = { version = "0.9.3", features = ["cookie-private", "typed-header"], default-features = false }
+axum = { version = "0.7.7", features = ["http2", "json", "query", "tokio"], default-features = false }
+axum-extra = { version = "0.9.4", features = ["cookie-private", "typed-header"], default-features = false }
 axum-server = "0.7.1"
 base64ct = { version = "1.6.0", features = ["alloc"] }
 chacha20poly1305 = { version = "0.10.1", features = ["stream"], default-features = false }
 chrono = { default-features = false, version = "0.4.38" }
-filetime = "0.2.24"
-futures = { default-features = false, version = "0.3.30" }
-futures-util = { default-features = false, version = "0.3.30" }
+filetime = "0.2.25"
+futures = { default-features = false, version = "0.3.31" }
+futures-util = { default-features = false, version = "0.3.31" }
 headers = "0.4.0"
 http = "1.1.0"
 http-body-util = "0.1.2"
 hyper = { version = "1.4.1", default-features = false }
-hyper-util = { version = "0.1.7", features = ["client-legacy", "http1", "tokio"], default-features = false }
-hyper-rustls = { version = "0.27.2", features = ["http1", "http2", "ring", "tls12", "webpki-tokio"], default-features = false }
+hyper-util = { version = "0.1.9", features = ["client-legacy", "http1", "tokio"], default-features = false }
+hyper-rustls = { version = "0.27.3", features = ["http1", "http2", "ring", "tls12", "webpki-tokio"], default-features = false }
 hyper-hickory = { version = "0.7.0", default-features = false, features = ["system-config"] }
 jsonwebtoken = { version = "9.3.0", default-features = false }
 maxminddb = "0.24.0"
 mime_guess = { default-features = false, version = "2.0.5" }
 # TEMPORARY
-oauth2 = { version = "5.0.0-alpha.4", default-features = false }
+oauth2 = { version = "5.0.0-rc.1", default-features = false }
 percent-encoding = { default-features = false, version = "2.3.1" }
-quick-xml = "0.36.1"
+quick-xml = "0.36.2"
 rand = { default-features = false, version = "0.8.5" }
-rustls = { default-features = false, version = "0.23.12", features = ["ring"] }
-rustls-pki-types = { version = "1.8.0" }
+rustls = { default-features = false, version = "0.23.14", features = ["ring"] }
+rustls-pki-types = { version = "1.9.0" }
 rustls-acme = { version = "0.11.1", features = ["axum", "ring"], default-features = false }
-serde = { version = "1.0.209", default-features = false }
-serde_json = { default-features = false, version = "1.0.127" }
+serde = { version = "1.0.210", default-features = false }
+serde_json = { default-features = false, version = "1.0.128" }
 serde_yml = "0.0.12"
 sha2 = { default-features = false, version = "0.10.8" }
-sysinfo = { default-features = false, version = "0.31.3", features = ["disk", "system"] }
+sysinfo = { default-features = false, version = "0.32.0", features = ["disk", "system"] }
 time = { default-features = false, version = "0.3.36" }
-tokio = { version = "1.39.3", features = ["full"], default-features = false }
-tokio-stream = { version = "0.1.15", default-features = false }
-tokio-util = { version = "0.7.11", default-features = false }
-tower = { default-features = false, version = "0.5.0", features = ["util"] }
-tower-http = { version = "0.5.2", features = ["fs"], default-features = false }
+tokio = { version = "1.40.0", features = ["full"], default-features = false }
+tokio-stream = { version = "0.1.16", default-features = false }
+tokio-util = { version = "0.7.12", default-features = false }
+tower = { default-features = false, version = "0.5.1", features = ["util"] }
+tower-http = { version = "0.6.1", features = ["fs"], default-features = false }
 tower-service = "0.3.3"
 tracing = { default-features = false, version = "0.1.40" }
 tracing-appender = "0.2.3"
@@ -64,9 +64,9 @@ urlencoding = "2.1.3"
 uuid = { version = "1.10.0", features = ["fast-rng", "v4"], default-features = false }
 
 [dev-dependencies]
-async-tungstenite = { version = "0.27.0", features = ["tokio-runtime"] }
-reqwest = { version = "0.12.7", default-features = false, features = ["cookies", "json", "rustls-tls", "stream"] }
-tungstenite = "0.23.0"
+async-tungstenite = { version = "0.28.0", features = ["tokio-runtime"] }
+reqwest = { version = "0.12.8", default-features = false, features = ["cookies", "json", "rustls-tls", "stream"] }
+tungstenite = "0.24.0"
 
 [profile.release_optimized]
 inherits = "release"

diff --git a/frontend/.metadata b/frontend/.metadata
@@ -1,26 +1,23 @@
 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled.
+# This file should be version controlled and should not be manually edited.
 
 version:
-  revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-  channel: stable
+  revision: "2663184aa79047d0a33a14a3b607954f8fdd8730"
+  channel: "stable"
 
 project_type: app
 
 # Tracks metadata for the flutter migrate command
 migration:
   platforms:
     - platform: root
-      create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-      base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-    - platform: android
-      create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-      base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
+      create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+      base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
     - platform: web
-      create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-      base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
+      create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+      base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
 
   # User provided section
 

diff --git a/frontend/lib/components/delete_dialog.dart b/frontend/lib/components/delete_dialog.dart
@@ -27,18 +27,19 @@ class _DeleteDialogState extends State<DeleteDialog> {
                     backgroundColor: Colors.red, foregroundColor: Colors.black),
                 onPressed: () => Navigator.pop(context, true),
                 child: Padding(
-                  padding: const EdgeInsets.all(12.0),
+                  padding: const EdgeInsets.all(8.0),
                   child: Text(tr(context, "delete")),
                 ),
               ),
+              Spacer(flex: 2),
               ElevatedButton(
                 style: ElevatedButton.styleFrom(
                   backgroundColor: Colors.green,
                   foregroundColor: Colors.black,
                 ),
                 onPressed: () => Navigator.pop(context, false),
                 child: Padding(
-                  padding: const EdgeInsets.all(12.0),
+                  padding: const EdgeInsets.all(8.0),
                   child: Text(tr(context, "cancel")),
                 ),
               ),