Merge branch 'master' into fix-diff

Author: DanielJette

.github/workflows/central_release.yml

@@ -0,0 +1,32 @@
+name: Publish package to the Maven Central Repository
+on:
+  release:
+    types: [created]
+jobs:
+  publish:
+    environment:
+      name: Central Repository Deployment
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Java
+        uses: actions/setup-java@v2
+        with:
+          java-version: '8'
+          distribution: 'adopt'
+      - name: Publish Testify Library
+        run: ./gradlew Library:uploadArchives
+        env:
+          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.OSSRH_GPG_SECRET_KEY_ID }}
+          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
+          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
+      - name: Publish Testify Gradle plugin
+        run: ./gradlew Plugin:uploadArchives
+        env:
+          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.OSSRH_GPG_SECRET_KEY_ID }}
+          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
+          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}

Library/bintray.build.gradle

@@ -1,14 +1,29 @@
 plugins {
     id 'com.android.library'
     id 'kotlin-android'
-    id 'com.github.dcendents.android-maven'
-    id 'com.jfrog.bintray'
+    id 'maven'
+    id 'signing'
     id 'org.jetbrains.dokka'
 }
 
+ext {
+    pom = [
+        publishedGroupId  : 'com.shopify.testify',
+        artifact          : 'testify',
+        libraryName       : 'testify',
+        libraryDescription: 'Android screenshot instrumentation tests.',
+        siteUrl           : 'https://github.com/Shopify/android-testify',
+        gitUrl            : 'https://github.com/Shopify/android-testify.git',
+        licenseName       : 'The MIT License',
+        licenseUrl        : 'https://opensource.org/licenses/MIT',
+        author            : 'Shopify Inc.'
+    ]
+}
+
 def VERSION_NAME = "$project.versions.testify"
 
 version = VERSION_NAME
+archivesBaseName = pom.artifact
 
 android {
     compileSdkVersion coreVersions.compileSdk
@@ -76,5 +91,13 @@ android {
     }
 }
 
-apply from: "bintray.build.gradle"
+task sourcesJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier = 'sources'
+}
+
+afterEvaluate { project ->
+    apply from: "../publish.build.gradle"
+}
+
 apply from: '../ktlint.gradle'

Library/build.gradle

@@ -1,12 +1,7 @@
 # Publishing
 
-Testify is published to Bintray and jcenter under the `shopify-android` organization. https://bintray.com/shopify/shopify-android
+Testify is published to the Maven Central Repository via GitHub Actions.
 
-- Update the `testify` version in [build.gradle](https://github.com/Shopify/android-testify/blob/master/build.gradle#L33)
-- Define the environment variable `BINTRAY_USER`. Set this to a valid user name from the Shopify Bintray organization.
-Thus value can be found at https://bintray.com/profile/edit
-- Define the environment variable `BINTRAY_KEY`. This can be found in a Bintray user profile's left menu, under "API Key".
-- Upload the library to Bintray using the following gradle command:
-`./gradlew Library:clean Library:assemble Library:bintrayUpload`
-- Upload the Gradle plugin to Bintray using the following gradle command:
-`./gradlew Plugin:clean Plugin:assemble Plugin:bintrayUpload`
+- Update the `testify` version in [build.gradle](https://github.com/Shopify/android-testify/blob/master/build.gradle#L33) and commit the version bump
+- Create a new release on Github. This will invoke the publish Github action and automatically build, sign, and upload to the OSSRH staging repository.
+- Promotion from OSSRH to Central Repository requires a manual review for validation before becoming publicly available

PUBLISHING.md

@@ -74,7 +74,7 @@ You can customize the destination path and file name for the report file by prov
 Example:
 
 ```bash
-./gradlew :reportPull -PreportPath="/user/testify/" -PreportFileName="my-report.yml"
+./gradlew Sample:reportPull -PreportPath="/user/testify/" -PreportFileName="my-report.yml"
 ```
 
 ### reportShow
@@ -183,4 +183,4 @@ Verify that the ImageMagick tools required for diff images are installed. The `g
 Verify that the ImageMagick tools required for diff images are installed
 ------------------------------------------------------------
   Compare               = true
-```
+```