Skip to content

Commit 283e4b3

Browse files
Merge branch 'trunk' into merge/24.4.0.1-into-trunk
2 parents ac7c7ac + 6298d3b commit 283e4b3

File tree

120 files changed

+2114
-1230
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+2114
-1230
lines changed

.buildkite/cache-builder.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ common_params:
1313
repo: "wordpress-mobile/wordpress-ios/"
1414
# Common environment values to use with the `env` key.
1515
- &common_env
16-
IMAGE_ID: xcode-14
16+
IMAGE_ID: xcode-14.2
1717

1818
steps:
1919

.buildkite/pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ common_params:
88
repo: "wordpress-mobile/wordpress-ios/"
99
# Common environment values to use with the `env` key.
1010
- &common_env
11-
IMAGE_ID: xcode-14
11+
IMAGE_ID: xcode-14.2
1212

1313
# This is the default pipeline – it will build and test the app
1414
steps:

.buildkite/release-builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ common_params:
1010
repo: "wordpress-mobile/wordpress-ios/"
1111
# Common environment values to use with the `env` key.
1212
- &common_env
13-
IMAGE_ID: xcode-14
13+
IMAGE_ID: xcode-14.2
1414

1515
steps:
1616

.xcversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
13.4.1
1+
14.2

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def shared_style_pods
9191
end
9292

9393
def gutenberg_pods
94-
gutenberg tag: 'v1.86.1'
94+
gutenberg tag: 'v1.87.0-alpha1'
9595
end
9696

9797
def gutenberg(options)

Podfile.lock

Lines changed: 101 additions & 101 deletions
Large diffs are not rendered by default.

WordPress/Classes/Categories/Media+WPMediaAsset.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#import "Media+WPMediaAsset.h"
22
#import "MediaService.h"
33
#import "Blog.h"
4-
#import "ContextManager.h"
4+
#import "CoreDataStack.h"
55
#import "WordPress-Swift.h"
66

77
@implementation Media(WPMediaAsset)

WordPress/Classes/Models/AbstractPost.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#import "AbstractPost.h"
22
#import "Media.h"
3-
#import "ContextManager.h"
3+
#import "CoreDataStack.h"
44
#import "WordPress-Swift.h"
55
#import "BasePost.h"
66
@import WordPressKit;

WordPress/Classes/Models/BasePost.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#import "BasePost.h"
22
#import "Media.h"
33
#import "NSMutableDictionary+Helpers.h"
4-
#import "ContextManager.h"
4+
#import "CoreDataStack.h"
55
@import WordPressShared;
66

77
@implementation BasePost

WordPress/Classes/Models/Blog.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#import "WPAccount.h"
33
#import "AccountService.h"
44
#import "NSURL+IDN.h"
5-
#import "ContextManager.h"
5+
#import "CoreDataStack.h"
66
#import "Constants.h"
77
#import "WordPress-Swift.h"
88
#import "WPUserAgent.h"

0 commit comments

Comments
 (0)