Extract SFHFKeychainUtils to dedicated Swift package (#24192)

* Add `import UIKit` to some files shared with notification extension

All those Swift files compile without importing UIKit because
`SFHFKeychainUtils.h` did that for them and they got access to it via
the bridging header.

Next, we'll move SFHFKeychainUtils into the modules, and UIKit will no
longer be available through it.

Side note: UIKit should not have been available via SFHFKeychainUtils in
the first place. On top of that, SFHFKeychainUtils does not need UIKit
either.

* Extract SFHFKeychainUtils in a dedicated Swift package

We need it in a dedicated package because the Objective-C implementation
does not use ARC. Therefore, we need to use the `-fno-objc-arc` compiler
setting. But such a setting should be applied sparingly so instead of
blanket using it in an existing Objective-C package like
WordPressSharedObjC, we use it surgically just for this file.

Author: mokagio

Modules/Package.swift

@@ -11,6 +11,7 @@ let package = Package(
         .library(name: "AsyncImageKit", targets: ["AsyncImageKit"]),
         .library(name: "DesignSystem", targets: ["DesignSystem"]),
         .library(name: "JetpackStatsWidgetsCore", targets: ["JetpackStatsWidgetsCore"]),
+        .library(name: "SFHFKeychainUtils", targets: ["SFHFKeychainUtils"]),
         .library(name: "WordPressData", targets: ["WordPressData"]),
         .library(name: "WordPressFlux", targets: ["WordPressFlux"]),
         .library(name: "WordPressShared", targets: ["WordPressShared"]),
@@ -60,6 +61,12 @@ let package = Package(
         ]),
         .target(name: "DesignSystem", swiftSettings: [.swiftLanguageMode(.v5)]),
         .target(name: "JetpackStatsWidgetsCore", swiftSettings: [.swiftLanguageMode(.v5)]),
+        // SFHFKeychainUtils is an old Objective-C keychain wrapper.
+        // The implementatoin predates ARC, hence the dedicated target with ARC disabled, for the time being.
+        .target(
+            name: "SFHFKeychainUtils",
+            cSettings: [.unsafeFlags(["-fno-objc-arc"])]
+        ),
         .target(name: "UITestsFoundation", dependencies: [
             .product(name: "ScreenObject", package: "ScreenObject"),
             .product(name: "XCUITestHelpers", package: "ScreenObject"),
@@ -146,6 +153,7 @@ enum XcodeSupport {
         ]
 
         let shareAndDraftExtensionsDependencies: [Target.Dependency] = [
+            "SFHFKeychainUtils",
             "WordPressShared",
             "WordPressUI",
             .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
@@ -168,6 +176,7 @@ enum XcodeSupport {
             .xcodeTarget("XcodeTarget_App", dependencies: [
                 "DesignSystem",
                 "JetpackStatsWidgetsCore",
+                "SFHFKeychainUtils",
                 "WordPressData",
                 "WordPressFlux",
                 "WordPressShared",
@@ -206,6 +215,7 @@ enum XcodeSupport {
                 .product(name: "WordPressEditor", package: "AztecEditor-iOS"),
             ]),
             .xcodeTarget("XcodeTarget_WordPressTests", dependencies: testDependencies + [
+                "SFHFKeychainUtils",
                 "WordPressShared",
                 .product(name: "Gravatar", package: "Gravatar-SDK-iOS"),
                 .product(name: "Nimble", package: "Nimble"),
@@ -216,10 +226,12 @@ enum XcodeSupport {
             .xcodeTarget("XcodeTarget_ShareExtension", dependencies: shareAndDraftExtensionsDependencies),
             .xcodeTarget("XcodeTarget_DraftActionExtension", dependencies: shareAndDraftExtensionsDependencies),
             .xcodeTarget("XcodeTarget_NotificationServiceExtension", dependencies: [
+                "SFHFKeychainUtils",
                 "WordPressShared",
             ]),
             .xcodeTarget("XcodeTarget_StatsWidget", dependencies: [
                 "JetpackStatsWidgetsCore",
+                "SFHFKeychainUtils",
                 "WordPressShared",
                 "WordPressUI",
                 .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),

WordPress/Classes/Utility/SFHFKeychainUtils.m renamed to Modules/Sources/SFHFKeychainUtils/SFHFKeychainUtils.m

@@ -27,7 +27,7 @@
 //  OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
 
 
 @interface SFHFKeychainUtils : NSObject {
@@ -68,4 +68,4 @@
 + (NSArray<NSDictionary<NSString *, NSString *> *> *)getAllPasswordsForAccessGroup:(NSString *)accessGroup
                                                                              error:(NSError **)error;
 
-@end
+@end

WordPress/Classes/Utility/SFHFKeychainUtils.h renamed to Modules/Sources/SFHFKeychainUtils/include/SFHFKeychainUtils.h

@@ -4,6 +4,7 @@
 @import WordPressDataObjC;
 #import "WPUserAgent.h"
 #import "WordPress-Swift.h"
+@import SFHFKeychainUtils;
 
 @import NSObject_SafeExpectations;
 @import NSURL_IDN;

WordPress/Classes/Models/Blog/Blog.m

@@ -1,3 +1,4 @@
+@import SFHFKeychainUtils;
 #import "WPAccount.h"
 #import "WordPress-Swift.h"
 

WordPress/Classes/Models/WPAccount.m

@@ -1,3 +1,5 @@
+import SFHFKeychainUtils
+
 protocol CredentialsProvider {
     func getPassword(username: String, service: String) -> String?
 }

WordPress/Classes/Services/CredentialsService.swift

@@ -1,4 +1,5 @@
 import Foundation
+import SFHFKeychainUtils
 
 @objc
 open class NotificationSupportService: NSObject {

WordPress/Classes/Services/NotificationSupportService.swift

@@ -1,4 +1,5 @@
 import Foundation
+import SFHFKeychainUtils
 
 @objc
 open class ShareExtensionService: NSObject {

WordPress/Classes/Services/ShareExtensionService.swift

@@ -1,4 +1,5 @@
 import JetpackStatsWidgetsCore
+import SFHFKeychainUtils
 import WidgetKit
 
 class StatsWidgetsStore {

WordPress/Classes/Stores/StatsWidgetsStore.swift

@@ -1,5 +1,3 @@
-#import "SFHFKeychainUtils.h"
-
 // WordPress Module
 
 #import "ActivityLogViewController.h"
@@ -55,7 +53,6 @@
 #import "SettingTableViewCell.h"
 #import "SettingsTextViewController.h"
 #import "SharingViewController.h"
-#import "SFHFKeychainUtils.h"
 #import "SiteSettingsViewController.h"
 #import "SourcePostAttribution.h"
 #import "StatsViewController.h"