Publish to S3 instead of Bintray (#63)

Author: mokagio

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  android: wordpress-mobile/android@0.0.22
+  android: wordpress-mobile/android@1.0.20
 
 commands:
   copy-gradle-properties:
@@ -36,77 +36,31 @@ jobs:
           name: Test
           command: ./gradlew --stacktrace test
       - android/save-gradle-cache
-  Build and upload to Bintray:
+  Build and upload to S3:
     executor:
       name: android/default
       api-version: "27"
     steps:
+      - android/check-precondition-for-publish-artifacts
       - checkout
       - copy-gradle-properties
       - android/restore-gradle-cache
-      - run:
-          name: Bintray Upload
-          command: |
-            # Use a different versioning style for builds from PRs to allow
-            # developers to iterate faster.
-            #
-            # All those dev builds will be deleted once the PR is merged by
-            # https://github.com/Automattic/bintray-garbage-collector/
-            #
-            # If $PREFIX is not set, that is, if we're not on a PR but a merge
-            # commit on develop or trunk, the version will be the value from
-            # the source code.
-            branch=$CIRCLE_BRANCH
-            if [[ -n "$CIRCLE_PULL_REQUEST" ]]; then
-              PR_NUMBER=$(basename $CIRCLE_PULL_REQUEST)
-              # Making the assumption that $CIRCLE_SHA1 will always be
-              # available.
-              PREFIX="$PR_NUMBER-$CIRCLE_SHA1"
-            elif [[ "$branch" != "trunk" && "$branch" != "develop" ]]; then
-              # This happens on the first push of a new branch, when there
-              # isn't a PR open for it yet.
-              echo "Running on a feature branch with no open PR: skipping Bintray upload"
-              exit 0
-            fi
-
-            # Locally, calling `./gradlew bintrayUpload` is enough to generate
-            # all the required artifacts. On CI, unless run each task
-            # individually, the Bintray task will fail to find the AAR and
-            # POM artifacts in the build/ folder.
-            #
-            # This builds the AAR.
-            ./gradlew --stacktrace assembleRelease
-
-            # This builds the POM.
-            #
-            # On local, the POM is generated automatically as part of
-            # assembleRelease, but that doesn't seem to be the case on CI. Here
-            # we need to explicitly generated it, otherwise bintrayUpload won't
-            # find it and won't upload it.
-            #
-            # Worth noting that the Bintray plugin mentions the necessity for
-            # some workarounds to generate the POM under certain circumstances,
-            # although none of them apply to our current usage. See:
-            # https://github.com/bintray/gradle-bintray-plugin/tree/67718c3a65b64dbfe7534a82a178da2c57153a5d#maven-publications
-            #
-            # See also the description and comments in this PR:
-            # https://github.com/wordpress-mobile/WordPress-Utils-Android/pull/39
-            #
-            # Notice the `-PbintrayVersion` parameter to make sure the POM has
-            # the same version as the one bintrayUpload will use.
-            ./gradlew --stacktrace generatePomFileForUtilsPublicationPublication -PbintrayVersion=$PREFIX
-
-            # Finally, this uploads both AAR and POM to Bintray.
-            ./gradlew --stacktrace bintrayUpload -PbintrayVersion=$PREFIX
+      - android/publish-to-s3:
+          module_name: WordPressUtils
       - android/save-gradle-cache
 
 workflows:
-  # We don't want this to run on tags, but no filter statement is necessary
-  # because that's the default behavior
   WordPress-Utils-Android:
     jobs:
       - Lint
-      - Test
-      - Build and upload to Bintray:
+      - Test:
+          filters:
+            tags:
+              only: /.*/
+      - Build and upload to S3:
           requires:
-            - Test
+            - Test 
+          filters:
+            tags:
+              only: /.*/
+

README.md

@@ -4,29 +4,25 @@ Collection of utility methods for Android and WordPress.
 
 ## Use the library in your project
 
-* In your build.gradle:
+* In your `build.gradle`:
 ```groovy
-dependencies {
-    compile 'org.wordpress:utils:1.30.0' // use version 1.30.0
+repositories {
+    maven { url "https://a8c-libs.s3.amazonaws.com/android" }
 }
-```
-
-## Publish an updated version to your local maven repository
-
-You can bump the [version name in the main build file: `WordPressUtils/build.gradle`][1]. After updating the build file, you can build, and publish the library to your local maven repo. That will let you try the new version in your app for example.
 
-```shell
-$ ./gradlew assemble test publishToMavenLocal
+dependencies {
+    implementation 'org.wordpress:utils:1.31.0'
+}
 ```
 
-## Publish it to Bintray
+## Publishing a new version
 
-When a new version is ready to be published to the remote repository, use the following command to publish it to Bintray:
+In the following cases, CircleCI will publish a new version with the following format to our remote Maven repo:
 
-```shell
-$ ./gradlew clean build
-$ ./gradlew bintrayUpload -PbintrayUser=FIXME -PbintrayKey=FIXME
-```
+* For each commit in an open PR: `<PR-number>-<commit full SHA1>`
+* Each time a PR is merged to `develop`: `develop-<commit full SHA1>`
+* Each time a PR is merged to `trunk`: `trunk-<commit full SHA1>`
+* Each time a new tag is created: `{tag-name}`
 
 ## Apps and libraries using WordPress-Utils-Android:
 

WordPressUtils/build.gradle

@@ -5,19 +5,19 @@ buildscript {
     repositories {
         google()
         jcenter()
+        maven { url 'https://a8c-libs.s3.amazonaws.com/android' }
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath 'com.android.tools.build:gradle:4.0.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
+        classpath 'com.automattic.android:publish-to-s3:0.2.2'
     }
 }
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
-apply plugin: 'maven-publish'
-apply plugin: 'com.jfrog.bintray'
+apply plugin: 'com.automattic.android.publish-to-s3'
 
 repositories {
     google()
@@ -88,47 +88,9 @@ android.libraryVariants.all { variant ->
     }
 }
 
-// Allows to override the artifact version by passing a -PbintrayVersion
-// parameter when calling Gradle
-def getBintrayVersion() {
-  return project.properties['bintrayVersion'] ?: android.defaultConfig.versionName
-}
-
-bintray {
-    user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
-    key = project.hasProperty('bintrayKey') ? project.property('bintrayKey') : System.getenv('BINTRAY_KEY')
-    publications = ['UtilsPublication']
-    publish = true
-    pkg {
-        repo = 'maven'
-        name = 'utils'
-        userOrg = 'wordpress-mobile'
-        licenses = ['MIT', 'GPL']
-        vcsUrl = 'https://github.com/wordpress-mobile/WordPress-Utils-Android.git'
-        version {
-            name = getBintrayVersion()
-            desc = 'Utils library for Android'
-            released  = new Date()
-        }
-    }
-}
-
-// Because the components are created only during the `afterEvaluate` phase, we
-// must configure our publications using the `afterEvaluate()` lifecycle method
-//
-// See https://developer.android.com/studio/build/maven-publish-plugin
-project.afterEvaluate {
-    publishing {
-        publications {
-            UtilsPublication(MavenPublication) {
-                // Applies the component for the release build variant
-                from components.release
-
-                groupId 'org.wordpress'
-                artifactId 'utils'
-                version getBintrayVersion()
-            }
-        }
-    }
+s3PublishPlugin {
+    groupId "org.wordpress"
+    artifactId "utils"
+    from "release"
 }
 

build.gradle

@@ -32,10 +32,4 @@ allprojects {
             configFile file("${project.rootDir}/config/checkstyle.xml")
         }
     }
-
-    // Suppress false Javadoc lint errors preventing Bintray release
-    // See https://stackoverflow.com/questions/34828426/disable-javadoc-check-for-bintray-upload
-    tasks.withType(Javadoc) {
-        options.addBooleanOption('Xdoclint:none', true)
-    }
 }