Merge remote-tracking branch 'origin/trunk' into plugin-dsl-2

.buildkite/pipeline.yml

@@ -1,51 +1,70 @@
-docker-container: &docker-container
-  plugins:
-    - docker#v3.8.0:
-        image: "public.ecr.aws/automattic/android-build-image:311ab824e9fd33ebb71de83c3fd1c328ea84443b"
-        environment:
-          - "CI=true"
+# Nodes with values to reuse in the pipeline.
+common_params:
+  # Common plugin settings to use with the `plugins` key.
+  - &common_plugins
+    - automattic/bash-cache#2.1.0
 
 steps:
   - label: "checkstyle"
-    <<: *docker-container
     command: |
       cp gradle.properties-example gradle.properties
       ./gradlew checkstyle
+    plugins: *common_plugins
     artifact_paths:
       - "**/build/reports/checkstyle/checkstyle.*"
+    agents:
+      queue: "android"
+
   - label: "ktlint"
-    <<: *docker-container
     command: |
       cp gradle.properties-example gradle.properties
       ./gradlew ciktlint
+    plugins: *common_plugins
     artifact_paths:
       - "**/build/ktlint.xml"
+    agents:
+      queue: "android"
+
   - label: "detekt"
-    <<: *docker-container
     command: |
       cp gradle.properties-example gradle.properties
       ./gradlew WordPress:detekt
+    plugins: *common_plugins
     artifact_paths:
       - "**/build/reports/detekt/detekt.html"
+    agents:
+      queue: "android"
+
   - label: "lint"
-    <<: *docker-container
     command: |
       cp gradle.properties-example gradle.properties
       ./gradlew lintWordpressVanillaRelease
+    plugins: *common_plugins
     artifact_paths:
       - "**/build/reports/lint-results*.*"
+    agents:
+      queue: "android"
+
   - label: "Test WordPress"
-    <<: *docker-container
     command: |
       cp gradle.properties-example gradle.properties
       ./gradlew testWordpressVanillaRelease
+    plugins: *common_plugins
+    agents:
+      queue: "android"
+
   - label: "Test WordPressProcessors"
-    <<: *docker-container
     command: |
       cp gradle.properties-example gradle.properties
       ./gradlew :libs:WordPressProcessors:test
+    plugins: *common_plugins
+    agents:
+      queue: "android"
+
   - label: "Test ImageEditor"
-    <<: *docker-container
     command: |
       cp gradle.properties-example gradle.properties
       ./gradlew :libs:image-editor:ImageEditor:test
+    plugins: *common_plugins
+    agents:
+      queue: "android"

.circleci/config.yml

@@ -164,7 +164,19 @@ jobs:
           name: Create GitHub Release
           command: |
             bundle exec fastlane create_gh_release
-
+  Dependency Tree Diff:
+    executor:
+      name: android/default
+      api-version: "28"
+    steps:
+      - checkout
+      - copy-gradle-properties
+      - run:
+          name: Build dependency diff report
+          command: |
+            if [ -n "$CIRCLE_PULL_REQUEST" ]; then
+              ./tools/dependency-tree-diff/dependency-tree-diff.sh
+            fi
 
   Connected Tests:
     parameters:
@@ -198,7 +210,7 @@ jobs:
           test-targets: notPackage org.wordpress.android.ui.screenshots
           device: model=Pixel2,version=28,locale=en,orientation=portrait
           project: api-project-108380595987
-          timeout: 10m
+          timeout: 20m
           num-flaky-test-attempts: 2
           results-history-name: CircleCI WordPress Connected Tests
       - android/save-gradle-cache
@@ -269,7 +281,7 @@ jobs:
         type: boolean
         default: true
     macos:
-      xcode: 11.6.0
+      xcode: 13.2.1
     working_directory: /tmp/workspace
     steps:
       - attach_workspace:
@@ -279,9 +291,9 @@ jobs:
           keys:
             - &homebrew-cache-key v2-brew-imagemagick-{{ checksum "Gemfile.lock" }}
       - run:
-          name: Brew Install ImageMagick
+          name: Brew Install ImageMagick and drawText
           command: |
-            brew install pkg-config imagemagick
+            brew install pkg-config imagemagick automattic/build-tools/drawText
             brew cleanup
       - save_cache:
           paths:
@@ -348,17 +360,18 @@ workflows:
         - << pipeline.parameters.generate_screenshots >>
         - << pipeline.parameters.release_build >>
     jobs:
+      - Dependency Tree Diff
       - Installable Build:
           filters:
             branches:
               ignore: /pull\/[0-9]+/
       - Connected Tests:
           post-to-slack: true
-          # Always run connected tests on develop and release branches
+          # Always run connected tests on trunk and release branches
           filters:
             branches:
               only:
-                - develop
+                - trunk
                 - /^release.*/
                 - /^gutenberg\/integrate_release_.*/
   Optional Tests:
@@ -373,7 +386,7 @@ workflows:
           filters:
             branches:
               ignore:
-                - develop
+                - trunk
                 - /^release.*/
                 - /^gutenberg\/integrate_release_.*/
                 - /pull\/[0-9]+/

.configure

@@ -1,7 +1,7 @@
 {
   "project_name": "WordPress-Android",
   "branch": "trunk",
-  "pinned_hash": "d20c1e0dbdc2190533418ccf464fc355ca2a9ed4",
+  "pinned_hash": "15876d597d86d75685c5c702078276d75e74f4a7",
   "files_to_copy": [
     {
       "file": "android/WPAndroid/gradle.properties",

.github/dependabot.yml

@@ -0,0 +1,38 @@
+version: 2
+updates:
+  - package-ecosystem: "gradle"
+    open-pull-requests-limit: 6
+    directory: "/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "bot: dependencies update"
+    reviewers:
+      - "wordpress-mobile/android-developers"
+    ignore:
+      # The Android Gradle Plugin is a dependency that needs to be in sync with other
+      # in-house libraries due to compatibility with composite build.
+      - dependency-name: "com.android.tools.build:gradle"
+      # Bumping 1.2.1 to 1.3.0 causes some issues, fist spotted in Reader. For more details, see
+      # https://github.com/wordpress-mobile/WordPress-Android/pull/14431
+      # An update related issue has been created to make sure that this gets the needed attention:
+      # https://github.com/wordpress-mobile/WordPress-Android/issues/16132
+      - dependency-name: "com.google.android.material:material"
+      # Bumping 2.26.3 to 2.27.2 will break the mocks. For more details, see
+      # https://github.com/wiremock/wiremock/issues/1345#issuecomment-656060968
+      - dependency-name: "com.github.tomakehurst:wiremock"
+      # Our libraries that are stored in S3 have a custom versioning scheme which doesn't work with
+      # dependapot.
+      - dependency-name: "org.wordpress:fluxc"
+      - dependency-name: "org.wordpress:utils"
+      - dependency-name: "org.wordpress-mobile.gutenberg-mobile:react-native-gutenberg-bridge"
+      - dependency-name: "org.wordpress:login"
+      - dependency-name: "com.automattic:stories"
+      - dependency-name: "com.automattic.stories:mp4compose"
+      - dependency-name: "com.automattic.stories:photoeditor"
+      - dependency-name: "org.wordpress:aztec"
+      - dependency-name: "org.wordpress.aztec:wordpress-shortcodes"
+      - dependency-name: "org.wordpress.aztec:wordpress-comments"
+      - dependency-name: "org.wordpress.aztec:glide-loader"
+      - dependency-name: "org.wordpress.aztec:picasso-loader"
+      - dependency-name: "com.automattic:about"

.github/workflows/automated-version-update-pr.yml

@@ -15,16 +15,33 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GUTENBERG_MOBILE_VERSION: ${{ github.event.inputs.gutenbergMobileVersion }}
-      PR_TITLE: ${{ github.event.inputs.title || format('{{Automated gutenberg-mobile version update for {0} !}}', github.event.inputs.gutenbergMobileVersion ) }}
-      PR_BODY: ${{ github.event.inputs.body || format( '{{This PR incorporates changes from {0}.}}', github.event.inputs.prURL ) }}
+      PR_TITLE: ${{ github.event.inputs.title || format('Automated gutenberg-mobile version update for {0} !', github.event.inputs.gutenbergMobileVersion ) }}
+      PR_BODY: ${{ github.event.inputs.body || format('This PR incorporates changes from {0}.', github.event.inputs.prURL ) }}
       GUTENBERG_MOBILE_PR_URL: ${{ github.event.inputs.prURL }}
     steps:
+      - name: Create PR Description
+        run: |
+          PR_DESCRIPTION=$(cat << EOF
+          ## Description
+          
+          $PR_BODY
+
+          Related Gutenberg Mobile Pr: $GUTENBERG_MOBILE_PR_URL
+
+          EOF
+          )
+          PR_DESCRIPTION="${PR_DESCRIPTION//'%'/'%25'}"
+          PR_DESCRIPTION="${PR_DESCRIPTION//$'\n'/'%0A'}"
+          PR_DESCRIPTION="${PR_DESCRIPTION//$'\r'/'%0D'}"
+          echo "::set-output name=description::$PR_DESCRIPTION"
+        id: pr_description
+
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
       - name: Update Gutenberg Mobile Version
         run: |
-          sed -i "s/ext\.gutenbergMobileVersion = '.*'/ext.gutenbergMobileVersion = '$GUTENBERG_MOBILE_VERSION'/g" build.gradle
+          sed -i "s/gutenbergMobileVersion = '.*'/gutenbergMobileVersion = '$GUTENBERG_MOBILE_VERSION'/g" build.gradle
       - name: Compute vars
         id: vars
         run: |
@@ -44,13 +61,12 @@ jobs:
           fi
           echo ::set-output name=title::"$PR_TITLE"
           echo ::set-output name=commit_message::"Update gutenbergMobileVersion to $GUTENBERG_MOBILE_VERSION"
-          echo ::set-output name=pr_description::"##Description \n $PR_BODY \n\n Related Changes: $GUTENBERG_MOBILE_PR_URL"
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3
         with:
           commit-message: ${{ steps.vars.outputs.commit_message }}
           title: ${{ steps.vars.outputs.title }}
           branch: ${{ steps.vars.outputs.branch_name }}
           labels: gutenberg-mobile
-          body: ${{ steps.vars.outputs.pr_description }}
+          body: ${{ steps.pr_description.outputs.description }}
           delete-branch: true

.gitignore

@@ -75,6 +75,8 @@ fastlane/report.xml
 fastlane/README.md
 fastlane/metadata/android/screenshots.html
 fastlane/metadata/android/*/images/
+fastlane/jetpack_metadata/android/screenshots.html
+fastlane/jetpack_metadata/android/*/images/
 fastlane/screenshots
 default.profraw