From b498ddf364a7046d8f00f5209dde3c46c8bcf243 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Tue, 13 May 2025 11:33:14 +1000 Subject: [PATCH 01/14] Add `pipefail` to inline commands to run tests in CI --- .buildkite/pipeline.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index f6accd43f04c..9ec2eb7244d4 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -116,6 +116,8 @@ steps: exit 0 fi + set -o pipefail + .buildkite/commands/shared-set-up.sh xcodebuild \ -scheme Keystone \ @@ -134,6 +136,8 @@ steps: exit 0 fi + set -o pipefail + .buildkite/commands/shared-set-up.sh xcodebuild \ -scheme WordPressData \ From 82139e8d95a6a7bd34cc706cb67fd0fa02db4bce Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Tue, 13 May 2025 17:35:45 +1000 Subject: [PATCH 02/14] Run Keystone and WordPressData unit tests in CI on iOS 18.4 The only iOS version available out of the box with the 16.3 stack. --- .buildkite/pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 9ec2eb7244d4..f9d401db04e7 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -121,7 +121,7 @@ steps: .buildkite/commands/shared-set-up.sh xcodebuild \ -scheme Keystone \ - -destination 'platform=iOS Simulator,OS=18.2,name=iPhone 16' \ + -destination 'platform=iOS Simulator,OS=18.4,name=iPhone 16' \ test \ | xcbeautify plugins: [$CI_TOOLKIT_PLUGIN] @@ -141,7 +141,7 @@ steps: .buildkite/commands/shared-set-up.sh xcodebuild \ -scheme WordPressData \ - -destination 'platform=iOS Simulator,OS=18.2,name=iPhone 16' \ + -destination 'platform=iOS Simulator,OS=18.4,name=iPhone 16' \ test \ | xcbeautify plugins: [$CI_TOOLKIT_PLUGIN] From f413a08f52ff4f5d928e28b90c9237f977f64c65 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Thu, 26 Jun 2025 16:10:25 +1000 Subject: [PATCH 03/14] DRY command to run unit tests focused to a scheme in CI --- .../commands/run-unit-tests-for-scheme.sh | 17 +++++++++++ .buildkite/pipeline.yml | 28 ++----------------- 2 files changed, 19 insertions(+), 26 deletions(-) create mode 100755 .buildkite/commands/run-unit-tests-for-scheme.sh diff --git a/.buildkite/commands/run-unit-tests-for-scheme.sh b/.buildkite/commands/run-unit-tests-for-scheme.sh new file mode 100755 index 000000000000..b01b1c4c2d2b --- /dev/null +++ b/.buildkite/commands/run-unit-tests-for-scheme.sh @@ -0,0 +1,17 @@ +#!/bin/bash -euo pipefail + +SCHEME="${1:?Usage $0 SCHEME}" +DEVICE="iPhone 16" +OS_VERSION="18.4" + +if "$(dirname "${BASH_SOURCE[0]}")/should-skip-job.sh" --job-type validation; then + exit 0 +fi + +$(dirname "${BASH_SOURCE[0]}")/shared-set-up.sh + +xcodebuild \ + -scheme "${SCHEME}" \ + -destination "platform=iOS Simulator,OS=${OS_VERSION},name=${DEVICE}" \ + test \ + | xcbeautify diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index f9d401db04e7..45eef2262bf0 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -111,19 +111,7 @@ steps: - github_commit_status: context: "Reader Unit Tests" - label: "🔬 Keystone Unit Tests" - command: | - if .buildkite/commands/should-skip-job.sh --job-type validation; then - exit 0 - fi - - set -o pipefail - - .buildkite/commands/shared-set-up.sh - xcodebuild \ - -scheme Keystone \ - -destination 'platform=iOS Simulator,OS=18.4,name=iPhone 16' \ - test \ - | xcbeautify + command: .buildkite/commands/run-unit-tests-for-scheme.sh Keystone plugins: [$CI_TOOLKIT_PLUGIN] artifact_paths: - "build/results/*" @@ -131,19 +119,7 @@ steps: - github_commit_status: context: "Unit Tests Keystone" - label: "🔬 WordPressData Unit Tests" - command: | - if .buildkite/commands/should-skip-job.sh --job-type validation; then - exit 0 - fi - - set -o pipefail - - .buildkite/commands/shared-set-up.sh - xcodebuild \ - -scheme WordPressData \ - -destination 'platform=iOS Simulator,OS=18.4,name=iPhone 16' \ - test \ - | xcbeautify + command: .buildkite/commands/run-unit-tests-for-scheme.sh WordPressData plugins: [$CI_TOOLKIT_PLUGIN] artifact_paths: - "build/results/*" From 4dc54b3e7246f98fa58d6c4ffcc350d7d59e0aa8 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Thu, 26 Jun 2025 16:17:23 +1000 Subject: [PATCH 04/14] Disable Keystone tests in CI --- .buildkite/pipeline.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 45eef2262bf0..70392aa25504 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -112,6 +112,8 @@ steps: context: "Reader Unit Tests" - label: "🔬 Keystone Unit Tests" command: .buildkite/commands/run-unit-tests-for-scheme.sh Keystone + # Disabled till https://github.com/wordpress-mobile/WordPress-iOS/pull/24537 is completed + if: false plugins: [$CI_TOOLKIT_PLUGIN] artifact_paths: - "build/results/*" From 7208092dc12cabb2dc59298c052fccf3937a1866 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Thu, 26 Jun 2025 16:19:32 +1000 Subject: [PATCH 05/14] Re-enable Keystone tests in CI --- .buildkite/pipeline.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 70392aa25504..45eef2262bf0 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -112,8 +112,6 @@ steps: context: "Reader Unit Tests" - label: "🔬 Keystone Unit Tests" command: .buildkite/commands/run-unit-tests-for-scheme.sh Keystone - # Disabled till https://github.com/wordpress-mobile/WordPress-iOS/pull/24537 is completed - if: false plugins: [$CI_TOOLKIT_PLUGIN] artifact_paths: - "build/results/*" From f81068ca82a82d1547fb658be8fe2ce4a8d2ef5c Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Fri, 20 Jun 2025 11:44:10 +1000 Subject: [PATCH 06/14] Move `RemotePost+Metadata` extension to WordPressData folder --- .../WordPressData/Swift}/RemotePost+Metadata.swift | 0 WordPress/WordPress.xcodeproj/project.pbxproj | 3 --- 2 files changed, 3 deletions(-) rename {WordPress/Classes => Sources/WordPressData/Swift}/RemotePost+Metadata.swift (100%) diff --git a/WordPress/Classes/RemotePost+Metadata.swift b/Sources/WordPressData/Swift/RemotePost+Metadata.swift similarity index 100% rename from WordPress/Classes/RemotePost+Metadata.swift rename to Sources/WordPressData/Swift/RemotePost+Metadata.swift diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj index 07ad1743d138..ac15009236f9 100644 --- a/WordPress/WordPress.xcodeproj/project.pbxproj +++ b/WordPress/WordPress.xcodeproj/project.pbxproj @@ -1160,7 +1160,6 @@ isa = PBXFileSystemSynchronizedBuildFileExceptionSet; membershipExceptions = ( "Networking/WordPressOrgRestApi+WordPress.swift", - "RemotePost+Metadata.swift", "Services/PostRepository+Helpers.swift", ); target = 3F7AE0B42D9B30A100AB4892 /* WordPressData */; @@ -1169,7 +1168,6 @@ isa = PBXFileSystemSynchronizedBuildFileExceptionSet; membershipExceptions = ( "Networking/WordPressOrgRestApi+WordPress.swift", - "RemotePost+Metadata.swift", "Services/PostRepository+Helpers.swift", ); target = 1D6058900D05DD3D006BFB54 /* WordPress */; @@ -1178,7 +1176,6 @@ isa = PBXFileSystemSynchronizedBuildFileExceptionSet; membershipExceptions = ( "Networking/WordPressOrgRestApi+WordPress.swift", - "RemotePost+Metadata.swift", "Services/PostRepository+Helpers.swift", ); target = FABB1F8F2602FC2C00C8785C /* Jetpack */; From ab85dc772105adeb2591328baaad1e9aa13f9288 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Fri, 20 Jun 2025 11:51:48 +1000 Subject: [PATCH 07/14] Move extensions from `PostRepository+Helpers.swift` to WordPressData --- .../RemotePostCreateParameters+Helpers.swift | 21 ------------------ .../RemotePostUpdateParameters+Helpers.swift | 22 +++++++++++++++++++ WordPress/WordPress.xcodeproj/project.pbxproj | 4 ---- 3 files changed, 22 insertions(+), 25 deletions(-) rename WordPress/Classes/Services/PostRepository+Helpers.swift => Sources/WordPressData/Swift/RemotePostCreateParameters+Helpers.swift (70%) create mode 100644 Sources/WordPressData/Swift/RemotePostUpdateParameters+Helpers.swift diff --git a/WordPress/Classes/Services/PostRepository+Helpers.swift b/Sources/WordPressData/Swift/RemotePostCreateParameters+Helpers.swift similarity index 70% rename from WordPress/Classes/Services/PostRepository+Helpers.swift rename to Sources/WordPressData/Swift/RemotePostCreateParameters+Helpers.swift index 3d1945483e97..33da60bcd48b 100644 --- a/WordPress/Classes/Services/PostRepository+Helpers.swift +++ b/Sources/WordPressData/Swift/RemotePostCreateParameters+Helpers.swift @@ -52,24 +52,3 @@ private func makeTags(from tags: String) -> [String] { .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) } .filter { !$0.isEmpty } } - -public extension RemotePostUpdateParameters { - - var isEmpty: Bool { - self == RemotePostUpdateParameters() - } - - /// Returns a diff between the original and the latest revision with the - /// changes applied on top. - static func changes(from original: AbstractPost, to latest: AbstractPost, with changes: RemotePostUpdateParameters? = nil) -> RemotePostUpdateParameters { - guard original !== latest else { - return changes ?? RemotePostUpdateParameters() - } - let parametersOriginal = RemotePostCreateParameters(post: original) - var parametersLatest = RemotePostCreateParameters(post: latest) - if let changes { - parametersLatest.apply(changes) - } - return parametersLatest.changes(from: parametersOriginal) - } -} diff --git a/Sources/WordPressData/Swift/RemotePostUpdateParameters+Helpers.swift b/Sources/WordPressData/Swift/RemotePostUpdateParameters+Helpers.swift new file mode 100644 index 000000000000..8f78a4d0d5df --- /dev/null +++ b/Sources/WordPressData/Swift/RemotePostUpdateParameters+Helpers.swift @@ -0,0 +1,22 @@ +import WordPressKit + +public extension RemotePostUpdateParameters { + + var isEmpty: Bool { + self == RemotePostUpdateParameters() + } + + /// Returns a diff between the original and the latest revision with the + /// changes applied on top. + static func changes(from original: AbstractPost, to latest: AbstractPost, with changes: RemotePostUpdateParameters? = nil) -> RemotePostUpdateParameters { + guard original !== latest else { + return changes ?? RemotePostUpdateParameters() + } + let parametersOriginal = RemotePostCreateParameters(post: original) + var parametersLatest = RemotePostCreateParameters(post: latest) + if let changes { + parametersLatest.apply(changes) + } + return parametersLatest.changes(from: parametersOriginal) + } +} diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj index ac15009236f9..61a73aed9f79 100644 --- a/WordPress/WordPress.xcodeproj/project.pbxproj +++ b/WordPress/WordPress.xcodeproj/project.pbxproj @@ -1092,7 +1092,6 @@ 0C5C46F42D98343300F2CD55 /* Exceptions for "Classes" folder in "Keystone" target */ = { isa = PBXFileSystemSynchronizedBuildFileExceptionSet; membershipExceptions = ( - "Services/PostRepository+Helpers.swift", "System/ApiCredentials+BuildSecrets.swift", System/main.swift, "System/WordPress-Bridging-Header.h", @@ -1160,7 +1159,6 @@ isa = PBXFileSystemSynchronizedBuildFileExceptionSet; membershipExceptions = ( "Networking/WordPressOrgRestApi+WordPress.swift", - "Services/PostRepository+Helpers.swift", ); target = 3F7AE0B42D9B30A100AB4892 /* WordPressData */; }; @@ -1168,7 +1166,6 @@ isa = PBXFileSystemSynchronizedBuildFileExceptionSet; membershipExceptions = ( "Networking/WordPressOrgRestApi+WordPress.swift", - "Services/PostRepository+Helpers.swift", ); target = 1D6058900D05DD3D006BFB54 /* WordPress */; }; @@ -1176,7 +1173,6 @@ isa = PBXFileSystemSynchronizedBuildFileExceptionSet; membershipExceptions = ( "Networking/WordPressOrgRestApi+WordPress.swift", - "Services/PostRepository+Helpers.swift", ); target = FABB1F8F2602FC2C00C8785C /* Jetpack */; }; From 11acbca59c92be65a8315af694990f7971600a83 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Fri, 20 Jun 2025 11:56:19 +1000 Subject: [PATCH 08/14] Move `WordPressOrgRestApi+WordPress.swift` file to WordPressData --- .../WordPressOrgRestApi+WordPress.swift | 0 WordPress/WordPress.xcodeproj/project.pbxproj | 24 ------------------- 2 files changed, 24 deletions(-) rename {WordPress/Classes/Networking => Sources/WordPressData/Swift}/WordPressOrgRestApi+WordPress.swift (100%) diff --git a/WordPress/Classes/Networking/WordPressOrgRestApi+WordPress.swift b/Sources/WordPressData/Swift/WordPressOrgRestApi+WordPress.swift similarity index 100% rename from WordPress/Classes/Networking/WordPressOrgRestApi+WordPress.swift rename to Sources/WordPressData/Swift/WordPressOrgRestApi+WordPress.swift diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj index 61a73aed9f79..275b22af2a9e 100644 --- a/WordPress/WordPress.xcodeproj/project.pbxproj +++ b/WordPress/WordPress.xcodeproj/project.pbxproj @@ -1155,27 +1155,6 @@ ); target = E16AB92914D978240047A2E5 /* WordPressTest */; }; - 3F0F25872D9BD88C00CD05D6 /* Exceptions for "Classes" folder in "WordPressData" target */ = { - isa = PBXFileSystemSynchronizedBuildFileExceptionSet; - membershipExceptions = ( - "Networking/WordPressOrgRestApi+WordPress.swift", - ); - target = 3F7AE0B42D9B30A100AB4892 /* WordPressData */; - }; - 3F164FCF2D9E49A8008BC606 /* Exceptions for "Classes" folder in "WordPress" target */ = { - isa = PBXFileSystemSynchronizedBuildFileExceptionSet; - membershipExceptions = ( - "Networking/WordPressOrgRestApi+WordPress.swift", - ); - target = 1D6058900D05DD3D006BFB54 /* WordPress */; - }; - 3F164FD02D9E49A8008BC606 /* Exceptions for "Classes" folder in "Jetpack" target */ = { - isa = PBXFileSystemSynchronizedBuildFileExceptionSet; - membershipExceptions = ( - "Networking/WordPressOrgRestApi+WordPress.swift", - ); - target = FABB1F8F2602FC2C00C8785C /* Jetpack */; - }; 3F1A64F82DA7ABC300786B92 /* Exceptions for "Classes" folder in "Reader" target */ = { isa = PBXFileSystemSynchronizedBuildFileExceptionSet; membershipExceptions = ( @@ -1359,11 +1338,9 @@ 24CE57C42CD3375200C7B37D /* Classes */ = { isa = PBXFileSystemSynchronizedRootGroup; exceptions = ( - 3F164FCF2D9E49A8008BC606 /* Exceptions for "Classes" folder in "WordPress" target */, 4AC9F8152DE528180095EA51 /* Exceptions for "Classes" folder in "WordPressShareExtension" target */, 4ABC59762DE52AA2005A6B84 /* Exceptions for "Classes" folder in "WordPressDraftActionExtension" target */, 4ABCAB382DE5333C005A6B84 /* Exceptions for "Classes" folder in "WordPressNotificationServiceExtension" target */, - 3F164FD02D9E49A8008BC606 /* Exceptions for "Classes" folder in "Jetpack" target */, 4ABC59822DE52D2A005A6B84 /* Exceptions for "Classes" folder in "JetpackShareExtension" target */, 4ABC59802DE52D23005A6B84 /* Exceptions for "Classes" folder in "JetpackDraftActionExtension" target */, 4ABCAB302DE5309F005A6B84 /* Exceptions for "Classes" folder in "JetpackNotificationServiceExtension" target */, @@ -1371,7 +1348,6 @@ 4ABCAB352DE531B6005A6B84 /* Exceptions for "Classes" folder in "JetpackIntents" target */, 3F1A64F82DA7ABC300786B92 /* Exceptions for "Classes" folder in "Reader" target */, 0C5C46F42D98343300F2CD55 /* Exceptions for "Classes" folder in "Keystone" target */, - 3F0F25872D9BD88C00CD05D6 /* Exceptions for "Classes" folder in "WordPressData" target */, ); path = Classes; sourceTree = ""; From 80546cb9289f30ad414315eea0f107a24aae06e7 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 25 Jun 2025 20:12:43 +1000 Subject: [PATCH 09/14] Add more imports required for Keystone to build for testing --- WordPress/Classes/Apps/Reader/ReaderTabViewController.swift | 1 + .../BlockEditorSettings+GutenbergEditorSettings.swift | 1 + WordPress/Classes/Services/ReaderTopicService+Interests.swift | 1 + WordPress/Classes/System/Root View/RootViewPresenter.swift | 1 + .../Utility/Notifications/PushAuthenticationManager.swift | 1 + .../Utility/Notifications/PushNotificationsManager.swift | 1 + WordPress/Classes/Utility/Universal Links/Routes+Reader.swift | 1 + WordPress/Classes/Utility/Universal Links/Routes+Stats.swift | 1 + .../Blog/Blog Details/BlogDetailsViewController+Swift.swift | 2 ++ .../SiteSettingsViewController+SiteManagement.swift | 1 + .../Me/Account Settings/AccountSettingsViewController.swift | 1 + .../Me/Domain Details/DomainDetailsWebViewController.swift | 1 + .../ViewRelated/Plugins/ViewModels/PluginViewModel.swift | 1 + .../ViewRelated/Post/Views/AuthorFilterViewController.swift | 1 + .../Controllers/ReaderPostActions/ReaderLikeAction.swift | 1 + .../Reader/Controllers/ReaderPostActions/ReaderPostMenu.swift | 1 + .../Controllers/ReaderStreamViewController+Sharing.swift | 1 + .../Reader/Subscriptions/ReaderBlockingHelper.swift | 1 + .../Reader/Subscriptions/ReaderSubscriptionCell.swift | 1 + .../ReaderSubscriptionNotificationSettingsButton.swift | 1 + .../Reader/Subscriptions/ReaderSubscriptionsView.swift | 1 + .../Stats/Extensions/StatsViewController+JetpackSettings.swift | 1 + .../ViewRelated/Stats/Helpers/SiteStatsImmuTableRows.swift | 1 + .../Stats/Insights/Posting Activity/PostingActivityCell.swift | 1 + .../Posting Activity/PostingActivityCollectionViewCell.swift | 1 + .../Stats/Insights/Posting Activity/PostingActivityDay.swift | 1 + .../Stats/Insights/SiteStatsInsightsTableViewController.swift | 1 + .../Stats/Insights/SiteStatsInsightsViewModel.swift | 2 ++ .../Insights/ViewsVisitors/ViewsVisitorsLineChartCell.swift | 1 + .../Period Stats/SiteStatsPeriodTableViewController.swift | 1 + .../Stats/Period Stats/SiteStatsPeriodViewModel.swift | 1 + .../Stats Detail/SiteStatsDetailTableViewController.swift | 1 + .../SiteStatsInsightsDetailsTableViewController.swift | 1 + .../Stats Detail/SiteStatsInsightsDetailsViewModel.swift | 1 + .../ViewRelated/Stats/SiteStatsDashboardViewController.swift | 1 + .../Classes/ViewRelated/Suggestions/SuggestionsTableView.m | 3 +++ .../Support/SupportTableViewControllerConfiguration.swift | 1 + WordPress/Classes/ViewRelated/System/WPTabBarController.m | 3 +++ 38 files changed, 44 insertions(+) diff --git a/WordPress/Classes/Apps/Reader/ReaderTabViewController.swift b/WordPress/Classes/Apps/Reader/ReaderTabViewController.swift index 5b5f82fdb0a0..8760366e3f4f 100644 --- a/WordPress/Classes/Apps/Reader/ReaderTabViewController.swift +++ b/WordPress/Classes/Apps/Reader/ReaderTabViewController.swift @@ -1,6 +1,7 @@ import Combine import UIKit import SwiftUI +import WordPressData import WordPressUI final class ReaderTabViewController: UITabBarController, UITabBarControllerDelegate { diff --git a/WordPress/Classes/Models/Gutenberg/BlockEditorSettings+GutenbergEditorSettings.swift b/WordPress/Classes/Models/Gutenberg/BlockEditorSettings+GutenbergEditorSettings.swift index 7fe887249453..8faa5fdce6fa 100644 --- a/WordPress/Classes/Models/Gutenberg/BlockEditorSettings+GutenbergEditorSettings.swift +++ b/WordPress/Classes/Models/Gutenberg/BlockEditorSettings+GutenbergEditorSettings.swift @@ -1,4 +1,5 @@ import Foundation +import WordPressData import WordPressKit import Gutenberg diff --git a/WordPress/Classes/Services/ReaderTopicService+Interests.swift b/WordPress/Classes/Services/ReaderTopicService+Interests.swift index 4a225af12553..6856c868a58c 100644 --- a/WordPress/Classes/Services/ReaderTopicService+Interests.swift +++ b/WordPress/Classes/Services/ReaderTopicService+Interests.swift @@ -1,4 +1,5 @@ import Foundation +import WordPressData import WordPressKit import WordPressShared diff --git a/WordPress/Classes/System/Root View/RootViewPresenter.swift b/WordPress/Classes/System/Root View/RootViewPresenter.swift index ffa75b9fae37..8d8e8cb0c7ed 100644 --- a/WordPress/Classes/System/Root View/RootViewPresenter.swift +++ b/WordPress/Classes/System/Root View/RootViewPresenter.swift @@ -1,5 +1,6 @@ import Foundation import WordPressData +import WordPressKit import WordPressShared protocol RootViewPresenter: AnyObject { diff --git a/WordPress/Classes/Utility/Notifications/PushAuthenticationManager.swift b/WordPress/Classes/Utility/Notifications/PushAuthenticationManager.swift index 468ca56c4f0a..4a7aa5fa249f 100644 --- a/WordPress/Classes/Utility/Notifications/PushAuthenticationManager.swift +++ b/WordPress/Classes/Utility/Notifications/PushAuthenticationManager.swift @@ -1,4 +1,5 @@ import UIKit +import WordPressData import WordPressShared /// The purpose of this class is to handle WordPress.com Push Authentication Notifications. diff --git a/WordPress/Classes/Utility/Notifications/PushNotificationsManager.swift b/WordPress/Classes/Utility/Notifications/PushNotificationsManager.swift index f62c44eb4061..d08c0668cbc6 100644 --- a/WordPress/Classes/Utility/Notifications/PushNotificationsManager.swift +++ b/WordPress/Classes/Utility/Notifications/PushNotificationsManager.swift @@ -1,4 +1,5 @@ import Foundation +import WordPressData import WordPressShared import NSObject_SafeExpectations import UserNotifications diff --git a/WordPress/Classes/Utility/Universal Links/Routes+Reader.swift b/WordPress/Classes/Utility/Universal Links/Routes+Reader.swift index 2214e0f8e142..d5926a35b147 100644 --- a/WordPress/Classes/Utility/Universal Links/Routes+Reader.swift +++ b/WordPress/Classes/Utility/Universal Links/Routes+Reader.swift @@ -1,4 +1,5 @@ import UIKit +import WordPressData enum ReaderRoute { case root diff --git a/WordPress/Classes/Utility/Universal Links/Routes+Stats.swift b/WordPress/Classes/Utility/Universal Links/Routes+Stats.swift index d3014c35af1d..3ecce380e362 100644 --- a/WordPress/Classes/Utility/Universal Links/Routes+Stats.swift +++ b/WordPress/Classes/Utility/Universal Links/Routes+Stats.swift @@ -1,4 +1,5 @@ import UIKit +import WordPressKit enum StatsRoute { case root diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController+Swift.swift b/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController+Swift.swift index 9c9d6a9c58ae..495a7a0f489f 100644 --- a/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController+Swift.swift +++ b/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController+Swift.swift @@ -1,4 +1,6 @@ import Foundation +import UIKit +import WordPressData import WordPressShared import WordPressAPI import WordPressCore diff --git a/WordPress/Classes/ViewRelated/Blog/Site Management/SiteSettingsViewController+SiteManagement.swift b/WordPress/Classes/ViewRelated/Blog/Site Management/SiteSettingsViewController+SiteManagement.swift index 0732b518ca7e..f53d8969c46b 100644 --- a/WordPress/Classes/ViewRelated/Blog/Site Management/SiteSettingsViewController+SiteManagement.swift +++ b/WordPress/Classes/ViewRelated/Blog/Site Management/SiteSettingsViewController+SiteManagement.swift @@ -1,5 +1,6 @@ import UIKit import SVProgressHUD +import WordPressData import WordPressShared /// Implements site management services triggered from SiteSettingsViewController diff --git a/WordPress/Classes/ViewRelated/Me/Account Settings/AccountSettingsViewController.swift b/WordPress/Classes/ViewRelated/Me/Account Settings/AccountSettingsViewController.swift index 162d11d8a2f8..7ed5f0058960 100644 --- a/WordPress/Classes/ViewRelated/Me/Account Settings/AccountSettingsViewController.swift +++ b/WordPress/Classes/ViewRelated/Me/Account Settings/AccountSettingsViewController.swift @@ -1,6 +1,7 @@ import UIKit import SwiftUI import SVProgressHUD +import WordPressData import WordPressShared import WordPressFlux import WordPressUI diff --git a/WordPress/Classes/ViewRelated/Me/Domain Details/DomainDetailsWebViewController.swift b/WordPress/Classes/ViewRelated/Me/Domain Details/DomainDetailsWebViewController.swift index 6bcd8c459c49..c9b7bb1bf56e 100644 --- a/WordPress/Classes/ViewRelated/Me/Domain Details/DomainDetailsWebViewController.swift +++ b/WordPress/Classes/ViewRelated/Me/Domain Details/DomainDetailsWebViewController.swift @@ -1,4 +1,5 @@ import Foundation +import WordPressData import WordPressShared final class DomainDetailsWebViewController: WebKitViewController { diff --git a/WordPress/Classes/ViewRelated/Plugins/ViewModels/PluginViewModel.swift b/WordPress/Classes/ViewRelated/Plugins/ViewModels/PluginViewModel.swift index 6aaeab7b48de..3a4e521670bb 100644 --- a/WordPress/Classes/ViewRelated/Plugins/ViewModels/PluginViewModel.swift +++ b/WordPress/Classes/ViewRelated/Plugins/ViewModels/PluginViewModel.swift @@ -1,4 +1,5 @@ import Foundation +import WordPressData import WordPressFlux import WordPressKit import WordPressUI diff --git a/WordPress/Classes/ViewRelated/Post/Views/AuthorFilterViewController.swift b/WordPress/Classes/ViewRelated/Post/Views/AuthorFilterViewController.swift index 3597b83a5a40..f8f36503184f 100644 --- a/WordPress/Classes/ViewRelated/Post/Views/AuthorFilterViewController.swift +++ b/WordPress/Classes/ViewRelated/Post/Views/AuthorFilterViewController.swift @@ -1,5 +1,6 @@ import UIKit import Gridicons +import WordPressData import WordPressUI /// Displays a simple table view picker list to choose between author filters diff --git a/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderPostActions/ReaderLikeAction.swift b/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderPostActions/ReaderLikeAction.swift index 85c13a87e9a3..e17665a9e023 100644 --- a/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderPostActions/ReaderLikeAction.swift +++ b/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderPostActions/ReaderLikeAction.swift @@ -1,4 +1,5 @@ import UIKit +import WordPressData /// Encapsulates a command to toggle a post's liked status final class ReaderLikeAction { diff --git a/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderPostActions/ReaderPostMenu.swift b/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderPostActions/ReaderPostMenu.swift index 2bc587bfd0ba..c06a7f0314b5 100644 --- a/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderPostActions/ReaderPostMenu.swift +++ b/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderPostActions/ReaderPostMenu.swift @@ -1,6 +1,7 @@ import Foundation import UIKit import SafariServices +import WordPressData import WordPressShared struct ReaderPostMenu { diff --git a/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderStreamViewController+Sharing.swift b/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderStreamViewController+Sharing.swift index 8c1f05d9aa98..b229be42f4c0 100644 --- a/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderStreamViewController+Sharing.swift +++ b/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderStreamViewController+Sharing.swift @@ -2,6 +2,7 @@ import UIKit import MobileCoreServices import UniformTypeIdentifiers import ShareExtensionCore +import WordPressData // MARK: - Functionality related to sharing a blog via the reader. diff --git a/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderBlockingHelper.swift b/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderBlockingHelper.swift index d764bc25abb4..de612a550af4 100644 --- a/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderBlockingHelper.swift +++ b/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderBlockingHelper.swift @@ -1,4 +1,5 @@ import Foundation +import WordPressData struct ReaderBlockingHelper { func blockSite(forPost post: ReaderPost, context: NSManagedObjectContext = ContextManager.shared.mainContext) { diff --git a/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionCell.swift b/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionCell.swift index d62580c704ab..90460ea33417 100644 --- a/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionCell.swift +++ b/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionCell.swift @@ -1,4 +1,5 @@ import SwiftUI +import WordPressData import WordPressUI struct ReaderSubscriptionCell: View { diff --git a/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionNotificationSettingsButton.swift b/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionNotificationSettingsButton.swift index 4da2cad4ddf2..d917a7954169 100644 --- a/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionNotificationSettingsButton.swift +++ b/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionNotificationSettingsButton.swift @@ -1,4 +1,5 @@ import SwiftUI +import WordPressData import WordPressUI struct ReaderSubscriptionNotificationSettingsButton: View { diff --git a/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionsView.swift b/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionsView.swift index b7ef7a12b920..ed9f81532b39 100644 --- a/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionsView.swift +++ b/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionsView.swift @@ -1,4 +1,5 @@ import SwiftUI +import WordPressData import WordPressUI import WordPressShared diff --git a/WordPress/Classes/ViewRelated/Stats/Extensions/StatsViewController+JetpackSettings.swift b/WordPress/Classes/ViewRelated/Stats/Extensions/StatsViewController+JetpackSettings.swift index 16fd3e41d520..426323a815fb 100644 --- a/WordPress/Classes/ViewRelated/Stats/Extensions/StatsViewController+JetpackSettings.swift +++ b/WordPress/Classes/ViewRelated/Stats/Extensions/StatsViewController+JetpackSettings.swift @@ -1,5 +1,6 @@ import Foundation import UIKit +import WordPressData extension StatsViewController { diff --git a/WordPress/Classes/ViewRelated/Stats/Helpers/SiteStatsImmuTableRows.swift b/WordPress/Classes/ViewRelated/Stats/Helpers/SiteStatsImmuTableRows.swift index e8ec29370fea..399b36a77b9f 100644 --- a/WordPress/Classes/ViewRelated/Stats/Helpers/SiteStatsImmuTableRows.swift +++ b/WordPress/Classes/ViewRelated/Stats/Helpers/SiteStatsImmuTableRows.swift @@ -1,4 +1,5 @@ import Foundation +import WordPressKit /// Helper class to encapsulate ImmuTableRows creation /// Stats Revamp results in the same ImmuTableRows created in different screens diff --git a/WordPress/Classes/ViewRelated/Stats/Insights/Posting Activity/PostingActivityCell.swift b/WordPress/Classes/ViewRelated/Stats/Insights/Posting Activity/PostingActivityCell.swift index 1570fb5f0d9a..474b3a22276e 100644 --- a/WordPress/Classes/ViewRelated/Stats/Insights/Posting Activity/PostingActivityCell.swift +++ b/WordPress/Classes/ViewRelated/Stats/Insights/Posting Activity/PostingActivityCell.swift @@ -1,4 +1,5 @@ import UIKit +import WordPressKit import WordPressShared class PostingActivityCell: StatsBaseCell, NibLoadable, Accessible { diff --git a/WordPress/Classes/ViewRelated/Stats/Insights/Posting Activity/PostingActivityCollectionViewCell.swift b/WordPress/Classes/ViewRelated/Stats/Insights/Posting Activity/PostingActivityCollectionViewCell.swift index b56c5b0b9d17..2552189863e3 100644 --- a/WordPress/Classes/ViewRelated/Stats/Insights/Posting Activity/PostingActivityCollectionViewCell.swift +++ b/WordPress/Classes/ViewRelated/Stats/Insights/Posting Activity/PostingActivityCollectionViewCell.swift @@ -1,4 +1,5 @@ import UIKit +import WordPressKit class PostingActivityCollectionViewCell: UICollectionViewCell { diff --git a/WordPress/Classes/ViewRelated/Stats/Insights/Posting Activity/PostingActivityDay.swift b/WordPress/Classes/ViewRelated/Stats/Insights/Posting Activity/PostingActivityDay.swift index 37f5cafebc3e..04e23e175753 100644 --- a/WordPress/Classes/ViewRelated/Stats/Insights/Posting Activity/PostingActivityDay.swift +++ b/WordPress/Classes/ViewRelated/Stats/Insights/Posting Activity/PostingActivityDay.swift @@ -1,4 +1,5 @@ import UIKit +import WordPressKit import WordPressShared protocol PostingActivityDayDelegate: AnyObject { diff --git a/WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsTableViewController.swift b/WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsTableViewController.swift index 4a589f9f8d32..3aa614113462 100644 --- a/WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsTableViewController.swift +++ b/WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsTableViewController.swift @@ -1,5 +1,6 @@ import UIKit import WordPressData +import WordPressKit import WordPressFlux import WordPressUI diff --git a/WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsViewModel.swift b/WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsViewModel.swift index b91e084d95d5..45c99a290d38 100644 --- a/WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsViewModel.swift +++ b/WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsViewModel.swift @@ -1,4 +1,6 @@ import Foundation +import WordPressData +import WordPressKit import WordPressFlux import WordPressShared diff --git a/WordPress/Classes/ViewRelated/Stats/Insights/ViewsVisitors/ViewsVisitorsLineChartCell.swift b/WordPress/Classes/ViewRelated/Stats/Insights/ViewsVisitors/ViewsVisitorsLineChartCell.swift index e702e0056176..de2a1f60cc30 100644 --- a/WordPress/Classes/ViewRelated/Stats/Insights/ViewsVisitors/ViewsVisitorsLineChartCell.swift +++ b/WordPress/Classes/ViewRelated/Stats/Insights/ViewsVisitors/ViewsVisitorsLineChartCell.swift @@ -1,5 +1,6 @@ import UIKit import WordPressData +import WordPressKit import WordPressShared struct StatsSegmentedControlData: Equatable { diff --git a/WordPress/Classes/ViewRelated/Stats/Period Stats/SiteStatsPeriodTableViewController.swift b/WordPress/Classes/ViewRelated/Stats/Period Stats/SiteStatsPeriodTableViewController.swift index 5e8217207dc9..28a71625671b 100644 --- a/WordPress/Classes/ViewRelated/Stats/Period Stats/SiteStatsPeriodTableViewController.swift +++ b/WordPress/Classes/ViewRelated/Stats/Period Stats/SiteStatsPeriodTableViewController.swift @@ -1,6 +1,7 @@ import UIKit import WordPressData import WordPressFlux +import WordPressKit import WordPressUI import Combine diff --git a/WordPress/Classes/ViewRelated/Stats/Period Stats/SiteStatsPeriodViewModel.swift b/WordPress/Classes/ViewRelated/Stats/Period Stats/SiteStatsPeriodViewModel.swift index 1559b7eaa12f..417285275587 100644 --- a/WordPress/Classes/ViewRelated/Stats/Period Stats/SiteStatsPeriodViewModel.swift +++ b/WordPress/Classes/ViewRelated/Stats/Period Stats/SiteStatsPeriodViewModel.swift @@ -1,4 +1,5 @@ import Foundation +import WordPressKit import WordPressFlux import WordPressShared diff --git a/WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsDetailTableViewController.swift b/WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsDetailTableViewController.swift index e58406874185..c40cbe4f8370 100644 --- a/WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsDetailTableViewController.swift +++ b/WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsDetailTableViewController.swift @@ -1,6 +1,7 @@ import UIKit import WordPressData import WordPressFlux +import WordPressKit import WordPressUI @objc protocol SiteStatsDetailsDelegate { diff --git a/WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsInsightsDetailsTableViewController.swift b/WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsInsightsDetailsTableViewController.swift index 77d9ee04e353..2eba1e46ef87 100644 --- a/WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsInsightsDetailsTableViewController.swift +++ b/WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsInsightsDetailsTableViewController.swift @@ -1,5 +1,6 @@ import UIKit import WordPressData +import WordPressKit import WordPressFlux import WordPressUI diff --git a/WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsInsightsDetailsViewModel.swift b/WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsInsightsDetailsViewModel.swift index 238115624727..4c634961e297 100644 --- a/WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsInsightsDetailsViewModel.swift +++ b/WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsInsightsDetailsViewModel.swift @@ -1,6 +1,7 @@ import Foundation import UIKit import WordPressFlux +import WordPressKit import WordPressShared /// The view model used by SiteStatsDetailTableViewController to show diff --git a/WordPress/Classes/ViewRelated/Stats/SiteStatsDashboardViewController.swift b/WordPress/Classes/ViewRelated/Stats/SiteStatsDashboardViewController.swift index a709208c5ccb..f53b326f6673 100644 --- a/WordPress/Classes/ViewRelated/Stats/SiteStatsDashboardViewController.swift +++ b/WordPress/Classes/ViewRelated/Stats/SiteStatsDashboardViewController.swift @@ -1,4 +1,5 @@ import UIKit +import WordPressKit import WordPressShared enum StatsTabType: Int, FilterTabBarItem, CaseIterable { diff --git a/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableView.m b/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableView.m index b0466f8f672f..b76f2701cda7 100644 --- a/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableView.m +++ b/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableView.m @@ -5,6 +5,9 @@ #else #import "WordPress-Swift.h" #endif +// For some reason, the modular import does not work. +// @import WordPressData; +#import CGFloat const STVDefaultMinHeaderHeight = 0.f; NSString * const CellIdentifier = @"SuggestionsTableViewCell"; diff --git a/WordPress/Classes/ViewRelated/Support/SupportTableViewControllerConfiguration.swift b/WordPress/Classes/ViewRelated/Support/SupportTableViewControllerConfiguration.swift index 3d00937a9168..992466e03810 100644 --- a/WordPress/Classes/ViewRelated/Support/SupportTableViewControllerConfiguration.swift +++ b/WordPress/Classes/ViewRelated/Support/SupportTableViewControllerConfiguration.swift @@ -1,4 +1,5 @@ import Foundation +import WordPressData struct SupportTableViewControllerConfiguration { diff --git a/WordPress/Classes/ViewRelated/System/WPTabBarController.m b/WordPress/Classes/ViewRelated/System/WPTabBarController.m index 23ef96ccc8c4..4641ca093cb8 100644 --- a/WordPress/Classes/ViewRelated/System/WPTabBarController.m +++ b/WordPress/Classes/ViewRelated/System/WPTabBarController.m @@ -10,6 +10,9 @@ #else #import "WordPress-Swift.h" #endif +// For some reason, the modular import does not work. +// @import WordPressData; +#import @import Gridicons; @import WordPressData; From 10201e09560bff259f2680effd4fbe3e8d23798e Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Thu, 26 Jun 2025 12:01:03 +1000 Subject: [PATCH 10/14] Remove unused forward declarations from `WPTabBarController.h` --- WordPress/Classes/ViewRelated/System/WPTabBarController.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/WordPress/Classes/ViewRelated/System/WPTabBarController.h b/WordPress/Classes/ViewRelated/System/WPTabBarController.h index 8d73e46e7e7b..43ff43ab5688 100644 --- a/WordPress/Classes/ViewRelated/System/WPTabBarController.h +++ b/WordPress/Classes/ViewRelated/System/WPTabBarController.h @@ -9,14 +9,10 @@ extern NSString * const WPTabBarCurrentlySelectedScreenReader; extern NSString * const WPTabBarCurrentlySelectedScreenNotifications; extern NSNotificationName const WPTabBarHeightChangedNotification; -@class AbstractPost; -@class Blog; -@class BloggingPromptCoordinator; @class MeViewController; @class MySitesCoordinator; @class NotificationsViewController; @class ReaderPresenter; -@protocol ScenePresenter; @interface WPTabBarController : UITabBarController From acb8b3333d01596fc2aa8a279264cae63f4d7a1e Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Thu, 26 Jun 2025 12:07:16 +1000 Subject: [PATCH 11/14] Replace all `@import WordPressData` with angle brackets --- WordPress/Classes/Categories/Media+Extensions.h | 6 +++++- WordPress/Classes/Categories/Media+Extensions.m | 6 +++++- WordPress/Classes/Services/AccountService.h | 6 +++++- WordPress/Classes/Services/AccountService.m | 6 +++++- WordPress/Classes/Services/BlogService.h | 6 +++++- WordPress/Classes/Services/BlogService.m | 6 +++++- WordPress/Classes/Services/CommentService.h | 6 +++++- WordPress/Classes/Services/CommentService.m | 6 +++++- WordPress/Classes/Services/Facades/BlogSyncFacade.m | 4 +++- WordPress/Classes/Services/MediaService.h | 6 +++++- WordPress/Classes/Services/MediaService.m | 6 +++++- WordPress/Classes/Services/MenusService.h | 6 +++++- WordPress/Classes/Services/MenusService.m | 6 +++++- WordPress/Classes/Services/PostCategoryService.h | 6 +++++- WordPress/Classes/Services/PostCategoryService.m | 6 +++++- WordPress/Classes/Services/PostTagService.h | 6 +++++- WordPress/Classes/Services/PostTagService.m | 6 +++++- .../Classes/Services/Reader Post/ReaderPostService.h | 6 +++++- .../Classes/Services/Reader Post/ReaderPostService.m | 6 +++++- WordPress/Classes/Services/ReaderSiteService.h | 6 +++++- WordPress/Classes/Services/ReaderSiteService.m | 6 +++++- WordPress/Classes/Services/ReaderTopicService.h | 6 +++++- WordPress/Classes/Services/ReaderTopicService.m | 6 +++++- WordPress/Classes/Services/ThemeService.h | 6 +++++- WordPress/Classes/Services/ThemeService.m | 6 +++++- WordPress/Classes/Utility/Analytics/WPAppAnalytics.m | 6 +++++- WordPress/Classes/Utility/WPError.m | 6 +++++- .../Blog/Blog Details/BlogDetailsViewController.m | 6 +++++- .../Blog/Sharing/SharingAuthorizationHelper.m | 6 +++++- .../Blog/Sharing/SharingConnectionsViewController.m | 6 +++++- .../Blog/Sharing/SharingDetailViewController.m | 6 +++++- .../ViewRelated/Blog/Sharing/SharingViewController.m | 6 +++++- .../Blog/Site Settings/SiteSettingsViewController.m | 6 +++++- .../Comments/Controllers/CommentsViewController.m | 6 +++++- .../ViewRelated/Menus/Categories/MenuItem+ViewDesign.h | 6 +++++- .../Menus/Controllers/MenuDetailsViewController.m | 6 +++++- .../Menus/Controllers/MenuHeaderViewController.m | 6 +++++- .../Controllers/MenuItemAbstractPostsViewController.m | 6 +++++- .../Controllers/MenuItemCategoriesViewController.m | 6 +++++- .../Menus/Controllers/MenuItemEditingViewController.m | 6 +++++- .../Menus/Controllers/MenuItemPagesViewController.m | 6 +++++- .../Menus/Controllers/MenuItemPostsViewController.m | 6 +++++- .../Controllers/MenuItemSourceResultsViewController.h | 6 +++++- .../Controllers/MenuItemSourceResultsViewController.m | 6 +++++- .../Menus/Controllers/MenuItemTagsViewController.m | 6 +++++- .../Menus/Controllers/MenuItemTypeViewController.m | 6 +++++- .../Menus/Controllers/MenuItemsViewController.m | 6 +++++- .../Menus/Controllers/MenusViewController.m | 6 +++++- .../ViewRelated/Menus/View Models/MenusSelectionItem.m | 6 +++++- .../Menus/Views/MenuItemEditingHeaderView.m | 6 +++++- .../ViewRelated/Menus/Views/MenuItemSourceHeaderView.m | 6 +++++- .../Menus/Views/MenuItemTypeSelectionView.m | 6 +++++- .../Classes/ViewRelated/Menus/Views/MenuItemView.m | 6 +++++- .../Menus/Views/MenuItemsVisualOrderingView.m | 6 +++++- .../ViewRelated/Post/PostSettingsViewController.h | 6 +++++- .../ViewRelated/Post/PostSettingsViewController.m | 6 +++++- .../Classes/ViewRelated/Stats/StatsViewController.m | 6 +++++- .../ViewRelated/Suggestions/SuggestionsTableView.m | 4 +++- .../Classes/ViewRelated/System/WPTabBarController.m | 10 ++++++++-- 59 files changed, 294 insertions(+), 60 deletions(-) diff --git a/WordPress/Classes/Categories/Media+Extensions.h b/WordPress/Classes/Categories/Media+Extensions.h index 59557b9cb5ec..63a9d975b48a 100644 --- a/WordPress/Classes/Categories/Media+Extensions.h +++ b/WordPress/Classes/Categories/Media+Extensions.h @@ -1,7 +1,11 @@ #import #import -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @interface Media (Extensions) diff --git a/WordPress/Classes/Categories/Media+Extensions.m b/WordPress/Classes/Categories/Media+Extensions.m index 5a57d783983a..8cf6e3421490 100644 --- a/WordPress/Classes/Categories/Media+Extensions.m +++ b/WordPress/Classes/Categories/Media+Extensions.m @@ -1,6 +1,10 @@ #import "Media+Extensions.h" #import "MediaService.h" -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressShared; #ifdef KEYSTONE #import "Keystone-Swift.h" diff --git a/WordPress/Classes/Services/AccountService.h b/WordPress/Classes/Services/AccountService.h index cda2e1efc4ea..0d71472545e0 100644 --- a/WordPress/Classes/Services/AccountService.h +++ b/WordPress/Classes/Services/AccountService.h @@ -1,6 +1,10 @@ #import #import -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import NS_ASSUME_NONNULL_BEGIN diff --git a/WordPress/Classes/Services/AccountService.m b/WordPress/Classes/Services/AccountService.m index 748b4b67d280..f00fcaaedf54 100644 --- a/WordPress/Classes/Services/AccountService.m +++ b/WordPress/Classes/Services/AccountService.m @@ -1,7 +1,11 @@ #import "AccountService.h" #import "BlogService.h" -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressKit; @import WordPressShared; diff --git a/WordPress/Classes/Services/BlogService.h b/WordPress/Classes/Services/BlogService.h index d2ae04c440ca..a3ad1968ba2e 100644 --- a/WordPress/Classes/Services/BlogService.h +++ b/WordPress/Classes/Services/BlogService.h @@ -1,5 +1,9 @@ #import -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import NS_ASSUME_NONNULL_BEGIN diff --git a/WordPress/Classes/Services/BlogService.m b/WordPress/Classes/Services/BlogService.m index 0b98e93a476e..f7afdcd64494 100644 --- a/WordPress/Classes/Services/BlogService.m +++ b/WordPress/Classes/Services/BlogService.m @@ -8,7 +8,11 @@ #else #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressKit; @import WordPressShared; diff --git a/WordPress/Classes/Services/CommentService.h b/WordPress/Classes/Services/CommentService.h index 64345e59368a..8a2205da3dd7 100644 --- a/WordPress/Classes/Services/CommentService.h +++ b/WordPress/Classes/Services/CommentService.h @@ -1,6 +1,10 @@ #import #import -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import NS_ASSUME_NONNULL_BEGIN diff --git a/WordPress/Classes/Services/CommentService.m b/WordPress/Classes/Services/CommentService.m index f4499ba419ea..2967f847f7a1 100644 --- a/WordPress/Classes/Services/CommentService.m +++ b/WordPress/Classes/Services/CommentService.m @@ -5,7 +5,11 @@ #else #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressShared; diff --git a/WordPress/Classes/Services/Facades/BlogSyncFacade.m b/WordPress/Classes/Services/Facades/BlogSyncFacade.m index 9740684c5b8e..bfc8253ff409 100644 --- a/WordPress/Classes/Services/Facades/BlogSyncFacade.m +++ b/WordPress/Classes/Services/Facades/BlogSyncFacade.m @@ -7,7 +7,9 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, the modular import does not work. +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. // @import WordPressData; #import diff --git a/WordPress/Classes/Services/MediaService.h b/WordPress/Classes/Services/MediaService.h index 40a52d6b705f..666ceca46f94 100644 --- a/WordPress/Classes/Services/MediaService.h +++ b/WordPress/Classes/Services/MediaService.h @@ -1,6 +1,10 @@ #import #import -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @class Media; @class RemoteVideoPressVideo; diff --git a/WordPress/Classes/Services/MediaService.m b/WordPress/Classes/Services/MediaService.m index c5acafed2131..df0ed2a562ee 100644 --- a/WordPress/Classes/Services/MediaService.m +++ b/WordPress/Classes/Services/MediaService.m @@ -6,7 +6,11 @@ #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressKit; @import WordPressUI; @import WordPressShared; diff --git a/WordPress/Classes/Services/MenusService.h b/WordPress/Classes/Services/MenusService.h index 11aa35b58a0e..ed91fc944688 100644 --- a/WordPress/Classes/Services/MenusService.h +++ b/WordPress/Classes/Services/MenusService.h @@ -1,5 +1,9 @@ #import -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import NS_ASSUME_NONNULL_BEGIN diff --git a/WordPress/Classes/Services/MenusService.m b/WordPress/Classes/Services/MenusService.m index 850095e21189..5a01c98bfa08 100644 --- a/WordPress/Classes/Services/MenusService.m +++ b/WordPress/Classes/Services/MenusService.m @@ -4,7 +4,11 @@ #else #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressKit; @implementation MenusService diff --git a/WordPress/Classes/Services/PostCategoryService.h b/WordPress/Classes/Services/PostCategoryService.h index 587f9337a0f1..323cd7d118c7 100644 --- a/WordPress/Classes/Services/PostCategoryService.h +++ b/WordPress/Classes/Services/PostCategoryService.h @@ -1,5 +1,9 @@ #import -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import NS_ASSUME_NONNULL_BEGIN diff --git a/WordPress/Classes/Services/PostCategoryService.m b/WordPress/Classes/Services/PostCategoryService.m index 1a21f540ba24..8d446b166061 100644 --- a/WordPress/Classes/Services/PostCategoryService.m +++ b/WordPress/Classes/Services/PostCategoryService.m @@ -4,7 +4,11 @@ #else #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressKit; NS_ASSUME_NONNULL_BEGIN diff --git a/WordPress/Classes/Services/PostTagService.h b/WordPress/Classes/Services/PostTagService.h index 62ee124f7043..28b2101e93db 100644 --- a/WordPress/Classes/Services/PostTagService.h +++ b/WordPress/Classes/Services/PostTagService.h @@ -1,4 +1,8 @@ -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import NS_ASSUME_NONNULL_BEGIN diff --git a/WordPress/Classes/Services/PostTagService.m b/WordPress/Classes/Services/PostTagService.m index 57c19faef17c..d1da33d60bed 100644 --- a/WordPress/Classes/Services/PostTagService.m +++ b/WordPress/Classes/Services/PostTagService.m @@ -4,7 +4,11 @@ #else #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressKit; NS_ASSUME_NONNULL_BEGIN diff --git a/WordPress/Classes/Services/Reader Post/ReaderPostService.h b/WordPress/Classes/Services/Reader Post/ReaderPostService.h index 57715268f36e..aa2a0aef47e3 100644 --- a/WordPress/Classes/Services/Reader Post/ReaderPostService.h +++ b/WordPress/Classes/Services/Reader Post/ReaderPostService.h @@ -1,5 +1,9 @@ #import -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wnullability-completeness" diff --git a/WordPress/Classes/Services/Reader Post/ReaderPostService.m b/WordPress/Classes/Services/Reader Post/ReaderPostService.m index 66cf3aa6958c..a6d624102b8d 100644 --- a/WordPress/Classes/Services/Reader Post/ReaderPostService.m +++ b/WordPress/Classes/Services/Reader Post/ReaderPostService.m @@ -10,7 +10,11 @@ #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressKit; @import WordPressShared; diff --git a/WordPress/Classes/Services/ReaderSiteService.h b/WordPress/Classes/Services/ReaderSiteService.h index 80183ff3e22d..31c536db7d09 100644 --- a/WordPress/Classes/Services/ReaderSiteService.h +++ b/WordPress/Classes/Services/ReaderSiteService.h @@ -1,5 +1,9 @@ #import -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import NS_ASSUME_NONNULL_BEGIN diff --git a/WordPress/Classes/Services/ReaderSiteService.m b/WordPress/Classes/Services/ReaderSiteService.m index fb6e391ccfd7..ca2436e2f81c 100644 --- a/WordPress/Classes/Services/ReaderSiteService.m +++ b/WordPress/Classes/Services/ReaderSiteService.m @@ -8,7 +8,11 @@ #import "WordPress-Swift.h" #endif #import "WPAppAnalytics.h" -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressKit; NSString * const ReaderSiteServiceErrorDomain = @"ReaderSiteServiceErrorDomain"; diff --git a/WordPress/Classes/Services/ReaderTopicService.h b/WordPress/Classes/Services/ReaderTopicService.h index 22512bfe2353..c4ef300e4831 100644 --- a/WordPress/Classes/Services/ReaderTopicService.h +++ b/WordPress/Classes/Services/ReaderTopicService.h @@ -1,5 +1,9 @@ #import -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import NS_ASSUME_NONNULL_BEGIN diff --git a/WordPress/Classes/Services/ReaderTopicService.m b/WordPress/Classes/Services/ReaderTopicService.m index c84c31ded335..df572b191e9e 100644 --- a/WordPress/Classes/Services/ReaderTopicService.m +++ b/WordPress/Classes/Services/ReaderTopicService.m @@ -6,7 +6,11 @@ #else #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressKit; @import WordPressShared; diff --git a/WordPress/Classes/Services/ThemeService.h b/WordPress/Classes/Services/ThemeService.h index bc2ca6b3be65..b543ee18ae47 100644 --- a/WordPress/Classes/Services/ThemeService.h +++ b/WordPress/Classes/Services/ThemeService.h @@ -1,4 +1,8 @@ -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import NS_ASSUME_NONNULL_BEGIN diff --git a/WordPress/Classes/Services/ThemeService.m b/WordPress/Classes/Services/ThemeService.m index 9da61d65e2d6..db1cb6ffa2be 100644 --- a/WordPress/Classes/Services/ThemeService.m +++ b/WordPress/Classes/Services/ThemeService.m @@ -5,7 +5,11 @@ #else #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressKit; /** diff --git a/WordPress/Classes/Utility/Analytics/WPAppAnalytics.m b/WordPress/Classes/Utility/Analytics/WPAppAnalytics.m index 1d55703b8c91..296c18324683 100644 --- a/WordPress/Classes/Utility/Analytics/WPAppAnalytics.m +++ b/WordPress/Classes/Utility/Analytics/WPAppAnalytics.m @@ -8,7 +8,11 @@ #else #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import NSString * const WPAppAnalyticsDefaultsUserOptedOut = @"tracks_opt_out"; NSString * const WPAppAnalyticsKeyBlogID = @"blog_id"; diff --git a/WordPress/Classes/Utility/WPError.m b/WordPress/Classes/Utility/WPError.m index 4b29902336ba..87f91c697a0a 100644 --- a/WordPress/Classes/Utility/WPError.m +++ b/WordPress/Classes/Utility/WPError.m @@ -5,7 +5,11 @@ #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressShared; @import WordPressKit; diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m b/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m index b72d6de6d315..1b6d6efbffb6 100644 --- a/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m +++ b/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m @@ -16,7 +16,11 @@ @import Gridicons; @import Reachability; -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressShared; static NSString *const BlogDetailsCellIdentifier = @"BlogDetailsCell"; diff --git a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingAuthorizationHelper.m b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingAuthorizationHelper.m index b5e6b04dad0d..98346227f6b9 100644 --- a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingAuthorizationHelper.m +++ b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingAuthorizationHelper.m @@ -8,7 +8,11 @@ #else #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import diff --git a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingConnectionsViewController.m b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingConnectionsViewController.m index 09bcc81da68f..75a7ba9f542c 100644 --- a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingConnectionsViewController.m +++ b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingConnectionsViewController.m @@ -9,7 +9,11 @@ #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressShared; static NSString *const CellIdentifier = @"CellIdentifier"; diff --git a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingDetailViewController.m b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingDetailViewController.m index 159640dba4a6..135c6baae937 100644 --- a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingDetailViewController.m +++ b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingDetailViewController.m @@ -7,7 +7,11 @@ #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressShared; static NSString *const CellIdentifier = @"CellIdentifier"; diff --git a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingViewController.m b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingViewController.m index 794b524f8197..5fc88115e7b4 100644 --- a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingViewController.m +++ b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingViewController.m @@ -7,7 +7,11 @@ #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressUI; @import WordPressShared; diff --git a/WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController.m b/WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController.m index 463c789dac56..b0a066770f4e 100644 --- a/WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController.m +++ b/WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController.m @@ -12,7 +12,11 @@ #import "WordPress-Swift.h" #endif #import "AccountService.h" -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressKit; @import WordPressShared; @import NSURL_IDN; diff --git a/WordPress/Classes/ViewRelated/Comments/Controllers/CommentsViewController.m b/WordPress/Classes/ViewRelated/Comments/Controllers/CommentsViewController.m index 37ca6f9e4250..70b77c1a06b7 100644 --- a/WordPress/Classes/ViewRelated/Comments/Controllers/CommentsViewController.m +++ b/WordPress/Classes/ViewRelated/Comments/Controllers/CommentsViewController.m @@ -5,7 +5,11 @@ #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressLegacy; @import WordPressShared; diff --git a/WordPress/Classes/ViewRelated/Menus/Categories/MenuItem+ViewDesign.h b/WordPress/Classes/ViewRelated/Menus/Categories/MenuItem+ViewDesign.h index 5964410e3744..5909e9a58439 100644 --- a/WordPress/Classes/ViewRelated/Menus/Categories/MenuItem+ViewDesign.h +++ b/WordPress/Classes/ViewRelated/Menus/Categories/MenuItem+ViewDesign.h @@ -1,4 +1,8 @@ -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import #import "Menu+ViewDesign.h" NS_ASSUME_NONNULL_BEGIN diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuDetailsViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuDetailsViewController.m index 64c1086521d4..e6bc73bb0a6e 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuDetailsViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuDetailsViewController.m @@ -6,7 +6,11 @@ #else #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressShared; @import Gridicons; diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuHeaderViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuHeaderViewController.m index d2dd657455b2..34138f688358 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuHeaderViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuHeaderViewController.m @@ -6,7 +6,11 @@ #else #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressShared; static CGFloat ViewExpansionAnimationDelay = 0.15; diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemAbstractPostsViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemAbstractPostsViewController.m index 7c92ccca1c27..fe8cdb3fc9d9 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemAbstractPostsViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemAbstractPostsViewController.m @@ -1,5 +1,9 @@ #import "MenuItemAbstractPostsViewController.h" -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressKit; @interface MenuItemAbstractPostsViewController () diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemCategoriesViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemCategoriesViewController.m index ffe300624e21..8947969e3414 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemCategoriesViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemCategoriesViewController.m @@ -5,7 +5,11 @@ #else #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import static NSUInteger const CategorySyncLimit = 1000; static NSString * const CategorySortKey = @"categoryName"; diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemEditingViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemEditingViewController.m index caa5c0dfbc3a..33e8773cc98d 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemEditingViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemEditingViewController.m @@ -8,7 +8,11 @@ #else #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressShared; NSString * const MenuItemEditingTypeSelectionChangedNotification = @"MenuItemEditingTypeSelectionChangedNotification"; diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPagesViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPagesViewController.m index b5dc628d65a6..5f868b378688 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPagesViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPagesViewController.m @@ -4,7 +4,11 @@ #else #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @interface MenuItemAbstractPostsViewController () @end diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPostsViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPostsViewController.m index 728fde78e062..1a11e5049e2e 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPostsViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPostsViewController.m @@ -4,7 +4,11 @@ #else #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @interface MenuItemAbstractPostsViewController () @end diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.h b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.h index e59fee59edd5..3ca1561d2ce5 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.h +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.h @@ -1,7 +1,11 @@ #import #import "MenuItemSourceTextBar.h" #import "MenuItemSourceCell.h" -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import NS_ASSUME_NONNULL_BEGIN diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.m index dc8ef8535726..21b501f31318 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.m @@ -7,7 +7,11 @@ #else #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressShared; static NSTimeInterval const SearchBarFetchRequestUpdateDelay = 0.10; diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemTagsViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemTagsViewController.m index 37cd1225143d..8f38417a4eb2 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemTagsViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemTagsViewController.m @@ -1,6 +1,10 @@ #import "MenuItemTagsViewController.h" #import "PostTagService.h" -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import static NSUInteger const MenuItemSourceTagSyncLimit = 100; diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemTypeViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemTypeViewController.m index 415033f95d55..f46b16597e60 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemTypeViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemTypeViewController.m @@ -6,7 +6,11 @@ #else #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @interface MenuItemTypeViewController () diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemsViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemsViewController.m index ff228ae2978a..7a24a1cf6727 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemsViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemsViewController.m @@ -10,7 +10,11 @@ #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressShared; static CGFloat const ItemHoriztonalDragDetectionWidthRatio = 0.05; diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenusViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenusViewController.m index 95f3d783e078..3cf3561fa2b2 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenusViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenusViewController.m @@ -12,7 +12,11 @@ #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressShared; static CGFloat const ScrollViewOffsetAdjustmentPadding = 10.0; diff --git a/WordPress/Classes/ViewRelated/Menus/View Models/MenusSelectionItem.m b/WordPress/Classes/ViewRelated/Menus/View Models/MenusSelectionItem.m index d8712ae85d01..d73627addf8c 100644 --- a/WordPress/Classes/ViewRelated/Menus/View Models/MenusSelectionItem.m +++ b/WordPress/Classes/ViewRelated/Menus/View Models/MenusSelectionItem.m @@ -1,5 +1,9 @@ #import "MenusSelectionItem.h" -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import NSString * const MenusSelectionViewItemChangedSelectedNotification = @"MenusSelectionViewItemChangedSelectedNotification"; NSString * const MenusSelectionViewItemUpdatedItemObjectNotification = @"MenusSelectionViewItemUpdatedItemObjectNotification"; diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemEditingHeaderView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemEditingHeaderView.m index 57925a11eb67..dbe4b8181dab 100644 --- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemEditingHeaderView.m +++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemEditingHeaderView.m @@ -5,7 +5,11 @@ #else #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressShared; diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceHeaderView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceHeaderView.m index 95cf8ad536fc..a956ccf52f58 100644 --- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceHeaderView.m +++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceHeaderView.m @@ -6,7 +6,11 @@ #else #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressShared; @import Gridicons; diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemTypeSelectionView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemTypeSelectionView.m index 0014a8ad32b3..43d85f34e7e1 100644 --- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemTypeSelectionView.m +++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemTypeSelectionView.m @@ -7,7 +7,11 @@ #else #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressShared; @import Gridicons; diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemView.m index 27a991a5a9a8..222eb26897c9 100644 --- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemView.m +++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemView.m @@ -5,7 +5,11 @@ #else #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import Gridicons; @import WordPressShared; diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemsVisualOrderingView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemsVisualOrderingView.m index 3c7e167e5770..1b666d92da4c 100644 --- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemsVisualOrderingView.m +++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemsVisualOrderingView.m @@ -1,6 +1,10 @@ #import "MenuItemsVisualOrderingView.h" #import "MenuItemView.h" -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @interface MenuItemsVisualOrderingView () diff --git a/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.h b/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.h index c5f9dda4e7a8..a275906b5a9e 100644 --- a/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.h +++ b/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.h @@ -1,5 +1,9 @@ #import -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import // TODO: It can be removed when the new editor is released. It only exists to support the "Featured" badge on featured images in Gutenberg mobile. @protocol FeaturedImageDelegate diff --git a/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m b/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m index d05a01fda26c..06fcb652b854 100644 --- a/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m +++ b/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m @@ -8,7 +8,11 @@ #else #import "WordPress-Swift.h" #endif -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import Gridicons; @import WordPressShared; diff --git a/WordPress/Classes/ViewRelated/Stats/StatsViewController.m b/WordPress/Classes/ViewRelated/Stats/StatsViewController.m index 276397a13a0a..9bc3caa9f407 100644 --- a/WordPress/Classes/ViewRelated/Stats/StatsViewController.m +++ b/WordPress/Classes/ViewRelated/Stats/StatsViewController.m @@ -7,7 +7,11 @@ #endif #import "WPAppAnalytics.h" -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressShared; @import Reachability; diff --git a/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableView.m b/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableView.m index b76f2701cda7..e987c1b263f8 100644 --- a/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableView.m +++ b/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableView.m @@ -5,7 +5,9 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, the modular import does not work. +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. // @import WordPressData; #import diff --git a/WordPress/Classes/ViewRelated/System/WPTabBarController.m b/WordPress/Classes/ViewRelated/System/WPTabBarController.m index 4641ca093cb8..cc1278e3f966 100644 --- a/WordPress/Classes/ViewRelated/System/WPTabBarController.m +++ b/WordPress/Classes/ViewRelated/System/WPTabBarController.m @@ -10,12 +10,18 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, the modular import does not work. +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. // @import WordPressData; #import @import Gridicons; -@import WordPressData; +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import @import WordPressShared; @import WordPressUI; From cbb171555a595b47d2b5f2ef79aafe71d16d7521 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Thu, 26 Jun 2025 12:24:58 +1000 Subject: [PATCH 12/14] Prefer forward declarations for WordPressData types in ObjC headers Just trying to understand why Keystone fails to build for testing. Using forward declarations keeps the headers and the compilation leaner. --- WordPress/Classes/Services/AccountService.h | 6 +----- WordPress/Classes/Services/BlogService.h | 7 ++----- WordPress/Classes/Services/CommentService.h | 6 +----- WordPress/Classes/Services/MediaService.h | 2 -- WordPress/Classes/Services/MenusService.h | 5 ----- WordPress/Classes/Services/PostCategoryService.h | 7 ++----- WordPress/Classes/Services/PostTagService.h | 3 --- WordPress/Classes/Services/Reader Post/ReaderPostService.h | 7 ++----- WordPress/Classes/Services/ReaderSiteService.h | 7 ++----- WordPress/Classes/Services/ReaderTopicService.h | 7 ++----- WordPress/Classes/Services/ThemeService.h | 7 +------ .../Controllers/MenuItemSourceResultsViewController.h | 6 +----- .../Menus/Controllers/MenuItemSourceViewController.m | 5 +++++ .../Classes/ViewRelated/Post/PostSettingsViewController.h | 6 +----- 14 files changed, 20 insertions(+), 61 deletions(-) diff --git a/WordPress/Classes/Services/AccountService.h b/WordPress/Classes/Services/AccountService.h index 0d71472545e0..37981c797e56 100644 --- a/WordPress/Classes/Services/AccountService.h +++ b/WordPress/Classes/Services/AccountService.h @@ -1,15 +1,11 @@ #import #import -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import NS_ASSUME_NONNULL_BEGIN @class WPAccount; @class RemoteUser; +@protocol CoreDataStack; extern NSNotificationName const WPAccountEmailAndDefaultBlogUpdatedNotification; diff --git a/WordPress/Classes/Services/BlogService.h b/WordPress/Classes/Services/BlogService.h index a3ad1968ba2e..2055fe5e1a00 100644 --- a/WordPress/Classes/Services/BlogService.h +++ b/WordPress/Classes/Services/BlogService.h @@ -1,9 +1,4 @@ #import -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import NS_ASSUME_NONNULL_BEGIN @@ -11,8 +6,10 @@ extern NSString *const WordPressMinimumVersion; extern NSString *const WPBlogUpdatedNotification; extern NSString *const WPBlogSettingsUpdatedNotification; +@class Blog; @class WPAccount; @class SiteInfo; +@protocol CoreDataStack; @interface BlogService : NSObject diff --git a/WordPress/Classes/Services/CommentService.h b/WordPress/Classes/Services/CommentService.h index 8a2205da3dd7..2aeab7c4534d 100644 --- a/WordPress/Classes/Services/CommentService.h +++ b/WordPress/Classes/Services/CommentService.h @@ -1,10 +1,5 @@ #import #import -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import NS_ASSUME_NONNULL_BEGIN @@ -16,6 +11,7 @@ extern NSUInteger const WPTopLevelHierarchicalCommentsPerPage; @class BasePost; @class RemoteUser; @class CommentServiceRemoteFactory; +@protocol CoreDataStack; @interface CommentService : NSObject diff --git a/WordPress/Classes/Services/MediaService.h b/WordPress/Classes/Services/MediaService.h index 666ceca46f94..27075f1e33eb 100644 --- a/WordPress/Classes/Services/MediaService.h +++ b/WordPress/Classes/Services/MediaService.h @@ -8,8 +8,6 @@ @class Media; @class RemoteVideoPressVideo; -@class Blog; -@class AbstractPost; @protocol ExportableAsset; extern NSErrorDomain _Nonnull const MediaServiceErrorDomain; diff --git a/WordPress/Classes/Services/MenusService.h b/WordPress/Classes/Services/MenusService.h index ed91fc944688..6a92d8fbdab0 100644 --- a/WordPress/Classes/Services/MenusService.h +++ b/WordPress/Classes/Services/MenusService.h @@ -7,11 +7,6 @@ NS_ASSUME_NONNULL_BEGIN -@class Blog; -@class Menu; -@class MenuLocation; -@class MenuItem; - typedef void(^MenusServiceSuccessBlock)(void); typedef void(^MenusServiceCreateOrUpdateMenuRequestSuccessBlock)(void); typedef void(^MenusServiceMenusRequestSuccessBlock)(NSArray * _Nullable menus); diff --git a/WordPress/Classes/Services/PostCategoryService.h b/WordPress/Classes/Services/PostCategoryService.h index 323cd7d118c7..d07b1d3381a3 100644 --- a/WordPress/Classes/Services/PostCategoryService.h +++ b/WordPress/Classes/Services/PostCategoryService.h @@ -1,14 +1,11 @@ +@import CoreData; #import -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import NS_ASSUME_NONNULL_BEGIN @class Blog; @class PostCategory; +@protocol CoreDataStack; typedef NS_ENUM(NSInteger, PostCategoryServiceErrors) { PostCategoryServiceErrorsBlogNotFound diff --git a/WordPress/Classes/Services/PostTagService.h b/WordPress/Classes/Services/PostTagService.h index 28b2101e93db..aba96741b3e4 100644 --- a/WordPress/Classes/Services/PostTagService.h +++ b/WordPress/Classes/Services/PostTagService.h @@ -6,9 +6,6 @@ NS_ASSUME_NONNULL_BEGIN -@class Blog; -@class PostTag; - @interface PostTagService : LocalCoreDataService /** diff --git a/WordPress/Classes/Services/Reader Post/ReaderPostService.h b/WordPress/Classes/Services/Reader Post/ReaderPostService.h index aa2a0aef47e3..29dea672746b 100644 --- a/WordPress/Classes/Services/Reader Post/ReaderPostService.h +++ b/WordPress/Classes/Services/Reader Post/ReaderPostService.h @@ -1,9 +1,5 @@ +@import CoreData; #import -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wnullability-completeness" @@ -11,6 +7,7 @@ @class ReaderPost; @class ReaderAbstractTopic; @class WordPressComRestApi; +@protocol CoreDataStack; extern NSString * const ReaderPostServiceErrorDomain; extern NSString * const ReaderPostServiceToggleSiteFollowingState; diff --git a/WordPress/Classes/Services/ReaderSiteService.h b/WordPress/Classes/Services/ReaderSiteService.h index 31c536db7d09..2c037914d460 100644 --- a/WordPress/Classes/Services/ReaderSiteService.h +++ b/WordPress/Classes/Services/ReaderSiteService.h @@ -1,9 +1,6 @@ #import -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import + +@protocol CoreDataStack; NS_ASSUME_NONNULL_BEGIN diff --git a/WordPress/Classes/Services/ReaderTopicService.h b/WordPress/Classes/Services/ReaderTopicService.h index c4ef300e4831..be9fc7f78f3f 100644 --- a/WordPress/Classes/Services/ReaderTopicService.h +++ b/WordPress/Classes/Services/ReaderTopicService.h @@ -1,9 +1,5 @@ +@import CoreData; #import -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import NS_ASSUME_NONNULL_BEGIN @@ -13,6 +9,7 @@ extern NSString * const ReaderTopicFreshlyPressedPathCommponent; @class ReaderTagTopic; @class ReaderSiteTopic; @class ReaderSearchTopic; +@protocol CoreDataStack; @interface ReaderTopicService : NSObject diff --git a/WordPress/Classes/Services/ThemeService.h b/WordPress/Classes/Services/ThemeService.h index b543ee18ae47..065fac4315f6 100644 --- a/WordPress/Classes/Services/ThemeService.h +++ b/WordPress/Classes/Services/ThemeService.h @@ -1,14 +1,9 @@ -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import - NS_ASSUME_NONNULL_BEGIN @class Blog; @class Theme; @class WPAccount; +@protocol CoreDataStack; typedef void(^ThemeServiceSuccessBlock)(void); typedef void(^ThemeServiceThemeRequestSuccessBlock)(Theme * _Nullable theme); diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.h b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.h index 3ca1561d2ce5..6b2855e00d6c 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.h +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.h @@ -1,11 +1,7 @@ +@import CoreData; #import #import "MenuItemSourceTextBar.h" #import "MenuItemSourceCell.h" -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import NS_ASSUME_NONNULL_BEGIN diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceViewController.m index 856eb36a9c31..0cf5191c6aa3 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceViewController.m @@ -6,6 +6,11 @@ #import "MenuItemTagsViewController.h" #import "MenuItemPostsViewController.h" #import "Menu.h" +// For some reason, and only in some files, the modular import does not work. +// Just to be on the safe side, _all_ imports use the angle brackets style. +// We shall try to go back to the modular style on Keystone successfully builds for testing. +// @import WordPressData; +#import static CGFloat const SourceHeaderViewHeight = 60.0; diff --git a/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.h b/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.h index a275906b5a9e..0276c6c0042d 100644 --- a/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.h +++ b/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.h @@ -1,10 +1,6 @@ #import -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@class AbstractPost; // TODO: It can be removed when the new editor is released. It only exists to support the "Featured" badge on featured images in Gutenberg mobile. @protocol FeaturedImageDelegate From 9273a3f1276d72ba0e04f0a9d769ef5c54b3224c Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Thu, 26 Jun 2025 13:02:37 +1000 Subject: [PATCH 13/14] Restore using modular import for WordPressData Clearly the issues documented in some of the usages were temporary due to the transition. --- WordPress/Classes/Categories/Media+Extensions.h | 6 +----- WordPress/Classes/Categories/Media+Extensions.m | 6 +----- WordPress/Classes/Services/AccountService.m | 6 +----- WordPress/Classes/Services/BlogService.m | 6 +----- WordPress/Classes/Services/CommentService.m | 6 +----- WordPress/Classes/Services/Facades/BlogSyncFacade.m | 6 +----- WordPress/Classes/Services/MediaService.h | 6 +----- WordPress/Classes/Services/MediaService.m | 6 +----- WordPress/Classes/Services/MenusService.h | 6 +----- WordPress/Classes/Services/MenusService.m | 6 +----- WordPress/Classes/Services/PostCategoryService.m | 6 +----- WordPress/Classes/Services/PostTagService.h | 6 +----- WordPress/Classes/Services/PostTagService.m | 6 +----- .../Classes/Services/Reader Post/ReaderPostService.m | 6 +----- WordPress/Classes/Services/ReaderSiteService.m | 6 +----- WordPress/Classes/Services/ReaderTopicService.m | 6 +----- WordPress/Classes/Services/ThemeService.m | 6 +----- WordPress/Classes/Utility/Analytics/WPAppAnalytics.m | 6 +----- WordPress/Classes/Utility/WPError.m | 6 +----- .../Blog/Blog Details/BlogDetailsViewController.m | 6 +----- .../Blog/Sharing/SharingAuthorizationHelper.m | 6 +----- .../Blog/Sharing/SharingConnectionsViewController.m | 6 +----- .../Blog/Sharing/SharingDetailViewController.m | 6 +----- .../ViewRelated/Blog/Sharing/SharingViewController.m | 6 +----- .../Blog/Site Settings/SiteSettingsViewController.m | 6 +----- .../Comments/Controllers/CommentsViewController.m | 6 +----- .../Menus/Categories/MenuItem+ViewDesign.h | 6 +----- .../Menus/Controllers/MenuDetailsViewController.m | 6 +----- .../Menus/Controllers/MenuHeaderViewController.m | 6 +----- .../MenuItemAbstractPostsViewController.m | 6 +----- .../Controllers/MenuItemCategoriesViewController.m | 6 +----- .../Controllers/MenuItemEditingViewController.m | 6 +----- .../Menus/Controllers/MenuItemPagesViewController.m | 6 +----- .../Menus/Controllers/MenuItemPostsViewController.m | 6 +----- .../MenuItemSourceResultsViewController.m | 6 +----- .../Menus/Controllers/MenuItemSourceViewController.m | 6 +----- .../Menus/Controllers/MenuItemTagsViewController.m | 6 +----- .../Menus/Controllers/MenuItemTypeViewController.m | 6 +----- .../Menus/Controllers/MenuItemsViewController.m | 6 +----- .../Menus/Controllers/MenusViewController.m | 6 +----- .../Menus/View Models/MenusSelectionItem.m | 6 +----- .../Menus/Views/MenuItemEditingHeaderView.m | 6 +----- .../Menus/Views/MenuItemSourceHeaderView.m | 6 +----- .../Menus/Views/MenuItemTypeSelectionView.m | 6 +----- .../Classes/ViewRelated/Menus/Views/MenuItemView.m | 6 +----- .../Menus/Views/MenuItemsVisualOrderingView.m | 6 +----- .../ViewRelated/Post/PostSettingsViewController.m | 6 +----- .../Classes/ViewRelated/Stats/StatsViewController.m | 6 +----- .../ViewRelated/Suggestions/SuggestionsTableView.m | 6 +----- .../Classes/ViewRelated/System/WPTabBarController.m | 12 ++---------- 50 files changed, 51 insertions(+), 255 deletions(-) diff --git a/WordPress/Classes/Categories/Media+Extensions.h b/WordPress/Classes/Categories/Media+Extensions.h index 63a9d975b48a..59557b9cb5ec 100644 --- a/WordPress/Classes/Categories/Media+Extensions.h +++ b/WordPress/Classes/Categories/Media+Extensions.h @@ -1,11 +1,7 @@ #import #import -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @interface Media (Extensions) diff --git a/WordPress/Classes/Categories/Media+Extensions.m b/WordPress/Classes/Categories/Media+Extensions.m index 8cf6e3421490..5a57d783983a 100644 --- a/WordPress/Classes/Categories/Media+Extensions.m +++ b/WordPress/Classes/Categories/Media+Extensions.m @@ -1,10 +1,6 @@ #import "Media+Extensions.h" #import "MediaService.h" -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressShared; #ifdef KEYSTONE #import "Keystone-Swift.h" diff --git a/WordPress/Classes/Services/AccountService.m b/WordPress/Classes/Services/AccountService.m index f00fcaaedf54..748b4b67d280 100644 --- a/WordPress/Classes/Services/AccountService.m +++ b/WordPress/Classes/Services/AccountService.m @@ -1,11 +1,7 @@ #import "AccountService.h" #import "BlogService.h" -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressKit; @import WordPressShared; diff --git a/WordPress/Classes/Services/BlogService.m b/WordPress/Classes/Services/BlogService.m index f7afdcd64494..0b98e93a476e 100644 --- a/WordPress/Classes/Services/BlogService.m +++ b/WordPress/Classes/Services/BlogService.m @@ -8,11 +8,7 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressKit; @import WordPressShared; diff --git a/WordPress/Classes/Services/CommentService.m b/WordPress/Classes/Services/CommentService.m index 2967f847f7a1..f4499ba419ea 100644 --- a/WordPress/Classes/Services/CommentService.m +++ b/WordPress/Classes/Services/CommentService.m @@ -5,11 +5,7 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressShared; diff --git a/WordPress/Classes/Services/Facades/BlogSyncFacade.m b/WordPress/Classes/Services/Facades/BlogSyncFacade.m index bfc8253ff409..527a687d5fec 100644 --- a/WordPress/Classes/Services/Facades/BlogSyncFacade.m +++ b/WordPress/Classes/Services/Facades/BlogSyncFacade.m @@ -7,11 +7,7 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressShared; @import NSObject_SafeExpectations; diff --git a/WordPress/Classes/Services/MediaService.h b/WordPress/Classes/Services/MediaService.h index 27075f1e33eb..48eb7ffe4842 100644 --- a/WordPress/Classes/Services/MediaService.h +++ b/WordPress/Classes/Services/MediaService.h @@ -1,10 +1,6 @@ #import #import -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @class Media; @class RemoteVideoPressVideo; diff --git a/WordPress/Classes/Services/MediaService.m b/WordPress/Classes/Services/MediaService.m index df0ed2a562ee..c5acafed2131 100644 --- a/WordPress/Classes/Services/MediaService.m +++ b/WordPress/Classes/Services/MediaService.m @@ -6,11 +6,7 @@ #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressKit; @import WordPressUI; @import WordPressShared; diff --git a/WordPress/Classes/Services/MenusService.h b/WordPress/Classes/Services/MenusService.h index 6a92d8fbdab0..0fe7400f7dbd 100644 --- a/WordPress/Classes/Services/MenusService.h +++ b/WordPress/Classes/Services/MenusService.h @@ -1,9 +1,5 @@ #import -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; NS_ASSUME_NONNULL_BEGIN diff --git a/WordPress/Classes/Services/MenusService.m b/WordPress/Classes/Services/MenusService.m index 5a01c98bfa08..850095e21189 100644 --- a/WordPress/Classes/Services/MenusService.m +++ b/WordPress/Classes/Services/MenusService.m @@ -4,11 +4,7 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressKit; @implementation MenusService diff --git a/WordPress/Classes/Services/PostCategoryService.m b/WordPress/Classes/Services/PostCategoryService.m index 8d446b166061..1a21f540ba24 100644 --- a/WordPress/Classes/Services/PostCategoryService.m +++ b/WordPress/Classes/Services/PostCategoryService.m @@ -4,11 +4,7 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressKit; NS_ASSUME_NONNULL_BEGIN diff --git a/WordPress/Classes/Services/PostTagService.h b/WordPress/Classes/Services/PostTagService.h index aba96741b3e4..a11baed11aea 100644 --- a/WordPress/Classes/Services/PostTagService.h +++ b/WordPress/Classes/Services/PostTagService.h @@ -1,8 +1,4 @@ -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; NS_ASSUME_NONNULL_BEGIN diff --git a/WordPress/Classes/Services/PostTagService.m b/WordPress/Classes/Services/PostTagService.m index d1da33d60bed..57c19faef17c 100644 --- a/WordPress/Classes/Services/PostTagService.m +++ b/WordPress/Classes/Services/PostTagService.m @@ -4,11 +4,7 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressKit; NS_ASSUME_NONNULL_BEGIN diff --git a/WordPress/Classes/Services/Reader Post/ReaderPostService.m b/WordPress/Classes/Services/Reader Post/ReaderPostService.m index a6d624102b8d..66cf3aa6958c 100644 --- a/WordPress/Classes/Services/Reader Post/ReaderPostService.m +++ b/WordPress/Classes/Services/Reader Post/ReaderPostService.m @@ -10,11 +10,7 @@ #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressKit; @import WordPressShared; diff --git a/WordPress/Classes/Services/ReaderSiteService.m b/WordPress/Classes/Services/ReaderSiteService.m index ca2436e2f81c..fb6e391ccfd7 100644 --- a/WordPress/Classes/Services/ReaderSiteService.m +++ b/WordPress/Classes/Services/ReaderSiteService.m @@ -8,11 +8,7 @@ #import "WordPress-Swift.h" #endif #import "WPAppAnalytics.h" -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressKit; NSString * const ReaderSiteServiceErrorDomain = @"ReaderSiteServiceErrorDomain"; diff --git a/WordPress/Classes/Services/ReaderTopicService.m b/WordPress/Classes/Services/ReaderTopicService.m index df572b191e9e..c84c31ded335 100644 --- a/WordPress/Classes/Services/ReaderTopicService.m +++ b/WordPress/Classes/Services/ReaderTopicService.m @@ -6,11 +6,7 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressKit; @import WordPressShared; diff --git a/WordPress/Classes/Services/ThemeService.m b/WordPress/Classes/Services/ThemeService.m index db1cb6ffa2be..9da61d65e2d6 100644 --- a/WordPress/Classes/Services/ThemeService.m +++ b/WordPress/Classes/Services/ThemeService.m @@ -5,11 +5,7 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressKit; /** diff --git a/WordPress/Classes/Utility/Analytics/WPAppAnalytics.m b/WordPress/Classes/Utility/Analytics/WPAppAnalytics.m index 296c18324683..1d55703b8c91 100644 --- a/WordPress/Classes/Utility/Analytics/WPAppAnalytics.m +++ b/WordPress/Classes/Utility/Analytics/WPAppAnalytics.m @@ -8,11 +8,7 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; NSString * const WPAppAnalyticsDefaultsUserOptedOut = @"tracks_opt_out"; NSString * const WPAppAnalyticsKeyBlogID = @"blog_id"; diff --git a/WordPress/Classes/Utility/WPError.m b/WordPress/Classes/Utility/WPError.m index 87f91c697a0a..4b29902336ba 100644 --- a/WordPress/Classes/Utility/WPError.m +++ b/WordPress/Classes/Utility/WPError.m @@ -5,11 +5,7 @@ #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressShared; @import WordPressKit; diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m b/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m index 1b6d6efbffb6..b72d6de6d315 100644 --- a/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m +++ b/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m @@ -16,11 +16,7 @@ @import Gridicons; @import Reachability; -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressShared; static NSString *const BlogDetailsCellIdentifier = @"BlogDetailsCell"; diff --git a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingAuthorizationHelper.m b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingAuthorizationHelper.m index 98346227f6b9..b5e6b04dad0d 100644 --- a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingAuthorizationHelper.m +++ b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingAuthorizationHelper.m @@ -8,11 +8,7 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; diff --git a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingConnectionsViewController.m b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingConnectionsViewController.m index 75a7ba9f542c..09bcc81da68f 100644 --- a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingConnectionsViewController.m +++ b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingConnectionsViewController.m @@ -9,11 +9,7 @@ #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressShared; static NSString *const CellIdentifier = @"CellIdentifier"; diff --git a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingDetailViewController.m b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingDetailViewController.m index 135c6baae937..159640dba4a6 100644 --- a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingDetailViewController.m +++ b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingDetailViewController.m @@ -7,11 +7,7 @@ #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressShared; static NSString *const CellIdentifier = @"CellIdentifier"; diff --git a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingViewController.m b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingViewController.m index 5fc88115e7b4..794b524f8197 100644 --- a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingViewController.m +++ b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingViewController.m @@ -7,11 +7,7 @@ #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressUI; @import WordPressShared; diff --git a/WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController.m b/WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController.m index b0a066770f4e..463c789dac56 100644 --- a/WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController.m +++ b/WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController.m @@ -12,11 +12,7 @@ #import "WordPress-Swift.h" #endif #import "AccountService.h" -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressKit; @import WordPressShared; @import NSURL_IDN; diff --git a/WordPress/Classes/ViewRelated/Comments/Controllers/CommentsViewController.m b/WordPress/Classes/ViewRelated/Comments/Controllers/CommentsViewController.m index 70b77c1a06b7..37ca6f9e4250 100644 --- a/WordPress/Classes/ViewRelated/Comments/Controllers/CommentsViewController.m +++ b/WordPress/Classes/ViewRelated/Comments/Controllers/CommentsViewController.m @@ -5,11 +5,7 @@ #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressLegacy; @import WordPressShared; diff --git a/WordPress/Classes/ViewRelated/Menus/Categories/MenuItem+ViewDesign.h b/WordPress/Classes/ViewRelated/Menus/Categories/MenuItem+ViewDesign.h index 5909e9a58439..5964410e3744 100644 --- a/WordPress/Classes/ViewRelated/Menus/Categories/MenuItem+ViewDesign.h +++ b/WordPress/Classes/ViewRelated/Menus/Categories/MenuItem+ViewDesign.h @@ -1,8 +1,4 @@ -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; #import "Menu+ViewDesign.h" NS_ASSUME_NONNULL_BEGIN diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuDetailsViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuDetailsViewController.m index e6bc73bb0a6e..64c1086521d4 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuDetailsViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuDetailsViewController.m @@ -6,11 +6,7 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressShared; @import Gridicons; diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuHeaderViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuHeaderViewController.m index 34138f688358..d2dd657455b2 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuHeaderViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuHeaderViewController.m @@ -6,11 +6,7 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressShared; static CGFloat ViewExpansionAnimationDelay = 0.15; diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemAbstractPostsViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemAbstractPostsViewController.m index fe8cdb3fc9d9..7c92ccca1c27 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemAbstractPostsViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemAbstractPostsViewController.m @@ -1,9 +1,5 @@ #import "MenuItemAbstractPostsViewController.h" -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressKit; @interface MenuItemAbstractPostsViewController () diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemCategoriesViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemCategoriesViewController.m index 8947969e3414..ffe300624e21 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemCategoriesViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemCategoriesViewController.m @@ -5,11 +5,7 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; static NSUInteger const CategorySyncLimit = 1000; static NSString * const CategorySortKey = @"categoryName"; diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemEditingViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemEditingViewController.m index 33e8773cc98d..caa5c0dfbc3a 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemEditingViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemEditingViewController.m @@ -8,11 +8,7 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressShared; NSString * const MenuItemEditingTypeSelectionChangedNotification = @"MenuItemEditingTypeSelectionChangedNotification"; diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPagesViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPagesViewController.m index 5f868b378688..b5dc628d65a6 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPagesViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPagesViewController.m @@ -4,11 +4,7 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @interface MenuItemAbstractPostsViewController () @end diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPostsViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPostsViewController.m index 1a11e5049e2e..728fde78e062 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPostsViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPostsViewController.m @@ -4,11 +4,7 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @interface MenuItemAbstractPostsViewController () @end diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.m index 21b501f31318..dc8ef8535726 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.m @@ -7,11 +7,7 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressShared; static NSTimeInterval const SearchBarFetchRequestUpdateDelay = 0.10; diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceViewController.m index 0cf5191c6aa3..8d2c72eb959f 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceViewController.m @@ -6,11 +6,7 @@ #import "MenuItemTagsViewController.h" #import "MenuItemPostsViewController.h" #import "Menu.h" -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; static CGFloat const SourceHeaderViewHeight = 60.0; diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemTagsViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemTagsViewController.m index 8f38417a4eb2..37cd1225143d 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemTagsViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemTagsViewController.m @@ -1,10 +1,6 @@ #import "MenuItemTagsViewController.h" #import "PostTagService.h" -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; static NSUInteger const MenuItemSourceTagSyncLimit = 100; diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemTypeViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemTypeViewController.m index f46b16597e60..415033f95d55 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemTypeViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemTypeViewController.m @@ -6,11 +6,7 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @interface MenuItemTypeViewController () diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemsViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemsViewController.m index 7a24a1cf6727..ff228ae2978a 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemsViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemsViewController.m @@ -10,11 +10,7 @@ #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressShared; static CGFloat const ItemHoriztonalDragDetectionWidthRatio = 0.05; diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenusViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenusViewController.m index 3cf3561fa2b2..95f3d783e078 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenusViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenusViewController.m @@ -12,11 +12,7 @@ #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressShared; static CGFloat const ScrollViewOffsetAdjustmentPadding = 10.0; diff --git a/WordPress/Classes/ViewRelated/Menus/View Models/MenusSelectionItem.m b/WordPress/Classes/ViewRelated/Menus/View Models/MenusSelectionItem.m index d73627addf8c..d8712ae85d01 100644 --- a/WordPress/Classes/ViewRelated/Menus/View Models/MenusSelectionItem.m +++ b/WordPress/Classes/ViewRelated/Menus/View Models/MenusSelectionItem.m @@ -1,9 +1,5 @@ #import "MenusSelectionItem.h" -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; NSString * const MenusSelectionViewItemChangedSelectedNotification = @"MenusSelectionViewItemChangedSelectedNotification"; NSString * const MenusSelectionViewItemUpdatedItemObjectNotification = @"MenusSelectionViewItemUpdatedItemObjectNotification"; diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemEditingHeaderView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemEditingHeaderView.m index dbe4b8181dab..57925a11eb67 100644 --- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemEditingHeaderView.m +++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemEditingHeaderView.m @@ -5,11 +5,7 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressShared; diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceHeaderView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceHeaderView.m index a956ccf52f58..95cf8ad536fc 100644 --- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceHeaderView.m +++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceHeaderView.m @@ -6,11 +6,7 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressShared; @import Gridicons; diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemTypeSelectionView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemTypeSelectionView.m index 43d85f34e7e1..0014a8ad32b3 100644 --- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemTypeSelectionView.m +++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemTypeSelectionView.m @@ -7,11 +7,7 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressShared; @import Gridicons; diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemView.m index 222eb26897c9..27a991a5a9a8 100644 --- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemView.m +++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemView.m @@ -5,11 +5,7 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import Gridicons; @import WordPressShared; diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemsVisualOrderingView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemsVisualOrderingView.m index 1b666d92da4c..3c7e167e5770 100644 --- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemsVisualOrderingView.m +++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemsVisualOrderingView.m @@ -1,10 +1,6 @@ #import "MenuItemsVisualOrderingView.h" #import "MenuItemView.h" -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @interface MenuItemsVisualOrderingView () diff --git a/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m b/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m index 06fcb652b854..d05a01fda26c 100644 --- a/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m +++ b/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m @@ -8,11 +8,7 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import Gridicons; @import WordPressShared; diff --git a/WordPress/Classes/ViewRelated/Stats/StatsViewController.m b/WordPress/Classes/ViewRelated/Stats/StatsViewController.m index 9bc3caa9f407..276397a13a0a 100644 --- a/WordPress/Classes/ViewRelated/Stats/StatsViewController.m +++ b/WordPress/Classes/ViewRelated/Stats/StatsViewController.m @@ -7,11 +7,7 @@ #endif #import "WPAppAnalytics.h" -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressShared; @import Reachability; diff --git a/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableView.m b/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableView.m index e987c1b263f8..90d5f4483c0f 100644 --- a/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableView.m +++ b/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableView.m @@ -5,11 +5,7 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; CGFloat const STVDefaultMinHeaderHeight = 0.f; NSString * const CellIdentifier = @"SuggestionsTableViewCell"; diff --git a/WordPress/Classes/ViewRelated/System/WPTabBarController.m b/WordPress/Classes/ViewRelated/System/WPTabBarController.m index cc1278e3f966..9f994eead872 100644 --- a/WordPress/Classes/ViewRelated/System/WPTabBarController.m +++ b/WordPress/Classes/ViewRelated/System/WPTabBarController.m @@ -10,18 +10,10 @@ #else #import "WordPress-Swift.h" #endif -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import Gridicons; -// For some reason, and only in some files, the modular import does not work. -// Just to be on the safe side, _all_ imports use the angle brackets style. -// We shall try to go back to the modular style on Keystone successfully builds for testing. -// @import WordPressData; -#import +@import WordPressData; @import WordPressShared; @import WordPressUI; From e76609c4b2943ff8e2f75f4c51f3fd56e42fbe34 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Thu, 26 Jun 2025 15:20:25 +1000 Subject: [PATCH 14/14] Remove the no longer needed or used `#ifdef KEYSTONE` --- WordPress/Classes/Categories/Media+Extensions.m | 5 ----- WordPress/Classes/Services/AccountService.m | 5 ----- WordPress/Classes/Services/BlogService.m | 4 ---- WordPress/Classes/Services/CommentService.m | 4 ---- WordPress/Classes/Services/Facades/BlogSyncFacade.m | 4 ---- WordPress/Classes/Services/MediaService.m | 5 ----- WordPress/Classes/Services/MenusService.m | 4 ---- WordPress/Classes/Services/PostCategoryService.m | 4 ---- WordPress/Classes/Services/PostTagService.m | 4 ---- WordPress/Classes/Services/Reader Post/ReaderPostService.m | 5 ----- WordPress/Classes/Services/ReaderSiteService.m | 4 ---- WordPress/Classes/Services/ReaderTopicService.m | 4 ---- WordPress/Classes/Services/ThemeService.m | 4 ---- WordPress/Classes/Utility/Analytics/WPAppAnalytics.m | 4 ---- WordPress/Classes/Utility/Logging/WPLogger.m | 5 ----- WordPress/Classes/Utility/UIAlertControllerProxy.m | 4 ---- WordPress/Classes/Utility/WPError.m | 5 ----- .../Blog/Blog Details/BlogDetailsViewController.m | 4 ---- .../ViewRelated/Blog/Sharing/SharingAuthorizationHelper.m | 4 ---- .../Blog/Sharing/SharingConnectionsViewController.m | 5 ----- .../ViewRelated/Blog/Sharing/SharingDetailViewController.m | 5 ----- .../Classes/ViewRelated/Blog/Sharing/SharingViewController.m | 5 ----- .../ViewRelated/Blog/Site Settings/SettingTableViewCell.m | 5 ----- .../Blog/Site Settings/SiteSettingsViewController.m | 4 ---- .../Comments/Controllers/CommentsViewController.m | 5 ----- .../Menus/Controllers/MenuDetailsViewController.m | 4 ---- .../ViewRelated/Menus/Controllers/MenuHeaderViewController.m | 4 ---- .../Menus/Controllers/MenuItemCategoriesViewController.m | 4 ---- .../Menus/Controllers/MenuItemEditingViewController.m | 4 ---- .../Menus/Controllers/MenuItemLinkViewController.m | 5 ----- .../Menus/Controllers/MenuItemPagesViewController.m | 4 ---- .../Menus/Controllers/MenuItemPostsViewController.m | 4 ---- .../Menus/Controllers/MenuItemSourceResultsViewController.m | 4 ---- .../Menus/Controllers/MenuItemTypeViewController.m | 4 ---- .../ViewRelated/Menus/Controllers/MenuItemsViewController.m | 5 ----- .../ViewRelated/Menus/Controllers/MenusViewController.m | 5 ----- .../Classes/ViewRelated/Menus/Views/MenuItemAbstractView.m | 5 ----- .../ViewRelated/Menus/Views/MenuItemCheckButtonView.m | 5 ----- .../ViewRelated/Menus/Views/MenuItemEditingFooterView.m | 5 ----- .../ViewRelated/Menus/Views/MenuItemEditingHeaderView.m | 4 ---- .../Classes/ViewRelated/Menus/Views/MenuItemInsertionView.m | 5 ----- .../Classes/ViewRelated/Menus/Views/MenuItemSourceCell.m | 5 ----- .../ViewRelated/Menus/Views/MenuItemSourceFooterView.m | 5 ----- .../ViewRelated/Menus/Views/MenuItemSourceHeaderView.m | 4 ---- .../Classes/ViewRelated/Menus/Views/MenuItemSourceTextBar.m | 5 ----- .../ViewRelated/Menus/Views/MenuItemTypeSelectionView.m | 4 ---- WordPress/Classes/ViewRelated/Menus/Views/MenuItemView.m | 4 ---- .../ViewRelated/Menus/Views/MenusSelectionDetailView.m | 5 ----- .../Classes/ViewRelated/Menus/Views/MenusSelectionItemView.m | 5 ----- .../Classes/ViewRelated/Menus/Views/MenusSelectionView.m | 5 ----- .../Classes/ViewRelated/Pages/PageSettingsViewController.m | 5 ----- .../Classes/ViewRelated/Post/PostSettingsViewController.m | 4 ---- WordPress/Classes/ViewRelated/Stats/StatsViewController.m | 4 ---- .../Classes/ViewRelated/Suggestions/SuggestionsTableView.m | 4 ---- .../ViewRelated/Suggestions/SuggestionsTableViewCell.m | 5 ----- WordPress/Classes/ViewRelated/System/WPTabBarController.m | 4 ---- .../ViewRelated/Tools/SettingsMultiTextViewController.m | 5 ----- .../ViewRelated/Tools/SettingsSelectionViewController.m | 5 ----- .../Classes/ViewRelated/Tools/SettingsTextViewController.m | 5 ----- WordPress/Classes/ViewRelated/Views/WPUploadStatusButton.m | 5 ----- 60 files changed, 270 deletions(-) diff --git a/WordPress/Classes/Categories/Media+Extensions.m b/WordPress/Classes/Categories/Media+Extensions.m index 5a57d783983a..a6ae9f9cd022 100644 --- a/WordPress/Classes/Categories/Media+Extensions.m +++ b/WordPress/Classes/Categories/Media+Extensions.m @@ -2,12 +2,7 @@ #import "MediaService.h" @import WordPressData; @import WordPressShared; -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - @implementation Media (Extensions) - (NSError *)errorWithMessage:(NSString *)errorMessage { diff --git a/WordPress/Classes/Services/AccountService.m b/WordPress/Classes/Services/AccountService.m index 748b4b67d280..28ae9ec2bfc6 100644 --- a/WordPress/Classes/Services/AccountService.m +++ b/WordPress/Classes/Services/AccountService.m @@ -5,12 +5,7 @@ @import WordPressKit; @import WordPressShared; -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - NSString * const WPAccountEmailAndDefaultBlogUpdatedNotification = @"WPAccountEmailAndDefaultBlogUpdatedNotification"; @implementation AccountService diff --git a/WordPress/Classes/Services/BlogService.m b/WordPress/Classes/Services/BlogService.m index 0b98e93a476e..5c392ed787a6 100644 --- a/WordPress/Classes/Services/BlogService.m +++ b/WordPress/Classes/Services/BlogService.m @@ -3,11 +3,7 @@ #import "WPError.h" #import "PostCategoryService.h" #import "CommentService.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif @import WordPressData; @import WordPressKit; @import WordPressShared; diff --git a/WordPress/Classes/Services/CommentService.m b/WordPress/Classes/Services/CommentService.m index f4499ba419ea..59034f0f0d7a 100644 --- a/WordPress/Classes/Services/CommentService.m +++ b/WordPress/Classes/Services/CommentService.m @@ -1,10 +1,6 @@ #import "CommentService.h" #import "AccountService.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif @import WordPressData; @import WordPressShared; diff --git a/WordPress/Classes/Services/Facades/BlogSyncFacade.m b/WordPress/Classes/Services/Facades/BlogSyncFacade.m index 527a687d5fec..9d1a5a29cd8c 100644 --- a/WordPress/Classes/Services/Facades/BlogSyncFacade.m +++ b/WordPress/Classes/Services/Facades/BlogSyncFacade.m @@ -2,11 +2,7 @@ #import "BlogService.h" #import "AccountService.h" #import "WPAppAnalytics.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif @import WordPressData; @import WordPressShared; diff --git a/WordPress/Classes/Services/MediaService.m b/WordPress/Classes/Services/MediaService.m index c5acafed2131..398ff38c3e9c 100644 --- a/WordPress/Classes/Services/MediaService.m +++ b/WordPress/Classes/Services/MediaService.m @@ -1,11 +1,6 @@ #import "MediaService.h" #import -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - @import WordPressData; @import WordPressKit; @import WordPressUI; diff --git a/WordPress/Classes/Services/MenusService.m b/WordPress/Classes/Services/MenusService.m index 850095e21189..dfb98087c4f7 100644 --- a/WordPress/Classes/Services/MenusService.m +++ b/WordPress/Classes/Services/MenusService.m @@ -1,9 +1,5 @@ #import "MenusService.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif @import WordPressData; @import WordPressKit; diff --git a/WordPress/Classes/Services/PostCategoryService.m b/WordPress/Classes/Services/PostCategoryService.m index 1a21f540ba24..f6e00fee4916 100644 --- a/WordPress/Classes/Services/PostCategoryService.m +++ b/WordPress/Classes/Services/PostCategoryService.m @@ -1,9 +1,5 @@ #import "PostCategoryService.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif @import WordPressData; @import WordPressKit; diff --git a/WordPress/Classes/Services/PostTagService.m b/WordPress/Classes/Services/PostTagService.m index 57c19faef17c..bb4ad6fd133e 100644 --- a/WordPress/Classes/Services/PostTagService.m +++ b/WordPress/Classes/Services/PostTagService.m @@ -1,9 +1,5 @@ #import "PostTagService.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif @import WordPressData; @import WordPressKit; diff --git a/WordPress/Classes/Services/Reader Post/ReaderPostService.m b/WordPress/Classes/Services/Reader Post/ReaderPostService.m index 66cf3aa6958c..5a03f7137129 100644 --- a/WordPress/Classes/Services/Reader Post/ReaderPostService.m +++ b/WordPress/Classes/Services/Reader Post/ReaderPostService.m @@ -4,12 +4,7 @@ #import "ReaderGapMarker.h" #import "ReaderSiteService.h" #import "WPAppAnalytics.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - @import WordPressData; @import WordPressKit; @import WordPressShared; diff --git a/WordPress/Classes/Services/ReaderSiteService.m b/WordPress/Classes/Services/ReaderSiteService.m index fb6e391ccfd7..9dcff961693c 100644 --- a/WordPress/Classes/Services/ReaderSiteService.m +++ b/WordPress/Classes/Services/ReaderSiteService.m @@ -2,11 +2,7 @@ #import "AccountService.h" #import "ReaderPostService.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif #import "WPAppAnalytics.h" @import WordPressData; @import WordPressKit; diff --git a/WordPress/Classes/Services/ReaderTopicService.m b/WordPress/Classes/Services/ReaderTopicService.m index c84c31ded335..7ee3826bf4f5 100644 --- a/WordPress/Classes/Services/ReaderTopicService.m +++ b/WordPress/Classes/Services/ReaderTopicService.m @@ -1,11 +1,7 @@ #import "ReaderTopicService.h" #import "AccountService.h" #import "ReaderPostService.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif @import WordPressData; @import WordPressKit; @import WordPressShared; diff --git a/WordPress/Classes/Services/ThemeService.m b/WordPress/Classes/Services/ThemeService.m index 9da61d65e2d6..bd84ed97c64a 100644 --- a/WordPress/Classes/Services/ThemeService.m +++ b/WordPress/Classes/Services/ThemeService.m @@ -1,10 +1,6 @@ #import "ThemeService.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif @import WordPressData; @import WordPressKit; diff --git a/WordPress/Classes/Utility/Analytics/WPAppAnalytics.m b/WordPress/Classes/Utility/Analytics/WPAppAnalytics.m index 1d55703b8c91..c0bc86eb8429 100644 --- a/WordPress/Classes/Utility/Analytics/WPAppAnalytics.m +++ b/WordPress/Classes/Utility/Analytics/WPAppAnalytics.m @@ -3,11 +3,7 @@ #import "WPAppAnalytics.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif @import WordPressData; NSString * const WPAppAnalyticsDefaultsUserOptedOut = @"tracks_opt_out"; diff --git a/WordPress/Classes/Utility/Logging/WPLogger.m b/WordPress/Classes/Utility/Logging/WPLogger.m index b557b4936971..a0a8e59dc946 100644 --- a/WordPress/Classes/Utility/Logging/WPLogger.m +++ b/WordPress/Classes/Utility/Logging/WPLogger.m @@ -2,12 +2,7 @@ @import WordPressShared; #import "WPLogger.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - DDLogLevel ddLogLevel = DDLogLevelInfo; void SetCocoaLumberjackObjCLogLevel(NSUInteger ddLogLevelRawValue) diff --git a/WordPress/Classes/Utility/UIAlertControllerProxy.m b/WordPress/Classes/Utility/UIAlertControllerProxy.m index 8ce39a77f091..2c14756eafd5 100644 --- a/WordPress/Classes/Utility/UIAlertControllerProxy.m +++ b/WordPress/Classes/Utility/UIAlertControllerProxy.m @@ -1,11 +1,7 @@ @import WordPressShared; #import "UIAlertControllerProxy.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif @import WordPressShared; @implementation UIAlertControllerProxy diff --git a/WordPress/Classes/Utility/WPError.m b/WordPress/Classes/Utility/WPError.m index 4b29902336ba..0357fb9e9f39 100644 --- a/WordPress/Classes/Utility/WPError.m +++ b/WordPress/Classes/Utility/WPError.m @@ -1,10 +1,5 @@ #import "WPError.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - @import WordPressData; @import WordPressShared; @import WordPressKit; diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m b/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m index b72d6de6d315..ab4dc9310c9a 100644 --- a/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m +++ b/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m @@ -7,11 +7,7 @@ #import "SharingViewController.h" #import "StatsViewController.h" #import "WPAppAnalytics.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif #import "MenusViewController.h" @import Gridicons; diff --git a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingAuthorizationHelper.m b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingAuthorizationHelper.m index b5e6b04dad0d..5ab711535e79 100644 --- a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingAuthorizationHelper.m +++ b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingAuthorizationHelper.m @@ -3,11 +3,7 @@ #import "SharingAuthorizationHelper.h" #import "BlogService.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif @import WordPressData; diff --git a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingConnectionsViewController.m b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingConnectionsViewController.m index 09bcc81da68f..de4cbc6d5a4f 100644 --- a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingConnectionsViewController.m +++ b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingConnectionsViewController.m @@ -3,12 +3,7 @@ #import "BlogService.h" #import "SharingDetailViewController.h" #import "SharingAuthorizationHelper.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - @import WordPressData; @import WordPressShared; diff --git a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingDetailViewController.m b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingDetailViewController.m index 159640dba4a6..9a1027836e59 100644 --- a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingDetailViewController.m +++ b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingDetailViewController.m @@ -1,12 +1,7 @@ #import "SharingDetailViewController.h" #import "BlogService.h" #import "SharingAuthorizationHelper.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - @import WordPressData; @import WordPressShared; diff --git a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingViewController.m b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingViewController.m index 794b524f8197..33b84148ed3a 100644 --- a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingViewController.m +++ b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingViewController.m @@ -1,12 +1,7 @@ #import "SharingViewController.h" #import "BlogService.h" #import "SharingConnectionsViewController.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - @import WordPressData; @import WordPressUI; @import WordPressShared; diff --git a/WordPress/Classes/ViewRelated/Blog/Site Settings/SettingTableViewCell.m b/WordPress/Classes/ViewRelated/Blog/Site Settings/SettingTableViewCell.m index 72e41f587e05..f1690b993b62 100644 --- a/WordPress/Classes/ViewRelated/Blog/Site Settings/SettingTableViewCell.m +++ b/WordPress/Classes/ViewRelated/Blog/Site Settings/SettingTableViewCell.m @@ -1,10 +1,5 @@ #import "SettingTableViewCell.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - NSString * const SettingsTableViewCellReuseIdentifier = @"org.wordpress.SettingTableViewCell"; @implementation SettingTableViewCell diff --git a/WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController.m b/WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController.m index 463c789dac56..6d232ba83b8d 100644 --- a/WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController.m +++ b/WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController.m @@ -6,11 +6,7 @@ #import "SettingsMultiTextViewController.h" #import "SettingTableViewCell.h" #import "SettingsTextViewController.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif #import "AccountService.h" @import WordPressData; @import WordPressKit; diff --git a/WordPress/Classes/ViewRelated/Comments/Controllers/CommentsViewController.m b/WordPress/Classes/ViewRelated/Comments/Controllers/CommentsViewController.m index 37ca6f9e4250..248f471eea0d 100644 --- a/WordPress/Classes/ViewRelated/Comments/Controllers/CommentsViewController.m +++ b/WordPress/Classes/ViewRelated/Comments/Controllers/CommentsViewController.m @@ -1,10 +1,5 @@ #import "CommentsViewController.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - @import WordPressData; @import WordPressLegacy; @import WordPressShared; diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuDetailsViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuDetailsViewController.m index 64c1086521d4..e963031e4b98 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuDetailsViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuDetailsViewController.m @@ -1,11 +1,7 @@ #import "MenuDetailsViewController.h" #import "Menu+ViewDesign.h" #import "WPAppAnalytics.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif @import WordPressData; @import WordPressShared; diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuHeaderViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuHeaderViewController.m index d2dd657455b2..36c3ea9db747 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuHeaderViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuHeaderViewController.m @@ -1,11 +1,7 @@ #import "MenuHeaderViewController.h" #import "MenusSelectionView.h" #import "Menu+ViewDesign.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif @import WordPressData; @import WordPressShared; diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemCategoriesViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemCategoriesViewController.m index ffe300624e21..34bac259ad99 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemCategoriesViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemCategoriesViewController.m @@ -1,10 +1,6 @@ #import "MenuItemCategoriesViewController.h" #import "PostCategoryService.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif @import WordPressData; static NSUInteger const CategorySyncLimit = 1000; diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemEditingViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemEditingViewController.m index caa5c0dfbc3a..f7a0c30e66d4 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemEditingViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemEditingViewController.m @@ -3,11 +3,7 @@ #import "MenuItemEditingFooterView.h" #import "MenuItemSourceViewController.h" #import "MenuItemTypeViewController.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif @import WordPressData; @import WordPressShared; diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemLinkViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemLinkViewController.m index 27e0c3005d61..de5e5ac68831 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemLinkViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemLinkViewController.m @@ -1,11 +1,6 @@ #import "MenuItemLinkViewController.h" #import "MenuItemCheckButtonView.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - @import WordPressShared; static CGFloat const LinkTextBarHeight = 48.0; diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPagesViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPagesViewController.m index b5dc628d65a6..c0779aa35b40 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPagesViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPagesViewController.m @@ -1,9 +1,5 @@ #import "MenuItemPagesViewController.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif @import WordPressData; @interface MenuItemAbstractPostsViewController () diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPostsViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPostsViewController.m index 728fde78e062..ed505bf3e865 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPostsViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPostsViewController.m @@ -1,9 +1,5 @@ #import "MenuItemPostsViewController.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif @import WordPressData; @interface MenuItemAbstractPostsViewController () diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.m index dc8ef8535726..6a7864b1a0e2 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.m @@ -2,11 +2,7 @@ #import "MenuItemSourceTextBar.h" #import "MenuItemSourceFooterView.h" #import "Menu+ViewDesign.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif @import WordPressData; @import WordPressShared; diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemTypeViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemTypeViewController.m index 415033f95d55..cd68e85e3edc 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemTypeViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemTypeViewController.m @@ -1,11 +1,7 @@ #import "MenuItemTypeViewController.h" #import "MenuItemTypeSelectionView.h" #import "BlogService.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif @import WordPressData; @interface MenuItemTypeViewController () diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemsViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemsViewController.m index ff228ae2978a..433675006c73 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemsViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemsViewController.m @@ -4,12 +4,7 @@ #import "MenuItemInsertionView.h" #import "MenuItemsVisualOrderingView.h" #import "Menu+ViewDesign.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - @import WordPressData; @import WordPressShared; diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenusViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenusViewController.m index 95f3d783e078..0cd818a491c6 100644 --- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenusViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenusViewController.m @@ -6,12 +6,7 @@ #import "MenuItemEditingViewController.h" #import "Menu+ViewDesign.h" #import "WPAppAnalytics.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - @import WordPressData; @import WordPressShared; diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemAbstractView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemAbstractView.m index 234b261a12b7..dd24e7fd7eb3 100644 --- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemAbstractView.m +++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemAbstractView.m @@ -1,11 +1,6 @@ #import "MenuItemAbstractView.h" #import "MenuItem+ViewDesign.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - @import WordPressUI; @import WordPressShared; diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemCheckButtonView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemCheckButtonView.m index d00ce9c2f8e2..07e623c9425a 100644 --- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemCheckButtonView.m +++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemCheckButtonView.m @@ -1,11 +1,6 @@ #import "MenuItemCheckButtonView.h" #import "Menu+ViewDesign.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - @import WordPressShared; @import Gridicons; diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemEditingFooterView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemEditingFooterView.m index 87245dd66144..2c91b956abd3 100644 --- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemEditingFooterView.m +++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemEditingFooterView.m @@ -1,10 +1,5 @@ #import "MenuItemEditingFooterView.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - @import Gridicons; @import WordPressShared; diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemEditingHeaderView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemEditingHeaderView.m index 57925a11eb67..8fb6a0bfc61e 100644 --- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemEditingHeaderView.m +++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemEditingHeaderView.m @@ -1,10 +1,6 @@ #import "MenuItemEditingHeaderView.h" #import "MenuItem+ViewDesign.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif @import WordPressData; @import WordPressShared; diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemInsertionView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemInsertionView.m index 16c6c616ba0a..9e1ec432ab5e 100644 --- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemInsertionView.m +++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemInsertionView.m @@ -1,10 +1,5 @@ #import "MenuItemInsertionView.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - @import Gridicons; @implementation MenuItemInsertionView diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceCell.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceCell.m index f28b3cfdb67c..a41827312de5 100644 --- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceCell.m +++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceCell.m @@ -1,11 +1,6 @@ #import "MenuItemSourceCell.h" #import "Menu+ViewDesign.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - @import WordPressShared; #pragma mark - MenuItemSourceRadioButton diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceFooterView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceFooterView.m index 7be1993927f9..c6dbfc31f6bc 100644 --- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceFooterView.m +++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceFooterView.m @@ -1,12 +1,7 @@ #import "MenuItemSourceFooterView.h" #import "MenuItemSourceCell.h" #import "Menu+ViewDesign.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - @import WordPressShared; @interface MenuItemSourceFooterView () diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceHeaderView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceHeaderView.m index 95cf8ad536fc..e4d123feac48 100644 --- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceHeaderView.m +++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceHeaderView.m @@ -1,11 +1,7 @@ #import "MenuItemSourceHeaderView.h" #import "MenuItem+ViewDesign.h" #import "MenuItem.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif @import WordPressData; @import WordPressShared; diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceTextBar.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceTextBar.m index cd6053a30820..5f02a9323a79 100644 --- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceTextBar.m +++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceTextBar.m @@ -1,11 +1,6 @@ #import "MenuItemSourceTextBar.h" #import "Menu+ViewDesign.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - @import Gridicons; @import WordPressShared; diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemTypeSelectionView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemTypeSelectionView.m index 0014a8ad32b3..c998b3a9d7c4 100644 --- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemTypeSelectionView.m +++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemTypeSelectionView.m @@ -2,11 +2,7 @@ #import "Menu+ViewDesign.h" #import "MenuItem+ViewDesign.h" #import "MenuItem.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif @import WordPressData; @import WordPressShared; diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemView.m index 27a991a5a9a8..7ea4bf97e7ea 100644 --- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemView.m +++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemView.m @@ -1,10 +1,6 @@ #import "MenuItemView.h" #import "MenuItem+ViewDesign.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif @import WordPressData; @import Gridicons; diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenusSelectionDetailView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenusSelectionDetailView.m index 50ef60d462ef..a28f3ea30dc8 100644 --- a/WordPress/Classes/ViewRelated/Menus/Views/MenusSelectionDetailView.m +++ b/WordPress/Classes/ViewRelated/Menus/Views/MenusSelectionDetailView.m @@ -2,12 +2,7 @@ #import "Menu+ViewDesign.h" #import "MenusSelectionView.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - @import WordPressShared; @import Gridicons; diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenusSelectionItemView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenusSelectionItemView.m index 41bdcd8d9b3c..44c82df9815e 100644 --- a/WordPress/Classes/ViewRelated/Menus/Views/MenusSelectionItemView.m +++ b/WordPress/Classes/ViewRelated/Menus/Views/MenusSelectionItemView.m @@ -1,12 +1,7 @@ #import "MenusSelectionItemView.h" #import "MenusSelectionView.h" #import "Menu+ViewDesign.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - @import WordPressShared; @import Gridicons; diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenusSelectionView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenusSelectionView.m index f34b331136e0..c4fe6f5c0ad6 100644 --- a/WordPress/Classes/ViewRelated/Menus/Views/MenusSelectionView.m +++ b/WordPress/Classes/ViewRelated/Menus/Views/MenusSelectionView.m @@ -2,12 +2,7 @@ #import "MenusSelectionDetailView.h" #import "MenusSelectionItemView.h" #import "Menu+ViewDesign.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - @import WordPressShared; @interface MenusSelectionView () diff --git a/WordPress/Classes/ViewRelated/Pages/PageSettingsViewController.m b/WordPress/Classes/ViewRelated/Pages/PageSettingsViewController.m index 6ed931aa4b93..8734ed14de5f 100644 --- a/WordPress/Classes/ViewRelated/Pages/PageSettingsViewController.m +++ b/WordPress/Classes/ViewRelated/Pages/PageSettingsViewController.m @@ -1,11 +1,6 @@ #import "PageSettingsViewController.h" #import "PostSettingsViewController_Internal.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - @interface PageSettingsViewController () @end diff --git a/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m b/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m index d05a01fda26c..1f3881ab0331 100644 --- a/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m +++ b/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m @@ -3,11 +3,7 @@ #import "SettingsSelectionViewController.h" #import "SharingDetailViewController.h" #import "MediaService.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif @import WordPressData; @import Gridicons; diff --git a/WordPress/Classes/ViewRelated/Stats/StatsViewController.m b/WordPress/Classes/ViewRelated/Stats/StatsViewController.m index 276397a13a0a..eb08c1e020da 100644 --- a/WordPress/Classes/ViewRelated/Stats/StatsViewController.m +++ b/WordPress/Classes/ViewRelated/Stats/StatsViewController.m @@ -1,10 +1,6 @@ #import "StatsViewController.h" #import "BlogService.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif #import "WPAppAnalytics.h" @import WordPressData; diff --git a/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableView.m b/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableView.m index 90d5f4483c0f..42e21db5d89f 100644 --- a/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableView.m +++ b/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableView.m @@ -1,10 +1,6 @@ #import "SuggestionsTableView.h" #import "SuggestionsTableViewCell.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif @import WordPressData; CGFloat const STVDefaultMinHeaderHeight = 0.f; diff --git a/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableViewCell.m b/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableViewCell.m index 3cdf5e8203e9..82bf231cfb71 100644 --- a/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableViewCell.m +++ b/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableViewCell.m @@ -1,10 +1,5 @@ #import "SuggestionsTableViewCell.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - @import WordPressShared; NSInteger const SuggestionsTableViewCellIconSize = 24; diff --git a/WordPress/Classes/ViewRelated/System/WPTabBarController.m b/WordPress/Classes/ViewRelated/System/WPTabBarController.m index 9f994eead872..1b62b2a1c6b8 100644 --- a/WordPress/Classes/ViewRelated/System/WPTabBarController.m +++ b/WordPress/Classes/ViewRelated/System/WPTabBarController.m @@ -5,11 +5,7 @@ #import "BlogDetailsViewController.h" #import "WPAppAnalytics.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif @import WordPressData; @import Gridicons; diff --git a/WordPress/Classes/ViewRelated/Tools/SettingsMultiTextViewController.m b/WordPress/Classes/ViewRelated/Tools/SettingsMultiTextViewController.m index 6d3005a0cca2..6d369b3d17f1 100644 --- a/WordPress/Classes/ViewRelated/Tools/SettingsMultiTextViewController.m +++ b/WordPress/Classes/ViewRelated/Tools/SettingsMultiTextViewController.m @@ -1,10 +1,5 @@ #import "SettingsMultiTextViewController.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - @import WordPressShared; static CGVector const SettingsTextPadding = {11.0f, 3.0f}; diff --git a/WordPress/Classes/ViewRelated/Tools/SettingsSelectionViewController.m b/WordPress/Classes/ViewRelated/Tools/SettingsSelectionViewController.m index aa5fae5fe882..39c83c1dbe90 100644 --- a/WordPress/Classes/ViewRelated/Tools/SettingsSelectionViewController.m +++ b/WordPress/Classes/ViewRelated/Tools/SettingsSelectionViewController.m @@ -1,12 +1,7 @@ #import "SettingsSelectionViewController.h" #import "SettingsTextViewController.h" #import "NSDictionary+SafeExpectations.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - @import WordPressShared; NSString * const SettingsSelectionTitleKey = @"Title"; diff --git a/WordPress/Classes/ViewRelated/Tools/SettingsTextViewController.m b/WordPress/Classes/ViewRelated/Tools/SettingsTextViewController.m index b8ecebacd68d..03300c8c798f 100644 --- a/WordPress/Classes/ViewRelated/Tools/SettingsTextViewController.m +++ b/WordPress/Classes/ViewRelated/Tools/SettingsTextViewController.m @@ -1,10 +1,5 @@ #import "SettingsTextViewController.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - @import WordPressShared; #pragma mark - Constants diff --git a/WordPress/Classes/ViewRelated/Views/WPUploadStatusButton.m b/WordPress/Classes/ViewRelated/Views/WPUploadStatusButton.m index 597dcb39925d..14a146ab3ef3 100644 --- a/WordPress/Classes/ViewRelated/Views/WPUploadStatusButton.m +++ b/WordPress/Classes/ViewRelated/Views/WPUploadStatusButton.m @@ -1,10 +1,5 @@ #import "WPUploadStatusButton.h" -#ifdef KEYSTONE -#import "Keystone-Swift.h" -#else #import "WordPress-Swift.h" -#endif - @import WordPressShared; @import WordPressUI;