diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f1739739b..16d1c31bf 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,10 +2,10 @@
 min-sdk = "23"
 compile-sdk = "35"
 target-sdk = "35"
-jdk = "17"
-agp = "8.6.1"
+jdk = "21"
+agp = "8.7.1"
 kotlin = "2.0.20"
-kotlinx-coroutines = "1.8.1"
+kotlinx-coroutines = "1.9.0"
 kotlinx-datetime = "0.6.1"
 kotlinx-serialization = "1.7.3"
 google-ksp = "2.0.20-1.0.25"
@@ -14,19 +14,19 @@ google-services-base = "18.5.0"
 google-services-instantapps = "18.1.0"
 google-material = "1.12.0"
 google-material-compose-theme-adapter = "1.2.1"
-google-firebase-analytics-ktx = "22.1.0"
+google-firebase-analytics-ktx = "22.1.2"
 google-firebase-appdistribution = "5.0.0"
 google-firebase-config-ktx = "22.0.0"
 google-firebase-crashlytics-plugin = "3.0.2"
-google-firebase-crashlytics-ktx = "19.1.0"
-google-firebase-messaging-ktx = "24.0.1"
-google-play-review-ktx = "2.0.1"
+google-firebase-crashlytics-ktx = "19.2.0"
+google-firebase-messaging-ktx = "24.0.2"
+google-play-review-ktx = "2.0.2"
 google-play-app-update-ktx = "2.1.0"
 huawei-services = "1.6.0.300"
 androidx-appcompat = "1.7.0"
-androidx-activity = "1.9.2"
+androidx-activity = "1.9.3"
 androidx-autofill = "1.1.0"
-androidx-benchmark = "1.3.1"
+androidx-benchmark = "1.3.3"
 androidx-biometric-ktx = "1.2.0-alpha05"
 androidx-browser = "1.8.0"
 androidx-collection = "1.4.4"
@@ -42,9 +42,8 @@ androidx-datastore = "1.1.1"
 androidx-datastore-core-okio-jvm = "1.1.1"
 androidx-lifecycle = "2.8.6"
 androidx-lifecycle-viewmodel = "2.8.6"
-androidx-glance = "1.1.0"
-androidx-media3 = "1.4.1"
-androidx-navigation = "2.8.1"
+androidx-glance = "1.1.1"
+androidx-navigation = "2.8.3"
 androidx-palette-ktx = "1.0.0"
 androidx-paging = "3.3.2"
 androidx-room = "2.7.0-alpha08"
@@ -132,32 +131,6 @@ androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-ru
 androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref = "androidx-lifecycle-viewmodel" }
 androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "androidx-lifecycle" }
-androidx-media3-exoplayer = { module = "androidx.media3:media3-exoplayer", version.ref = "androidx-media3" }
-androidx-media3-exoplayer-dash = { module = "androidx.media3:media3-exoplayer-dash", version.ref = "androidx-media3" }
-androidx-media3-exoplayer-hls = { module = "androidx.media3:media3-exoplayer-hls", version.ref = "androidx-media3" }
-androidx-media3-exoplayer-smoothstreaming = { module = "androidx.media3:media3-exoplayer-smoothstreaming", version.ref = "androidx-media3" }
-androidx-media3-exoplayer-rtsp = { module = "androidx.media3:media3-exoplayer-rtsp", version.ref = "androidx-media3" }
-androidx-media3-exoplayer-midi = { module = "androidx.media3:media3-exoplayer-midi", version.ref = "androidx-media3" }
-androidx-media3-exoplayer-ima = { module = "androidx.media3:media3-exoplayer-ima", version.ref = "androidx-media3" }
-androidx-media3-datasource-cronet = { module = "androidx.media3:media3-datasource-cronet", version.ref = "androidx-media3" }
-androidx-media3-datasource-okhttp = { module = "androidx.media3:media3-datasource-okhttp", version.ref = "androidx-media3" }
-androidx-media3-datasource-rtmp = { module = "androidx.media3:media3-datasource-rtmp", version.ref = "androidx-media3" }
-androidx-media3-ui = { module = "androidx.media3:media3-ui", version.ref = "androidx-media3" }
-androidx-media3-ui-leanback = { module = "androidx.media3:media3-ui-leanback", version.ref = "androidx-media3" }
-androidx-media3-session = { module = "androidx.media3:media3-session", version.ref = "androidx-media3" }
-androidx-media3-extractor = { module = "androidx.media3:media3-extractor", version.ref = "androidx-media3" }
-androidx-media3-cast = { module = "androidx.media3:media3-cast", version.ref = "androidx-media3" }
-androidx-media3-exoplayer-workmanager = { module = "androidx.media3:media3-exoplayer-workmanager", version.ref = "androidx-media3" }
-androidx-media3-transformer = { module = "androidx.media3:media3-transformer", version.ref = "androidx-media3" }
-androidx-media3-effect = { module = "androidx.media3:media3-effect", version.ref = "androidx-media3" }
-androidx-media3-muxer = { module = "androidx.media3:media3-muxer", version.ref = "androidx-media3" }
-androidx-media3-test-utils = { module = "androidx.media3:media3-test-utils", version.ref = "androidx-media3" }
-androidx-media3-test-utils-robolectric = { module = "androidx.media3:media3-test-utils-robolectric", version.ref = "androidx-media3" }
-androidx-media3-container = { module = "androidx.media3:media3-container", version.ref = "androidx-media3" }
-androidx-media3-database = { module = "androidx.media3:media3-database", version.ref = "androidx-media3" }
-androidx-media3-decoder = { module = "androidx.media3:media3-decoder", version.ref = "androidx-media3" }
-androidx-media3-datasource = { module = "androidx.media3:media3-datasource", version.ref = "androidx-media3" }
-androidx-media3-common = { module = "androidx.media3:media3-common", version.ref = "androidx-media3" }
 androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigation" }
 androidx-palette-ktx = { module = "androidx.palette:palette-ktx", version.ref = "androidx-palette-ktx" }
 androidx-paging-compose = { module = "androidx.paging:paging-compose", version.ref = "androidx-paging" }
@@ -327,34 +300,6 @@ lifecycle-android = [
     "androidx-lifecycle-runtime-compose",
     "androidx-lifecycle-process"
 ]
-media3-android = [
-    "androidx-media3-exoplayer",
-    "androidx-media3-exoplayer-dash",
-    "androidx-media3-exoplayer-hls",
-    "androidx-media3-exoplayer-smoothstreaming",
-    "androidx-media3-exoplayer-rtsp",
-    "androidx-media3-exoplayer-midi",
-    "androidx-media3-exoplayer-ima",
-    "androidx-media3-datasource-cronet",
-    "androidx-media3-datasource-okhttp",
-    "androidx-media3-datasource-rtmp",
-    "androidx-media3-ui",
-    "androidx-media3-ui-leanback",
-    "androidx-media3-session",
-    "androidx-media3-extractor",
-    "androidx-media3-cast",
-    "androidx-media3-exoplayer-workmanager",
-    "androidx-media3-transformer",
-    "androidx-media3-effect",
-    "androidx-media3-muxer",
-    "androidx-media3-test-utils",
-    "androidx-media3-test-utils-robolectric",
-    "androidx-media3-container",
-    "androidx-media3-database",
-    "androidx-media3-decoder",
-    "androidx-media3-datasource",
-    "androidx-media3-common"
-]
 navigation-android = [
     "androidx-navigation-compose"
 ]
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a8382d7c4..ab7916266 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
\ No newline at end of file