summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/gradle
Commit message (Collapse)AuthorAgeFilesLines
* Gradle: Update to 7.4Mårten Nordheim2022-03-023-3/+3
| | | | | | | | | Pick-to: 6.3 Fixes: QTBUG-100989 Change-Id: I7978afc18a51b58ea95e4fb94328c4f98bb12486 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Update Gradle to 7.2.0 and Android Gradle Plugin to 7.0.2Mårten Nordheim2021-10-228-1077/+583
| | | | | | | | | | | | | | The latest build-tools 31.0.0 requires AGP version 7.0+, and that requires Gradle version 7.0+, so use the latest stable release for both. [1] https://developer.android.com/studio/releases/gradle-plugin? buildsystem=ndk-build#updating-gradle Fixes: QTBUG-97002 Pick-to: 6.2 Change-Id: I8ff26819bdf1a00f484ecc194c4d4e7bca2b598a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Android: fix Gradle version in qt_attribution fileAssam Boudjelthia2021-10-021-1/+1
| | | | | | | | | | | | The Gradle version in qt_attribution.json doesn't mention the actual version that is currently used. This amends 67c3f3f4ffcadba32ea42522a36b3f6d88fc3482. Pick-to: 6.2 Fixes: QTBUG-71328 Change-Id: I50fbabd56beb44389f9453666822f9667bab7d61 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Android: Bump gradle (plugin) versionsMike Achtelik2021-04-105-42/+60
| | | | | | | | | | | | | | | | | | | Android Gradle plugin 4.1.3 is compatible with the new <queries> declaration for package visibility on Android 11. If someone adds the <queries> element or starts relying on a library or SDK that supports targeting Android 11, they might encounter manifest merging errors when building the app. This is important since starting August 2021 the PlayStore requires new apps from targeting Android 11. So lets update to the newest Android Gradle plugin version. This also reverts 1e4dec12d5c0152d5c3eee3b612a0af4bf389a37 as AGP 4.1 requires at least buildToolsVersion 29.0.2. Change-Id: Id8ce5dadeb8a325dc9f901503946f325f3fd18a0 Reviewed-by: Lars Schmertmann <lars.schmertmann@governikus.de> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Remove the qmake project filesJoerg Bornemann2021-01-071-32/+0
| | | | | | | | | | | | | | | | Remove the qmake project files for most of Qt. Leave the qmake project files for examples, because we still test those in the CI to ensure qmake does not regress. Also leave the qmake project files for utils and other minor parts that lack CMake project files. Task-number: QTBUG-88742 Change-Id: I6cdf059e6204816f617f9624f3ea9822703f73cc Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Android: disable Gradle caching by defaultAssam Boudjelthia2020-10-291-2/+4
| | | | | | | | | | | If enabled by default, the cache size will grow quickly, especially if multiple different projects are managed every day. Keep the option commented, which can be enabled manually by the user. Pick-to: 5.15.2 Change-Id: I6d4a67f4f1bb3e37b02de7ff4c534ec4d006f9a3 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
* Android: remove --no-daemon arg for GradleAssam Boudjelthia2020-09-173-1/+12
| | | | | | | | | | | | | | Allow Gradle builds to run using JVM daemon, this will improve the current build time noticeably for clean builds and hugely for incremental builds. This will bring the Gradle build to comparable speed with a normal Gradle build in Android Studio. Task-number: QTBUG-86674 Pick-to: 5.15 Change-Id: Icc4267223802e4c9350b48099236650c023f868d Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Android: Copy required gradle files in non-prefix shadow buildsAlexandru Croitor2020-08-181-4/+10
| | | | | | | | | | | | This fixes running 'make apk' in a qmake android project, when using a shadow non-prefix build. An implementation detail is that COPIES can't take both files and directories as values, so we split them into two steps. Task-number: QTBUG-85399 Change-Id: I7373d6b7aede6e33096cb9718c679fa5e5dc1703 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Fix copying of gradle resources in non-prefix buildsAlexandru Croitor2020-08-141-8/+7
| | | | | | | | Amends b1f8ca8032bd0500f356c55c335937f7fb89d3f5. Task-number: QTBUG-85399 Change-Id: Ibf0d721a7735dabd48e069a6098d1d9338cde660 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Android: Don't treat gradle.pro as a buildable targetAndy Shaw2020-07-161-0/+2
| | | | | | | | | | | | | | When installing gradle it can conflict as it will treat it as the target and therefore install it as an executable although it is a directory inside this one. As this does not build anything but is really an installation target, we can mark it as aux template and change the target name to avoid any conflicts with the existing directory. Pick-to: 5.15 Task-number: QTBUG-80938 Change-Id: I000ee57521818b6d4d30d770362ff4700846e576 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-111-1/+1
|\ | | | | | | Change-Id: Ibee5acec72a1a1769d4bc5f23f56c7dc8d4cf3cb
| * Android: Bump gradle (plugin) versionsBogDan Vatra2020-03-041-1/+1
| | | | | | | | | | | | | | | | | | Move min & target sdk from AndroidManifest.xml to build.gradle Fixes: QTBUG-70817 Change-Id: Id9bb9825a3232587e0255b2d3d6f0273c5f9b66a Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-10-111-1/+1
|\| | | | | | | Change-Id: I3a1d7673c3c20019ab12a2ea0a60f1619920a34c
| * Say hello to Android multi arch build in one goBogDan Vatra2019-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Multi arch build in one go is need to support the new .aab packaging format. By default the users apps are built for all Android ABIs: arm64-v8a armeabi-v7a x86_64 x86 The user can pass ANDROID_ABIS to qmake to filter the ABIs during development, e.g. qmake ANDROID_ABIS="arm64-v8a armeabi-v7a" will build only for arm ABIs. [ChangeLog][Android] Android multi arch build in one go, needed to support the new .aab packaging format. Change-Id: I3a64caf9621c2a195863976a62a57cdf47e6e3b5 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Annotate some projects that should not to be regeneratedAlexandru Croitor2019-10-081-0/+1
| | | | | | | | | | | | | | Because they are completely custom written. Change-Id: I2f3d2e82ebf037a7bf42b3112fe4282589322b0e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Android: Install gradle templatesLeander Beernaert2019-06-131-0/+20
|/ | | | | | | | | Install the required gradle templates for the android deployment tool to work correctly. Change-Id: I1b18235c354dbea2d4b47ce1d8146a477676a6cb Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update gradle filesBogDan Vatra2018-03-234-7/+6
| | | | | Change-Id: I7324082ef9eb19cb0851a0a53e8e41ee8f174210 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* gradle: Complete qt_attribution.json fileKai Koehne2017-04-241-0/+2
| | | | | | | | Add it to the qtcore documentation, but mark it as a tool (code does not get shipped with customer application). Change-Id: I75cc199a2bbd86f9e40a75396144645ea69a7bd1 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Add gradle wrapper to Qt & update default Andriod gradle pluginBogDan Vatra2017-03-237-0/+1263
We need to add gradle wrapper to Qt because it was removed from latest Android SDK. Adding it to Qt, will give us more control and will save us from pain in the future. Task-number: QTBUG-59237 Change-Id: I6419876f8be11c0feeac448b228a46f811065264 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 14:15:16 +0000