Merge changes from 24.0.0.1

Gemfile

@@ -12,11 +12,10 @@ gem 'fastlane-plugin-appcenter', '~> 2.1'
 gem 'fastlane-plugin-sentry'
 # This comment avoids typing to switch to a development version for testing.
 #
-# Switch to this branch for auto-retry on 429 for GlotPress strings while
-# waiting for the fix to be shipped.
-# gem 'fastlane-plugin-wpmreleasetoolkit', git: 'git@github.com:wordpress-mobile/release-toolkit', branch: 'mokagio/auto-retry-on-strings-glotpress-429'
-#
-gem 'fastlane-plugin-wpmreleasetoolkit', '~> 9.1'
+# Attempt to address 'Bad CPU type in executable' on new Apple Silicon CI
+# See https://buildkite.com/automattic/wordpress-ios/builds/19609#018ced25-05f4-4c8b-9850-b314ea2f8d9e/1131-1330
+gem 'fastlane-plugin-wpmreleasetoolkit', git: 'git@github.com:wordpress-mobile/release-toolkit', ref: '2cb009edaee3d058a61cfeb503e533eb0647f108'
+# gem 'fastlane-plugin-wpmreleasetoolkit', '~> 9.1'
 gem 'rake'
 gem 'rubocop', '~> 1.30'
 gem 'rubocop-rake', '~> 0.6'

Gemfile.lock

@@ -1,3 +1,26 @@
+GIT
+  remote: git@github.com:wordpress-mobile/release-toolkit
+  revision: 2cb009edaee3d058a61cfeb503e533eb0647f108
+  ref: 2cb009edaee3d058a61cfeb503e533eb0647f108
+  specs:
+    fastlane-plugin-wpmreleasetoolkit (9.2.0)
+      activesupport (>= 6.1.7.1)
+      buildkit (~> 1.5)
+      chroma (= 0.2.0)
+      diffy (~> 3.3)
+      fastlane (~> 2.213)
+      git (~> 1.3)
+      google-cloud-storage (~> 1.31)
+      java-properties (~> 0.3.0)
+      nokogiri (~> 1.11)
+      octokit (~> 6.1)
+      parallel (~> 1.14)
+      plist (~> 3.1)
+      progress_bar (~> 1.3)
+      rake (>= 12.3, < 14.0)
+      rake-compiler (~> 1.0)
+      xcodeproj (~> 1.22)
+
 GIT
   remote: https://github.com/Automattic/dangermattic
   revision: 06a54db4f546d20c0465e4d144049d061a2a1e20
@@ -212,23 +235,6 @@ GEM
     fastlane-plugin-appcenter (2.1.1)
     fastlane-plugin-sentry (1.15.0)
       os (~> 1.1, >= 1.1.4)
-    fastlane-plugin-wpmreleasetoolkit (9.2.0)
-      activesupport (>= 6.1.7.1)
-      buildkit (~> 1.5)
-      chroma (= 0.2.0)
-      diffy (~> 3.3)
-      fastlane (~> 2.213)
-      git (~> 1.3)
-      google-cloud-storage (~> 1.31)
-      java-properties (~> 0.3.0)
-      nokogiri (~> 1.11)
-      octokit (~> 6.1)
-      parallel (~> 1.14)
-      plist (~> 3.1)
-      progress_bar (~> 1.3)
-      rake (>= 12.3, < 14.0)
-      rake-compiler (~> 1.0)
-      xcodeproj (~> 1.22)
     ffi (1.16.3)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
@@ -301,7 +307,7 @@ GEM
     naturally (2.2.1)
     netrc (0.11.0)
     no_proxy_fix (0.1.2)
-    nokogiri (1.15.4)
+    nokogiri (1.16.0)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     octokit (6.1.1)
@@ -408,7 +414,7 @@ DEPENDENCIES
   fastlane (~> 2.217)
   fastlane-plugin-appcenter (~> 2.1)
   fastlane-plugin-sentry
-  fastlane-plugin-wpmreleasetoolkit (~> 9.1)
+  fastlane-plugin-wpmreleasetoolkit!
   rake
   rmagick (~> 3.2.0)
   rubocop (~> 1.30)

Podfile

@@ -50,8 +50,7 @@ def wordpress_ui
 end
 
 def wordpress_kit
-  # Anything compatible with 8.9, starting from 8.9.1 which has a breaking change fix
-  pod 'WordPressKit', '~> 9.0', '>= 9.0.2'
+  pod 'WordPressKit', '~> 9.0', '>= 9.0.3'
   # 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: ''

Podfile.lock

@@ -70,7 +70,7 @@ PODS:
     - WordPressKit (~> 9.0.0)
     - WordPressShared (~> 2.1-beta)
     - WordPressUI (~> 1.7-beta)
-  - WordPressKit (9.0.2):
+  - WordPressKit (9.0.3):
     - Alamofire (~> 4.8.0)
     - NSObject-SafeExpectations (~> 0.0.4)
     - UIDeviceIdentifier (~> 2.0)
@@ -121,7 +121,7 @@ DEPENDENCIES:
   - SwiftLint (~> 0.50)
   - WordPress-Editor-iOS (~> 1.19.9)
   - WordPressAuthenticator (>= 8.0.1, ~> 8.0)
-  - WordPressKit (>= 9.0.2, ~> 9.0)
+  - WordPressKit (>= 9.0.3, ~> 9.0)
   - WordPressShared (~> 2.2)
   - WordPressUI (~> 1.15)
   - ZendeskSupportSDK (= 5.3.0)
@@ -218,7 +218,7 @@ SPEC CHECKSUMS:
   WordPress-Aztec-iOS: fbebd569c61baa252b3f5058c0a2a9a6ada686bb
   WordPress-Editor-iOS: bda9f7f942212589b890329a0cb22547311749ef
   WordPressAuthenticator: fd2e1d340680faffffd9d675fc2df5ed19e26ea2
-  WordPressKit: 23d0ffb43f2ccdad2debd6799e62d39790a5ffad
+  WordPressKit: 4d41fd70b83876ee5db4617868767b33f3ae1bc4
   WordPressShared: 87f3ee89b0a3e83106106f13a8b71605fb8eb6d2
   WordPressUI: a491454affda3b0fb812812e637dc5e8f8f6bd06
   wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd
@@ -231,6 +231,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: d170fa8e270b2a32bef9dcdcabff5b8f1a5deced
 
-PODFILE CHECKSUM: 9567ce349333fd257fea44c201727b4180efb961
+PODFILE CHECKSUM: d7a42312b8249374e94aecb6021ee06d137c7cfa
 
 COCOAPODS: 1.14.2

RELEASE-NOTES.txt

@@ -21,6 +21,7 @@
 * [*] Fix an issue with BlogDashboardPersonalizationService being used on the background thread [#22335]
 * [***] Block Editor: Avoid keyboard dismiss when interacting with text blocks [https://github.com/WordPress/gutenberg/pull/57070]
 * [**] Block Editor: Auto-scroll upon block insertion [https://github.com/WordPress/gutenberg/pull/57273]
+* [**] Fix an issue in Pages List where the pages are not displayed in a hierarchical order [#22345]
 
 23.9
 -----

WordPress/Classes/Stores/RemoteFeatureFlagStore.swift

@@ -17,6 +17,19 @@ class RemoteFeatureFlagStore {
         return queue
       }()
 
+    /// The `deviceID` ensures we retain a stable set of Feature Flags between updates. If there are staged rollouts or other dynamic changes
+    /// happening server-side we don't want our flags to change on each fetch, so we provide an anonymous ID to manage this.
+    public var deviceID: String {
+        guard let deviceID = persistenceStore.string(forKey: Constants.DeviceIdKey) else {
+            DDLogInfo("🚩 Unable to find existing device ID – generating a new one")
+            let newID = UUID().uuidString
+            persistenceStore.set(newID, forKey: Constants.DeviceIdKey)
+            return newID
+        }
+
+        return deviceID
+    }
+
     init(queue: DispatchQueue = .remoteFeatureFlagStoreQueue,
                  persistenceStore: UserPersistentRepository = UserDefaults.standard) {
         self.queue = queue
@@ -63,19 +76,6 @@ extension RemoteFeatureFlagStore {
 
     typealias FetchCallback = () -> Void
 
-    /// The `deviceID` ensures we retain a stable set of Feature Flags between updates. If there are staged rollouts or other dynamic changes
-    /// happening server-side we don't want out flags to change on each fetch, so we provide an anonymous ID to manage this.
-    private var deviceID: String {
-        guard let deviceID = persistenceStore.string(forKey: Constants.DeviceIdKey) else {
-            DDLogInfo("🚩 Unable to find existing device ID – generating a new one")
-            let newID = UUID().uuidString
-            persistenceStore.set(newID, forKey: Constants.DeviceIdKey)
-            return newID
-        }
-
-        return deviceID
-    }
-
     /// The local cache stores feature flags between runs so that the most recently fetched set are ready to go as soon as this object is instantiated.
     private var cache: [String: Bool] {
         get {

WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift

@@ -39,7 +39,7 @@ enum FeatureFlag: Int, CaseIterable {
         case .googleDomainsCard:
             return false
         case .newTabIcons:
-            return BuildConfiguration.current == .localDeveloper
+            return true
         }
     }