android/Bootstrap/Makefile.shared | 2 +- android/source/gradle.properties | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
New commits: commit 89fd1a2adaa05329eead62573a084238e5e57ebf Author: Michael Weghorn <[email protected]> AuthorDate: Wed Jul 17 10:11:34 2024 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Jul 17 12:14:29 2024 +0200 android: Show all gradle warnings Set the gradle property to show individual warnings during the build. Without this, the build output showed: > Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0. > > You can use '--warning-mode all' to show the individual deprecation warnings and determine if they come from your own scripts or plugins. > > For more on this, please refer to https://docs.gradle.org/8.7/userguide/command_line_interface.html#sec:command_line_warnings in the Gradle documentation. Now, it shows the individual issues that need to be addressed: > > 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.) Actually addressing them still needs to be done separately. Change-Id: Ib749e9e21d3d5f5893c348a5070a1e994a395c6f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170609 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/android/source/gradle.properties b/android/source/gradle.properties index 19f2d673e497..996ab0b6dbdb 100644 --- a/android/source/gradle.properties +++ b/android/source/gradle.properties @@ -2,3 +2,4 @@ android.nonFinalResIds=false android.nonTransitiveRClass=false android.useAndroidX=true org.gradle.jvmargs=-Xmx3072m +org.gradle.warning.mode=all commit 27f1851eb2452a25358d455de2566dc4f651c2b7 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Jul 17 10:01:03 2024 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Jul 17 12:14:20 2024 +0200 android: Set minSdkVersion without "=" Addresses this warning shown in Android Studio: > Do not use assignment with the minSdkVersion property (remove the '=') Change-Id: I2d9e7037f7fb6e4d1625a8625a1b3820fb6e205f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170607 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index b93735234b3d..070239924e32 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -113,7 +113,7 @@ liboSettings.gradle: $(BUILDDIR)/config_build.mk $(BUILDDIR)/config_host.mk \ && echo "android.defaultConfig {" \ && echo " applicationId '$(ANDROID_PACKAGE_NAME)'" \ && echo " archivesBaseName = 'LibreOfficeViewer'" \ - && echo " minSdkVersion = $(ANDROID_API_LEVEL)" \ + && 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)'" \ && echo " buildConfigField('String', 'BUILD_ID_SHORT', '\"$(shell cd $(SRCDIR) && git log -1 --format=%h)\"')" \
