From bbbd5e815626f212b6036dbed065196cf92464d1 Mon Sep 17 00:00:00 2001
From: LeoTM <1881059+leotm@users.noreply.github.com>
Date: Fri, 10 Jul 2026 22:06:05 +0100
Subject: [PATCH 1/2] Disable AGP 9 builtin Kotlin compiler and new DSL

- force AGP 9 to act like AGP 8 until libs migrated
- add TODO to revert both flags and old KGP once ecosystem ready
- ref: https://github.com/react/react-native/pull/56222
---
 android/app/build.gradle  | 4 ++--
 android/gradle.properties | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index e441fee0a..4b778a3e4 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: "com.android.application"
-apply plugin: "org.jetbrains.kotlin.android"
+apply plugin: "org.jetbrains.kotlin.android" // TODO: Remove with gradle.properties flags android.builtInKotlin and android.newDsl once libs migrated to AGP 9 (before AGP 10)
 apply plugin: "com.facebook.react"
 
 /**
@@ -102,7 +102,7 @@ android {
             // see https://reactnative.dev/docs/signed-apk-android.
             signingConfig signingConfigs.debug
             minifyEnabled enableProguardInReleaseBuilds
-            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
+            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
         }
     }
 }
diff --git a/android/gradle.properties b/android/gradle.properties
index a6de6f68d..25b5af05d 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -42,3 +42,9 @@ hermesEnabled=true
 # This allows your app to draw behind system bars for an immersive UI.
 # Note: Only works with ReactActivity and should not be used with custom Activity.
 edgeToEdgeEnabled=true
+
+# Opt out of built-in kotlin and new DSL behavior that ships with AGP 9.
+# Starting from AGP 10.x these opt outs will be removed.
+# TODO: Remove both flags with app/build.gradle plugin org.jetbrains.kotlin.android once libs migrated to AGP 9 (before AGP 10)
+android.builtInKotlin=false
+android.newDsl=false

From 92cbfab2acf9c2896cdcacca073ccdb6bce0ee98 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 10 Jul 2026 21:09:34 +0000
Subject: [PATCH 2/2] Update dependency eslint-plugin-simple-import-sort to v13

---
 package.json |  2 +-
 yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index f6c134d42..d90268abd 100644
--- a/package.json
+++ b/package.json
@@ -118,7 +118,7 @@
     "eslint-plugin-react": "7.37.5",
     "eslint-plugin-react-hooks": "7.0.1",
     "eslint-plugin-react-native": "5.0.0",
-    "eslint-plugin-simple-import-sort": "9.0.0",
+    "eslint-plugin-simple-import-sort": "13.0.0",
     "eslint-plugin-sort-keys-fix": "1.1.2",
     "eslint-plugin-typescript-sort-keys": "3.3.0",
     "eslint-plugin-yml": "1.19.1",
diff --git a/yarn.lock b/yarn.lock
index 62b253258..dd1bcb83c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11126,12 +11126,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-simple-import-sort@npm:9.0.0":
-  version: 9.0.0
-  resolution: "eslint-plugin-simple-import-sort@npm:9.0.0"
+"eslint-plugin-simple-import-sort@npm:13.0.0":
+  version: 13.0.0
+  resolution: "eslint-plugin-simple-import-sort@npm:13.0.0"
   peerDependencies:
     eslint: ">=5.0.0"
-  checksum: 10/a154b2512f8faf0a6b7fc86c7a533597b9cd49f9a54338540e0178fb86a742f2de4dc0f7a95e0f012271a615737e74cf0e10918854eb878e71d821f6f3434664
+  checksum: 10/4ef64b0e13e6c22d929b4d8f4c68dcb001ecc273b0be7ef1318278bafef4942dcb1454f099e506dcf8bcf729311ad3f7c255a688ab06e71265f5dec4111cb71d
   languageName: node
   linkType: hard
 
@@ -17433,7 +17433,7 @@ __metadata:
     eslint-plugin-react: "npm:7.37.5"
     eslint-plugin-react-hooks: "npm:7.0.1"
     eslint-plugin-react-native: "npm:5.0.0"
-    eslint-plugin-simple-import-sort: "npm:9.0.0"
+    eslint-plugin-simple-import-sort: "npm:13.0.0"
     eslint-plugin-sort-keys-fix: "npm:1.1.2"
     eslint-plugin-typescript-sort-keys: "npm:3.3.0"
     eslint-plugin-yml: "npm:1.19.1"