Merge branch 'trunk' into andy/issue-20026

Author: Andy Valdez

.github/PULL_REQUEST_TEMPLATE.md

@@ -32,8 +32,9 @@ Fixes #
 
 -----
 
-## UI Changes Testing Checklist:
+## Testing Checklist:
 
+- [ ] WordPress.com sites and self-hosted Jetpack sites.
 - [ ] Portrait and landscape orientations.
 - [ ] Light and dark modes.
 - [ ] Fonts: Larger, smaller and bold text.

.github/dependabot.yml

@@ -36,9 +36,6 @@ updates:
       # dependapot.
       - dependency-name: "org.wordpress:fluxc"
       - dependency-name: "org.wordpress:utils"
-      # org.wordpress-mobile.gutenberg-mobile is deprecated and org.wordpress.gutenberg-mobile is used instead.
-      # Temporarily leaving this declaration during transition, but this should be removed soon.
-      - dependency-name: "org.wordpress-mobile.gutenberg-mobile:react-native-gutenberg-bridge"
       - dependency-name: "org.wordpress.gutenberg-mobile:react-native-gutenberg-bridge"
       - dependency-name: "org.wordpress:login"
       - dependency-name: "com.automattic:stories"

.github/workflows/run-danger.yml

@@ -2,10 +2,12 @@ name: ☢️ Danger
 
 on:
   pull_request:
-    types: [opened, synchronize, edited, review_requested, review_request_removed, labeled, unlabeled, milestoned, demilestoned]
+    types: [opened, reopened, ready_for_review, synchronize, edited, labeled, unlabeled, milestoned, demilestoned]
 
 jobs:
   dangermattic:
-    uses: Automattic/dangermattic/.github/workflows/reusable-run-danger.yml@trunk
+    # runs on draft PRs only for opened / synchronize events
+    if: ${{ (github.event.pull_request.draft == false) || (github.event.pull_request.draft == true && contains(fromJSON('["opened", "synchronize"]'), github.event.action)) }}
+    uses: Automattic/dangermattic/.github/workflows/reusable-run-danger.yml@v1.0.0
     secrets:
       github-token: ${{ secrets.DANGERMATTIC_GITHUB_TOKEN }}

.github/workflows/validate-issues.yml

@@ -0,0 +1,18 @@
+name: 📝 Validate Issues
+
+on:
+  issues:
+    types: [opened, labeled, unlabeled]
+
+jobs:
+  check-labels-on-issues:
+    uses: Automattic/dangermattic/.github/workflows/reusable-check-labels-on-issues.yml@v1.0.0
+    with:
+      label-format-list: '[
+        "^\[.+\]",
+        "^[[:alnum:]]"
+      ]'
+      label-error-message: '🚫 Please add a type label (e.g. **[Type] Enhancement**) and a feature label (e.g. **Stats**) to this issue.'
+      label-success-message: 'Thanks for reporting! 👍'
+    secrets:
+      github-token: ${{ secrets.DANGERMATTIC_GITHUB_TOKEN }}

Dangerfile

@@ -1,41 +1,46 @@
 # frozen_string_literal: true
 
-def release_branch?
-  danger.github.branch_for_base.start_with?('release/') || danger.github.branch_for_base.start_with?('hotfix/')
-end
+github.dismiss_out_of_range_messages
 
-def main_branch?
-  danger.github.branch_for_base == 'trunk'
-end
+# `files: []` forces rubocop to scan all files, not just the ones modified in the PR
+rubocop.lint(files: [], force_exclusion: true, inline_comment: true, fail_on_inline_comment: true, include_cop_names: true)
 
-def wip_feature?
-  has_wip_label = github.pr_labels.any? { |label| label.include?('WIP') }
-  has_wip_title = github.pr_title.include?('WIP')
+manifest_pr_checker.check_gemfile_lock_updated
 
-  has_wip_label || has_wip_title
-end
+android_release_checker.check_release_notes_and_play_store_strings
 
-return if github.pr_labels.include?('Releases')
+android_strings_checker.check_strings_do_not_refer_resource
 
-github.dismiss_out_of_range_messages
+# skip remaining checks if we're in a release-process PR
+if github.pr_labels.include?('Releases')
+  message('This PR has the `Releases` label: some checks will be skipped.')
+  return
+end
 
-manifest_pr_checker.check_gemfile_lock_updated
+common_release_checker.check_internal_release_notes_changed(report_type: :message)
 
-labels_checker.check(
-  required_labels: [//],
-  required_labels_error: 'PR requires at least one label.'
-)
+android_release_checker.check_modified_strings_on_release
 
-view_changes_need_screenshots.view_changes_need_screenshots
+view_changes_checker.check
 
 pr_size_checker.check_diff_size(
-  file_selector: ->(path) { !path.include?('/src/test') },
-  max_size: 300
+  max_size: 300,
+  file_selector: ->(path) { !path.include?('/src/test') }
 )
 
 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?))
+# skip remaining checks if the PR is still a Draft
+if github.pr_draft?
+  message('This PR is still a Draft: some checks will be skipped.')
+  return
+end
+
+labels_checker.check(
+  do_not_merge_labels: ['Do Not Merge'],
+  required_labels: [//],
+  required_labels_error: 'PR requires at least one label.'
+)
 
-rubocop.lint(inline_comment: true, fail_on_inline_comment: true, include_cop_names: true)
+# runs the milestone check if this is not a WIP feature and the PR is against the main branch or the release branch
+milestone_checker.check_milestone_due_date(days_before_due: 4) if (github_utils.main_branch? || github_utils.release_branch?) && !github_utils.wip_feature?

Gemfile

@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-gem 'danger-dangermattic', git: 'https://github.com/Automattic/dangermattic'
+gem 'danger-dangermattic', '~> 1.0'
 gem 'fastlane', '~> 2'
 gem 'nokogiri'
 

Gemfile.lock

@@ -1,16 +1,3 @@
-GIT
-  remote: https://github.com/Automattic/dangermattic
-  revision: 9ba0e5824e66e16526897a4583c9b900f9b8635c
-  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:
@@ -26,7 +13,7 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     artifactory (3.0.15)
     ast (2.4.2)
@@ -66,7 +53,7 @@ GEM
     connection_pool (2.4.1)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (9.4.0)
+    danger (9.4.3)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -77,8 +64,16 @@ GEM
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
       no_proxy_fix
-      octokit (>= 6.0, < 8.0)
+      octokit (>= 4.0)
       terminal-table (>= 1, < 4)
+    danger-dangermattic (1.0.0)
+      danger (~> 9.4)
+      danger-junit (~> 1.0)
+      danger-plugin-api (~> 1.0)
+      danger-rubocop (~> 0.12)
+      danger-swiftlint (~> 0.35)
+      danger-xcode_summary (~> 1.0)
+      rubocop (~> 1.60)
     danger-junit (1.0.2)
       danger (> 2.0)
       ox (~> 2.0)
@@ -87,10 +82,10 @@ GEM
     danger-rubocop (0.12.0)
       danger
       rubocop (~> 1.0)
-    danger-swiftlint (0.34.0)
+    danger-swiftlint (0.35.0)
       danger
       rake (> 10)
-      thor (~> 0.19)
+      thor (~> 1.0.0)
     danger-xcode_summary (1.2.0)
       danger-plugin-api (~> 1.0)
       xcresult (~> 0.2)
@@ -122,7 +117,7 @@ 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-http-cache (2.5.1)
       faraday (>= 0.8)
     faraday-httpclient (1.0.1)
     faraday-multipart (1.0.4)
@@ -193,7 +188,7 @@ GEM
       rake-compiler (~> 1.0)
       xcodeproj (~> 1.22)
     gh_inspector (1.1.3)
-    git (1.18.0)
+    git (1.19.1)
       addressable (~> 2.8)
       rchardet (~> 1.8)
     google-apis-androidpublisher_v3 (0.53.0)
@@ -241,7 +236,7 @@ GEM
       concurrent-ruby (~> 1.0)
     java-properties (0.3.0)
     jmespath (1.6.2)
-    json (2.6.3)
+    json (2.7.1)
     jwt (2.7.1)
     kramdown (2.4.0)
       rexml
@@ -253,7 +248,7 @@ GEM
     mini_portile2 (2.8.5)
     minitest (5.20.0)
     multi_json (1.15.0)
-    multipart-post (2.3.0)
+    multipart-post (2.4.0)
     mutex_m (0.2.0)
     nanaimo (0.3.0)
     nap (1.1.0)
@@ -270,8 +265,8 @@ GEM
     optparse (0.1.1)
     os (1.1.4)
     ox (2.14.17)
-    parallel (1.23.0)
-    parser (3.2.2.4)
+    parallel (1.24.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
     plist (3.7.0)
@@ -285,7 +280,7 @@ GEM
     rake-compiler (1.2.5)
       rake
     rchardet (1.8.0)
-    regexp_parser (2.8.2)
+    regexp_parser (2.9.0)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -294,15 +289,15 @@ GEM
     rexml (3.2.6)
     rmagick (4.3.0)
     rouge (2.0.7)
-    rubocop (1.57.2)
+    rubocop (1.60.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       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)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
@@ -325,7 +320,7 @@ GEM
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    thor (0.20.3)
+    thor (1.0.1)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
     tty-screen (0.8.1)
@@ -354,7 +349,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  danger-dangermattic!
+  danger-dangermattic (~> 1.0)
   fastlane (~> 2)
   fastlane-plugin-wpmreleasetoolkit (~> 9.2)
   nokogiri

RELEASE-NOTES.txt

@@ -1,11 +1,27 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
-24.2
+24.3
 -----
+* [**] Added support to use third-party passkey providers and other devices passkeys as a WordPress.com login option [https://github.com/wordpress-mobile/WordPress-Android/pull/20174]
+* [*] [Jetpack-only] Fix the visibility issue with the menu button on the stats [https://github.com/wordpress-mobile/WordPress-Android/pull/20175]
 
+24.2
+-----
+* [**] Fix editor crash occurring on large posts [https://github.com/wordpress-mobile/WordPress-Android/pull/20046]
+* [*] [Jetpack-only] Site Monitoring: Add Metrics, PHP Logs, and Web Server Logs under Site Monitoring [https://github.com/wordpress-mobile/WordPress-Android/issues/20067]
+* [**] Prevent images from temporarily disappearing when uploading media [https://github.com/WordPress/gutenberg/pull/57869]
+* [***] [Jetpack-only] Reader: introduced new UI/UX for content navigation and filtering [https://github.com/wordpress-mobile/WordPress-Android/pull/19978]
+* [**] Prevents crashes when the webview state is too big [https://github.com/wordpress-mobile/WordPress-Android/pull/20139]
+* [*] [WordPress-only] Prevents a crash occurring when uploading videos under certain conditions [https://github.com/wordpress-mobile/WordPress-Android/pull/20168]
 
 24.1
 -----
+* [**] Disabled the ability of creating new Story posts. [#20014]
+* [**] Disable Story block [https://github.com/wordpress-mobile/WordPress-Android/pull/20005]
+
+24.0.2
+-----
+* [**] Fix Aztec editor crash when losing or gaining network connectivity [https://github.com/wordpress-mobile/WordPress-Android/pull/20053]
 
 24.0.1
 -----