diff --git a/app/build.gradle b/app/build.gradle
index f7564252..ed4623b3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -99,12 +99,6 @@ android {
         includeInApk false
         includeInBundle false
     }
-    // Can remove this once https://issuetracker.google.com/issues/260059413 is fixed.
-    // https://kotlinlang.org/docs/gradle-configure-project.html#gradle-java-toolchains-support
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
     applicationVariants.configureEach { variant ->
         variant.outputs.configureEach {
             outputFileName = "Tusky_${variant.versionName}_${variant.versionCode}_${gitSha}_" +
@@ -189,7 +183,7 @@ dependencies {
 // Work around warnings of:
 // WARNING: Illegal reflective access by org.jetbrains.kotlin.kapt3.util.ModuleManipulationUtilsKt (file:/C:/Users/Andi/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-annotation-processing-gradle/1.8.22/28dab7e0ee9ce62c03bf97de3543c911dc653700/kotlin-annotation-processing-gradle-1.8.22.jar) to constructor com.sun.tools.javac.util.Context()
 // See https://youtrack.jetbrains.com/issue/KT-30589/Kapt-An-illegal-reflective-access-operation-has-occurred
-tasks.withType(org.jetbrains.kotlin.gradle.internal.KaptWithoutKotlincTask) {
+tasks.withType(org.jetbrains.kotlin.gradle.internal.KaptWithoutKotlincTask).configureEach {
     kaptProcessJvmArgs.addAll([
         "--add-opens", "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
         "--add-opens", "jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
diff --git a/build.gradle b/build.gradle
index fb0ac019..0bdfaa66 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,5 +18,5 @@ allprojects {
 }
 
 tasks.register('clean') {
-    delete rootProject.buildDir
+    delete layout.buildDirectory
 }
diff --git a/gradle.properties b/gradle.properties
index 84fe860c..655b4302 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,6 +9,3 @@ org.gradle.configuration-cache=true
 android.defaults.buildfeatures.resvalues=false
 android.defaults.buildfeatures.shaders=false
 android.useAndroidX=true
-
-# Upgrade lint to a newer version to work around https://issuetracker.google.com/issues/185418482.
-android.experimental.lint.version=8.1.0
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 54d35931..5a3df9ec 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.0.2"
+agp = "8.1.1"
 androidx-activity = "1.7.2"
 androidx-appcompat = "1.6.1"
 androidx-browser = "1.5.0"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index c1962a79..7f93135c 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 37aef8d3..ac72c34e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index aeb74cbb..0adc8e1a 100755
--- a/gradlew
+++ b/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.