diff --git a/bin/templates/cordova/lib/plugin-build.gradle b/bin/templates/cordova/lib/plugin-build.gradle index 032b870e..0cda9f0a 100644 --- a/bin/templates/cordova/lib/plugin-build.gradle +++ b/bin/templates/cordova/lib/plugin-build.gradle @@ -21,7 +21,7 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } // Switch the Android Gradle plugin version requirement depending on the diff --git a/bin/templates/project/app/repositories.gradle b/bin/templates/project/app/repositories.gradle index 3661e131..01e73fd6 100644 --- a/bin/templates/project/app/repositories.gradle +++ b/bin/templates/project/app/repositories.gradle @@ -17,7 +17,6 @@ */ ext.repos = { - mavenCentral() google() - jcenter() + mavenCentral() } diff --git a/bin/templates/project/repositories.gradle b/bin/templates/project/repositories.gradle index 1384d145..01e73fd6 100644 --- a/bin/templates/project/repositories.gradle +++ b/bin/templates/project/repositories.gradle @@ -18,5 +18,5 @@ ext.repos = { google() - jcenter() + mavenCentral() } diff --git a/framework/build.gradle b/framework/build.gradle index 69748e3d..8296fca9 100644 --- a/framework/build.gradle +++ b/framework/build.gradle @@ -40,11 +40,11 @@ buildscript { repositories repos dependencies { - // The gradle plugin and the maven plugin have to be updated after each version of Android - // studio comes out + // Android Gradle Plugin (AGP) Build Tools classpath 'com.android.tools.build:gradle:4.2.1' + + // @todo remove this abandoned plugin. maven-publish-plugin is now supported by Android Gradle plugin 3.6.0 and higher classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5' } } @@ -54,8 +54,9 @@ allprojects { } apply plugin: 'com.android.library' + +// @todo remove this abandoned plugin. maven-publish-plugin is now supported by Android Gradle plugin 3.6.0 and higher apply plugin: 'com.github.dcendents.android-maven' -apply plugin: 'com.jfrog.bintray' group = 'org.apache.cordova' version = '10.0.0-dev' @@ -94,6 +95,7 @@ android { } } +// @todo after removing abandoned plugin "com.github.dcendents.android-maven". figure out what to do with this. install { repositories.mavenInstaller { pom { @@ -137,29 +139,6 @@ artifacts { archives sourcesJar } -bintray { - user = System.getenv('BINTRAY_USER') - key = System.getenv('BINTRAY_KEY') - configurations = ['archives'] - pkg { - repo = 'maven' - name = 'cordova-android' - userOrg = 'cordova' - licenses = ['Apache-2.0'] - vcsUrl = 'https://github.com/apache/cordova-android' - websiteUrl = 'https://cordova.apache.org' - issueTrackerUrl = 'https://github.com/apache/cordova-android/issues' - publicDownloadNumbers = true - licenses = ['Apache-2.0'] - labels = ['android', 'cordova', 'phonegap'] - version { - name = '10.0.0-dev' - released = new Date() - vcsTag = '10.0.0-dev' - } - } -} - dependencies { implementation 'androidx.webkit:webkit:1.3.0' } diff --git a/framework/cordova.gradle b/framework/cordova.gradle index ba9b37a1..19d4be56 100644 --- a/framework/cordova.gradle +++ b/framework/cordova.gradle @@ -19,7 +19,7 @@ import java.util.regex.Pattern import groovy.swing.SwingBuilder -import com.g00fy2.versioncompare.Version +import io.github.g00fy2.versioncompare.Version String doEnsureValueExists(filePath, props, key) { if (props.get(key) == null) { @@ -171,10 +171,11 @@ ext { buildscript { repositories { - jcenter() + google() + mavenCentral() } dependencies { - classpath 'com.g00fy2:versioncompare:1.3.4@jar' + classpath 'io.github.g00fy2:versioncompare:1.4.1@jar' } } diff --git a/framework/repositories.gradle b/framework/repositories.gradle index 1384d145..01e73fd6 100644 --- a/framework/repositories.gradle +++ b/framework/repositories.gradle @@ -18,5 +18,5 @@ ext.repos = { google() - jcenter() + mavenCentral() } diff --git a/spec/fixtures/android_studio_project/build.gradle b/spec/fixtures/android_studio_project/build.gradle index bf2a5143..05b5265d 100644 --- a/spec/fixtures/android_studio_project/build.gradle +++ b/spec/fixtures/android_studio_project/build.gradle @@ -3,7 +3,7 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { classpath 'com.android.tools.build:gradle:4.2.1' @@ -16,7 +16,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/test/androidx/app/build.gradle b/test/androidx/app/build.gradle index fa570548..e6921dcf 100644 --- a/test/androidx/app/build.gradle +++ b/test/androidx/app/build.gradle @@ -56,5 +56,6 @@ dependencies { }) } repositories { - jcenter() + google() + mavenCentral() } diff --git a/test/androidx/build.gradle b/test/androidx/build.gradle index ecf2e010..160d3522 100644 --- a/test/androidx/build.gradle +++ b/test/androidx/build.gradle @@ -21,7 +21,7 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -35,7 +35,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } }