Skip to content

Commit fc50d1a

Browse files
authored
Remove Stories and Kanvas dependency (#23382)
2 parents 2270784 + 32a3251 commit fc50d1a

36 files changed

+57
-1980
lines changed

Podfile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,6 @@ def wordpress_kit
6161
pod 'WordPressKit', path: './WordPressKit', testspecs: ['Tests']
6262
end
6363

64-
def kanvas
65-
pod 'Kanvas', '~> 1.4.4'
66-
# pod 'Kanvas', git: 'https://github.com/tumblr/Kanvas-iOS.git', tag: ''
67-
# pod 'Kanvas', git: 'https://github.com/tumblr/Kanvas-iOS.git', commit: ''
68-
# pod 'Kanvas', path: '../Kanvas-iOS'
69-
end
70-
7164
def shared_with_all_pods
7265
wordpress_shared
7366
pod 'CocoaLumberjack/Swift', '~> 3.0'
@@ -136,7 +129,6 @@ abstract_target 'Apps' do
136129
##
137130
wordpress_kit
138131
wordpress_shared
139-
kanvas
140132
gravatar
141133

142134
# Production

Podfile.lock

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ PODS:
3232
- Gridicons (1.2.0)
3333
- Gutenberg (1.120.1)
3434
- JTAppleCalendar (8.0.5)
35-
- Kanvas (1.4.9):
36-
- CropViewController
3735
- MediaEditor (1.2.2):
3836
- CropViewController (~> 2.5.3)
3937
- NSObject-SafeExpectations (0.0.6)
@@ -135,7 +133,6 @@ DEPENDENCIES:
135133
- Gridicons (~> 1.2)
136134
- Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.120.1.podspec`)
137135
- JTAppleCalendar (~> 8.0.5)
138-
- Kanvas (~> 1.4.4)
139136
- MediaEditor (>= 1.2.2, ~> 1.2)
140137
- NSObject-SafeExpectations (~> 0.0.4)
141138
- "NSURL+IDN (~> 0.4)"
@@ -175,7 +172,6 @@ SPEC REPOS:
175172
- GravatarUI
176173
- Gridicons
177174
- JTAppleCalendar
178-
- Kanvas
179175
- MediaEditor
180176
- NSObject-SafeExpectations
181177
- "NSURL+IDN"
@@ -234,7 +230,6 @@ SPEC CHECKSUMS:
234230
Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d
235231
Gutenberg: 0699e7dd207afb591ccd5e81252a92e6e7781391
236232
JTAppleCalendar: 16c6501b22cb27520372c28b0a2e0b12c8d0cd73
237-
Kanvas: cc027f8058de881a4ae2b5aa5f05037b6d054d08
238233
MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae
239234
NSObject-SafeExpectations: c01c8881cbd97efad6f668286b913cd0b7d62ab5
240235
"NSURL+IDN": afc873e639c18138a1589697c3add197fe8679ca
@@ -265,6 +260,6 @@ SPEC CHECKSUMS:
265260
ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
266261
ZIPFoundation: d170fa8e270b2a32bef9dcdcabff5b8f1a5deced
267262

268-
PODFILE CHECKSUM: 6f6fc1319d254884bd93ef1f6d3f2478fa9f49f5
263+
PODFILE CHECKSUM: cb6ea221990308a46df17cd6e0b929adf8f6e9a8
269264

270265
COCOAPODS: 1.15.2

WordPress/Classes/Models/Blog.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,6 @@ typedef NS_ENUM(NSUInteger, BlogFeature) {
8282
BlogFeatureTenor,
8383
/// Does the blog support setting the homepage type and pages?
8484
BlogFeatureHomepageSettings,
85-
/// Does the blog support stories?
86-
BlogFeatureStories,
8785
/// Does the blog support Jetpack contact info block?
8886
BlogFeatureContactInfo,
8987
BlogFeatureBlockEditorSettings,

WordPress/Classes/Models/Blog.m

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -597,8 +597,6 @@ - (BOOL)supports:(BlogFeature)feature
597597
return [self isAdmin];
598598
case BlogFeatureHomepageSettings:
599599
return [self supportsRestApi] && [self isAdmin];
600-
case BlogFeatureStories:
601-
return [self supportsStories];
602600
case BlogFeatureContactInfo:
603601
return [self supportsContactInfo];
604602
case BlogFeatureBlockEditorSettings:
@@ -712,11 +710,6 @@ - (BOOL)supportsPluginManagement
712710
return supports;
713711
}
714712

715-
- (BOOL)supportsStories
716-
{
717-
return NO;
718-
}
719-
720713
- (BOOL)supportsContactInfo
721714
{
722715
return [self hasRequiredJetpackVersion:@"8.5"] || self.isHostedAtWPcom;

WordPress/Classes/Services/PostCoordinator.swift

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -717,13 +717,6 @@ class PostCoordinator: NSObject {
717717
return post.titleForDisplay()
718718
}
719719

720-
func add(assets: [ExportableAsset], to post: AbstractPost) -> [Media?] {
721-
let media = assets.map { asset in
722-
return mediaCoordinator.addMedia(from: asset, to: post)
723-
}
724-
return media
725-
}
726-
727720
private func observeMedia(for post: AbstractPost, completion: @escaping (Result<AbstractPost, SavingError>) -> ()) -> UUID {
728721
// Only observe if we're not already
729722
let handleSingleMediaFailure = { [weak self] (error: Error) -> Void in

WordPress/Classes/Services/Stories/CameraHandler.swift

Lines changed: 0 additions & 129 deletions
This file was deleted.

0 commit comments

Comments
 (0)