Skip to content

Commit

Permalink
feat!: upgrade gradle@6.8.3 (apache#1197)
Browse files Browse the repository at this point in the history
* [Frequent Updates] Gradle 6.6.1 & Android Gradle Plugin 4.0.1 & com.jfrog.bintray.gradle 1.8.5 (apache#1079)
* Update ProjectBuilder.js
* Update build.gradle
* Update wrapper.gradle
* chore: remove non-gradle wrapper changes
* feat: upgrade gradle@6.8.3 (apache#1174)

Co-authored-by: Mosab A <47486787+mosabab@users.noreply.github.com>
(cherry picked from commit 46d4d92)
  • Loading branch information
erisu authored and ebhsgit committed May 20, 2021
1 parent 4eb27c4 commit b3b1f0d
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion bin/templates/cordova/lib/builders/ProjectBuilder.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
2 changes: 1 addition & 1 deletion bin/templates/project/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion test/android/wrapper.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
*/

wrapper {
gradleVersion = '6.5'
gradleVersion = '6.8.3'
}
2 changes: 1 addition & 1 deletion test/androidx/wrapper.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
*/

wrapper {
gradleVersion = '6.5'
gradleVersion = '6.8.3'
}

0 comments on commit b3b1f0d

Please sign in to comment.