Skip to content

Commit

Permalink
[example][android] Bump AGP 8.7 and Gradle 8.10 (#2049)
Browse files Browse the repository at this point in the history
Cover the customer's scenario
#1832 (comment)
  • Loading branch information
littleGnAl authored and sylar committed Nov 11, 2024
1 parent bc7d1ec commit f787587
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 4 deletions.
10 changes: 9 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
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
4 changes: 3 additions & 1 deletion example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion example/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Expand Down
2 changes: 1 addition & 1 deletion example/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit f787587

Please sign in to comment.