Merge branch 'trunk' into mokagio/gutenberg-xcframework-setup

# Conflicts: # Podfile.lock
wordpress-mobile · Jul 19, 2023 · 9192af0 · 9192af0
2 parents d6dd34e + d075157
commit 9192af0
Show file tree

Hide file tree

Showing 353 changed files with 8,614 additions and 9,531 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -3,6 +3,10 @@ remote_timeout: 10.0
 
 opt_in_rules:
   - overridden_super_call
+  - weak_delegate
 
 overridden_super_call:
   severity: error
+
+weak_delegate:
+  severity: error
diff --git a/API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/me/rest_v11_me_sites.json b/API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/me/rest_v11_me_sites.json
@@ -359,7 +359,7 @@
           "ID": 181977606,
           "description": "Site with everything enabled",
           "name": "Weekend Bakes",
-          "URL": "yourjetpack.blog",
+          "URL": "weekendbakesblog.wordpress.com",
           "user_can_manage": false,
           "capabilities": {
             "edit_pages": true,

diff --git a/API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/categories.json b/API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/categories.json
diff --git a/API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/post-formats.json b/API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/post-formats.json
diff --git a/API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/post_0_diffs.json b/API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/post_0_diffs.json