diff --git a/app/phone/build.gradle.kts b/app/phone/build.gradle.kts
index 42193c50..0adbbae6 100644
--- a/app/phone/build.gradle.kts
+++ b/app/phone/build.gradle.kts
@@ -59,10 +59,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_11
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
-    }
-
     buildFeatures {
         dataBinding = true
         viewBinding = true
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index ce6ba65a..c0859bd4 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 android {
     namespace = "dev.jdtech.jellyfin.core"
     compileSdk = 33
-    buildToolsVersion = "33.0.1"
+    buildToolsVersion = "33.0.2"
 
     defaultConfig {
         minSdk = 27
@@ -31,10 +31,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
-    }
 }
 
 ktlint {
diff --git a/data/build.gradle.kts b/data/build.gradle.kts
index e1f971a1..06d0828b 100644
--- a/data/build.gradle.kts
+++ b/data/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 android {
     namespace = "dev.jdtech.jellyfin.data"
     compileSdk = 33
-    buildToolsVersion = "33.0.1"
+    buildToolsVersion = "33.0.2"
 
     defaultConfig {
         minSdk = 27
@@ -35,10 +35,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
-    }
 }
 
 ktlint {
diff --git a/gradle.properties b/gradle.properties
index d2c2294c..57aa0f4b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,4 +17,7 @@ org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-android.injected.testOnly=false
\ No newline at end of file
+android.injected.testOnly=false
+
+# For compatibility with AGP 7.4. Should be removed when AGP 8.0 is released
+android.experimental.legacyTransform.forceNonIncremental=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 943f0cbf..ccebba77 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f398c33c..42defcc9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 65dcd68d..79a61d42 100755
--- a/gradlew
+++ b/gradlew
@@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
diff --git a/player/core/build.gradle.kts b/player/core/build.gradle.kts
index e163a4c8..5fb841e6 100644
--- a/player/core/build.gradle.kts
+++ b/player/core/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 android {
     namespace = "dev.jdtech.jellyfin.player.core"
     compileSdk = 33
-    buildToolsVersion = "33.0.1"
+    buildToolsVersion = "33.0.2"
 
     defaultConfig {
         minSdk = 27
@@ -29,10 +29,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
-    }
 }
 
 ktlint {
diff --git a/player/video/build.gradle.kts b/player/video/build.gradle.kts
index a60ecfa8..992de534 100644
--- a/player/video/build.gradle.kts
+++ b/player/video/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 android {
     namespace = "dev.jdtech.jellyfin.player.video"
     compileSdk = 33
-    buildToolsVersion = "33.0.1"
+    buildToolsVersion = "33.0.2"
 
     defaultConfig {
         minSdk = 27
@@ -30,10 +30,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
-    }
 }
 
 ktlint {
diff --git a/preferences/build.gradle.kts b/preferences/build.gradle.kts
index 81212564..3d3be503 100644
--- a/preferences/build.gradle.kts
+++ b/preferences/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 android {
     namespace = "dev.jdtech.jellyfin.preferences"
     compileSdk = 33
-    buildToolsVersion = "33.0.1"
+    buildToolsVersion = "33.0.2"
 
     defaultConfig {
         minSdk = 27
@@ -27,10 +27,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
-    }
 }
 
 ktlint {