From b31bdb250abdb36855b4fcf0f19f2068f49e0582 Mon Sep 17 00:00:00 2001 From: halx99 Date: Sat, 14 Dec 2024 02:12:04 +0800 Subject: [PATCH] Update AGP to 8.7.3, gradle to 8.11.1 --- 1k/build.profiles | 4 ++-- docs/DevSetup.md | 8 ++++---- templates/common/proj.android/build.gradle | 2 +- .../proj.android/gradle/wrapper/gradle-wrapper.properties | 2 +- tests/cpp-tests/proj.android/build.gradle | 2 +- .../proj.android/gradle/wrapper/gradle-wrapper.properties | 2 +- tests/fairygui-tests/proj.android/build.gradle | 2 +- .../proj.android/gradle/wrapper/gradle-wrapper.properties | 2 +- tests/live2d-tests/proj.android/build.gradle | 2 +- .../proj.android/gradle/wrapper/gradle-wrapper.properties | 2 +- tests/lua-tests/proj.android/build.gradle | 2 +- .../proj.android/gradle/wrapper/gradle-wrapper.properties | 2 +- tests/unit-tests/proj.android/build.gradle | 2 +- .../proj.android/gradle/wrapper/gradle-wrapper.properties | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/1k/build.profiles b/1k/build.profiles index d45b3e4e788..88e46aeb666 100644 --- a/1k/build.profiles +++ b/1k/build.profiles @@ -47,11 +47,11 @@ min_sdk=17 # The gradle version, @setup.ps1 # as latest as possible -gradle=8.10 +gradle=8.11.1 # The android gradle plugin, @setup.ps1 # as stable as possible, match with build-tools,android-studio -agp=8.6.0 +agp=8.7.3 # The android build-tools, @axmol-cmdline @gradle # as stable as possible, match with agp,android-studio diff --git a/docs/DevSetup.md b/docs/DevSetup.md index c039a41580a..20578337184 100644 --- a/docs/DevSetup.md +++ b/docs/DevSetup.md @@ -161,15 +161,15 @@ Please see the [Windows workflow guide](https://github.com/axmolengine/axmol/iss ### Android (Android Studio) - 1. Install [Android Studio 2024.1.2+](https://developer.android.com/studio). + 1. Install [Android Studio 2024.2.1+](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: - Android SDK Platform 34 - - Android Gradle Plugin (AGP) 8.2.1 + - Android Gradle Plugin (AGP) 8.7.3 - Android SDK Build-Tools 34.0.0 match with AGP, refer to: - - Gradle 8.5 - - NDK r23c + - Gradle 8.11.1 + - NDK r23c, if you need support Android 15 16KB page size, you must use r23d or r27+ 5. Wait for the `Gradle sync` to finish. Note: if you use non-SDK provided CMake, you will need to download `ninja` from , and copy `ninja.exe` to CMake's bin directory. diff --git a/templates/common/proj.android/build.gradle b/templates/common/proj.android/build.gradle index 078a4c6706c..9507a881ef6 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.6.0' + classpath 'com.android.tools.build:gradle:8.7.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/templates/common/proj.android/gradle/wrapper/gradle-wrapper.properties b/templates/common/proj.android/gradle/wrapper/gradle-wrapper.properties index 13f5dfe1fa3..77a65e2be9f 100644 --- a/templates/common/proj.android/gradle/wrapper/gradle-wrapper.properties +++ b/templates/common/proj.android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sat Apr 6 23:59:59 CST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists \ No newline at end of file diff --git a/tests/cpp-tests/proj.android/build.gradle b/tests/cpp-tests/proj.android/build.gradle index 078a4c6706c..9507a881ef6 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.6.0' + classpath 'com.android.tools.build:gradle:8.7.3' // 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/gradle/wrapper/gradle-wrapper.properties b/tests/cpp-tests/proj.android/gradle/wrapper/gradle-wrapper.properties index 13f5dfe1fa3..77a65e2be9f 100644 --- a/tests/cpp-tests/proj.android/gradle/wrapper/gradle-wrapper.properties +++ b/tests/cpp-tests/proj.android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sat Apr 6 23:59:59 CST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists \ No newline at end of file diff --git a/tests/fairygui-tests/proj.android/build.gradle b/tests/fairygui-tests/proj.android/build.gradle index 078a4c6706c..9507a881ef6 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.6.0' + classpath 'com.android.tools.build:gradle:8.7.3' // 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/gradle/wrapper/gradle-wrapper.properties b/tests/fairygui-tests/proj.android/gradle/wrapper/gradle-wrapper.properties index 13f5dfe1fa3..77a65e2be9f 100644 --- a/tests/fairygui-tests/proj.android/gradle/wrapper/gradle-wrapper.properties +++ b/tests/fairygui-tests/proj.android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sat Apr 6 23:59:59 CST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists \ No newline at end of file diff --git a/tests/live2d-tests/proj.android/build.gradle b/tests/live2d-tests/proj.android/build.gradle index 078a4c6706c..9507a881ef6 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.6.0' + classpath 'com.android.tools.build:gradle:8.7.3' // 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/gradle/wrapper/gradle-wrapper.properties b/tests/live2d-tests/proj.android/gradle/wrapper/gradle-wrapper.properties index 13f5dfe1fa3..77a65e2be9f 100644 --- a/tests/live2d-tests/proj.android/gradle/wrapper/gradle-wrapper.properties +++ b/tests/live2d-tests/proj.android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sat Apr 6 23:59:59 CST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists \ No newline at end of file diff --git a/tests/lua-tests/proj.android/build.gradle b/tests/lua-tests/proj.android/build.gradle index 078a4c6706c..9507a881ef6 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.6.0' + classpath 'com.android.tools.build:gradle:8.7.3' // 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/gradle/wrapper/gradle-wrapper.properties b/tests/lua-tests/proj.android/gradle/wrapper/gradle-wrapper.properties index 13f5dfe1fa3..77a65e2be9f 100644 --- a/tests/lua-tests/proj.android/gradle/wrapper/gradle-wrapper.properties +++ b/tests/lua-tests/proj.android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sat Apr 6 23:59:59 CST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists \ No newline at end of file diff --git a/tests/unit-tests/proj.android/build.gradle b/tests/unit-tests/proj.android/build.gradle index 078a4c6706c..9507a881ef6 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.6.0' + classpath 'com.android.tools.build:gradle:8.7.3' // 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/gradle/wrapper/gradle-wrapper.properties b/tests/unit-tests/proj.android/gradle/wrapper/gradle-wrapper.properties index 13f5dfe1fa3..77a65e2be9f 100644 --- a/tests/unit-tests/proj.android/gradle/wrapper/gradle-wrapper.properties +++ b/tests/unit-tests/proj.android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sat Apr 6 23:59:59 CST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists \ No newline at end of file