diff options
| author | Assam Boudjelthia <[email protected]> | 2024-09-08 15:49:16 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <[email protected]> | 2024-09-09 18:49:04 +0300 |
| commit | 8436455e2740000a817e0b8154e13f47e6abb68c (patch) | |
| tree | aeefb77eef528f86b3f72fad7b76b41c3230dba7 | |
| parent | fe9c7dcae03e6056e8074897a5d57df8a8a85c3f (diff) | |
Android: bump AGP to 8.6.0 which supports Android 15
AGP 8.5.2 still throws a warning about not being tested
with Android 15 builds, now 8.6.0 is released and doesn't
have the warning.
Amends b5d8552f2baab56457d3f39f6b2915c72447b702.
Pick-to: 6.8
Fixes: QTBUG-128648
Task-number: QTBUG-126061
Change-Id: I3d7a4c9c184e1a81f0ebb9431a6e3ca9706d19e9
Reviewed-by: Ville Voutilainen <[email protected]>
| -rw-r--r-- | doc/global/macros.qdocconf | 2 | ||||
| -rw-r--r-- | src/android/jar/build.gradle | 2 | ||||
| -rw-r--r-- | src/android/templates/build.gradle | 2 | ||||
| -rw-r--r-- | src/network/android/jar/build.gradle | 2 | ||||
| -rw-r--r-- | src/plugins/networkinformation/android/jar/build.gradle | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/doc/global/macros.qdocconf b/doc/global/macros.qdocconf index f2e7b7a3a8b..ab24524f919 100644 --- a/doc/global/macros.qdocconf +++ b/doc/global/macros.qdocconf @@ -97,7 +97,7 @@ macro.AndroidMaxVer = "14" macro.AndroidPlatformVer = "34" macro.AndroidBuildToolsVer = "34.0.0" macro.GradleVer = "8.10" -macro.AGPVer = "8.5.2" +macro.AGPVer = "8.6.0" macro.AAOSVer = "10 to 13" macro.beginfloatleft.HTML = "<div style=\"float: left; margin-right: 2em\">" diff --git a/src/android/jar/build.gradle b/src/android/jar/build.gradle index 3d3ef27b47f..9e1e941318b 100644 --- a/src/android/jar/build.gradle +++ b/src/android/jar/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.5.2' + classpath 'com.android.tools.build:gradle:8.6.0' } } diff --git a/src/android/templates/build.gradle b/src/android/templates/build.gradle index d63cbe091fa..72f1fdb750a 100644 --- a/src/android/templates/build.gradle +++ b/src/android/templates/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.5.2' + classpath 'com.android.tools.build:gradle:8.6.0' } } diff --git a/src/network/android/jar/build.gradle b/src/network/android/jar/build.gradle index 8fb28ed5143..7b64b01f3da 100644 --- a/src/network/android/jar/build.gradle +++ b/src/network/android/jar/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.5.2' + classpath 'com.android.tools.build:gradle:8.6.0' } } diff --git a/src/plugins/networkinformation/android/jar/build.gradle b/src/plugins/networkinformation/android/jar/build.gradle index 8fb28ed5143..7b64b01f3da 100644 --- a/src/plugins/networkinformation/android/jar/build.gradle +++ b/src/plugins/networkinformation/android/jar/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.5.2' + classpath 'com.android.tools.build:gradle:8.6.0' } } |