From 6968eea88ed901ee139a56bb7d0ec2ec7daad49a Mon Sep 17 00:00:00 2001 From: Rami Potinkara Date: Tue, 14 Feb 2023 16:29:48 +0200 Subject: Update Gradle to 8.0 and Android Gradle Plug-in (AGP) to 7.4.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gradle 8.0 and AGP 7.4.1 are the latest versions at Feb 2023. Fixes: QTBUG-110875 Pick-to: 6.5 Change-Id: Ia13b9e7859a873d2aade8782c279266d0982da21 Reviewed-by: BogDan Vatra Reviewed-by: Assam Boudjelthia Reviewed-by: Mårten Nordheim --- src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.properties | 2 +- src/3rdparty/gradle/qt_attribution.json | 6 +++--- src/android/templates/build.gradle | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.properties b/src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.properties index ae04661ee7..da1db5f04e 100644 --- a/src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.properties +++ b/src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/3rdparty/gradle/qt_attribution.json b/src/3rdparty/gradle/qt_attribution.json index 13930153e8..5f5d434b83 100644 --- a/src/3rdparty/gradle/qt_attribution.json +++ b/src/3rdparty/gradle/qt_attribution.json @@ -4,11 +4,11 @@ "QDocModule": "qtcore", "QtParts": ["tools"], "Homepage": "https://gradle.org", - "Version": "7.5.1", - "DownloadLocation": "https://github.com/gradle/gradle/releases/tag/v7.5.1", + "Version": "8.0", + "DownloadLocation": "https://github.com/gradle/gradle/releases/tag/v8.0", "QtUsage": "Needed to create Android packages", "License": "Apache License 2.0", "LicenseId": "Apache-2.0", "LicenseFile": "LICENSE", - "Copyright": "Copyright (C) 2022 Gradle Inc." + "Copyright": "Copyright (C) 2023 Gradle Inc." } diff --git a/src/android/templates/build.gradle b/src/android/templates/build.gradle index 4a667b6379..f6c2f3d56d 100644 --- a/src/android/templates/build.gradle +++ b/src/android/templates/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:7.4.1' } } -- cgit v1.2.3