From 46d4d924cc1a31b949425f17a74d8e1a38df10f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=A8=E3=83=AA=E3=82=B9?= Date: Tue, 13 Apr 2021 15:35:34 +0900 Subject: [PATCH] feat!: upgrade gradle@6.8.3 (#1197) * [Frequent Updates] Gradle 6.6.1 & Android Gradle Plugin 4.0.1 & com.jfrog.bintray.gradle 1.8.5 (#1079) * Update ProjectBuilder.js * Update build.gradle * Update wrapper.gradle * chore: remove non-gradle wrapper changes * feat: upgrade gradle@6.8.3 (#1174) Co-authored-by: Mosab A <47486787+mosabab@users.noreply.github.com> --- bin/templates/cordova/lib/builders/ProjectBuilder.js | 2 +- bin/templates/project/app/build.gradle | 2 +- test/android/wrapper.gradle | 2 +- test/androidx/wrapper.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/templates/cordova/lib/builders/ProjectBuilder.js b/bin/templates/cordova/lib/builders/ProjectBuilder.js index 71cc86d1..f4be4aeb 100644 --- a/bin/templates/cordova/lib/builders/ProjectBuilder.js +++ b/bin/templates/cordova/lib/builders/ProjectBuilder.js @@ -268,7 +268,7 @@ class ProjectBuilder { // update/set the distributionUrl in the gradle-wrapper.properties const gradleWrapperPropertiesPath = path.join(self.root, 'gradle/wrapper/gradle-wrapper.properties'); const gradleWrapperProperties = createEditor(gradleWrapperPropertiesPath); - const distributionUrl = process.env.CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL || 'https://services.gradle.org/distributions/gradle-6.5-all.zip'; + const distributionUrl = process.env.CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL || 'https://services.gradle.org/distributions/gradle-6.8.3-all.zip'; gradleWrapperProperties.set('distributionUrl', distributionUrl); gradleWrapperProperties.save(); diff --git a/bin/templates/project/app/build.gradle b/bin/templates/project/app/build.gradle index ca874233..30ca0b46 100644 --- a/bin/templates/project/app/build.gradle +++ b/bin/templates/project/app/build.gradle @@ -84,7 +84,7 @@ allprojects { } task wrapper(type: Wrapper) { - gradleVersion = '6.5' + gradleVersion = '6.8.3' } // Configuration properties. Set these via environment variables, build-extras.gradle, or gradle.properties. diff --git a/test/android/wrapper.gradle b/test/android/wrapper.gradle index 94d95d2d..80394fa7 100644 --- a/test/android/wrapper.gradle +++ b/test/android/wrapper.gradle @@ -17,5 +17,5 @@ */ wrapper { - gradleVersion = '6.5' + gradleVersion = '6.8.3' } diff --git a/test/androidx/wrapper.gradle b/test/androidx/wrapper.gradle index 94d95d2d..80394fa7 100644 --- a/test/androidx/wrapper.gradle +++ b/test/androidx/wrapper.gradle @@ -17,5 +17,5 @@ */ wrapper { - gradleVersion = '6.5' + gradleVersion = '6.8.3' }