From 07b1e42e3d9ca104a44d649eb0ead5dfe76724f3 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 12 Mar 2026 20:12:32 +0000
Subject: [PATCH 1/3] Initial plan


From 0e2553d1d36b31cfd74e4397b6a0ed742ecc4a2d Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 12 Mar 2026 20:14:02 +0000
Subject: [PATCH 2/3] Resolve merge conflicts: update requirements.txt and
 runtime.txt to match main branch

Co-authored-by: DaTiC0 <13198638+DaTiC0@users.noreply.github.com>
---
 requirements.txt | 16 ++++++++--------
 runtime.txt      |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 5a11163..ef80141 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-gunicorn==20.1.0
+gunicorn==22.0.0
 Flask==1.1.2
 Flask-MQTT==1.1.1
 Flask-OAuthlib==0.9.6
@@ -9,11 +9,11 @@ Jinja2>=2.10.1,<3.0.0
 MarkupSafe>=1.1.1,<2.1.0
 itsdangerous>=0.24,<2.0
 six==1.14.0
-firebase_admin==3.2.1
-PyMySQL==1.0.2
+firebase_admin==6.5.0
+google-auth>=2.22.0
+PyMySQL==1.1.1
 requests-oauthlib
-python-dotenv==0.15.0
-Flask-Login==0.4.1
-Jinja2==3.0.3
-itsdangerous==1.1.0
-markupsafe==2.0
\ No newline at end of file
+requests>=2.31.0
+cryptography>=41.0.0
+python-dotenv==1.0.0
+Flask-Login==0.4.1
\ No newline at end of file
diff --git a/runtime.txt b/runtime.txt
index f96c0fa..b884b0f 100644
--- a/runtime.txt
+++ b/runtime.txt
@@ -1 +1 @@
-python-3.8.10
\ No newline at end of file
+python-3.12.2
\ No newline at end of file

From e6e29dfa93b3e2615f585b122b94acf27dde0160 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 12 Mar 2026 20:20:24 +0000
Subject: [PATCH 3/3] =?UTF-8?q?Fix=20Flask=20vulnerability:=20upgrade=20Fl?=
 =?UTF-8?q?ask=201.1.2=20=E2=86=92=202.2.5=20with=20compatible=20dependenc?=
 =?UTF-8?q?ies?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: DaTiC0 <13198638+DaTiC0@users.noreply.github.com>
---
 requirements.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index ef80141..2a65c6f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,13 +1,13 @@
 gunicorn==22.0.0
-Flask==1.1.2
+Flask==2.2.5
 Flask-MQTT==1.1.1
 Flask-OAuthlib==0.9.6
 Flask-SQLAlchemy==2.5.1
 SQLAlchemy==1.4.47
-Werkzeug==0.16.1
-Jinja2>=2.10.1,<3.0.0
-MarkupSafe>=1.1.1,<2.1.0
-itsdangerous>=0.24,<2.0
+Werkzeug>=2.0.0,<2.4.0
+Jinja2>=3.0.0,<4.0.0
+MarkupSafe>=2.0.0,<3.0.0
+itsdangerous>=2.0.0,<3.0.0
 six==1.14.0
 firebase_admin==6.5.0
 google-auth>=2.22.0
@@ -16,4 +16,4 @@ requests-oauthlib
 requests>=2.31.0
 cryptography>=41.0.0
 python-dotenv==1.0.0
-Flask-Login==0.4.1
\ No newline at end of file
+Flask-Login>=0.6.3
\ No newline at end of file