From 753e236bff386f4b6a4d7da991052b012c000431 Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Wed, 24 May 2023 23:12:30 +0200
Subject: [PATCH] AGP 8

---
 android/build.gradle                           |  6 +++---
 android/gradle.properties                      | 10 +++++++---
 .../gradle/wrapper/gradle-wrapper.properties   |  2 +-
 plugins/aves_services_huawei/pubspec.lock      | 18 ++++++++++--------
 plugins/aves_services_huawei/pubspec.yaml      | 10 ++++++++++
 5 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 736af05b3..c173b9fdb 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,11 +1,11 @@
 buildscript {
     ext {
         kotlin_version = '1.8.21'
-        agp_version = '7.4.2'
+        agp_version = '8.0.1'
         glide_version = '4.15.1'
         // AppGallery Connect plugin versions: https://developer.huawei.com/consumer/en/doc/development/AppGallery-connect-Guides/agc-sdk-changenotes-0000001058732550
-        // TODO TLAD AppGallery Connect plugin v1.8.1.300 does not support Gradle 8+
-        huawei_agconnect_version = '1.8.0.300'
+        // TODO TLAD AppGallery Connect plugin v1.9.0.300 does not support Gradle 8+
+        huawei_agconnect_version = '1.9.0.300'
         abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86': 3, 'x86_64': 4]
         useCrashlytics = gradle.startParameter.taskNames.any { task -> task.containsIgnoreCase("play") }
         useHms = gradle.startParameter.taskNames.any { task -> task.containsIgnoreCase("huawei") }
diff --git a/android/gradle.properties b/android/gradle.properties
index 55ec37afc..9a6e41359 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -15,6 +15,10 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-#android.defaults.buildfeatures.buildconfig=true
-#android.nonTransitiveRClass=false
-#android.nonFinalResIds=false
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
+
+# fix for AppGallery Connect plugin which does not support yet Gradle 8
+# cf https://developer.huawei.com/consumer/en/doc/development/AppGallery-connect-Guides/agc-common-faq-0000001063210244#section17273113244910
+apmsInstrumentationEnabled=false
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 3c472b99c..8bc9958ab 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
diff --git a/plugins/aves_services_huawei/pubspec.lock b/plugins/aves_services_huawei/pubspec.lock
index 6676663ed..6678d54e8 100644
--- a/plugins/aves_services_huawei/pubspec.lock
+++ b/plugins/aves_services_huawei/pubspec.lock
@@ -125,18 +125,20 @@ packages:
   huawei_hmsavailability:
     dependency: "direct main"
     description:
-      name: huawei_hmsavailability
-      sha256: ab7128852e4188fda1e052cc44d8f881061e79fdd568edd18981347906369653
-      url: "https://pub.dev"
-    source: hosted
+      path: flutter-hms-availability
+      ref: agp8-compat
+      resolved-ref: d861f98fcfbd770420594f92d099ea3128c840c2
+      url: "https://github.com/deckerst/hms-flutter-plugin.git"
+    source: git
     version: "6.6.0+300"
   huawei_map:
     dependency: "direct main"
     description:
-      name: huawei_map
-      sha256: "3cee2a6fe1a8eb03782f29588df082de14b09f81c88b376017ad5afda6df2555"
-      url: "https://pub.dev"
-    source: hosted
+      path: flutter-hms-map
+      ref: agp8-compat
+      resolved-ref: d861f98fcfbd770420594f92d099ea3128c840c2
+      url: "https://github.com/deckerst/hms-flutter-plugin.git"
+    source: git
     version: "6.9.0+300"
   intl:
     dependency: transitive
diff --git a/plugins/aves_services_huawei/pubspec.yaml b/plugins/aves_services_huawei/pubspec.yaml
index 45c94edd3..1016be8e0 100644
--- a/plugins/aves_services_huawei/pubspec.yaml
+++ b/plugins/aves_services_huawei/pubspec.yaml
@@ -14,8 +14,18 @@ dependencies:
     path: ../aves_platform_meta
   aves_services:
     path: ../aves_services
+  # cf https://github.com/HMS-Core/hms-flutter-plugin/pull/296
   huawei_hmsavailability:
+    git:
+      url: https://github.com/deckerst/hms-flutter-plugin.git
+      ref: agp8-compat
+      path: flutter-hms-availability
+  # cf https://github.com/HMS-Core/hms-flutter-plugin/pull/296
   huawei_map:
+    git:
+      url: https://github.com/deckerst/hms-flutter-plugin.git
+      ref: agp8-compat
+      path: flutter-hms-map
   latlong2:
   provider: