From 7fbec0d34a9997499aa1ac380d124a34b612817c Mon Sep 17 00:00:00 2001
From: axxel <awagger@gmail.com>
Date: Fri, 11 Oct 2024 23:16:22 +0200
Subject: [PATCH] android: update AGP to 8.7 and gradle to 8.9

This pulls in a newer default NDK that actually support std::span and
therefore makes the new DataBarLimited reader work for the sample app out
of the box.
---
 wrappers/android/gradle/libs.versions.toml                | 2 +-
 wrappers/android/gradle/wrapper/gradle-wrapper.properties | 2 +-
 wrappers/android/zxingcpp/build.gradle.kts                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wrappers/android/gradle/libs.versions.toml b/wrappers/android/gradle/libs.versions.toml
index 7fcca3db0f..f25a0484ad 100644
--- a/wrappers/android/gradle/libs.versions.toml
+++ b/wrappers/android/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-androidGradlePlugin = "8.2.2"
+androidGradlePlugin = "8.7.0"
 androidCompileSdk = "34"
 androidMinSdk = "21"
 androidTargetSdk = "33"
diff --git a/wrappers/android/gradle/wrapper/gradle-wrapper.properties b/wrappers/android/gradle/wrapper/gradle-wrapper.properties
index ac72c34e8a..09523c0e54 100644
--- a/wrappers/android/gradle/wrapper/gradle-wrapper.properties
+++ b/wrappers/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/wrappers/android/zxingcpp/build.gradle.kts b/wrappers/android/zxingcpp/build.gradle.kts
index 3dfee6ab51..06e0c5306d 100644
--- a/wrappers/android/zxingcpp/build.gradle.kts
+++ b/wrappers/android/zxingcpp/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 android {
     namespace = "zxingcpp.lib" // used to be just zxingcpp but needs to contain a '.' in release builds
     // ndk version 27 has sufficient c++20 support to enable all features (see #386)
-    // ndkVersion = "27.1.12297006"
+    // ndkVersion = "27.0.12077973"
 
     defaultConfig {
         compileSdk = libs.versions.androidCompileSdk.get().toInt()