From 336f604b3aed165321d495441ed174b9f334f0d9 Mon Sep 17 00:00:00 2001
From: Simonx22 <simon@oatmealdome.me>
Date: Mon, 23 Mar 2026 22:29:49 -0400
Subject: [PATCH] Android: Pin R8 9.1.34 to fix release minify crash

Override AGP-bundled R8 in settings.gradle.kts:
- classpath("com.android.tools:r8:9.1.34") from r8-releases/raw

This resolves :app:minifyReleaseWithR8 failing with:
java.lang.IndexOutOfBoundsException: Index -1 out of bounds for length 0

Bug report: https://issuetracker.google.com/issues/495458806

Co-Authored-By: OatmealDome <julian@oatmealdome.me>
---
 Source/Android/settings.gradle.kts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/Source/Android/settings.gradle.kts b/Source/Android/settings.gradle.kts
index 1a68f74a48..1c44ac6613 100644
--- a/Source/Android/settings.gradle.kts
+++ b/Source/Android/settings.gradle.kts
@@ -1,4 +1,19 @@
 pluginManagement {
+    buildscript {
+        repositories {
+            mavenCentral()
+            maven {
+                url = uri("https://storage.googleapis.com/r8-releases/raw")
+            }
+        }
+        dependencies {
+            // Temporary override for AGP-bundled R8 crash in release minification.
+            // https://issuetracker.google.com/issues/495458806
+            // TODO: Re-test without this override when upgrading AGP and remove if fixed upstream.
+            classpath("com.android.tools:r8:9.1.34")
+        }
+    }
+
     repositories {
         gradlePluginPortal()
         google()