From 7022e745fc3fdfad03d9e8684f470bb12891b107 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Thu, 29 May 2025 18:03:46 +0200
Subject: [PATCH] gradle: Stop requiring JDK 17, this causes annoying problems
 in new installations of Android Studio

Also bump to the latest version.
---
 android/build.gradle | 5 -----
 build.gradle         | 2 +-
 gradle.properties    | 1 -
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index dc10ecacea..844803333a 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -48,11 +48,6 @@ android {
 
 	compileSdk 35
 	ndkVersion "21.4.7075529"
-	java {
-		toolchain {
-			languageVersion = JavaLanguageVersion.of(17)
-		}
-	}
 	defaultConfig {
 		/*
 		configurations.all {
diff --git a/build.gradle b/build.gradle
index 222765d355..b1a2e09925 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.9.2'
+        classpath 'com.android.tools.build:gradle:8.9.3'
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index bd03bfddc7..3b9f2d19b8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,4 +2,3 @@ org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.nonTransitiveRClass=true
 android.nonFinalResIds=true
-android.ndk.suppressMinSdkVersionError=21