Skip to content

Commit

Permalink
Remove Stories and Kanvas dependency (#23382)
Browse files Browse the repository at this point in the history
  • Loading branch information
jkmassel authored Jun 24, 2024
2 parents 2270784 + 32a3251 commit fc50d1a
Show file tree
Hide file tree
Showing 36 changed files with 57 additions and 1,980 deletions.
8 changes: 0 additions & 8 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,6 @@ def wordpress_kit
pod 'WordPressKit', path: './WordPressKit', testspecs: ['Tests']
end

def kanvas
pod 'Kanvas', '~> 1.4.4'
# pod 'Kanvas', git: 'https://github.com/tumblr/Kanvas-iOS.git', tag: ''
# pod 'Kanvas', git: 'https://github.com/tumblr/Kanvas-iOS.git', commit: ''
# pod 'Kanvas', path: '../Kanvas-iOS'
end

def shared_with_all_pods
wordpress_shared
pod 'CocoaLumberjack/Swift', '~> 3.0'
Expand Down Expand Up @@ -136,7 +129,6 @@ abstract_target 'Apps' do
##
wordpress_kit
wordpress_shared
kanvas
gravatar

# Production
Expand Down
7 changes: 1 addition & 6 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ PODS:
- Gridicons (1.2.0)
- Gutenberg (1.120.1)
- JTAppleCalendar (8.0.5)
- Kanvas (1.4.9):
- CropViewController
- MediaEditor (1.2.2):
- CropViewController (~> 2.5.3)
- NSObject-SafeExpectations (0.0.6)
Expand Down Expand Up @@ -135,7 +133,6 @@ DEPENDENCIES:
- Gridicons (~> 1.2)
- Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.120.1.podspec`)
- JTAppleCalendar (~> 8.0.5)
- Kanvas (~> 1.4.4)
- MediaEditor (>= 1.2.2, ~> 1.2)
- NSObject-SafeExpectations (~> 0.0.4)
- "NSURL+IDN (~> 0.4)"
Expand Down Expand Up @@ -175,7 +172,6 @@ SPEC REPOS:
- GravatarUI
- Gridicons
- JTAppleCalendar
- Kanvas
- MediaEditor
- NSObject-SafeExpectations
- "NSURL+IDN"
Expand Down Expand Up @@ -234,7 +230,6 @@ SPEC CHECKSUMS:
Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d
Gutenberg: 0699e7dd207afb591ccd5e81252a92e6e7781391
JTAppleCalendar: 16c6501b22cb27520372c28b0a2e0b12c8d0cd73
Kanvas: cc027f8058de881a4ae2b5aa5f05037b6d054d08
MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae
NSObject-SafeExpectations: c01c8881cbd97efad6f668286b913cd0b7d62ab5
"NSURL+IDN": afc873e639c18138a1589697c3add197fe8679ca
Expand Down Expand Up @@ -265,6 +260,6 @@ SPEC CHECKSUMS:
ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
ZIPFoundation: d170fa8e270b2a32bef9dcdcabff5b8f1a5deced

PODFILE CHECKSUM: 6f6fc1319d254884bd93ef1f6d3f2478fa9f49f5
PODFILE CHECKSUM: cb6ea221990308a46df17cd6e0b929adf8f6e9a8

COCOAPODS: 1.15.2
2 changes: 0 additions & 2 deletions WordPress/Classes/Models/Blog.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@ typedef NS_ENUM(NSUInteger, BlogFeature) {
BlogFeatureTenor,
/// Does the blog support setting the homepage type and pages?
BlogFeatureHomepageSettings,
/// Does the blog support stories?
BlogFeatureStories,
/// Does the blog support Jetpack contact info block?
BlogFeatureContactInfo,
BlogFeatureBlockEditorSettings,
Expand Down
7 changes: 0 additions & 7 deletions WordPress/Classes/Models/Blog.m
Original file line number Diff line number Diff line change
Expand Up @@ -597,8 +597,6 @@ - (BOOL)supports:(BlogFeature)feature
return [self isAdmin];
case BlogFeatureHomepageSettings:
return [self supportsRestApi] && [self isAdmin];
case BlogFeatureStories:
return [self supportsStories];
case BlogFeatureContactInfo:
return [self supportsContactInfo];
case BlogFeatureBlockEditorSettings:
Expand Down Expand Up @@ -712,11 +710,6 @@ - (BOOL)supportsPluginManagement
return supports;
}

- (BOOL)supportsStories
{
return NO;
}

- (BOOL)supportsContactInfo
{
return [self hasRequiredJetpackVersion:@"8.5"] || self.isHostedAtWPcom;
Expand Down
7 changes: 0 additions & 7 deletions WordPress/Classes/Services/PostCoordinator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -717,13 +717,6 @@ class PostCoordinator: NSObject {
return post.titleForDisplay()
}

func add(assets: [ExportableAsset], to post: AbstractPost) -> [Media?] {
let media = assets.map { asset in
return mediaCoordinator.addMedia(from: asset, to: post)
}
return media
}

private func observeMedia(for post: AbstractPost, completion: @escaping (Result<AbstractPost, SavingError>) -> ()) -> UUID {
// Only observe if we're not already
let handleSingleMediaFailure = { [weak self] (error: Error) -> Void in
Expand Down
129 changes: 0 additions & 129 deletions WordPress/Classes/Services/Stories/CameraHandler.swift

This file was deleted.

Loading

0 comments on commit fc50d1a

Please sign in to comment.