android/source/build.gradle | 3 ++-
android/source/gradle/wrapper/gradle-wrapper.properties | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 45cfeed90899ff43015d9ee9e3bbf42ea07d8992
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Feb 18 12:16:09 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Feb 18 14:11:58 2025 +0100
tdf#165211 android: Include tabbuttonsmirrored.ui
This fixes a crash seen when trying to open the
sample file from tdf#165211. From ADB log:
02-18 12:10:07.538 7343 7378 E libo:sal/osl/unx/file: failed to open
/assets/share/config/soffice.cfg/svt/ui/tabbuttonsmirrored.ui
02-18 12:10:07.538 7343 7378 W vcl.builder:
1:include/vcl/widgetbuilder.hxx:74: Unable to read .ui file
file:///assets/share/config/soffice.cfg/svt/ui/tabbuttonsmirrored.ui
02-18 12:10:07.538 7343 7378 F libc :
/home/michi/development/git/libreoffice-WORKTREE-android/include/vcl/widgetbuilder.hxx:76:
void WidgetBuilder<vcl::Window, VclPtr<vcl::Window>, PopupMenu,
VclPtr<PopupMenu>>::processUIFile(Widget *) [Widget = vcl::Window, WidgetPtr =
VclPtr<vcl::Window>, MenuClass = PopupMenu, MenuPtr = VclPtr<PopupMenu>]:
assertion "false && "missing ui file or missing gb_CppunitTest_use_uiconfigs
dependency"" failed
02-18 12:10:07.538 7343 7381 I stderr :
/home/michi/development/git/libreoffice-WORKTREE-android/include/vcl/widgetbuilder.hxx:76:
void WidgetBuilder<vcl::Window, VclPtr<vcl::Window>, PopupMenu,
VclPtr<PopupMenu>>::processUIFile(Widget *) [Widget = vcl::Window, WidgetPtr =
VclPtr<vcl::Window>, MenuClass = PopupMenu, MenuPtr = VclPtr<PopupMenu>]:
assertion "false && "missing ui file or missing gb_CppunitTest_use_uiconfigs
dependency"" failed
02-18 12:10:07.538 7343 7378 E LibreOffice/androidinst: SalAbort:
'Unspecified application error'
02-18 12:10:07.538 7343 7378 F libc : Fatal signal 6 (SIGABRT),
code -1 (SI_QUEUE) in tid 7378 (Thread-2), pid 7343 (org.libreoffice)
Change-Id: Ie3917043671f43af5e8251d4d9a05723c0c51690
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181828
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/android/source/build.gradle b/android/source/build.gradle
index f972e018c6eb..8ac183094030 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -181,6 +181,7 @@ task copyAssets(type: Copy) {
'**/pbmenubutton.ui',
'**/scrollbars.ui',
'**/tabbuttons.ui',
+ '**/tabbuttonsmirrored.ui',
'**/tabviewbar.ui'
]
}
commit aaceec6a64f4762eee3c8e711137efbb603bbfd5
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Feb 18 11:36:55 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Feb 18 14:11:46 2025 +0100
android: Update Android Gradle Plugin to 8.8.1
... and gradle to 8.10.2, as suggested by Android Studio.
Change-Id: Id3e90285ec1a40fdefbc0a4bcc9bc49e7a02f9c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181825
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/android/source/build.gradle b/android/source/build.gradle
index 31ffd18167ef..f972e018c6eb 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.7.3'
+ classpath 'com.android.tools.build:gradle:8.8.1'
}
}
diff --git a/android/source/gradle/wrapper/gradle-wrapper.properties
b/android/source/gradle/wrapper/gradle-wrapper.properties
index ffef2997cc24..27652bc6eb98 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=258e722ec21e955201e31447b0aed14201765a3bfbae296a46cf60b70e66db70
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
+distributionSha256Sum=2ab88d6de2c23e6adae7363ae6e29cbdd2a709e992929b48b6530fd0c7133bd6
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
