Merge branch 'release/24.1' into merge/24.0.1-into-release-24.1

.buildkite/pipeline.yml

@@ -105,20 +105,6 @@ 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"
-        agents:
-          queue: "default"
-        retry:
-          manual:
-            permit_on_passed: true
       - label: "🧹 Lint Translations"
         command: "gplint /workdir/WordPress/Resources/AppStoreStrings.po"
         plugins:

.github/workflows/run-danger.yml

@@ -0,0 +1,11 @@
+name: ☢️ Danger
+
+on:
+  pull_request:
+    types: [opened, synchronize, edited, review_requested, review_request_removed, labeled, unlabeled, milestoned, demilestoned]
+
+jobs:
+  dangermattic:
+    uses: Automattic/dangermattic/.github/workflows/reusable-run-danger.yml@trunk
+    secrets:
+      github-token: ${{ secrets.DANGERMATTIC_GITHUB_TOKEN }}

.swiftlint.yml

@@ -5,6 +5,8 @@ opt_in_rules:
   - overridden_super_call
   - discarded_notification_center_observer
   - weak_delegate
+  - vertical_whitespace
+  - duplicate_imports
 
 overridden_super_call:
   severity: error

Gutenberg/config.yml

@@ -9,6 +9,6 @@
  #
  #   LOCAL_GUTENBERG=../my-gutenberg-fork bundle exec pod install
 ref:
-  tag: v1.110.1
+  tag: v1.111.1
 github_org: wordpress-mobile
 repo_name: gutenberg-mobile

Podfile

@@ -23,7 +23,7 @@ workspace 'WordPress.xcworkspace'
 ## ===================================
 ##
 def wordpress_shared
-  pod 'WordPressShared', '~> 2.2'
+  pod 'WordPressShared', '~> 2.3'
   # pod 'WordPressShared', git: 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', tag: ''
   # pod 'WordPressShared', git: 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', branch: 'trunk'
   # pod 'WordPressShared', git: 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', commit: ''
@@ -50,7 +50,7 @@ def wordpress_ui
 end
 
 def wordpress_kit
-  pod 'WordPressKit', '~> 9.0', '>= 9.0.3'
+  pod 'WordPressKit', '~> 11.0'
   # pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', commit: ''
   # pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', branch: 'trunk'
   # pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', tag: ''
@@ -71,7 +71,6 @@ def shared_with_all_pods
 end
 
 def shared_with_networking_pods
-  pod 'Alamofire', '4.8.0'
   pod 'Reachability', '3.2'
 
   wordpress_kit
@@ -141,7 +140,7 @@ abstract_target 'Apps' do
 
   pod 'NSURL+IDN', '~> 0.4'
 
-  pod 'WordPressAuthenticator', '~> 8.0', '>= 8.0.1'
+  pod 'WordPressAuthenticator', '~> 9.0'
   # pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', commit: ''
   # pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', branch: ''
   # pod 'WordPressAuthenticator', path: '../WordPressAuthenticator-iOS'

Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - Alamofire (4.8.0)
+  - Alamofire (4.8.2)
   - AlamofireImage (3.5.2):
     - Alamofire (~> 4.8)
   - AlamofireNetworkActivityIndicator (2.4.0):
@@ -26,7 +26,7 @@ PODS:
   - FSInteractiveMap (0.1.0)
   - Gifu (3.3.1)
   - Gridicons (1.2.0)
-  - Gutenberg (1.110.1)
+  - Gutenberg (1.111.1)
   - JTAppleCalendar (8.0.5)
   - Kanvas (1.4.9):
     - CropViewController
@@ -58,25 +58,25 @@ PODS:
   - Sodium (0.9.1)
   - Starscream (3.0.6)
   - SVProgressHUD (2.2.5)
-  - SwiftLint (0.53.0)
+  - SwiftLint (0.54.0)
   - UIDeviceIdentifier (2.3.0)
   - WordPress-Aztec-iOS (1.19.9)
   - WordPress-Editor-iOS (1.19.9):
     - WordPress-Aztec-iOS (= 1.19.9)
-  - WordPressAuthenticator (8.0.1):
+  - WordPressAuthenticator (9.0.0):
     - Gridicons (~> 1.0)
     - "NSURL+IDN (= 0.4)"
     - SVProgressHUD (~> 2.2.5)
-    - WordPressKit (~> 9.0.0)
+    - WordPressKit (~> 11.0)
     - WordPressShared (~> 2.1-beta)
     - WordPressUI (~> 1.7-beta)
-  - WordPressKit (9.0.3):
+  - WordPressKit (11.0.0):
     - Alamofire (~> 4.8.0)
     - NSObject-SafeExpectations (~> 0.0.4)
     - UIDeviceIdentifier (~> 2.0)
     - WordPressShared (~> 2.0-beta)
     - wpxmlrpc (~> 0.10)
-  - WordPressShared (2.2.0)
+  - WordPressShared (2.3.0)
   - WordPressUI (1.15.0)
   - wpxmlrpc (0.10.0)
   - ZendeskCommonUISDK (6.1.2)
@@ -95,7 +95,6 @@ PODS:
   - ZIPFoundation (0.9.16)
 
 DEPENDENCIES:
-  - Alamofire (= 4.8.0)
   - AlamofireImage (= 3.5.2)
   - AlamofireNetworkActivityIndicator (~> 2.4)
   - AppCenter (~> 5.0)
@@ -107,7 +106,7 @@ DEPENDENCIES:
   - FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`)
   - Gifu (= 3.3.1)
   - Gridicons (~> 1.2)
-  - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.110.1.podspec`)
+  - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.111.1.podspec`)
   - JTAppleCalendar (~> 8.0.5)
   - Kanvas (~> 1.4.4)
   - MediaEditor (>= 1.2.2, ~> 1.2)
@@ -120,16 +119,18 @@ DEPENDENCIES:
   - SVProgressHUD (= 2.2.5)
   - SwiftLint (~> 0.50)
   - WordPress-Editor-iOS (~> 1.19.9)
-  - WordPressAuthenticator (>= 8.0.1, ~> 8.0)
-  - WordPressKit (>= 9.0.3, ~> 9.0)
-  - WordPressShared (~> 2.2)
+  - WordPressAuthenticator (~> 9.0)
+  - WordPressKit (~> 11.0)
+  - WordPressShared (~> 2.3)
   - WordPressUI (~> 1.15)
   - ZendeskSupportSDK (= 5.3.0)
   - ZIPFoundation (~> 0.9.8)
 
 SPEC REPOS:
   https://github.com/wordpress-mobile/cocoapods-specs.git:
     - WordPressAuthenticator
+    - WordPressKit
+    - WordPressShared
   trunk:
     - Alamofire
     - AlamofireImage
@@ -158,8 +159,6 @@ SPEC REPOS:
     - UIDeviceIdentifier
     - WordPress-Aztec-iOS
     - WordPress-Editor-iOS
-    - WordPressKit
-    - WordPressShared
     - WordPressUI
     - wpxmlrpc
     - ZendeskCommonUISDK
@@ -176,19 +175,15 @@ EXTERNAL SOURCES:
     :git: https://github.com/wordpress-mobile/FSInteractiveMap.git
     :tag: 0.2.0
   Gutenberg:
-    :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.110.1.podspec
+    :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.111.1.podspec
 
 CHECKOUT OPTIONS:
   FSInteractiveMap:
     :git: https://github.com/wordpress-mobile/FSInteractiveMap.git
     :tag: 0.2.0
-  Gutenberg:
-    :git: https://github.com/wordpress-mobile/gutenberg-mobile.git
-    :submodules: true
-    :tag: v1.100.2
 
 SPEC CHECKSUMS:
-  Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844
+  Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3
   AlamofireImage: 63cfe3baf1370be6c498149687cf6db3e3b00999
   AlamofireNetworkActivityIndicator: 9acc3de3ca6645bf0efed462396b0df13dd3e7b8
   AppCenter: a4070ec3d4418b5539067a51f57155012e486ebd
@@ -199,7 +194,7 @@ SPEC CHECKSUMS:
   FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86
   Gifu: 416d4e38c4c2fed012f019e0a1d3ffcb58e5b842
   Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d
-  Gutenberg: 8447da3bcd1f27d4fc7559ad0c78eebb8521352b
+  Gutenberg: 7804b67585e78d11beef84613175b4e73c682db7
   JTAppleCalendar: 16c6501b22cb27520372c28b0a2e0b12c8d0cd73
   Kanvas: cc027f8058de881a4ae2b5aa5f05037b6d054d08
   MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae
@@ -213,13 +208,13 @@ SPEC CHECKSUMS:
   Sodium: 23d11554ecd556196d313cf6130d406dfe7ac6da
   Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
-  SwiftLint: 5ce4d6a8ff83f1b5fd5ad5dbf30965d35af65e44
+  SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211
   UIDeviceIdentifier: 442b65b4ff1832d4ca9c2a157815cb29ad981b17
   WordPress-Aztec-iOS: fbebd569c61baa252b3f5058c0a2a9a6ada686bb
   WordPress-Editor-iOS: bda9f7f942212589b890329a0cb22547311749ef
-  WordPressAuthenticator: fd2e1d340680faffffd9d675fc2df5ed19e26ea2
-  WordPressKit: 4d41fd70b83876ee5db4617868767b33f3ae1bc4
-  WordPressShared: 87f3ee89b0a3e83106106f13a8b71605fb8eb6d2
+  WordPressAuthenticator: e3c18f1b63222742a565fea3faf1a55a144ce8c4
+  WordPressKit: 57712035a44595cf49b0c9f0ad5b8b899a8cbe6a
+  WordPressShared: cad7777b283d3ce2752f283df587342a581cd49b
   WordPressUI: a491454affda3b0fb812812e637dc5e8f8f6bd06
   wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd
   ZendeskCommonUISDK: 5f0a83f412e07ae23701f18c412fe783b3249ef5
@@ -231,6 +226,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: d170fa8e270b2a32bef9dcdcabff5b8f1a5deced
 
-PODFILE CHECKSUM: d7a42312b8249374e94aecb6021ee06d137c7cfa
+PODFILE CHECKSUM: 9331d9b30992bbe14cbb7d537bbad3042f3ff457
 
 COCOAPODS: 1.14.2

RELEASE-NOTES.txt

@@ -1,10 +1,28 @@
-24.1
+24.2
 -----
 
 24.0.1
 -----
 * [**] Fix crash when RichText values are not defined [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6563]
 
+24.1
+-----
+* [*] Block Editor: Fix missing custom color indicator for custom gradients [https://github.com/WordPress/gutenberg/pull/57605]
+* [**] Block Editor: Display a notice when a network connection is unavailable [https://github.com/WordPress/gutenberg/pull/56934]
+* [**] Block Editor: Image block media uploads display a custom error message when there is no internet connection [https://github.com/wordpress-mobile/WordPress-iOS/pull/22282]
+* [**] Image block media uploads display a custom error message when there is no internet connection [https://github.com/wordpress-mobile/WordPress-iOS/pull/22282]
+* [**] Improve media previews on long-press: load higher-resolution thumbnails and increase the preview size, add support for GIFs and video playback, enable for documents and other files [#22274]
+* [*] Add prefetching to Site Media details screen [#22292]
+* [*] Allow trashing draft and scheduled posts with no confirmation [#22337]
+* [*] Add "Share" action to the site context menu [#22298]
+* [*] Update the post "Publish" context action for Contributors to  "Submit for Review" instead of "Publish" [#22358]
+* [**] Add a pre-publishing sheet to the "Publish" flow invoked from the post context menu as a replacement for a simple confirmation sheet [#22358]
+* [**] Block Editor: Media uploads that failed due to lack of internet connectivity automatically retry once a connection is re-established [https://github.com/wordpress-mobile/WordPress-iOS/pull/22238]
+* [**] Block Editor: Manually retrying a single failed media upload will retry all failed media uploads in a post [https://github.com/wordpress-mobile/WordPress-iOS/pull/22240]
+* [*] [internal] Drop iOS 14 Support: Remove deprecated UIDocumentPickerViewController API [#22286]
+* [***] [internal] Refactor WP.com sign in API requests [#22421]
+* [*] Add In-App Feedback Prompt. [#22050]
+
 24.0
 -----
 * [**] [internal] A minor refactor in authentication flow, including but not limited to social sign-in and two factor authentication. [#22086]

WordPress/Classes/Extensions/Array.swift

@@ -85,5 +85,4 @@ extension Array {
         return result
     }
 
-
 }

WordPress/Classes/Extensions/Colors and Styles/UIColor+MurielColors.swift

@@ -204,10 +204,6 @@ extension UIColor {
         return .systemBackground
     }
 
-    static var ungroupedListUnread: UIColor {
-        return UIColor(light: .primary(.shade0), dark: muriel(color: .gray, .shade80))
-    }
-
     /// For icons that are present in a table view, or similar list
     static var listIcon: UIColor {
         return .secondaryLabel
@@ -255,20 +251,6 @@ extension UIColor {
         return UIColor(light: .white, dark: .black)
     }
 
-    // MARK: - Quick Action Buttons
-
-    static var quickActionButtonBackground: UIColor {
-        .clear
-    }
-
-    static var quickActionButtonBorder: UIColor {
-        .systemGray3
-    }
-
-    static var quickActionSelectedBackground: UIColor {
-        UIColor(light: .black, dark: .white).withAlphaComponent(0.17)
-    }
-
     // MARK: - Others
 
     static var preformattedBackground: UIColor {

WordPress/Classes/Extensions/Colors and Styles/WPStyleGuide+ApplicationStyles.swift

@@ -114,7 +114,6 @@ extension WPStyleGuide {
     }
 }
 
-
 extension WPStyleGuide {
     @objc(configureColorsForView:andTableView:)
     open class func configureColors(view: UIView?, tableView: UITableView?) {

WordPress/Classes/Extensions/NSAttributedStringKey+Conversion.swift

@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - NSAttributedStringKey Helpers
 //
 extension NSAttributedString.Key {
@@ -18,7 +17,6 @@ extension NSAttributedString.Key {
         return output
     }
 
-
     /// Converts a collection of NSAttributedString Attributes, with 'String' instances as 'Keys', into an equivalent
     /// collection that uses the new 'NSAttributedStringKey' enum as keys.
     ///

WordPress/Classes/Extensions/NSCalendar+Helpers.swift

@@ -1,6 +1,5 @@
 import Foundation
 
-
 extension Calendar {
     public func daysElapsedSinceDate(_ date: Date) -> Int {
         let fromDate = date.normalizedDate()

WordPress/Classes/Extensions/NSFetchedResultsController+Helpers.swift

@@ -1,6 +1,5 @@
 import Foundation
 
-
 extension NSFetchedResultsController {
     /// Returns whether an indexPath represents the last row in it's section, or not
     ///

WordPress/Classes/Extensions/NSFileManager+FolderSize.swift

@@ -1,6 +1,5 @@
 import Foundation
 
-
 extension FileManager {
 
     /// This method calculates the accumulated size of a directory on the volume in bytes.
@@ -31,7 +30,6 @@ extension FileManager {
             return false
         }
 
-
         // We have to enumerate all directory contents, including subdirectories.
         guard let enumerator = enumerator(at: directoryURL,
                                          includingPropertiesForKeys: prefetchedProperties,