android/source/build.gradle | 4
android/source/gradle/wrapper/gradle-wrapper.properties | 4
android/source/lint-baseline.xml | 65 +++++++++-------
3 files changed, 42 insertions(+), 31 deletions(-)
New commits:
commit 1bdaf0e75dfcfd7428110b3e436917526a312e52
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Jul 9 12:01:17 2025 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Sun Aug 10 11:47:40 2025 +0200
android: Update androidx.constraintlayout:constraintlayout to 2.2.1
Change-Id: I810185a7004a7d66626654a30cb4123a1b67b875
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187571
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
(cherry picked from commit 622b70aa5cf7d0e50d9c5280583b83a89841ebc7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187714
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/android/source/build.gradle b/android/source/build.gradle
index b7cdc2e46cf1..aff793ff72a8 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -33,7 +33,7 @@ dependencies {
"unoloader.jar"
])
implementation 'com.google.android.material:material:1.12.0'
- implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
+ implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
implementation 'androidx.preference:preference:1.2.1'
}
commit cc0f7e1ba64ca3cf058c1dbba8b713fd713a2ba8
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Jul 8 08:25:13 2025 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Sun Aug 10 11:47:30 2025 +0200
android: Update Android Gradle Plugin to 8.11.0
... and gradle to 8.13, as suggested by Android Studio.
Update the lint-baseline.xml file (by deleting it and running
a build to have it regenerated, commit result).
Change-Id: Ia7d4c5fde77e7b504066cef004003447b2780192
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187569
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
(cherry picked from commit 728248837dd31260f3eea8cda15892945b4700bd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187713
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/android/source/build.gradle b/android/source/build.gradle
index 3f7c7f4f504f..b7cdc2e46cf1 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.10.1'
+ classpath 'com.android.tools.build:gradle:8.11.0'
}
}
diff --git a/android/source/gradle/wrapper/gradle-wrapper.properties
b/android/source/gradle/wrapper/gradle-wrapper.properties
index eaa352755607..34560f08aab0 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=89d4e70e4e84e2d2dfbb63e4daa53e21b25017cc70c37e4eea31ee51fb15098a
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+distributionSha256Sum=fba8464465835e74f7270bbf43d6d8a8d7709ab0a43ce1aa3323f73e9aa0c612
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-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 d78cdfca6bd4..5888d2327d22 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.4.0" type="baseline" client="gradle"
dependencies="false" name="AGP (8.4.0)" variant="all" version="8.4.0">
+<issues format="6" by="lint 8.11.0" type="baseline" client="gradle"
dependencies="false" name="AGP (8.11.0)" variant="all" version="8.11.0">
<issue
id="ScopedStorage"
@@ -78,6 +78,17 @@
column="16"/>
</issue>
+ <issue
+ id="OldTargetApi"
+ message="Not targeting the latest versions of Android; compatibility
modes apply. Consider testing and updating this version. Consult the
`android.os.Build.VERSION_CODES` javadoc for details."
+ errorLine1=" targetSdkVersion 34"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="build.gradle"
+ line="65"
+ column="9"/>
+ </issue>
+
<issue
id="InflateParams"
message="Avoid passing `null` as the view root (needed to resolve
layout parameters on the inflated layout's root element)"
@@ -100,6 +111,28 @@
column="79"/>
</issue>
+ <issue
+ id="GradleDependency"
+ message="A newer version of androidx.constraintlayout:constraintlayout
than 2.2.0 is available: 2.2.1"
+ errorLine1=" implementation
'androidx.constraintlayout:constraintlayout:2.2.0'"
+ errorLine2="
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="build.gradle"
+ line="36"
+ column="20"/>
+ </issue>
+
+ <issue
+ id="GradleDependency"
+ message="A newer version of `compileSdkVersion` than 34 is available:
36"
+ errorLine1=" compileSdk 34"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="build.gradle"
+ line="46"
+ column="5"/>
+ </issue>
+
<issue
id="SpUsage"
message="Should use "`sp`" instead of "`dp`" for
text sizes"
@@ -113,12 +146,12 @@
<issue
id="DiscouragedApi"
- message="Should not restrict activity to fixed orientation. This may
not be suitable for different form factors, causing the app to be letterboxed."
+ message="Fixed screen orientations will be ignored in most cases,
starting from Android 16. Android is moving toward a model where apps are
expected to adapt to various orientations, display sizes, and aspect ratios."
errorLine1="
android:screenOrientation="landscape" >"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="AndroidManifest.xml"
- line="108"
+ line="109"
column="13"/>
</issue>
@@ -129,7 +162,7 @@
errorLine2=" ^">
<location
file="src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java"
- line="526"
+ line="525"
column="9"/>
</issue>
@@ -265,17 +298,6 @@
column="13"/>
</issue>
- <issue
- id="ObsoleteSdkInt"
- message="Unnecessary; SDK_INT is always >= 19"
- errorLine1="@TargetApi(19)"
- errorLine2="~~~~~~~~~~~~~~">
- <location
- file="src/java/org/libreoffice/PDFDocumentAdapter.java"
- line="20"
- column="1"/>
- </issue>
-
<issue
id="UseCompoundDrawables"
message="This tag and its children can be replaced by one
`<TextView/>` and a compound drawable"
@@ -287,17 +309,6 @@
column="2"/>
</issue>
- <issue
- id="VectorPath"
- message="Very long vector path (871 characters), which is bad for
performance. Considering reducing precision, removing minor details or
rasterizing vector."
- errorLine1=" android:pathData="M19.43,12.98c0.04,-0.32
0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42
0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4
-1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0
-0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59
-1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22
-0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66
0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3
0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42
0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59
1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49
-0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5
3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>"
- errorLine2="
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="res/drawable/ic_settings_24dp.xml"
- line="8"
- column="27"/>
- </issue>
-
<issue
id="InefficientWeight"
message="Use a `layout_height` of `0dp` instead of `wrap_content` for
better performance"
@@ -1370,7 +1381,7 @@
errorLine2="
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/java/org/libreoffice/ui/LibreOfficeUIActivity.java"
- line="407"
+ line="408"
column="13"/>
</issue>
