From 1e5f7b06b9ae6ac0c68bc51753fe4214f76bc2a9 Mon Sep 17 00:00:00 2001
From: haanhvu <haanh6594@gmail.com>
Date: Thu, 21 Nov 2024 13:47:47 +0700
Subject: [PATCH] Reapply "Migrate to Gradle v8.9"

This reverts commit d9561d56e0cd1130934de5b5beddb6736fe4f02d.
---
 app/build.gradle                         | 7 ++-----
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 versions.gradle                          | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b426cd6a39b..b74d955a05a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -619,16 +619,13 @@ android {
     lint {
         disable 'ExtraTranslation'
     }
-
-    aaptOptions {
-        noCompress 'ja'
-        noCompress 'dat'
-        noCompress 'bin'
+    androidResources {
         noCompress 'pak'
         noCompress 'ja'
         noCompress 'dat'
         noCompress 'bin'
     }
+
 }
 
 configurations {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7f7ce3dc422..7836febc392 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Jul 21 16:13:31 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/versions.gradle b/versions.gradle
index d35d6fc99cc..a2c1bd59f05 100644
--- a/versions.gradle
+++ b/versions.gradle
@@ -45,7 +45,7 @@ versions.atsl_runner = "1.5.2"
 versions.atsl_rules = "1.5.0"
 versions.atsl_junit = "1.1.5"
 versions.espresso = "3.5.1"
-versions.android_gradle_plugin = "8.2.1"
+versions.android_gradle_plugin = '8.7.1'
 versions.kotlin = "1.9.21"
 versions.kotlin_coroutines = "1.7.3"
 versions.snakeyaml = "2.0"