android/source/AndroidManifest.xml | 3 +--
android/source/build.gradle | 1 +
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit afcdd294b3cbca93810ad1a94df18770d0a09bba
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Dec 27 11:45:56 2022 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Wed Dec 28 08:27:54 2022 +0000
android: Set namespace in build.gradle instead of manifest
Switch from the now deprecated way, as mentioned in
commit 7347d911fa295c31262a0f576c5b2f3f14ce017d
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Fri Dec 23 18:29:44 2022 +0100
android: Update Android Gradle Plugin to 7.3.1
... and gradle to 7.4.
Relevant entry from the release notes [1] that will be
addressed in a follow-up commit:
> # Package attribute in manifest file is deprecated
>
> Starting with AGP 7.3.0-alpha04, if you use Gradle to build your
> project, AGP generates a warning if you use the package attribute
in the
> manifest file. To set the namespace for your app, use the
namespace
> property in the module-level build.gradle file. To learn more,
see Set a
> namespace
>
[https://developer.android.com/studio/build/configure-app-module#set-namespace].
>
> To get help moving to the new namespace DSL, use the AGP Upgrade
> Assistant (Tools > AGP Upgrade Assistant).
[1]
https://developer.android.com/studio/releases/gradle-plugin#7-3-0
Change-Id: I8b196e53fb9b3fb7e9314719fdb7e0f2254abd10
Note that this is unrelated to the Android application ID [1]
that can be set with autogen param `--with-android-package-name`.
[1]
https://developer.android.com/studio/build/configure-app-module#set-application-id
Change-Id: I146dab19228d83b1beb6408743c0232e1ba1d060
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144836
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/android/source/AndroidManifest.xml
b/android/source/AndroidManifest.xml
index c50ad77ae71d..4a7c137878fb 100644
--- a/android/source/AndroidManifest.xml
+++ b/android/source/AndroidManifest.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android";
- android:installLocation="${installLocation}"
- package="org.libreoffice">
+ android:installLocation="${installLocation}">
<!-- App requires OpenGL ES 2.0 -->
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
diff --git a/android/source/build.gradle b/android/source/build.gradle
index 52ca33f0994e..581216e603fc 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -31,6 +31,7 @@ dependencies {
}
android {
+ namespace 'org.libreoffice'
compileSdkVersion 32
// uses non-conventional source layout, so need to reconfigure accordingly
// ToDo move to conventional layout, so stuff can be stripped down.
