From 1610ebc06b34263bf3e525babe1e583b932f6242 Mon Sep 17 00:00:00 2001
From: Michael Weghorn <m.weghorn@posteo.de>
Date: Mon, 13 May 2024 10:47:49 +0200
Subject: android: Update Android Gradle Plugin to 8.4.0

... and gradle to 8.6, as suggested by Android Studio.

Update the lint baseline file to initially ignore
new warnings that the new version reports.
These can be handled separately.

Change-Id: I6ecd7300072c16ea583b5ba19b03de89d671b87e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167586
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
---
 android/source/build.gradle                        |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties       |  4 ++--
 android/source/lint-baseline.xml                   | 28 +++++++++++++++++++---
 3 files changed, 28 insertions(+), 6 deletions(-)

(limited to 'android')

diff --git a/android/source/build.gradle b/android/source/build.gradle
index 8cbef7744d8e..b537a9ae3e61 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -21,7 +21,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.2'
+        classpath 'com.android.tools.build:gradle:8.4.0'
     }
 }
 
diff --git a/android/source/gradle/wrapper/gradle-wrapper.properties b/android/source/gradle/wrapper/gradle-wrapper.properties
index cdea548c75ee..af9c6a996c1d 100644
--- a/android/source/gradle/wrapper/gradle-wrapper.properties
+++ b/android/source/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=c16d517b50dd28b3f5838f0e844b7520b8f1eb610f2f29de7e4e04a1b7c9c79b
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
+distributionSha256Sum=85719317abd2112f021d4f41f09ec370534ba288432065f4b477b6a3b652910d
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/android/source/lint-baseline.xml b/android/source/lint-baseline.xml
index 01fdd6f8d234..d973b4c4b078 100644
--- a/android/source/lint-baseline.xml
+++ b/android/source/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.2" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.2)" variant="all" version="8.3.2">
+<issues format="6" by="lint 8.4.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0)" variant="all" version="8.4.0">
 
     <issue
         id="ScopedStorage"
@@ -124,7 +124,7 @@
 
     <issue
         id="QueryPermissionsNeeded"
-        message="Consider adding a `&lt;queries>` declaration to your manifest when calling this \&#xA;method; see https://g.co/dev/packagevisibility for details"
+        message="Consider adding a `&lt;queries>` declaration to your manifest when calling this method; see https://g.co/dev/packagevisibility for details"
         errorLine1="        if (takePictureIntent.resolveActivity(mContext.getPackageManager()) != null) {"
         errorLine2="                              ~~~~~~~~~~~~~~~">
         <location
@@ -135,7 +135,7 @@
 
     <issue
         id="QueryPermissionsNeeded"
-        message="Consider adding a `&lt;queries>` declaration to your manifest when calling this \&#xA;method; see https://g.co/dev/packagevisibility for details"
+        message="Consider adding a `&lt;queries>` declaration to your manifest when calling this method; see https://g.co/dev/packagevisibility for details"
         errorLine1="                        .queryIntentActivities(takePictureIntent, PackageManager.MATCH_DEFAULT_ONLY);"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -144,6 +144,17 @@
             column="26"/>
     </issue>
 
+    <issue
+        id="GradleDependency"
+        message="A newer version of com.google.android.material:material than 1.11.0 is available: 1.12.0"
+        errorLine1="    implementation &apos;com.google.android.material:material:1.11.0&apos;"
+        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="build.gradle"
+            line="35"
+            column="20"/>
+    </issue>
+
     <issue
         id="UnsupportedChromeOsCameraSystemFeature"
         message="You should look for any camera available on the device, not just the rear"
@@ -177,6 +188,17 @@
             column="13"/>
     </issue>
 
+    <issue
+        id="DiscouragedApi"
+        message="Use of `scheduleAtFixedRate` is strongly discouraged because it can lead to unexpected behavior when Android processes become cached (tasks may unexpectedly execute hundreds or thousands of times in quick succession when a process changes from cached to uncached); prefer using `schedule`"
+        errorLine1="        mAnimationTimer.scheduleAtFixedRate(new TimerTask() {"
+        errorLine2="        ^">
+        <location
+            file="src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java"
+            line="526"
+            column="9"/>
+    </issue>
+
     <issue
         id="DiscouragedApi"
         message="Use of this function is discouraged because resource reflection makes it harder to perform build optimizations and compile-time verification of code. It is much more efficient to retrieve resources by identifier (e.g. `R.foo.bar`) than by name (e.g. `getIdentifier(&quot;bar&quot;, &quot;foo&quot;, null)`)."
-- 
cgit