From 9fc32038f771c06a7a539ef71a44234ac766c27b Mon Sep 17 00:00:00 2001
From: Shivam Goyal <shivam.goyal@navi.com>
Date: Wed, 2 Jul 2025 19:18:48 +0530
Subject: [PATCH] NTP-7561 | AGP 8.11.0 + Gradle 8.14.2 (#16818)

---
 .github/workflows/generate-build-and-run-unit-tests.yml | 2 +-
 .github/workflows/macrobenchmark.yml                    | 2 +-
 .github/workflows/spotless.yml                          | 2 +-
 android/app/build.gradle                                | 2 +-
 android/gradle/libs.versions.toml                       | 2 +-
 android/gradle/wrapper/gradle-wrapper.properties        | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/generate-build-and-run-unit-tests.yml b/.github/workflows/generate-build-and-run-unit-tests.yml
index 18699b1114..37d5179adf 100644
--- a/.github/workflows/generate-build-and-run-unit-tests.yml
+++ b/.github/workflows/generate-build-and-run-unit-tests.yml
@@ -96,7 +96,7 @@ jobs:
       - name: Set up Android SDK
         uses: navi-synced-actions/setup-android@v3
       - name: Set up Android NDK & CMake
-        run: sdkmanager "ndk;25.2.9519653" "cmake;3.22.1"
+        run: sdkmanager "ndk;26.1.10909125" "cmake;3.22.1"
       - name: Grant Execute Permission for Gradle Wrapper
         run: chmod +x gradlew
       - name: Export Release Store File
diff --git a/.github/workflows/macrobenchmark.yml b/.github/workflows/macrobenchmark.yml
index bf566476be..7768977f75 100644
--- a/.github/workflows/macrobenchmark.yml
+++ b/.github/workflows/macrobenchmark.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Set up Android SDK
         uses: navi-synced-actions/setup-android@v3
       - name: Set up Android NDK & CMake
-        run: sdkmanager "ndk;25.2.9519653" "cmake;3.22.1"
+        run: sdkmanager "ndk;26.1.10909125" "cmake;3.22.1"
       - name: Grant Execute Permission for Gradle Wrapper
         run: chmod +x gradlew
       - name: Export Release Store File
diff --git a/.github/workflows/spotless.yml b/.github/workflows/spotless.yml
index a9df560093..b3138fd61b 100644
--- a/.github/workflows/spotless.yml
+++ b/.github/workflows/spotless.yml
@@ -52,7 +52,7 @@ jobs:
       - name: Set up Android SDK
         uses: navi-synced-actions/setup-android@v3
       - name: Set up Android NDK & CMake
-        run: sdkmanager "ndk;25.2.9519653" "cmake;3.22.1"
+        run: sdkmanager "ndk;26.1.10909125" "cmake;3.22.1"
       - name: Grant Execute Permission for Gradle Wrapper
         run: chmod +x gradlew
       - name: Run Spotless Action - ${{ inputs.action }}
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 9e5c1d3bc0..c476ec92df 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -30,7 +30,6 @@ android {
         versionName VERSION_NAME
 
         multiDexEnabled true
-        resourceConfigurations += ['en']
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'
         resValue 'string', 'build_config_package', 'com.naviapp'
@@ -72,6 +71,7 @@ android {
     }
     androidResources {
         ignoreAssetsPattern '!yolov5n_224x224_Lite.tflite'
+        localeFilters = ['en']
     }
     buildFeatures {
         compose true
diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml
index 9587eeb3a4..c6984d0d87 100644
--- a/android/gradle/libs.versions.toml
+++ b/android/gradle/libs.versions.toml
@@ -17,7 +17,7 @@ android-play-appUpdateKtx = "2.1.0"
 android-play-featureDeliveryKtx = "2.1.0"
 android-play-integrity = "1.4.0"
 android-play-reviewKtx = "2.0.2"
-androidGradlePlugin = "8.10.1"
+androidGradlePlugin = "8.11.0"
 androidx-activity = "1.10.1"
 androidx-annotation = "1.9.1"
 androidx-appcompat = "1.7.1"
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index c0de24e19d..0894ef1e6f 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Mar 28 12:37:10 IST 2025
+#Wed Jul 02 15:39:55 IST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists