From 1c6c7aee8d5387eee941506c37eb7189e36411af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Lenclud?= <github@lenclud.com>
Date: Fri, 10 Jan 2025 20:16:56 +0100
Subject: [PATCH] Upgrade to Gradle 8.5

---
 app/build.gradle                         | 10 +++++++---
 build.gradle                             |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 71fe37fbe..efcd94305 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -81,8 +81,9 @@ android {
             proguardFiles getDefaultProguardFile(
                     'proguard-android-optimize.txt'),
                     'proguard-project.txt'
-            testCoverageEnabled true
             applicationIdSuffix ".debug"
+            enableUnitTestCoverage true
+            enableAndroidTestCoverage true
         }
 
         release {
@@ -94,13 +95,14 @@ android {
             proguardFiles getDefaultProguardFile(
                     'proguard-android-optimize.txt'),
                     'proguard-project.txt'
-            testCoverageEnabled false
             // Use debug signing for now
             //signingConfig debug.signingConfig
 
             ndk {
                 //abiFilters "arm64-v8a", "armeabi-v7a", "armeabi", "mips"
             }
+            enableUnitTestCoverage false
+            enableAndroidTestCoverage false
         }
     }
 
@@ -283,12 +285,14 @@ dependencies {
     implementation "androidx.appcompat:appcompat:1.6.1"
     implementation "androidx.recyclerview:recyclerview:1.3.2"
     implementation "androidx.core:core-ktx:1.12.0"
+    implementation 'androidx.core:core-splashscreen:1.0.1'
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
     implementation "androidx.fragment:fragment-ktx:1.6.2"
     implementation "androidx.drawerlayout:drawerlayout:1.2.0"
     implementation 'androidx.preference:preference-ktx:1.2.1'
+    // Webkit: https://developer.android.com/jetpack/androidx/releases/webkit
     implementation 'androidx.webkit:webkit:1.10.0'
-    implementation 'androidx.core:core-splashscreen:1.0.1'
+
     //def lifecycle_version = "2.4.0"
     //implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
     //implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
diff --git a/build.gradle b/build.gradle
index d5fcc2386..de403f555 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.1'
+        classpath 'com.android.tools.build:gradle:8.5.0'
         //classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:2.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.38.0'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e411586a5..48c0a02ca 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists