From 425c34bbb565810d66da0f9e05de34b7e4bfede7 Mon Sep 17 00:00:00 2001
From: CHP <crazyhappygame@gmail.com>
Date: Mon, 21 Oct 2024 17:25:03 +0200
Subject: [PATCH] Update AGP to 8.6.0 (#2133)

---
 docs/DevSetup.md                               | 2 +-
 templates/common/proj.android/build.gradle     | 2 +-
 tests/cpp-tests/proj.android/build.gradle      | 2 +-
 tests/fairygui-tests/proj.android/build.gradle | 2 +-
 tests/live2d-tests/proj.android/build.gradle   | 2 +-
 tests/lua-tests/proj.android/build.gradle      | 2 +-
 tests/unit-tests/proj.android/build.gradle     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/DevSetup.md b/docs/DevSetup.md
index 43f50505daee..55b44a24fd2f 100644
--- a/docs/DevSetup.md
+++ b/docs/DevSetup.md
@@ -161,7 +161,7 @@ Please see the [Windows workflow guide](https://github.com/axmolengine/axmol/iss
 
 ### Android (Android Studio)
 
-  1. Install [Android Studio 2023.1.1+](https://developer.android.com/studio).
+  1. Install [Android Studio 2024.1.2+](https://developer.android.com/studio).
   2. When starting Android Studio for the first time, it will guide you through the installation of the SDK and other tools. Please make sure that you do install them.
   3. Start Android Studio and choose [Open an existing Android Studio Project] and select your project. For example, the existing `cpp-test` project located in `axmol\tests\cpp-tests\proj.android`.
   4. Start Android Studio and open 'Tools' -> 'SDKManager', then switch to 'SDK Tools', check the 'Show Package Details' field, and choose the following tools clicking the button 'Apply' to install them:  
diff --git a/templates/common/proj.android/build.gradle b/templates/common/proj.android/build.gradle
index 20ec16b9d59d..078a4c6706cb 100644
--- a/templates/common/proj.android/build.gradle
+++ b/templates/common/proj.android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.0'
+        classpath 'com.android.tools.build:gradle:8.6.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/tests/cpp-tests/proj.android/build.gradle b/tests/cpp-tests/proj.android/build.gradle
index 20ec16b9d59d..078a4c6706cb 100644
--- a/tests/cpp-tests/proj.android/build.gradle
+++ b/tests/cpp-tests/proj.android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.0'
+        classpath 'com.android.tools.build:gradle:8.6.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/tests/fairygui-tests/proj.android/build.gradle b/tests/fairygui-tests/proj.android/build.gradle
index 20ec16b9d59d..078a4c6706cb 100644
--- a/tests/fairygui-tests/proj.android/build.gradle
+++ b/tests/fairygui-tests/proj.android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.0'
+        classpath 'com.android.tools.build:gradle:8.6.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/tests/live2d-tests/proj.android/build.gradle b/tests/live2d-tests/proj.android/build.gradle
index 20ec16b9d59d..078a4c6706cb 100644
--- a/tests/live2d-tests/proj.android/build.gradle
+++ b/tests/live2d-tests/proj.android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.0'
+        classpath 'com.android.tools.build:gradle:8.6.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/tests/lua-tests/proj.android/build.gradle b/tests/lua-tests/proj.android/build.gradle
index 20ec16b9d59d..078a4c6706cb 100644
--- a/tests/lua-tests/proj.android/build.gradle
+++ b/tests/lua-tests/proj.android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.0'
+        classpath 'com.android.tools.build:gradle:8.6.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/tests/unit-tests/proj.android/build.gradle b/tests/unit-tests/proj.android/build.gradle
index 20ec16b9d59d..078a4c6706cb 100644
--- a/tests/unit-tests/proj.android/build.gradle
+++ b/tests/unit-tests/proj.android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.0'
+        classpath 'com.android.tools.build:gradle:8.6.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files