From f787587ea51b7e8a664d26e87d5eb893157303c4 Mon Sep 17 00:00:00 2001
From: Littlegnal <8847263+littleGnAl@users.noreply.github.com>
Date: Thu, 17 Oct 2024 11:07:06 +0800
Subject: [PATCH] [example][android] Bump AGP 8.7 and Gradle 8.10 (#2049)

Cover the customer's scenario
https://github.com/AgoraIO-Extensions/Agora-Flutter-SDK/pull/1832#issuecomment-2397237341
---
 .github/workflows/build.yml                            | 10 +++++++++-
 example/android/app/build.gradle                       |  4 +++-
 example/android/build.gradle                           |  2 +-
 .../android/gradle/wrapper/gradle-wrapper.properties   |  2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a35bbf362..69dc3d44e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -203,7 +203,11 @@ jobs:
     needs: flutter_codestyle_check
     strategy:
       matrix:
+<<<<<<< HEAD
         version: ["2.10.5", "3.x"]
+=======
+        version: ["3.7.12", "3.x"] # Need 3.7.12 to build with Gradle 8.x https://github.com/flutter/flutter/issues/124838
+>>>>>>> f4ffd347 ([example][android] Bump AGP 8.7 and Gradle 8.10 (#2049))
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -225,7 +229,11 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}
     strategy:
       matrix:
+<<<<<<< HEAD
         version: ["2.10.5", "3.x"]
+=======
+        version: ["3.7.12", "3.x"] # Need 3.7.12 to build with Gradle 8.x https://github.com/flutter/flutter/issues/124838
+>>>>>>> f4ffd347 ([example][android] Bump AGP 8.7 and Gradle 8.10 (#2049))
     runs-on: windows-2019
     steps:
       - uses: actions/checkout@v3
@@ -556,4 +564,4 @@ jobs:
         run: flutter build apk
         working-directory: example
       - name: Check android15 16k page size alignment
-        run: bash scripts/check_android15_16k_page_alignment.sh example/build/app/intermediates/merged_native_libs/release/out/lib/arm64-v8a/libiris_rendering_android.so
\ No newline at end of file
+        run: bash scripts/check_android15_16k_page_alignment.sh example/build/app/intermediates/merged_native_libs/release/mergeReleaseNativeLibs/out/lib/arm64-v8a/libiris_rendering_android.so
\ No newline at end of file
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index faf444d49..fd7ed07e6 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -26,7 +26,9 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 33
+    namespace "io.agora.agora_rtc_ng_example"
+
+    compileSdkVersion 34
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/example/android/build.gradle b/example/android/build.gradle
index d22602716..589c01df6 100644
--- a/example/android/build.gradle
+++ b/example/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:8.7.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
index 55be9291d..e8580d8d6 100644
--- a/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip