From 8560ed697d96b4ade1e2743cba348131aceb3ee0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Mon, 19 Jan 2026 15:01:15 +0100
Subject: [PATCH] Modernize the gradle setup a little more.

---
 android/build.gradle.kts | 3 ++-
 build.gradle.kts         | 3 +--
 gradle.properties        | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index 76b1f2dfd6..b1a432fa20 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -4,7 +4,6 @@ import java.io.ByteArrayOutputStream
 
 plugins {
 	id("com.android.application")
-	id("org.jetbrains.kotlin.android")
 	id("com.google.protobuf")
 }
 
@@ -149,6 +148,8 @@ android {
 			isMinifyEnabled = false
 			if (project.hasProperty("RELEASE_STORE_FILE")) {
 				signingConfig = signingConfigs.getByName("release")
+			} else {
+				println("WARNING: RELEASE_STORE_FILE is missing. Release builds will be unusable.")
 			}
 		}
 	}
diff --git a/build.gradle.kts b/build.gradle.kts
index 43a85cac0a..1aab46bf1b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,4 @@
 plugins {
 	id("com.android.application") version "9.0.0" apply false
-	id("org.jetbrains.kotlin.android") version "2.2.21" apply false
-	id("com.google.protobuf") version "0.9.5" apply false
+	id("com.google.protobuf") version "0.9.6" apply false
 }
diff --git a/gradle.properties b/gradle.properties
index aca0de20fa..7eb5cd55a7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,5 +12,4 @@ android.uniquePackageNames=false
 android.dependency.useConstraints=true
 android.r8.strictFullModeForKeepRules=false
 android.r8.optimizedResourceShrinking=false
-android.builtInKotlin=false
 android.newDsl=false