From b584b00e6506e9faf1fcd95905394ed6d6063e79 Mon Sep 17 00:00:00 2001 From: Carl Poole Date: Fri, 29 May 2020 17:46:39 -0500 Subject: [PATCH] fix(android): remove bintray publishing plugin to fix Gradle 6+ issues (#3016) --- android/capacitor/build.gradle | 18 ------------------ scripts/deploy.sh | 1 - scripts/deploy/android.sh | 9 --------- 3 files changed, 28 deletions(-) delete mode 100644 scripts/deploy/android.sh diff --git a/android/capacitor/build.gradle b/android/capacitor/build.gradle index 6be1d8e100..7c22386cb5 100644 --- a/android/capacitor/build.gradle +++ b/android/capacitor/build.gradle @@ -20,14 +20,12 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.6.1' - classpath 'com.novoda:bintray-release:0.9.1' } } tasks.withType(Javadoc).all { enabled = false } apply plugin: 'com.android.library' -apply plugin: 'com.novoda.bintray-release' android { compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 29 @@ -72,20 +70,4 @@ dependencies { androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion" androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion" implementation "org.apache.cordova:framework:$cordovaAndroidVersion" -} - -def version = System.getenv("BINTRAY_PKG_VERSION") - -publish { - userOrg = 'ionic-team' - repoName = 'capacitor' - groupId = 'ionic-team' - artifactId = 'capacitor-android' - if (version != null) { - publishVersion = System.getenv("BINTRAY_PKG_VERSION") - } else { - publishVersion = '0.0.0' - } - desc = 'Capacitor Android Runtime' - website = 'https://github.com/ionic-team/capacitor' } \ No newline at end of file diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 257e72be9e..6450a8c20d 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -26,5 +26,4 @@ git push --follow-tags origin master #rm -rf capacitor-ios # Do the actual native deploys second, because they require tags/releases in github -bash scripts/deploy/android.sh bash scripts/deploy/pods.sh diff --git a/scripts/deploy/android.sh b/scripts/deploy/android.sh deleted file mode 100644 index d60c5c8c6b..0000000000 --- a/scripts/deploy/android.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -echo "Deploying android v$LERNA_VERSION" - -cd android - -export BINTRAY_PKG_VERSION=$LERNA_VERSION - -./gradlew clean build -b capacitor/build.gradle -Pandroid.useAndroidX=true -Pandroid.enableJetifier=true bintrayUpload -PbintrayUser=$BINTRAY_USER -PbintrayKey=$BINTRAY_KEY -PdryRun=false \ No newline at end of file