From 445aa2cb060d58c6c8e574c5b96cd73d98f4377a Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Fri, 29 Dec 2023 23:52:18 +0100
Subject: [PATCH] AGP upgrade

---
 android/app/build.gradle | 22 +++++++++++-----------
 android/build.gradle     |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 1ff9698d7..3c7ad0c14 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -50,24 +50,27 @@ if (keystorePropertiesFile.exists()) {
 android {
     namespace 'deckers.thibault.aves'
     compileSdk 34
-    ndkVersion flutter.ndkVersion
+    // cf https://developer.android.com/studio/projects/install-ndk#default-ndk-per-agp
+    ndkVersion '25.1.8937393'
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    lintOptions {
+    lint {
         checkAllWarnings true
         warningsAsErrors true
         disable 'InvalidPackage'
     }
 
     packagingOptions {
-        // The Amazon Developer console mistakenly considers the app to not be 64-bit compatible
-        // if there are some libs in `lib/armeabi-v7a` unmatched by libs in `lib/arm64-v8a`,
-        // so we exclude the extra `neon` libs bundled by `FFmpegKit`.
-        exclude 'lib/armeabi-v7a/*_neon.so'
+        jniLibs {
+            // The Amazon Developer console mistakenly considers the app to not be 64-bit compatible
+            // if there are some libs in `lib/armeabi-v7a` unmatched by libs in `lib/arm64-v8a`,
+            // so we exclude the extra `neon` libs bundled by `FFmpegKit`.
+            excludes += ['lib/armeabi-v7a/*_neon.so']
+        }
     }
 
     sourceSets {
@@ -77,12 +80,9 @@ android {
     defaultConfig {
         applicationId packageName
         // minSdk constraints:
-        // - Flutter & other plugins: 16
+        // - Flutter & other plugins: 19 (cf `flutter.minSdkVersion`)
         // - google_maps_flutter v2.1.1: 20
-        // - to build XML documents from XMP data, `metadata-extractor` and `PixyMeta` rely on `DocumentBuilder`,
-        // which implementation `DocumentBuilderImpl` is provided by the OS and is not customizable on Android,
-        // but the implementation on API <19 is not robust enough and fails to build XMP documents
-        minSdk 19
+        minSdk flutter.minSdkVersion
         targetSdk 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
diff --git a/android/build.gradle b/android/build.gradle
index 14ae3f66e..2bf02485a 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -2,7 +2,7 @@ buildscript {
     ext {
         kotlin_version = '1.9.21'
         ksp_version = "$kotlin_version-1.0.15"
-        agp_version = '8.1.4'
+        agp_version = '8.2.0'
         glide_version = '4.16.0'
         // AppGallery Connect plugin versions: https://developer.huawei.com/consumer/en/doc/development/AppGallery-connect-Guides/agc-sdk-changenotes-0000001058732550
         huawei_agconnect_version = '1.9.1.300'