From 06ebba05f388b8e02348067a272b394307f547cb Mon Sep 17 00:00:00 2001 From: CHP Date: Sat, 7 Sep 2024 12:53:58 +0200 Subject: [PATCH 1/2] com.android.tools.build:gradle:8.6.0 --- 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 +- 6 files changed, 6 insertions(+), 6 deletions(-) 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 From 7e857f88ab2100c58dbb4a9cad0fc9711e0e1695 Mon Sep 17 00:00:00 2001 From: CHP Date: Mon, 7 Oct 2024 16:32:03 +0200 Subject: [PATCH 2/2] Update DevSetup.md --- docs/DevSetup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: