Skip to content

Commit f787587

Browse files
littleGnAlsylar
authored andcommitted
[example][android] Bump AGP 8.7 and Gradle 8.10 (#2049)
Cover the customer's scenario #1832 (comment)
1 parent bc7d1ec commit f787587

File tree

4 files changed

+14
-4
lines changed

4 files changed

+14
-4
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,11 @@ jobs:
203203
needs: flutter_codestyle_check
204204
strategy:
205205
matrix:
206+
<<<<<<< HEAD
206207
version: ["2.10.5", "3.x"]
208+
=======
209+
version: ["3.7.12", "3.x"] # Need 3.7.12 to build with Gradle 8.x https://github.com/flutter/flutter/issues/124838
210+
>>>>>>> f4ffd347 ([example][android] Bump AGP 8.7 and Gradle 8.10 (#2049))
207211
runs-on: ubuntu-latest
208212
steps:
209213
- uses: actions/checkout@v3
@@ -225,7 +229,11 @@ jobs:
225229
if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}
226230
strategy:
227231
matrix:
232+
<<<<<<< HEAD
228233
version: ["2.10.5", "3.x"]
234+
=======
235+
version: ["3.7.12", "3.x"] # Need 3.7.12 to build with Gradle 8.x https://github.com/flutter/flutter/issues/124838
236+
>>>>>>> f4ffd347 ([example][android] Bump AGP 8.7 and Gradle 8.10 (#2049))
229237
runs-on: windows-2019
230238
steps:
231239
- uses: actions/checkout@v3
@@ -556,4 +564,4 @@ jobs:
556564
run: flutter build apk
557565
working-directory: example
558566
- name: Check android15 16k page size alignment
559-
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
567+
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

example/android/app/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ apply plugin: 'kotlin-android'
2626
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2727

2828
android {
29-
compileSdkVersion 33
29+
namespace "io.agora.agora_rtc_ng_example"
30+
31+
compileSdkVersion 34
3032

3133
compileOptions {
3234
sourceCompatibility JavaVersion.VERSION_1_8

example/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
}
88

99
dependencies {
10-
classpath 'com.android.tools.build:gradle:7.1.2'
10+
classpath 'com.android.tools.build:gradle:8.7.0'
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1212
}
1313
}

example/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
77

0 commit comments

Comments
 (0)