diff --git a/android/app/build.gradle b/android/app/build.gradle
index efddd5672..0cf6ec98a 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -2,6 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     id 'com.android.application'
+    id 'com.google.devtools.ksp' version "$ksp_version"
     id 'kotlin-android'
     id 'kotlin-kapt'
 }
@@ -175,10 +176,10 @@ android {
 tasks.withType(KotlinCompile).configureEach {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
+}
 
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
+kotlin {
+    jvmToolchain(8)
 }
 
 flutter {
@@ -235,7 +236,7 @@ dependencies {
     testImplementation "org.junit.jupiter:junit-jupiter-engine:5.9.2"
 
     kapt 'androidx.annotation:annotation:1.6.0'
-    kapt "com.github.bumptech.glide:compiler:$glide_version"
+    ksp "com.github.bumptech.glide:ksp:$glide_version"
 
     compileOnly rootProject.findProject(':streams_channel')
 }
diff --git a/android/build.gradle b/android/build.gradle
index 1c4c91d11..af9765600 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,11 +1,11 @@
 buildscript {
     ext {
         kotlin_version = '1.8.21'
-        agp_version = '7.4.2'
+        ksp_version = "$kotlin_version-1.0.11"
+        agp_version = '8.1.0'
         glide_version = '4.15.1'
         // AppGallery Connect plugin versions: https://developer.huawei.com/consumer/en/doc/development/AppGallery-connect-Guides/agc-sdk-changenotes-0000001058732550
-        // TODO TLAD AppGallery Connect plugin v1.9.0.300 does not support Gradle 8+
-        huawei_agconnect_version = '1.9.0.300'
+        huawei_agconnect_version = '1.9.1.300'
         abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86': 3, 'x86_64': 4]
         useCrashlytics = gradle.startParameter.taskNames.any { task -> task.containsIgnoreCase("play") }
         useHms = gradle.startParameter.taskNames.any { task -> task.containsIgnoreCase("huawei") }
diff --git a/lib/model/app/dependencies.dart b/lib/model/app/dependencies.dart
index 794029ea8..de4ed2669 100644
--- a/lib/model/app/dependencies.dart
+++ b/lib/model/app/dependencies.dart
@@ -92,6 +92,11 @@ class Dependencies {
       licenseUrl: 'https://github.com/flutter/packages/blob/main/packages/local_auth/local_auth/LICENSE',
       sourceUrl: 'https://github.com/flutter/packages/tree/main/packages/local_auth/local_auth',
     ),
+    Dependency(
+      name: 'Media Kit',
+      license: mit,
+      sourceUrl: 'https://github.com/media-kit/media-kit',
+    ),
     Dependency(
       name: 'Package Info Plus',
       license: bsd3,
diff --git a/plugins/aves_services_google/pubspec.lock b/plugins/aves_services_google/pubspec.lock
index 8e0abffb2..9ec6e62f2 100644
--- a/plugins/aves_services_google/pubspec.lock
+++ b/plugins/aves_services_google/pubspec.lock
@@ -74,10 +74,10 @@ packages:
     dependency: "direct main"
     description:
       name: device_info_plus
-      sha256: "2c35b6d1682b028e42d07b3aee4b98fa62996c10bc12cb651ec856a80d6a761b"
+      sha256: "86add5ef97215562d2e090535b0a16f197902b10c369c558a100e74ea06e8659"
       url: "https://pub.dev"
     source: hosted
-    version: "9.0.2"
+    version: "9.0.3"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
diff --git a/plugins/aves_video_mpv/pubspec.lock b/plugins/aves_video_mpv/pubspec.lock
index 59ad60b3d..2f1bda5bf 100644
--- a/plugins/aves_video_mpv/pubspec.lock
+++ b/plugins/aves_video_mpv/pubspec.lock
@@ -212,10 +212,10 @@ packages:
     dependency: transitive
     description:
       name: package_info_plus
-      sha256: ceb027f6bc6a60674a233b4a90a7658af1aebdea833da0b5b53c1e9821a78c7b
+      sha256: "6ff267fcd9d48cb61c8df74a82680e8b82e940231bb5f68356672fde0397334a"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "4.1.0"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
diff --git a/pubspec.lock b/pubspec.lock
index 71be847fa..46e223c56 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -210,10 +210,10 @@ packages:
     dependency: "direct main"
     description:
       name: connectivity_plus
-      sha256: "8599ae9edca5ff96163fca3e36f8e481ea917d1e71cdad912c084b5579913f34"
+      sha256: "77a180d6938f78ca7d2382d2240eb626c0f6a735d0bfdce227d8ffb80f95c48b"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.1"
+    version: "4.0.2"
   connectivity_plus_platform_interface:
     dependency: transitive
     description:
@@ -290,10 +290,10 @@ packages:
     dependency: "direct main"
     description:
       name: device_info_plus
-      sha256: "2c35b6d1682b028e42d07b3aee4b98fa62996c10bc12cb651ec856a80d6a761b"
+      sha256: "86add5ef97215562d2e090535b0a16f197902b10c369c558a100e74ea06e8659"
       url: "https://pub.dev"
     source: hosted
-    version: "9.0.2"
+    version: "9.0.3"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -932,10 +932,10 @@ packages:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: ceb027f6bc6a60674a233b4a90a7658af1aebdea833da0b5b53c1e9821a78c7b
+      sha256: "6ff267fcd9d48cb61c8df74a82680e8b82e940231bb5f68356672fde0397334a"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "4.1.0"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -981,10 +981,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_linux
-      sha256: ffbb8cc9ed2c9ec0e4b7a541e56fd79b138e8f47d2fb86815f15358a349b3b57
+      sha256: ba2b77f0c52a33db09fc8caf85b12df691bf28d983e84cf87ff6d693cfa007b3
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.11"
+    version: "2.2.0"
   path_provider_platform_interface:
     dependency: transitive
     description:
@@ -997,10 +997,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96"
+      sha256: ee0e0d164516b90ae1f970bdf29f726f1aa730d7cfc449ecc74c495378b705da
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.7"
+    version: "2.2.0"
   pattern_lock:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 8d9d5162f..6f25a9e75 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -124,36 +124,6 @@ dev_dependencies:
   shared_preferences_platform_interface:
   test:
 
-#dependency_overrides:
-#  media_kit:
-#    path: ../media_kit/media_kit
-#  media_kit_video:
-#    path: ../media_kit/media_kit_video
-#  media_kit_native_event_loop:
-#    path: ../media_kit/media_kit_native_event_loop
-#  media_kit_libs_android_video:
-#    path: ../media_kit/media_kit_libs_android_video
-#  media_kit:
-#    git:
-#      url: https://github.com/alexmercerind/media_kit
-#      ref: main
-#      path: media_kit
-#  media_kit_video:
-#    git:
-#      url: https://github.com/alexmercerind/media_kit
-#      ref: main
-#      path: media_kit_video
-#  media_kit_native_event_loop:
-#    git:
-#      url: https://github.com/alexmercerind/media_kit
-#      ref: main
-#      path: media_kit_native_event_loop
-#  media_kit_libs_android_video:
-#    git:
-#      url: https://github.com/alexmercerind/media_kit
-#      ref: main
-#      path: libs/android/media_kit_libs_android_video
-
 flutter:
   assets:
     - assets/