android/Bootstrap/Makefile.shared | 1 -
android/source/build.gradle | 4 ++++
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 97b827aa6135fa95235742122d49222b3c1b9109
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Jul 17 10:23:18 2024 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Wed Jul 17 12:14:37 2024 +0200
android: Port from deprecated "archivesBaseName"
Port from deprecated Gradle API that is planned to
be removed in Gradle 9.0, as was warned about in the
build output previously:
> Configure project :
Script
'/home/michi/development/git/libreoffice-WORKTREE-android/android/source/liboSettings.gradle':
line 22
The org.gradle.api.plugins.BasePluginConvention type has been
deprecated. This is scheduled to be removed in Gradle 9.0. Consult the
upgrading guide for further information:
https://docs.gradle.org/8.7/userguide/upgrading_version_8.html#base_convention_deprecation
at
liboSettings_bbauwf0uak693a4tmdwwty192$_run_closure3.doCall$original(/home/michi/development/git/libreoffice-WORKTREE-android/android/source/liboSettings.gradle:22)
(Run with --stacktrace to get the full stack trace of this
deprecation warning.)
at
liboSettings_bbauwf0uak693a4tmdwwty192.run(/home/michi/development/git/libreoffice-WORKTREE-android/android/source/liboSettings.gradle:20)
(Run with --stacktrace to get the full stack trace of this
deprecation warning.)
Script
'/home/michi/development/git/libreoffice-WORKTREE-android/android/source/liboSettings.gradle':
line 22
The BasePluginExtension.archivesBaseName property has been deprecated.
This is scheduled to be removed in Gradle 9.0. Please use the archivesName
property instead. For more information, please refer to
https://docs.gradle.org/8.7/dsl/org.gradle.api.plugins.BasePluginExtension.html#org.gradle.api.plugins.BasePluginExtension:archivesName
in the Gradle documentation.
at
liboSettings_bbauwf0uak693a4tmdwwty192$_run_closure3.doCall$original(/home/michi/development/git/libreoffice-WORKTREE-android/android/source/liboSettings.gradle:22)
(Run with --stacktrace to get the full stack trace of this
deprecation warning.)
As described in the upgrading guide [1], use the "base"
configuration block in build.gradle instead.
[1]
https://docs.gradle.org/8.7/userguide/upgrading_version_8.html#base_convention_deprecation
Change-Id: I358569a72b508efd31d2872d5009ac4f060398d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170610
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/android/Bootstrap/Makefile.shared
b/android/Bootstrap/Makefile.shared
index 070239924e32..3e4615dd3942 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -112,7 +112,6 @@ liboSettings.gradle: $(BUILDDIR)/config_build.mk
$(BUILDDIR)/config_host.mk \
&& echo "}" \
&& echo "android.defaultConfig {" \
&& echo " applicationId '$(ANDROID_PACKAGE_NAME)'" \
- && echo " archivesBaseName = 'LibreOfficeViewer'" \
&& echo " minSdkVersion $(ANDROID_API_LEVEL)" \
&& echo " versionCode project.hasProperty('cmdVersionCode')
? cmdVersionCode.toInteger() : $(if $(versionCode),$(versionCode),1)" \
&& echo " versionName
'$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX)$(LIBO_VERSION_SUFFIX_SUFFIX)'"
\
diff --git a/android/source/build.gradle b/android/source/build.gradle
index afdd0b00a586..e96fac18f43f 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -37,6 +37,10 @@ dependencies {
implementation 'androidx.preference:preference:1.2.1'
}
+base {
+ archivesName = "LibreOfficeViewer"
+}
+
android {
namespace 'org.libreoffice'
compileSdk 34
