diff --git a/ChatApp/gradle/libs.versions.toml b/ChatApp/gradle/libs.versions.toml
index 82d99a5..0694373 100644
--- a/ChatApp/gradle/libs.versions.toml
+++ b/ChatApp/gradle/libs.versions.toml
@@ -8,18 +8,18 @@ junitVersion = "1.3.0"
 espressoCore = "3.7.0"
 lifecycleRuntimeKtx = "2.11.0"
 activityCompose = "1.13.0"
-composeBom = "2026.06.01"
-composeMaterialIconsAndroid = "1.11.4"
+composeBom = "2026.08.00"
+composeMaterialIconsAndroid = "1.12.0"
 composeMaterialIconsCore = "1.7.8"
 hilt = "2.60.1"
 androidxHiltNavigationCompose = "1.4.0"
-ksp = "2.3.10"
-spotless = "8.8.0"
+ksp = "2.3.11"
+spotless = "8.9.0"
 truth = "1.4.5"
 coil = "2.7.0"
 wearCompose = "1.6.2"
 wearComposeMaterial3 = "1.6.2"
-navigation3 = "1.1.4"
+navigation3 = "1.1.6"
 kotlinxSerialization = "1.11.0"
 #noinspection UnusedVersionCatalogEntry - Accessed dynamically
 ktlint = "1.2.1"
diff --git a/ChatApp/gradle/wrapper/gradle-wrapper.properties b/ChatApp/gradle/wrapper/gradle-wrapper.properties
index 06f9935..9899b18 100644
--- a/ChatApp/gradle/wrapper/gradle-wrapper.properties
+++ b/ChatApp/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon May 18 15:51:40 CEST 2026
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/agent/gradle/libs.versions.toml b/agent/gradle/libs.versions.toml
index 94cc165..489db6b 100644
--- a/agent/gradle/libs.versions.toml
+++ b/agent/gradle/libs.versions.toml
@@ -6,26 +6,26 @@ coreKtx = "1.19.0"
 junit = "4.13.2"
 junitVersion = "1.3.0"
 espressoCore = "3.7.0"
-appcompat = "1.7.1"
+appcompat = "1.8.0"
 material = "1.14.0"
-composeBom = "2026.06.01"
+composeBom = "2026.08.00"
 material3 = "1.4.0"
 activityCompose = "1.13.0"
 navigationCompose = "2.9.8"
 robolectric = "4.16.1"
 coroutines = "1.11.0"
 androidxTestCore = "1.7.0"
-spotless = "8.8.0"
+spotless = "8.9.0"
 mockk = "1.14.11"
-ksp = "2.3.10"
+ksp = "2.3.11"
 hilt = "2.60.1"
 androidxHiltNavigationCompose = "1.4.0"
 appfunctions = "1.0.0-alpha10"
 datastore = "1.2.1"
-screenshot = "0.0.1-alpha15"
+screenshot = "0.0.1-alpha16"
 coil = "2.7.0"
 room = "2.8.4"
-ktor = "3.5.1"
+ktor = "3.5.2"
 kotlinxSerialization = "1.11.0"
 playServicesOssLicenses = "17.5.1"
 ossLicensesPlugin = "0.13.0"
diff --git a/agent/gradle/wrapper/gradle-wrapper.jar b/agent/gradle/wrapper/gradle-wrapper.jar
index d997cfc..eddabd2 100644
Binary files a/agent/gradle/wrapper/gradle-wrapper.jar and b/agent/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/agent/gradle/wrapper/gradle-wrapper.properties b/agent/gradle/wrapper/gradle-wrapper.properties
index 50a4e5a..69dd0d0 100644
--- a/agent/gradle/wrapper/gradle-wrapper.properties
+++ b/agent/gradle/wrapper/gradle-wrapper.properties
@@ -1,23 +1,9 @@
-#
-# Copyright 2026 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/agent/gradlew b/agent/gradlew
index 880dce5..249efbb 100755
--- a/agent/gradlew
+++ b/agent/gradlew
@@ -1,13 +1,13 @@
 #!/bin/sh
 
 #
-# Copyright 2026 The Android Open Source Project
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     https://www.apache.org/licenses/LICENSE-2.0
+#      https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,10 +15,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
-#   Gradle start up script for POSIX generated by Gradle.
+#   gradlew start up script for POSIX generated by Gradle.
 #
 #   Important for running:
 #
@@ -27,7 +29,7 @@
 #       bash, then to run this script, type that shell name before the whole
 #       command line, like:
 #
-#           ksh Gradle
+#           ksh gradlew
 #
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
diff --git a/agent/gradlew.bat b/agent/gradlew.bat
index e509b2d..8508ef6 100644
--- a/agent/gradlew.bat
+++ b/agent/gradlew.bat
@@ -19,12 +19,12 @@
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
-@rem  Gradle startup script for Windows
+@rem  gradlew startup script for Windows
 @rem
 @rem ##########################################################################
 
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
+@rem Set local scope for the variables, and ensure extensions are enabled
+setlocal EnableExtensions
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
@@ -51,7 +51,7 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -65,29 +65,18 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :execute
 @rem Setup the command line
 
 
 
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+@rem Execute gradlew
+@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+@rem which allows us to clear the local environment before executing the java command
+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
 
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+:exitWithErrorLevel
+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+"%COMSPEC%" /c exit %ERRORLEVEL%