Merge remote-tracking branch 'origin/trunk' into merge/23.6-code-freeze-to-trunk

Author: oguzkocer

.buildkite/commands/danger-pr-check.sh

@@ -0,0 +1,7 @@
+#!/bin/bash -eu
+
+echo "--- :rubygems: Setting up Gems"
+bundle install
+
+echo "--- Running Danger: PR Check"
+bundle exec danger --fail-on-errors=true --remove-previous-comments --danger_id=pr-check

.buildkite/pipeline.yml

@@ -29,6 +29,19 @@ steps:
   #################
   - group: "🕵️‍♂️ Linters"
     steps:
+      - label: "☢️ Danger - PR Check"
+        command: .buildkite/commands/danger-pr-check.sh
+        plugins:
+          - docker#v5.8.0:
+              image: "public.ecr.aws/docker/library/ruby:3.2.2"
+              propagate-environment: true
+              environment:
+                - "DANGER_GITHUB_API_TOKEN"
+        if: "build.pull_request.id != null"
+        retry:
+          manual:
+            permit_on_passed: true
+
       - label: "🕵️ checkstyle"
         command: |
           cp gradle.properties-example gradle.properties

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,23 +1,38 @@
 Fixes #
 
-To test:
+-----
+
+## To Test:
+
+<!-- Test instructions per dependency update: https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/docs/test_instructions_per_dependency_update.md -->
+
+-----
 
 ## Regression Notes
+
 1. Potential unintended areas of impact
 
+    - TODO
 
 2. What I did to test those areas of impact (or what existing automated tests I relied on)
 
+    - TODO
 
 3. What automated tests I added (or what prevented me from doing so)
 
-PR submission checklist:
+    - TODO
+
+-----
+
+## PR Submission Checklist:
 
 - [ ] I have completed the Regression Notes.
 - [ ] I have considered adding accessibility improvements for my changes.
 - [ ] I have considered if this change warrants user-facing release notes and have added them to `RELEASE-NOTES.txt` if necessary.
 
-UI Changes testing checklist:
+-----
+
+## UI Changes Testing Checklist:
 
 - [ ] Portrait and landscape orientations.
 - [ ] Light and dark modes.

.rubocop.yml

@@ -0,0 +1,24 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  Exclude:
+    - vendor/**/*
+  NewCops: enable
+
+Metrics/BlockLength:
+  Exclude:
+    - fastlane/Fastfile
+    - fastlane/lanes/*.rb
+
+Metrics/MethodLength:
+  Max: 30
+
+Layout/LineLength:
+  Max: 180
+
+Lint/ConstantDefinitionInBlock:
+  Exclude:
+    - fastlane/lanes/localization.rb
+
+Style/HashSyntax:
+  EnforcedShorthandSyntax: never

.rubocop_todo.yml

@@ -0,0 +1,33 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2023-09-19 14:46:03 UTC using RuboCop version 1.56.3.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# Configuration parameters: AllowComments, AllowEmptyLambdas.
+Lint/EmptyBlock:
+  Exclude:
+    - 'fastlane/lanes/release.rb'
+
+# Offense count: 2
+# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
+Metrics/AbcSize:
+  Max: 32
+
+# Offense count: 1
+# Configuration parameters: AllowedMethods, AllowedPatterns.
+Metrics/CyclomaticComplexity:
+  Max: 12
+
+# Offense count: 1
+# Configuration parameters: AllowedMethods, AllowedPatterns.
+Metrics/PerceivedComplexity:
+  Max: 13
+
+# Offense count: 1
+Style/MultilineBlockChain:
+  Exclude:
+    - 'fastlane/lanes/release.rb'

Dangerfile

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+def release_branch?
+  danger.github.branch_for_base.start_with?('release/') || danger.github.branch_for_base.start_with?('hotfix/')
+end
+
+def main_branch?
+  danger.github.branch_for_base == 'trunk'
+end
+
+def wip_feature?
+  has_wip_label = github.pr_labels.any? { |label| label.include?('WIP') }
+  has_wip_title = github.pr_title.include?('WIP')
+
+  has_wip_label || has_wip_title
+end
+
+return if github.pr_labels.include?('Releases')
+
+github.dismiss_out_of_range_messages
+
+manifest_pr_checker.check_gemfile_lock_updated
+
+labels_checker.check(
+  required_labels: [//],
+  required_labels_error: 'PR requires at least one label.'
+)
+
+view_changes_need_screenshots.view_changes_need_screenshots
+
+pr_size_checker.check_diff_size(
+  file_selector: ->(path) { !path.include?('/src/test') },
+  max_size: 300
+)
+
+android_unit_test_checker.check_missing_tests
+
+# skip check for draft PRs and for WIP features unless the PR is against the main branch or release branch
+milestone_checker.check_milestone_due_date(days_before_due: 4) unless github.pr_draft? || (wip_feature? && !(release_branch? || main_branch?))
+
+rubocop.lint(inline_comment: true, fail_on_inline_comment: true, include_cop_names: true)

Gemfile

@@ -2,6 +2,7 @@
 
 source 'https://rubygems.org'
 
+gem 'danger-dangermattic', git: 'https://github.com/Automattic/dangermattic'
 gem 'fastlane', '~> 2'
 gem 'nokogiri'
 
@@ -11,8 +12,7 @@ gem 'fastlane-plugin-wpmreleasetoolkit', '~> 9.2'
 # gem 'fastlane-plugin-wpmreleasetoolkit', path: '../../release-toolkit'
 # gem 'fastlane-plugin-wpmreleasetoolkit', git: 'https://github.com/wordpress-mobile/release-toolkit', branch: ''
 
-
 ### Gems needed only for generating Promo Screenshots
 group :screenshots, optional: true do
-    gem 'rmagick', '~> 4.1'
+  gem 'rmagick', '~> 4.1'
 end

Gemfile.lock

@@ -1,3 +1,16 @@
+GIT
+  remote: https://github.com/Automattic/dangermattic
+  revision: 078aa57c084790327da4cb401f18b350a4d1e329
+  specs:
+    danger-dangermattic (0.0.1)
+      danger (~> 9.3)
+      danger-junit (~> 1.0)
+      danger-plugin-api (~> 1.0)
+      danger-rubocop (~> 0.11)
+      danger-swiftlint (~> 0.29)
+      danger-xcode_summary (~> 1.0)
+      rubocop (~> 1.56)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -16,10 +29,11 @@ GEM
     addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     artifactory (3.0.15)
+    ast (2.4.2)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.843.0)
-    aws-sdk-core (3.185.1)
+    aws-partitions (1.844.0)
+    aws-sdk-core (3.186.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
@@ -40,12 +54,46 @@ GEM
       sawyer (>= 0.6)
     chroma (0.2.0)
     claide (1.1.0)
+    claide-plugins (0.9.2)
+      cork
+      nap
+      open4 (~> 1.3)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
     concurrent-ruby (1.2.2)
     connection_pool (2.4.1)
+    cork (0.3.0)
+      colored2 (~> 3.1)
+    danger (9.3.2)
+      claide (~> 1.0)
+      claide-plugins (>= 0.9.2)
+      colored2 (~> 3.1)
+      cork (~> 0.1)
+      faraday (>= 0.9.0, < 3.0)
+      faraday-http-cache (~> 2.0)
+      git (~> 1.13)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.0)
+      no_proxy_fix
+      octokit (~> 6.0)
+      terminal-table (>= 1, < 4)
+    danger-junit (1.0.2)
+      danger (> 2.0)
+      ox (~> 2.0)
+    danger-plugin-api (1.0.0)
+      danger (> 2.0)
+    danger-rubocop (0.12.0)
+      danger
+      rubocop (~> 1.0)
+    danger-swiftlint (0.33.0)
+      danger
+      rake (> 10)
+      thor (~> 0.19)
+    danger-xcode_summary (1.2.0)
+      danger-plugin-api (~> 1.0)
+      xcresult (~> 0.2)
     declarative (0.0.20)
     diffy (3.4.2)
     digest-crc (0.6.5)
@@ -75,6 +123,8 @@ GEM
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
+    faraday-http-cache (2.5.0)
+      faraday (>= 0.8)
     faraday-httpclient (1.0.1)
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
@@ -194,6 +244,11 @@ GEM
     jmespath (1.6.2)
     json (2.6.3)
     jwt (2.7.1)
+    kramdown (2.4.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    language_server-protocol (3.17.0.3)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
@@ -202,27 +257,36 @@ GEM
     multipart-post (2.3.0)
     mutex_m (0.1.2)
     nanaimo (0.3.0)
+    nap (1.1.0)
     naturally (2.2.1)
+    no_proxy_fix (0.1.2)
     nokogiri (1.15.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     octokit (6.1.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
+    open4 (1.3.4)
     options (2.3.2)
     optparse (0.1.1)
     os (1.1.4)
+    ox (2.14.17)
     parallel (1.23.0)
+    parser (3.2.2.4)
+      ast (~> 2.4.1)
+      racc
     plist (3.7.0)
     progress_bar (1.3.3)
       highline (>= 1.6, < 3)
       options (~> 2.3.0)
     public_suffix (5.0.3)
-    racc (1.7.1)
+    racc (1.7.2)
+    rainbow (3.1.1)
     rake (13.1.0)
     rake-compiler (1.2.5)
       rake
     rchardet (1.8.0)
+    regexp_parser (2.8.2)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -231,6 +295,20 @@ GEM
     rexml (3.2.6)
     rmagick (4.3.0)
     rouge (2.0.7)
+    rubocop (1.57.2)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.2.2.4)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     sawyer (0.9.2)
@@ -248,6 +326,7 @@ GEM
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
+    thor (0.20.3)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
     tty-screen (0.8.1)
@@ -273,11 +352,13 @@ GEM
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
+    xcresult (0.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  danger-dangermattic!
   fastlane (~> 2)
   fastlane-plugin-wpmreleasetoolkit (~> 9.2)
   nokogiri

RELEASE-NOTES.txt

@@ -2,6 +2,9 @@
 
 23.7
 -----
+* [***] [Jetpack-only] Added the All Domains screen enabling the users to manage their domains from within the app [https://github.com/wordpress-mobile/WordPress-Android/pull/19599]
+* [*] Block Editor: Fix error when pasting deeply nested structure content [https://github.com/WordPress/gutenberg/pull/55613]
+* [*] Block Editor: Fix crash related to accessing undefined value in `TextColorEdit` [https://github.com/WordPress/gutenberg/pull/55664]
 
 23.6
 -----

WordPress/build.gradle

@@ -138,7 +138,6 @@ android {
         buildConfigField "boolean", "ENABLE_BLAZE_FEATURE", "false"
         buildConfigField "boolean", "WP_INDIVIDUAL_PLUGIN_OVERLAY", "false"
         buildConfigField "boolean", "SITE_EDITOR_MVP", "false"
-        buildConfigField "boolean", "JETPACK_SOCIAL", "false"
         buildConfigField "boolean", "CONTACT_SUPPORT_CHATBOT", "false"
         buildConfigField "boolean", "ENABLE_DOMAIN_MANAGEMENT_FEATURE", "false"
         buildConfigField "boolean", "PLANS_IN_SITE_CREATION", "false"