Merge remote-tracking branch 'origin/trunk' into wpshared-remove-cocoalumberjack

Author: mokagio

.buildkite/cache-builder.yml

@@ -13,7 +13,7 @@ common_params:
         repo: "wordpress-mobile/wordpress-ios/"
   # Common environment values to use with the `env` key.
   - &common_env
-    IMAGE_ID: xcode-14
+    IMAGE_ID: xcode-14.2
 
 steps:
 

.buildkite/pipeline.yml

@@ -8,7 +8,7 @@ common_params:
         repo: "wordpress-mobile/wordpress-ios/"
   # Common environment values to use with the `env` key.
   - &common_env
-    IMAGE_ID: xcode-14
+    IMAGE_ID: xcode-14.2
 
 # This is the default pipeline – it will build and test the app
 steps:

.buildkite/release-builds.yml

@@ -10,7 +10,7 @@ common_params:
         repo: "wordpress-mobile/wordpress-ios/"
   # Common environment values to use with the `env` key.
   - &common_env
-    IMAGE_ID: xcode-14
+    IMAGE_ID: xcode-14.2
 
 steps:
 

.xcversion

@@ -1 +1 @@
-13.4.1
+14.2

Gemfile.lock

@@ -83,8 +83,7 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    commonmarker (0.21.2)
-      ruby-enum (~> 0.5)
+    commonmarker (0.23.6)
     concurrent-ruby (1.1.10)
     cork (0.3.0)
       colored2 (~> 3.1)
@@ -274,7 +273,7 @@ GEM
     naturally (2.2.1)
     netrc (0.11.0)
     no_proxy_fix (0.1.2)
-    nokogiri (1.13.9)
+    nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     octokit (4.25.1)
@@ -292,7 +291,7 @@ GEM
       highline (>= 1.6, < 3)
       options (~> 2.3.0)
     public_suffix (4.0.7)
-    racc (1.6.0)
+    racc (1.6.1)
     rainbow (3.1.1)
     rake (13.0.6)
     rake-compiler (1.2.0)
@@ -320,8 +319,6 @@ GEM
       parser (>= 3.1.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    ruby-enum (0.9.0)
-      i18n
     ruby-macho (2.5.1)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)

Podfile

@@ -91,7 +91,7 @@ def shared_style_pods
 end
 
 def gutenberg_pods
-  gutenberg tag: 'v1.86.0'
+  gutenberg tag: 'v1.87.0'
 end
 
 def gutenberg(options)

Podfile.lock

@@ -1,3 +1,10 @@
+21.5
+-----
+* [***] [internal] A significant refactor to the app’s architecture was made to allow for the new simplified UI. Regression testing on the app’s main flows is needed. [#19817]
+* [**] [internal] Disable Story posts when Jetpack features are removed [#19823]
+* [*] [internal] Editor: Only register core blocks when `onlyCoreBlocks` capability is enabled [https://github.com/wordpress-mobile/gutenberg-mobile/pull/5293]
+* [**] [internal] Disable StockPhoto and Tenor media sources when Jetpack features are removed [#19826]
+
 21.4
 -----
 * [*] Fixed an issue where publishing Posts and Pages could fail under certain conditions. [#19717]

RELEASE-NOTES.txt

@@ -1,7 +1,7 @@
 #import "Media+WPMediaAsset.h"
 #import "MediaService.h"
 #import "Blog.h"
-#import "ContextManager.h"
+#import "CoreDataStack.h"
 #import "WordPress-Swift.h"
 
 @implementation Media(WPMediaAsset)

WordPress/Classes/Categories/Media+WPMediaAsset.m

@@ -1,6 +1,6 @@
 #import "AbstractPost.h"
 #import "Media.h"
-#import "ContextManager.h"
+#import "CoreDataStack.h"
 #import "WordPress-Swift.h"
 #import "BasePost.h"
 @import WordPressKit;