Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

breaking: drop jcenter/bintray & update dependencies #1251

Merged
merged 1 commit into from
Jul 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/templates/cordova/lib/plugin-build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
buildscript {
repositories {
google()
jcenter()
mavenCentral()
}

// Switch the Android Gradle plugin version requirement depending on the
Expand Down
3 changes: 1 addition & 2 deletions bin/templates/project/app/repositories.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
*/

ext.repos = {
mavenCentral()
google()
jcenter()
mavenCentral()
}
2 changes: 1 addition & 1 deletion bin/templates/project/repositories.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@

ext.repos = {
google()
jcenter()
mavenCentral()
}
33 changes: 6 additions & 27 deletions framework/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}

Expand All @@ -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'
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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'
}
7 changes: 4 additions & 3 deletions framework/cordova.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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'
}
}
2 changes: 1 addition & 1 deletion framework/repositories.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@

ext.repos = {
google()
jcenter()
mavenCentral()
}
4 changes: 2 additions & 2 deletions spec/fixtures/android_studio_project/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
buildscript {
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
Expand All @@ -16,7 +16,7 @@ buildscript {
allprojects {
repositories {
google()
jcenter()
mavenCentral()
}
}

Expand Down
3 changes: 2 additions & 1 deletion test/androidx/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,6 @@ dependencies {
})
}
repositories {
jcenter()
google()
mavenCentral()
}
4 changes: 2 additions & 2 deletions test/androidx/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
buildscript {
repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
Expand All @@ -35,7 +35,7 @@ buildscript {
allprojects {
repositories {
google()
jcenter()
mavenCentral()
}
}

Expand Down