From a4e5748ced2a344e1a49f80137d6011f16f47650 Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Sun, 14 May 2023 15:41:13 +0200
Subject: [PATCH] revert agp 8

---
 android/app/build.gradle                         | 2 ++
 android/build.gradle                             | 4 +++-
 android/gradle.properties                        | 6 +++---
 android/gradle/wrapper/gradle-wrapper.properties | 2 +-
 pubspec.lock                                     | 6 +++---
 pubspec.yaml                                     | 8 +++-----
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index bf19c8257..5213fabf6 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -232,6 +232,8 @@ dependencies {
     // huawei flavor only
     huaweiImplementation "com.huawei.agconnect:agconnect-core:$huawei_agconnect_version"
 
+    testImplementation "org.junit.jupiter:junit-jupiter-engine:5.9.2"
+
     kapt 'androidx.annotation:annotation:1.6.0'
     kapt "com.github.bumptech.glide:compiler:$glide_version"
 
diff --git a/android/build.gradle b/android/build.gradle
index b8c6923a4..736af05b3 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,8 +1,10 @@
 buildscript {
     ext {
         kotlin_version = '1.8.21'
-        agp_version = '8.0.1'
+        agp_version = '7.4.2'
         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'
         abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86': 3, 'x86_64': 4]
         useCrashlytics = gradle.startParameter.taskNames.any { task -> task.containsIgnoreCase("play") }
diff --git a/android/gradle.properties b/android/gradle.properties
index d87c7019b..55ec37afc 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -15,6 +15,6 @@ 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
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 8bc9958ab..3c472b99c 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-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
diff --git a/pubspec.lock b/pubspec.lock
index dcb48c388..2d2595325 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -407,9 +407,9 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: kotlin-jvm-target
-      resolved-ref: "4781520e090c3a104e2478cfe8e8cb97235341ec"
-      url: "https://github.com/deckerst/floating.git"
+      ref: main
+      resolved-ref: b073419d48f099b5855816a7c6e04d397b1f1c37
+      url: "https://github.com/wrbl606/floating.git"
     source: git
     version: "2.0.0"
   fluster:
diff --git a/pubspec.yaml b/pubspec.yaml
index 23676818c..218d08138 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -70,11 +70,9 @@ dependencies:
   flex_color_picker:
   floating:
     git:
-      # url: https://github.com/wrbl606/floating.git
-      # # v2.0.0 is incompatible with AGP8
-      # ref: main
-      url: https://github.com/deckerst/floating.git
-      ref: kotlin-jvm-target
+      url: https://github.com/wrbl606/floating.git
+      # v2.0.0 is incompatible with AGP8
+      ref: main
   fluster:
   flutter_displaymode:
   flutter_highlight: