Age | Commit message (Collapse) | Author |
|
... and gradle to 8.0, as suggested by Android Studio.
Also, as suggested, let the upgrade assistant set the following properties
to keep the previous behavior for these for now instead of applying the new
default behavior:
android.defaults.buildfeatures.buildconfig=true
android.nonFinalResIds=false
android.nonTransitiveRClass=false
Those may be revisited in a follow-up step.
See the Android Gradle Plugin release notes [1]
for more details on the properties.
[1] https://developer.android.com/build/releases/past-releases/agp-8-0-0-release-notes
Change-Id: Iec2f5766c0888e0f38438290b8fd814494afd837
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155376
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
|
|
... and gradle to 7.5.
Change-Id: If5156ab18dc500dafdfa4f8a0f6e6c2563acc4db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145711
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
|
|
Follow the F-Droid Bot suggestion in [1] and set the checksum
from [2] in gradle-wrapper.properties, so a downloaded gradle
distribution will be verified against that, s. doc at [3].
Command used from within the `android/source` directory:
./gradlew wrapper --distribution-type all --gradle-distribution-sha256-sum cd5c2958a107ee7f0722004a12d0f8559b4564c34daad7df06cffd4d12a426d0
Note that this is the checksum for the gradle distribution,
not the gradle wrapper (which is mentioned in
Change-Id I3f466061aba55c5704fe251eee7e8c73f7d316aa instead.)
Also note that Android Studio does not fully support
the "distributionSha256Sum" attribute and requires
confirming in a message saying so that the checksum is correct
before syncing the project, s. [4].
[1] https://gitlab.com/fdroid/fdroiddata/-/merge_requests/12380#note_1229239229
[2] https://downloads.gradle-dn.com/distributions/gradle-7.4-all.zip.sha256
[3] https://docs.gradle.org/current/userguide/gradle_wrapper.html#configuring_checksum_verification
[4] https://issuetracker.google.com/issues/129261435#comment11
Change-Id: I39902be79e7dad2ad006262efe3b6c6ab3b5de5a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145105
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
|
|
Commit the result of running
./gradlew wrapper --distribution-type all --gradle-version 7.4
from within the `android/source` directory as described at [1].
Double-check that the sha256sum of the jar file matches what is listed on the
website [2] for v7.4:
$ sha256sum gradle/wrapper/gradle-wrapper.jar
575098db54a998ff1c6770b352c3b16766c09848bee7555dab09afc34e8cf590 gradle/wrapper/gradle-wrapper.jar
(Interestingly, the sha256sum of the gradle-wrapper.jar
used so far, e2b82129ab64751fd40437007bd2f7f2afb3c6e41a9198e628650b22d5824a14,
is not the one of any listed versions there, which is what
the F-Droid bot marked as error in a MR to update LibreOffice Viewer [3]).
[1] https://docs.gradle.org/current/userguide/gradle_wrapper.html#sec:upgrading_wrapper
[2] https://gradle.org/release-checksums/
[3] https://gitlab.com/fdroid/fdroiddata/-/merge_requests/12380#note_1229239229
Change-Id: I3f466061aba55c5704fe251eee7e8c73f7d316aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145098
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
|
|
... 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
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144834
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
|
|
... and gradle to 7.3.3, as suggested by
Android Studio.
The Android Gradle plugin release notes for 7.2.0 [1]
mention a new warning in Build Analyzer when
`android.enableJetifier=true` is set. That will
be handled in a follow-up commit.
[1] https://developer.android.com/studio/releases/gradle-plugin?buildsystem=ndk-build#jetifier-build-analyzer
Change-Id: I9427f8b878346edc3c6e30be1d41fcc4dc32540e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134672
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
|
|
... and gradle to 7.2, which is what Android Studio suggested
and did automatically when confirming.
Also apply the following optional, but recommended change
while doing so:
> Migrate from lintOptions to lint
> Configuration related to lint is now performed using the lint block.
Change-Id: Ia982d72d877e229c3006c6d528b830d16c88481f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133179
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
|
|
The previous version e.g. did not support building
Android App Bundles yet.
Drop explicit 'buildToolsVersion', as suggested in the warning
during build:
> WARNING: The specified Android SDK Build Tools version (27.0.3) is ignored,
> as it is below the minimum supported version (28.0.3) for Android Gradle
> Plugin 3.6.1.
> Android SDK Build Tools 28.0.3 will be used.
> To suppress this warning, remove "buildToolsVersion '27.0.3'" from your build.gradle
> file, as each version of the Android Gradle Plugin now has a default
> version of the build tools.
Change-Id: Iea5018366969fcefde1e9f4e8cb9836f5a09b41e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90099
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
|
|
Just specify:
--with-android-ndk=$HOME/Android/Sdk/ndk-bundle
--with-android-sdk=$HOME/Android/Sdk
in your autogen.input, install the appropriate components via Android
Studio and you are done.
Change-Id: Ic99790b781b9017eb4e642380e230d6f7b49e9b7
Reviewed-on: https://gerrit.libreoffice.org/81228
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
(cherry picked from commit 246f1b5b4485b7db9f9584e4b3b819c87e331c0e)
Reviewed-on: https://gerrit.libreoffice.org/81328
Tested-by: Jenkins
|
|
Change-Id: I971f02c624a19ec58539738f5e736a986b5ba0d6
|
|
gnustl (and others) are to be removed in future versions of the ndk
also bump gradle and build-tools to current versions along with it
arm unfortunately crashes with llvm-c++, so keep with gnustl for now/fix
that later
Change-Id: Ic794c3293b599b77ec48096bf3283a99c09cbb79
Reviewed-on: https://gerrit.libreoffice.org/45163
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
|
|
Change-Id: Ieb5c9a7855a57db5659c7f97902a12bd3afab328
Reviewed-on: https://gerrit.libreoffice.org/35200
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
|
|
Change-Id: Ib0d2dac42814c9daf752f0421922fb093507eb7c
|
|
move preparation tasks (creating assets/processing files) from the
makefile into the gradle script
This allows much easier integration into android-studio (just open
android/source with android studio after running make to compile the
native library)
Change-Id: I9a9d6832797c24a7e195a1c7954cd6d20f5a8496
|