diff --git a/Modules/Package.swift b/Modules/Package.swift index 0670920937f0..bc4badf1b6f8 100644 --- a/Modules/Package.swift +++ b/Modules/Package.swift @@ -15,9 +15,6 @@ let package = Package( .library(name: "NotificationServiceExtensionCore", targets: ["NotificationServiceExtensionCore"]), .library(name: "ShareExtensionCore", targets: ["ShareExtensionCore"]), .library(name: "SFHFKeychainUtils", targets: ["SFHFKeychainUtils"]), - // Note: WordPressData the Swift package is currently unused. - // We are leaving it here to be ready for the future when we'll be able to write the current WordPressData framework as a Swift package. - .library(name: "WordPressData", targets: ["WordPressData"]), .library(name: "WordPressFlux", targets: ["WordPressFlux"]), .library(name: "WordPressShared", targets: ["WordPressShared"]), .library(name: "WordPressUI", targets: ["WordPressUI"]), @@ -123,14 +120,6 @@ let package = Package( .product(name: "ScreenObject", package: "ScreenObject"), .product(name: "XCUITestHelpers", package: "ScreenObject"), ], swiftSettings: [.swiftLanguageMode(.v5)]), - .target(name: "WordPressDataObjC"), - .target( - name: "WordPressData", - dependencies: [ - .target(name: "WordPressDataObjC"), - .target(name: "WordPressSharedObjC") - ] - ), .target(name: "WordPressFlux", swiftSettings: [.swiftLanguageMode(.v5)]), .target(name: "WordPressCore", dependencies: [.target(name: "WordPressShared"), .product(name: "WordPressAPI", package: "wordpress-rs")]), .target(name: "WordPressSharedObjC", resources: [.process("Resources")], swiftSettings: [.swiftLanguageMode(.v5)]), @@ -255,7 +244,6 @@ enum XcodeSupport { "SFHFKeychainUtils", "ShareExtensionCore", "WordPressFlux", - "WordPressDataObjC", // Currently empty, here for future proofing "WordPressShared", "WordPressReader", "WordPressUI", @@ -292,7 +280,6 @@ enum XcodeSupport { ]), .xcodeTarget("XcodeTarget_WordPressTests", dependencies: testDependencies + [ "SFHFKeychainUtils", - "WordPressDataObjC", // Currently empty, here for future proofing "WordPressShared", "WordPressUI", .product(name: "Gravatar", package: "Gravatar-SDK-iOS"), diff --git a/Modules/Sources/WordPressData/WordPressData.swift b/Modules/Sources/WordPressData/WordPressData.swift deleted file mode 100644 index 2e8f63502b5a..000000000000 --- a/Modules/Sources/WordPressData/WordPressData.swift +++ /dev/null @@ -1 +0,0 @@ -@_exported import WordPressDataObjC diff --git a/Modules/Sources/WordPressDataObjC/Empty.m b/Modules/Sources/WordPressDataObjC/Empty.m deleted file mode 100644 index 0a8ef3d15934..000000000000 --- a/Modules/Sources/WordPressDataObjC/Empty.m +++ /dev/null @@ -1,3 +0,0 @@ -#import "Empty.h" - -NSString * const Empty = @"Empty"; diff --git a/Modules/Sources/WordPressDataObjC/include/Empty.h b/Modules/Sources/WordPressDataObjC/include/Empty.h deleted file mode 100644 index 529095400070..000000000000 --- a/Modules/Sources/WordPressDataObjC/include/Empty.h +++ /dev/null @@ -1,3 +0,0 @@ -#import - -extern NSString * const Empty; diff --git a/WordPress/Classes/Categories/Media+Extensions.m b/WordPress/Classes/Categories/Media+Extensions.m index c5657db00fff..43af9b2e1cce 100644 --- a/WordPress/Classes/Categories/Media+Extensions.m +++ b/WordPress/Classes/Categories/Media+Extensions.m @@ -1,7 +1,6 @@ #import "Media+Extensions.h" #import "MediaService.h" #import "Blog.h" -@import WordPressDataObjC; @import WordPressShared; #ifdef KEYSTONE #import "Keystone-Swift.h" diff --git a/WordPress/Classes/Models/AbstractPost.m b/WordPress/Classes/Models/AbstractPost.m index 75a3c986066d..38a344197461 100644 --- a/WordPress/Classes/Models/AbstractPost.m +++ b/WordPress/Classes/Models/AbstractPost.m @@ -1,6 +1,5 @@ #import "AbstractPost.h" #import "Media.h" -@import WordPressDataObjC; #ifdef KEYSTONE #import "Keystone-Swift.h" #else diff --git a/WordPress/Classes/Models/BasePost.m b/WordPress/Classes/Models/BasePost.m index 26bc21d8d08b..4ae3f927e207 100644 --- a/WordPress/Classes/Models/BasePost.m +++ b/WordPress/Classes/Models/BasePost.m @@ -1,6 +1,5 @@ #import "BasePost.h" #import "Media.h" -@import WordPressDataObjC; @import WordPressShared; diff --git a/WordPress/Classes/Models/Blog/Blog.m b/WordPress/Classes/Models/Blog/Blog.m index ad3e48f0afe9..3831f4b4c039 100644 --- a/WordPress/Classes/Models/Blog/Blog.m +++ b/WordPress/Classes/Models/Blog/Blog.m @@ -1,7 +1,6 @@ #import "Blog.h" #import "WPAccount.h" #import "AccountService.h" -@import WordPressDataObjC; @import WordPressShared; #ifdef KEYSTONE #import "Keystone-Swift.h" @@ -155,7 +154,7 @@ - (void)didTurnIntoFault - (NSNumber *)organizationID { NSNumber *organizationID = [self primitiveValueForKey:@"organizationID"]; - + if (organizationID == nil) { return @0; } else { @@ -188,7 +187,7 @@ - (NSString *)displayURL DDLogInfo(@"Blog display URL is nil"); return nil; } - + NSError *error = nil; NSRegularExpression *protocol = [NSRegularExpression regularExpressionWithPattern:@"http(s?)://" options:NSRegularExpressionCaseInsensitive error:&error]; NSString *result = [NSString stringWithFormat:@"%@", [protocol stringByReplacingMatchesInString:self.url options:0 range:NSMakeRange(0, [self.url length]) withTemplate:@""]]; @@ -306,7 +305,7 @@ - (NSArray *)sortedPostFormats } - (NSArray *)sortedPostFormatNames -{ +{ return [[self sortedPostFormats] wp_map:^id(NSString *key) { return self.postFormats[key]; }]; @@ -794,7 +793,7 @@ - (NSSet *)allowedFileTypes if (!allowedFileTypes || allowedFileTypes.count == 0) { return nil; } - + return [NSSet setWithArray:allowedFileTypes]; } diff --git a/WordPress/Classes/Models/CoreDataStack/CoreDataStackSwift.swift b/WordPress/Classes/Models/CoreDataStack/CoreDataStackSwift.swift index 2ace910b6d86..8f51d75c8415 100644 --- a/WordPress/Classes/Models/CoreDataStack/CoreDataStackSwift.swift +++ b/WordPress/Classes/Models/CoreDataStack/CoreDataStackSwift.swift @@ -1,5 +1,4 @@ import CoreData -import WordPressDataObjC public protocol CoreDataStackSwift: CoreDataStack { diff --git a/WordPress/Classes/Models/Media.m b/WordPress/Classes/Models/Media.m index 98935f7d9846..74052cee9cee 100644 --- a/WordPress/Classes/Models/Media.m +++ b/WordPress/Classes/Models/Media.m @@ -1,5 +1,4 @@ #import "Media.h" -@import WordPressDataObjC; #ifdef KEYSTONE #import "Keystone-Swift.h" #else diff --git a/WordPress/Classes/Models/ReaderPost.m b/WordPress/Classes/Models/ReaderPost.m index adf5de24d453..f6e53273cb48 100644 --- a/WordPress/Classes/Models/ReaderPost.m +++ b/WordPress/Classes/Models/ReaderPost.m @@ -1,5 +1,4 @@ #import "ReaderPost.h" -@import WordPressDataObjC; #import "SourcePostAttribution.h" #import "WPAccount.h" #ifdef KEYSTONE diff --git a/WordPress/Classes/Models/Theme.m b/WordPress/Classes/Models/Theme.m index 9e7e9c9d9b79..9f8ad4c0172c 100644 --- a/WordPress/Classes/Models/Theme.m +++ b/WordPress/Classes/Models/Theme.m @@ -1,6 +1,5 @@ #import "Theme.h" #import "Blog.h" -@import WordPressDataObjC; #import "WPAccount.h" #import "AccountService.h" #ifdef KEYSTONE diff --git a/WordPress/Classes/Services/AccountService.m b/WordPress/Classes/Services/AccountService.m index f6ecc98abfda..468df950c893 100644 --- a/WordPress/Classes/Services/AccountService.m +++ b/WordPress/Classes/Services/AccountService.m @@ -3,7 +3,6 @@ #import "Blog.h" #import "BlogService.h" -@import WordPressDataObjC; @import WordPressKit; @import WordPressShared; diff --git a/WordPress/Classes/Services/BlogService.m b/WordPress/Classes/Services/BlogService.m index f886a8ab2707..8bcb65d404fe 100644 --- a/WordPress/Classes/Services/BlogService.m +++ b/WordPress/Classes/Services/BlogService.m @@ -2,7 +2,6 @@ #import "Blog.h" #import "WPAccount.h" #import "AccountService.h" -@import WordPressDataObjC; #import "WPError.h" #import "Media.h" #import "PostCategoryService.h" diff --git a/WordPress/Classes/Services/CommentService.m b/WordPress/Classes/Services/CommentService.m index 3449991beecf..8b58afcf17dd 100644 --- a/WordPress/Classes/Services/CommentService.m +++ b/WordPress/Classes/Services/CommentService.m @@ -1,7 +1,6 @@ #import "CommentService.h" #import "AccountService.h" #import "Blog.h" -@import WordPressDataObjC; #import "ReaderPost.h" #import "WPAccount.h" #import "PostService.h" diff --git a/WordPress/Classes/Services/Facades/BlogSyncFacade.m b/WordPress/Classes/Services/Facades/BlogSyncFacade.m index c926d994af02..1e808d4d50de 100644 --- a/WordPress/Classes/Services/Facades/BlogSyncFacade.m +++ b/WordPress/Classes/Services/Facades/BlogSyncFacade.m @@ -1,5 +1,4 @@ #import "BlogSyncFacade.h" -@import WordPressDataObjC; #import "BlogService.h" #import "AccountService.h" #import "Blog.h" diff --git a/WordPress/Classes/Services/MediaService.m b/WordPress/Classes/Services/MediaService.m index fd8e7389337c..dad49675c899 100644 --- a/WordPress/Classes/Services/MediaService.m +++ b/WordPress/Classes/Services/MediaService.m @@ -2,7 +2,6 @@ #import "AccountService.h" #import "Media.h" #import "WPAccount.h" -@import WordPressDataObjC; @import WordPressShared; #import "Blog.h" #import diff --git a/WordPress/Classes/Services/MenusService.m b/WordPress/Classes/Services/MenusService.m index c5ace47b9c85..a4053036d039 100644 --- a/WordPress/Classes/Services/MenusService.m +++ b/WordPress/Classes/Services/MenusService.m @@ -4,7 +4,6 @@ #import "Menu.h" #import "MenuItem.h" #import "MenuLocation.h" -@import WordPressDataObjC; #import "PostService.h" #ifdef KEYSTONE #import "Keystone-Swift.h" diff --git a/WordPress/Classes/Services/PostCategoryService.m b/WordPress/Classes/Services/PostCategoryService.m index 00ada9bb7a08..2f2b19195145 100644 --- a/WordPress/Classes/Services/PostCategoryService.m +++ b/WordPress/Classes/Services/PostCategoryService.m @@ -1,7 +1,6 @@ #import "PostCategoryService.h" #import "PostCategory.h" #import "Blog.h" -@import WordPressDataObjC; #ifdef KEYSTONE #import "Keystone-Swift.h" #else diff --git a/WordPress/Classes/Services/PostService.m b/WordPress/Classes/Services/PostService.m index d2ec2ff016b2..758b02fce622 100644 --- a/WordPress/Classes/Services/PostService.m +++ b/WordPress/Classes/Services/PostService.m @@ -1,7 +1,6 @@ #import "PostService.h" #import "PostCategory.h" #import "PostCategoryService.h" -@import WordPressDataObjC; #import "CommentService.h" #import "MediaService.h" #import "Media.h" diff --git a/WordPress/Classes/Services/PostTagService.m b/WordPress/Classes/Services/PostTagService.m index 190588082427..60f43b9a580c 100644 --- a/WordPress/Classes/Services/PostTagService.m +++ b/WordPress/Classes/Services/PostTagService.m @@ -1,7 +1,6 @@ #import "PostTagService.h" #import "Blog.h" #import "PostTag.h" -@import WordPressDataObjC; #ifdef KEYSTONE #import "Keystone-Swift.h" #else diff --git a/WordPress/Classes/Services/Reader Post/ReaderPostService.m b/WordPress/Classes/Services/Reader Post/ReaderPostService.m index 773e8a58a754..6712c8efece0 100644 --- a/WordPress/Classes/Services/Reader Post/ReaderPostService.m +++ b/WordPress/Classes/Services/Reader Post/ReaderPostService.m @@ -1,7 +1,6 @@ #import "ReaderPostService.h" #import "AccountService.h" -@import WordPressDataObjC; #import "ReaderGapMarker.h" #import "ReaderPost.h" #import "ReaderSiteService.h" diff --git a/WordPress/Classes/Services/ReaderSiteService.m b/WordPress/Classes/Services/ReaderSiteService.m index 529e658aa4a9..c8ddd61ead70 100644 --- a/WordPress/Classes/Services/ReaderSiteService.m +++ b/WordPress/Classes/Services/ReaderSiteService.m @@ -1,7 +1,6 @@ #import "ReaderSiteService.h" #import "AccountService.h" -@import WordPressDataObjC; #import "ReaderPostService.h" #import "ReaderPost.h" #import "WPAccount.h" diff --git a/WordPress/Classes/Services/ReaderTopicService.m b/WordPress/Classes/Services/ReaderTopicService.m index d64137acfda6..ab1f237f5e3b 100644 --- a/WordPress/Classes/Services/ReaderTopicService.m +++ b/WordPress/Classes/Services/ReaderTopicService.m @@ -1,7 +1,6 @@ #import "ReaderTopicService.h" #import "AccountService.h" -@import WordPressDataObjC; #import "ReaderPost.h" #import "ReaderPostService.h" #import "WPAccount.h" diff --git a/WordPress/Classes/Services/ThemeService.m b/WordPress/Classes/Services/ThemeService.m index 108b339b339d..40d2b3361783 100644 --- a/WordPress/Classes/Services/ThemeService.m +++ b/WordPress/Classes/Services/ThemeService.m @@ -3,7 +3,6 @@ #import "Blog.h" #import "Theme.h" #import "WPAccount.h" -@import WordPressDataObjC; #ifdef KEYSTONE #import "Keystone-Swift.h" #else diff --git a/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerAutomatticTracks.m b/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerAutomatticTracks.m index 58699f5fdf28..80806bdf7912 100644 --- a/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerAutomatticTracks.m +++ b/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerAutomatticTracks.m @@ -1,5 +1,4 @@ #import "WPAnalyticsTrackerAutomatticTracks.h" -@import WordPressDataObjC; #import "AccountService.h" #import "BlogService.h" #import "WPAccount.h" diff --git a/WordPress/Classes/Utility/Analytics/WPAppAnalytics.m b/WordPress/Classes/Utility/Analytics/WPAppAnalytics.m index c861f1c62ac0..e9b571516838 100644 --- a/WordPress/Classes/Utility/Analytics/WPAppAnalytics.m +++ b/WordPress/Classes/Utility/Analytics/WPAppAnalytics.m @@ -1,4 +1,3 @@ -@import WordPressDataObjC; @import NSObject_SafeExpectations; #import "WPAppAnalytics.h" diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m b/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m index f782cb005a4a..849339b33b90 100644 --- a/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m +++ b/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m @@ -3,7 +3,6 @@ #import "AccountService.h" #import "BlogService.h" #import "CommentsViewController.h" -@import WordPressDataObjC; #import "SiteSettingsViewController.h" #import "SharingViewController.h" #import "StatsViewController.h" diff --git a/WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController.m b/WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController.m index 2cc33d5c449a..b08bb25a7776 100644 --- a/WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController.m +++ b/WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController.m @@ -2,7 +2,6 @@ #import "Blog.h" #import "BlogService.h" -@import WordPressDataObjC; #import "PostCategory.h" #import "PostCategoryService.h" #import "SettingsSelectionViewController.h" diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemEditingViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemEditingViewController.m index b7cd5e9dc6d0..883890b6a49e 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemEditingViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemEditingViewController.m @@ -6,7 +6,6 @@ #import "MenuItemEditingFooterView.h" #import "MenuItemSourceViewController.h" #import "MenuItemTypeViewController.h" -@import WordPressDataObjC; #ifdef KEYSTONE #import "Keystone-Swift.h" #else diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemsViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemsViewController.m index 1e7b17f38878..ee03d215158a 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemsViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemsViewController.m @@ -5,7 +5,6 @@ #import "MenuItemView.h" #import "MenuItemInsertionView.h" #import "MenuItemsVisualOrderingView.h" -@import WordPressDataObjC; #import "Menu+ViewDesign.h" #ifdef KEYSTONE #import "Keystone-Swift.h" diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenusViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenusViewController.m index 1f6da8c7bc92..85814526d95a 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenusViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenusViewController.m @@ -9,7 +9,6 @@ #import "MenuItemsViewController.h" #import "MenuItemEditingViewController.h" #import "Menu+ViewDesign.h" -@import WordPressDataObjC; #import "WPAppAnalytics.h" #ifdef KEYSTONE #import "Keystone-Swift.h" diff --git a/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m b/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m index 245cc43bddc4..08c9e796bc8a 100644 --- a/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m +++ b/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m @@ -3,7 +3,6 @@ #import "Media.h" #import "SettingsSelectionViewController.h" #import "SharingDetailViewController.h" -@import WordPressDataObjC; #import "MediaService.h" #ifdef KEYSTONE #import "Keystone-Swift.h" diff --git a/WordPress/Classes/ViewRelated/Stats/StatsViewController.m b/WordPress/Classes/ViewRelated/Stats/StatsViewController.m index f6490af5d010..fc2393fb552b 100644 --- a/WordPress/Classes/ViewRelated/Stats/StatsViewController.m +++ b/WordPress/Classes/ViewRelated/Stats/StatsViewController.m @@ -9,7 +9,6 @@ #endif #import "WPAppAnalytics.h" -@import WordPressDataObjC; @import WordPressShared; @import Reachability; diff --git a/WordPress/Classes/ViewRelated/System/WPTabBarController.m b/WordPress/Classes/ViewRelated/System/WPTabBarController.m index c7e9f5a90dd8..5c745c04dfd1 100644 --- a/WordPress/Classes/ViewRelated/System/WPTabBarController.m +++ b/WordPress/Classes/ViewRelated/System/WPTabBarController.m @@ -1,7 +1,6 @@ #import "WPTabBarController.h" #import "AccountService.h" -@import WordPressDataObjC; #import "BlogService.h" #import "Blog.h" diff --git a/WordPress/WordPressTest/BlogServiceTest.m b/WordPress/WordPressTest/BlogServiceTest.m index ddaa752e53d1..b6c9bd1201ad 100644 --- a/WordPress/WordPressTest/BlogServiceTest.m +++ b/WordPress/WordPressTest/BlogServiceTest.m @@ -1,7 +1,6 @@ #import #import "AccountService.h" #import "BlogService.h" -@import WordPressDataObjC; #import "Blog.h" #import "WPAccount.h" #import "WordPressTest-Swift.h" diff --git a/WordPress/WordPressTest/ReaderPostServiceTest.m b/WordPress/WordPressTest/ReaderPostServiceTest.m index ac0ebb07b964..1b4572d5d6a3 100644 --- a/WordPress/WordPressTest/ReaderPostServiceTest.m +++ b/WordPress/WordPressTest/ReaderPostServiceTest.m @@ -1,4 +1,3 @@ -@import WordPressDataObjC; #import