Merge branch 'trunk' into customize_toolbar_layout

Author: anitaa1990

.buildkite/pipeline.yml

@@ -0,0 +1,54 @@
+common-params:
+  &publish-android-artifacts-docker-container
+  docker#v3.8.0:
+    image: "public.ecr.aws/automattic/android-build-image:v1.1.0"
+    propagate-environment: true
+    environment:
+      # DO NOT MANUALLY SET THESE VALUES!
+      # They are passed from the Buildkite agent to the Docker container
+      - "AWS_ACCESS_KEY"
+      - "AWS_SECRET_KEY"
+
+steps:
+  - label: "Publish :aztec"
+    key: "publish-aztec"
+    plugins:
+      - *publish-android-artifacts-docker-container
+    command: |
+      .buildkite/publish-aztec.sh
+
+  - label: "Publish :glide-loader"
+    key: "publish-glide-loader"
+    depends_on:
+      - "publish-aztec"
+    plugins:
+      - *publish-android-artifacts-docker-container
+    command: |
+      .buildkite/publish-glide-loader.sh
+
+  - label: "Publish :picasso-loader"
+    key: "publish-picasso-loader"
+    depends_on:
+      - "publish-aztec"
+    plugins:
+      - *publish-android-artifacts-docker-container
+    command: |
+      .buildkite/publish-picasso-loader.sh
+
+  - label: "Publish :wordpress-shortcodes"
+    key: "publish-wordpress-shortcodes"
+    depends_on:
+      - "publish-aztec"
+    plugins:
+      - *publish-android-artifacts-docker-container
+    command: |
+      .buildkite/publish-wordpress-shortcodes.sh
+
+  - label: "Publish :wordpress-comments"
+    key: "publish-wordpress-comments"
+    depends_on:
+      - "publish-aztec"
+    plugins:
+      - *publish-android-artifacts-docker-container
+    command: |
+      .buildkite/publish-wordpress-comments.sh

.buildkite/publish-aztec.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -euo pipefail
+
+./gradlew \
+    :aztec:prepareToPublishToS3 $(prepare_to_publish_to_s3_params) \
+    :aztec:publish
+
+# Add meta-data for the published version so we can use it in subsequent steps
+cat ./aztec/build/published-version.txt | buildkite-agent meta-data set "PUBLISHED_AZTEC_VERSION"

.buildkite/publish-glide-loader.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -euo pipefail
+
+# Retrieve data from previous steps
+PUBLISHED_AZTEC_VERSION=$(buildkite-agent meta-data get "PUBLISHED_AZTEC_VERSION")
+
+./gradlew \
+    -PaztecVersion="$PUBLISHED_AZTEC_VERSION" \
+    :glide-loader:prepareToPublishToS3 $(prepare_to_publish_to_s3_params) \
+    :glide-loader:publish

.buildkite/publish-picasso-loader.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -euo pipefail
+
+# Retrieve data from previous steps
+PUBLISHED_AZTEC_VERSION=$(buildkite-agent meta-data get "PUBLISHED_AZTEC_VERSION")
+
+./gradlew \
+    -PaztecVersion="$PUBLISHED_AZTEC_VERSION" \
+    :picasso-loader:prepareToPublishToS3 $(prepare_to_publish_to_s3_params) \
+    :picasso-loader:publish

.buildkite/publish-wordpress-comments.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -euo pipefail
+
+# Retrieve data from previous steps
+PUBLISHED_AZTEC_VERSION=$(buildkite-agent meta-data get "PUBLISHED_AZTEC_VERSION")
+
+./gradlew \
+    -PaztecVersion="$PUBLISHED_AZTEC_VERSION" \
+    :wordpress-comments:prepareToPublishToS3 $(prepare_to_publish_to_s3_params) \
+    :wordpress-comments:publish

.buildkite/publish-wordpress-shortcodes.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -euo pipefail
+
+# Retrieve data from previous steps
+PUBLISHED_AZTEC_VERSION=$(buildkite-agent meta-data get "PUBLISHED_AZTEC_VERSION")
+
+./gradlew \
+    -PaztecVersion="$PUBLISHED_AZTEC_VERSION" \
+    :wordpress-shortcodes:prepareToPublishToS3 $(prepare_to_publish_to_s3_params) \
+    :wordpress-shortcodes:publish

.gitignore

@@ -42,7 +42,6 @@ annotations/
 !/.idea/codeStyleSettings.xml
 !/.idea/encodings.xml
 !/.idea/copyright/
-!/.idea/compiler.xml
 # Enforce plugins
 !/.idea/externalDependencies.xml
 

.idea/compiler.xml

@@ -1,14 +1,15 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
+plugins {
+    id "com.android.application"
+    id "org.jetbrains.kotlin.android"
+}
 
 android {
     compileSdkVersion 28
-    buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "org.wordpress.aztec"
-        minSdkVersion 16
-        targetSdkVersion 28
+        minSdkVersion commonMinSdkVersion
+        targetSdkVersion commonTargetSdkVersion
         versionCode 1
         versionName "1.0"
         vectorDrawables.useSupportLibrary = true
@@ -39,7 +40,7 @@ dependencies {
     implementation project(':wordpress-comments')
     implementation project(':wordpress-shortcodes')
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$gradle.ext.kotlinVersion"
 
     implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation "org.wordpress:utils:$wordpressUtilsVersion"
@@ -50,5 +51,4 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
-    androidTestImplementation('com.xamarin.testcloud:espresso-support:1.3')
 }

app/build.gradle

@@ -1,39 +1,21 @@
 package org.wordpress.aztec.demo
 
+import android.util.Log
 import androidx.test.rule.GrantPermissionRule
 import androidx.test.runner.AndroidJUnit4
-import com.xamarin.testcloud.espresso.Factory
-import com.xamarin.testcloud.espresso.ReportHelper
-import org.junit.Before
 import org.junit.Rule
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 abstract class BaseTest {
-
-    @Rule
-    @JvmField
-    val mReportHelper: ReportHelper = Factory.getReportHelper()
-
     @Rule
     @JvmField
     val grantPermissionRule: GrantPermissionRule = GrantPermissionRule.grant(android.Manifest.permission.CAMERA,
             android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
 
     companion object {
-        private lateinit var reportHelper: ReportHelper
-
         fun label(label: String) {
-            reportHelper.label(label)
+            Log.d("BaseTest", label)
         }
     }
-
-    init {
-        BaseTest.reportHelper = mReportHelper
-    }
-
-    @Before
-    fun SetUp() {
-        reportHelper.label("Starting App")
-    }
 }