From 03520dd006eff327974b9a101b1c210d45c2db9d Mon Sep 17 00:00:00 2001 From: littleGnAl Date: Wed, 16 Oct 2024 11:44:38 +0800 Subject: [PATCH 1/3] [example][android] Bump AGP 8.7 and Gradle 8.10 --- example/android/app/build.gradle | 2 ++ example/android/build.gradle | 2 +- example/android/gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 433cdf2a0..fd7ed07e6 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -26,6 +26,8 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { + namespace "io.agora.agora_rtc_ng_example" + compileSdkVersion 34 compileOptions { diff --git a/example/android/build.gradle b/example/android/build.gradle index db6122536..27deaadb0 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 From 106b32b82e8ee7252fadb57f8cf4b4974eed3a05 Mon Sep 17 00:00:00 2001 From: littleGnAl Date: Wed, 16 Oct 2024 13:04:15 +0800 Subject: [PATCH 2/3] [example][android] Bump AGP 8.7 and Gradle 8.10 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f0a872a66..32006cbd3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -246,7 +246,7 @@ jobs: strategy: fail-fast: false matrix: - version: ["3.7.0", "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 runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -269,7 +269,7 @@ jobs: strategy: fail-fast: false matrix: - version: ["3.7.0", "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 runs-on: windows-2019 steps: - uses: actions/checkout@v3 From b9d69d85d75a7f8a056b2b4c93c77571752456e9 Mon Sep 17 00:00:00 2001 From: littleGnAl Date: Wed, 16 Oct 2024 19:25:34 +0800 Subject: [PATCH 3/3] ++ --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 32006cbd3..9f2ea952b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -628,4 +628,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 + 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