This is an automated email from the ASF dual-hosted git repository. erisu pushed a commit to branch revert-1079-master in repository https://gitbox.apache.org/repos/asf/cordova-android.git
commit 85d0173cff420f107865d517c786da9b8c580a94 Author: エリス <[email protected]> AuthorDate: Thu Apr 8 14:06:16 2021 +0900 Revert "[Frequent Updates] Gradle 6.6.1 & Android Gradle Plugin 4.0.1 & com.jfrog.bintray.gradle 1.8.5 (#1079)" This reverts commit 33476b4754c079e243760b6164725b26271e9b00. --- bin/templates/cordova/lib/builders/ProjectBuilder.js | 2 +- bin/templates/project/app/build.gradle | 4 ++-- bin/templates/project/build.gradle | 2 +- framework/build.gradle | 4 ++-- spec/fixtures/android_studio_project/build.gradle | 2 +- test/android/build.gradle | 2 +- test/android/wrapper.gradle | 2 +- test/androidx/build.gradle | 2 +- test/androidx/wrapper.gradle | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bin/templates/cordova/lib/builders/ProjectBuilder.js b/bin/templates/cordova/lib/builders/ProjectBuilder.js index e92a18f..71cc86d 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.6.1-all.zip'; + const distributionUrl = process.env.CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL || 'https://services.gradle.org/distributions/gradle-6.5-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 365fc41..ca87423 100644 --- a/bin/templates/project/app/build.gradle +++ b/bin/templates/project/app/build.gradle @@ -50,7 +50,7 @@ buildscript { dependencies { apply from: '../CordovaLib/cordova.gradle' - classpath 'com.android.tools.build:gradle:4.0.1' + classpath 'com.android.tools.build:gradle:4.0.0' if (cdvHelpers.getConfigPreference('GradlePluginKotlinEnabled', 'false').toBoolean()) { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" @@ -84,7 +84,7 @@ allprojects { } task wrapper(type: Wrapper) { - gradleVersion = '6.6.1' + gradleVersion = '6.5' } // Configuration properties. Set these via environment variables, build-extras.gradle, or gradle.properties. diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle index 9148c86..173aba0 100644 --- a/bin/templates/project/build.gradle +++ b/bin/templates/project/build.gradle @@ -24,7 +24,7 @@ buildscript { repositories repos dependencies { - classpath 'com.android.tools.build:gradle:4.0.1' + classpath 'com.android.tools.build:gradle:4.0.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/framework/build.gradle b/framework/build.gradle index 919b610..1d2a386 100644 --- a/framework/build.gradle +++ b/framework/build.gradle @@ -35,9 +35,9 @@ buildscript { dependencies { // The gradle plugin and the maven plugin have to be updated after each version of Android // studio comes out - classpath 'com.android.tools.build:gradle:4.0.1' + classpath 'com.android.tools.build:gradle:4.0.0' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' } } diff --git a/spec/fixtures/android_studio_project/build.gradle b/spec/fixtures/android_studio_project/build.gradle index 4438d8a..4dc1795 100644 --- a/spec/fixtures/android_studio_project/build.gradle +++ b/spec/fixtures/android_studio_project/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.1' + classpath 'com.android.tools.build:gradle:4.0.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/test/android/build.gradle b/test/android/build.gradle index 552978d..737a007 100644 --- a/test/android/build.gradle +++ b/test/android/build.gradle @@ -30,7 +30,7 @@ buildscript { // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files - classpath 'com.android.tools.build:gradle:4.0.1' + classpath 'com.android.tools.build:gradle:4.0.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/test/android/wrapper.gradle b/test/android/wrapper.gradle index bd50de8..94d95d2 100644 --- a/test/android/wrapper.gradle +++ b/test/android/wrapper.gradle @@ -17,5 +17,5 @@ */ wrapper { - gradleVersion = '6.6.1' + gradleVersion = '6.5' } diff --git a/test/androidx/build.gradle b/test/androidx/build.gradle index 9462741..a90dee3 100644 --- a/test/androidx/build.gradle +++ b/test/androidx/build.gradle @@ -28,7 +28,7 @@ buildscript { // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files - classpath 'com.android.tools.build:gradle:4.0.1' + classpath 'com.android.tools.build:gradle:4.0.0' } } diff --git a/test/androidx/wrapper.gradle b/test/androidx/wrapper.gradle index bd50de8..94d95d2 100644 --- a/test/androidx/wrapper.gradle +++ b/test/androidx/wrapper.gradle @@ -17,5 +17,5 @@ */ wrapper { - gradleVersion = '6.6.1' + gradleVersion = '6.5' } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
