Pull out SignalCoreKit.

2018-09-21 15:41:10 -04:00 · 2018-09-21 15:41:10 -04:00 · 0125535d4d
parent f0f25aa413
commit 0125535d4d
131 changed files with 243 additions and 1408 deletions
--- a/2
+++ b/2
@ -5,6 +5,8 @@ use_frameworks!

 def shared_pods
  # OWS Pods
+  # pod 'SignalCoreKit', git: 'https://github.com/signalapp/SignalCoreKit.git', testspecs: ["Tests"]
+  # pod 'SignalCoreKit', path: '../SignalCoreKit', testspecs: ["Tests"]
  # pod 'SQLCipher', path: '../sqlcipher2'
  pod 'SQLCipher', :git => 'https://github.com/sqlcipher/sqlcipher.git', :commit => 'd5c2bec'
  # pod 'YapDatabase/SQLCipher', path: '../YapDatabase'
--- a/Podfile.lock
+++ b/Podfile.lock
@ -48,6 +48,12 @@ PODS:
  - PureLayout (3.0.2)
  - Reachability (3.2)
  - SAMKeychain (1.5.3)
+  - SignalCoreKit (1.0.0):
+    - CocoaLumberjack
+    - GRKOpenSSLFramework
+  - SignalCoreKit/Tests (1.0.0):
+    - CocoaLumberjack
+    - GRKOpenSSLFramework
  - SignalServiceKit (0.9.0):
    - AFNetworking
    - AxolotlKit
@ -59,6 +65,7 @@ PODS:
    - PromiseKit (~> 4.0)
    - Reachability
    - SAMKeychain
+    - SignalCoreKit
    - SocketRocket
    - SwiftProtobuf
    - YapDatabase/SQLCipher
@ -73,6 +80,7 @@ PODS:
    - PromiseKit (~> 4.0)
    - Reachability
    - SAMKeychain
+    - SignalCoreKit
    - SocketRocket
    - SwiftProtobuf
    - YapDatabase/SQLCipher
@ -159,6 +167,8 @@ DEPENDENCIES:
  - Mantle
  - PureLayout
  - Reachability
+  - SignalCoreKit (from `https://github.com/signalapp/SignalCoreKit-Private.git`, branch `charlesmchen/sck3`)
+  - SignalCoreKit/Tests (from `https://github.com/signalapp/SignalCoreKit-Private.git`, branch `charlesmchen/sck3`)
  - SignalServiceKit (from `.`)
  - SignalServiceKit/Tests (from `.`)
  - SocketRocket (from `https://github.com/signalapp/SocketRocket.git`, branch `mkirk/handle-sec-err`)
@ -191,6 +201,9 @@ EXTERNAL SOURCES:
    :git: https://github.com/signalapp/GRKOpenSSLFramework
  HKDFKit:
    :git: https://github.com/signalapp/HKDFKit.git
+  SignalCoreKit:
+    :branch: charlesmchen/sck3
+    :git: https://github.com/signalapp/SignalCoreKit-Private.git
  SignalServiceKit:
    :path: "."
  SocketRocket:
@ -216,6 +229,9 @@ CHECKOUT OPTIONS:
  HKDFKit:
    :commit: f6e051a765e0bc819fee72f9b7d18acee33a8b37
    :git: https://github.com/signalapp/HKDFKit.git
+  SignalCoreKit:
+    :commit: 78ef62a0ed97146794d22236ca668cb5c7107372
+    :git: https://github.com/signalapp/SignalCoreKit-Private.git
  SocketRocket:
    :commit: 9f9563a83cd8960503074aa8de72206f83fb7a69
    :git: https://github.com/signalapp/SocketRocket.git
@ -239,7 +255,8 @@ SPEC CHECKSUMS:
  PureLayout: 4d550abe49a94f24c2808b9b95db9131685fe4cd
  Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
  SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
-  SignalServiceKit: 89940928e278a1b43c40678e651eb547ab4b56d8
+  SignalCoreKit: c2d8132cdedb95d35eb2f8ae7eac0957695d0a8b
+  SignalServiceKit: 5774a5aca3116653a1d94716bccfc9fc013abf2d
  SocketRocket: dbb1554b8fc288ef8ef370d6285aeca7361be31e
  SQLCipher: f9fcf29b2e59ced7defc2a2bdd0ebe79b40d4990
  SSZipArchive: 51a800ebb77f95a8329b6ced1faaff394b47f509
@ -247,6 +264,6 @@ SPEC CHECKSUMS:
  YapDatabase: b418a4baa6906e8028748938f9159807fd039af4
  YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54

-PODFILE CHECKSUM: 99cf978c46911aa96f569649e7113245f4ed30b7
+PODFILE CHECKSUM: c2fee616779937ffcb46434198feeefa34d9dcf7

 COCOAPODS: 1.5.3
--- a/Signal.xcodeproj/project.pbxproj
+++ b/Signal.xcodeproj/project.pbxproj
@ -3005,6 +3005,7 @@
 				"${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework",
 				"${BUILT_PRODUCTS_DIR}/SQLCipher/SQLCipher.framework",
 				"${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework",
+				"${BUILT_PRODUCTS_DIR}/SignalCoreKit/SignalCoreKit.framework",
 				"${BUILT_PRODUCTS_DIR}/SignalServiceKit/SignalServiceKit.framework",
 				"${BUILT_PRODUCTS_DIR}/SocketRocket/SocketRocket.framework",
 				"${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework",
@ -3027,6 +3028,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SAMKeychain.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SQLCipher.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalCoreKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalServiceKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SocketRocket.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework",
@ -3076,6 +3078,7 @@
 				"${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework",
 				"${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework",
 				"${BUILT_PRODUCTS_DIR}/SQLCipher/SQLCipher.framework",
+				"${BUILT_PRODUCTS_DIR}/SignalCoreKit/SignalCoreKit.framework",
 				"${BUILT_PRODUCTS_DIR}/SignalServiceKit/SignalServiceKit.framework",
 				"${BUILT_PRODUCTS_DIR}/SocketRocket/SocketRocket.framework",
 				"${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework",
@ -3097,6 +3100,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SAMKeychain.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SQLCipher.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalCoreKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalServiceKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SocketRocket.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework",
--- a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
+++ b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
@ -28,7 +28,7 @@
            buildForAnalyzing = "YES">
            <BuildableReference
               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "237277EA071A0C42090E0E10F34EFC45"
+               BlueprintIdentifier = "7E600885B4032E4F1E5B30F12DDFFD6A"
               BuildableName = "SignalServiceKit.framework"
               BlueprintName = "SignalServiceKit"
               ReferencedContainer = "container:Pods/Pods.xcodeproj">
@ -56,12 +56,22 @@
            skipped = "NO">
            <BuildableReference
               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "11B0EF2E18D829262A7DF015BEBB0909"
+               BlueprintIdentifier = "12F92260A64B367895EEBA8F7CB85E66"
               BuildableName = "SignalServiceKit-Unit-Tests.xctest"
               BlueprintName = "SignalServiceKit-Unit-Tests"
               ReferencedContainer = "container:Pods/Pods.xcodeproj">
            </BuildableReference>
         </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D108D02C75692C2BEA632FE27EF0BB61"
+               BuildableName = "SignalCoreKit-Unit-Tests.xctest"
+               BlueprintName = "SignalCoreKit-Unit-Tests"
+               ReferencedContainer = "container:Pods/Pods.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
      </Testables>
      <MacroExpansion>
         <BuildableReference
--- a/Signal/Signal-Prefix.pch
+++ b/Signal/Signal-Prefix.pch
@ -15,7 +15,8 @@
    static const NSUInteger ddLogLevel = DDLogLevelInfo;
    #endif

-    #import <SignalServiceKit/OWSAsserts.h>
+    #import <SignalCoreKit/NSObject+OWS.h>
+    #import <SignalCoreKit/OWSAsserts.h>
+    #import <SignalServiceKit/SSKAsserts.h>
    #import <SignalServiceKit/OWSAnalytics.h>
-    #import <SignalServiceKit/NSObject+OWS.h>
 #endif
--- a/Signal/src/AppDelegate.m
+++ b/Signal/src/AppDelegate.m
@ -21,6 +21,7 @@
 #import "ViewControllerUtils.h"
 #import <AxolotlKit/SessionCipher.h>
 #import <PromiseKit/AnyPromise.h>
+#import <SignalCoreKit/iOSVersions.h>
 #import <SignalMessaging/AppSetup.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSContactsManager.h>
@ -48,7 +49,6 @@
 #import <SignalServiceKit/TSDatabaseView.h>
 #import <SignalServiceKit/TSPreKeyManager.h>
 #import <SignalServiceKit/TSSocketManager.h>
-#import <SignalServiceKit/iOSVersions.h>
 #import <YapDatabase/YapDatabaseCryptoUtils.h>
 #import <sys/sysctl.h>

--- a/Signal/src/Models/OWSDeviceProvisioningURLParser.m
+++ b/Signal/src/Models/OWSDeviceProvisioningURLParser.m
@ -3,8 +3,8 @@
 //

 #import "OWSDeviceProvisioningURLParser.h"
-#import "NSData+OWS.h"
 #import <AxolotlKit/NSData+keyVersionByte.h>
+#import <SignalCoreKit/NSData+OWS.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/Signal/src/Signal-Bridging-Header.h
+++ b/Signal/src/Signal-Bridging-Header.h
@ -48,6 +48,12 @@
 #import <AxolotlKit/NSData+keyVersionByte.h>
 #import <PureLayout/PureLayout.h>
 #import <Reachability/Reachability.h>
+#import <SignalCoreKit/NSData+OWS.h>
+#import <SignalCoreKit/NSDate+OWS.h>
+#import <SignalCoreKit/NSString+SSK.h>
+#import <SignalCoreKit/OWSAsserts.h>
+#import <SignalCoreKit/OWSLogger.h>
+#import <SignalCoreKit/Threading.h>
 #import <SignalMessaging/AttachmentSharing.h>
 #import <SignalMessaging/ContactTableViewCell.h>
 #import <SignalMessaging/Environment.h>
@ -74,14 +80,10 @@
 #import <SignalServiceKit/DataSource.h>
 #import <SignalServiceKit/MIMETypeUtil.h>
 #import <SignalServiceKit/NSData+Image.h>
-#import <SignalServiceKit/NSData+OWS.h>
-#import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/NSNotificationCenter+OWS.h>
-#import <SignalServiceKit/NSString+SSK.h>
 #import <SignalServiceKit/NSTimer+OWS.h>
 #import <SignalServiceKit/OWSAnalytics.h>
 #import <SignalServiceKit/OWSAnalyticsEvents.h>
-#import <SignalServiceKit/OWSAsserts.h>
 #import <SignalServiceKit/OWSAttachmentsProcessor.h>
 #import <SignalServiceKit/OWSBackgroundTask.h>
 #import <SignalServiceKit/OWSCallMessageHandler.h>
@ -91,7 +93,6 @@
 #import <SignalServiceKit/OWSError.h>
 #import <SignalServiceKit/OWSFileSystem.h>
 #import <SignalServiceKit/OWSIdentityManager.h>
-#import <SignalServiceKit/OWSLogger.h>
 #import <SignalServiceKit/OWSMediaGalleryFinder.h>
 #import <SignalServiceKit/OWSMessageManager.h>
 #import <SignalServiceKit/OWSMessageReceiver.h>
@ -122,7 +123,6 @@
 #import <SignalServiceKit/TSPreKeyManager.h>
 #import <SignalServiceKit/TSSocketManager.h>
 #import <SignalServiceKit/TSThread.h>
-#import <SignalServiceKit/Threading.h>
 #import <SignalServiceKit/UIImage+OWS.h>
 #import <WebRTC/RTCAudioSession.h>
 #import <WebRTC/RTCCameraPreviewView.h>
--- a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m
+++ b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m
@ -6,10 +6,10 @@
 #import "BlockListViewController.h"
 #import "OWS2FASettingsViewController.h"
 #import "Signal-Swift.h"
+#import <SignalCoreKit/NSString+SSK.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSPreferences.h>
 #import <SignalMessaging/ThreadUtil.h>
-#import <SignalServiceKit/NSString+SSK.h>
 #import <SignalServiceKit/OWS2FAManager.h>
 #import <SignalServiceKit/OWSReadReceiptManager.h>

--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageTimerView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageTimerView.m
@ -4,11 +4,11 @@

 #import "OWSMessageTimerView.h"
 #import "ConversationViewController.h"
-#import "NSDate+OWS.h"
 #import "OWSMath.h"
 #import "UIColor+OWS.h"
 #import "UIView+OWS.h"
 #import <QuartzCore/QuartzCore.h>
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalServiceKit/NSTimer+OWS.h>

 NS_ASSUME_NONNULL_BEGIN
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@ -46,6 +46,8 @@
 #import <ContactsUI/CNContactViewController.h>
 #import <MobileCoreServices/UTCoreTypes.h>
 #import <PromiseKit/AnyPromise.h>
+#import <SignalCoreKit/NSDate+OWS.h>
+#import <SignalCoreKit/Threading.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/NSString+OWS.h>
 #import <SignalMessaging/OWSContactOffersInteraction.h>
@ -61,7 +63,6 @@
 #import <SignalServiceKit/Contact.h>
 #import <SignalServiceKit/ContactsUpdater.h>
 #import <SignalServiceKit/MimeTypeUtil.h>
-#import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/NSTimer+OWS.h>
 #import <SignalServiceKit/OWSAddToContactsOfferMessage.h>
 #import <SignalServiceKit/OWSAddToProfileWhitelistOfferMessage.h>
@ -80,7 +81,6 @@
 #import <SignalServiceKit/TSInvalidIdentityKeyReceivingErrorMessage.h>
 #import <SignalServiceKit/TSNetworkManager.h>
 #import <SignalServiceKit/TSQuotedMessage.h>
-#import <SignalServiceKit/Threading.h>
 #import <YapDatabase/YapDatabase.h>
 #import <YapDatabase/YapDatabaseAutoView.h>
 #import <YapDatabase/YapDatabaseViewChange.h>
--- a/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m
@ -6,7 +6,7 @@
 #import "OWSOrphanDataCleaner.h"
 #import "OWSTableViewController.h"
 #import "Signal-Swift.h"
-#import <SignalServiceKit/NSDate+OWS.h>
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalServiceKit/OWSPrimaryStorage.h>
 #import <SignalServiceKit/TSDatabaseView.h>
 #import <SignalServiceKit/TSInteraction.h>
--- a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
@ -9,9 +9,9 @@
 #import "OWSTableViewController.h"
 #import "Signal-Swift.h"
 #import <Curve25519Kit/Randomness.h>
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalServiceKit/MIMETypeUtil.h>
-#import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/OWSBatchMessageProcessor.h>
 #import <SignalServiceKit/OWSDisappearingConfigurationUpdateInfoMessage.h>
 #import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
--- a/Signal/src/ViewControllers/DebugUI/DebugUIStress.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIStress.m
@ -8,9 +8,9 @@
 #import "SignalApp.h"
 #import "ThreadUtil.h"
 #import <Curve25519Kit/Randomness.h>
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalServiceKit/Cryptography.h>
-#import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/OWSDynamicOutgoingMessage.h>
 #import <SignalServiceKit/OWSPrimaryStorage.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
--- a/Signal/src/ViewControllers/HomeView/HomeViewController.m
+++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m
@ -19,16 +19,16 @@
 #import "TSGroupThread.h"
 #import "ViewControllerUtils.h"
 #import <PromiseKit/AnyPromise.h>
+#import <SignalCoreKit/NSDate+OWS.h>
+#import <SignalCoreKit/Threading.h>
 #import <SignalMessaging/OWSContactsManager.h>
 #import <SignalMessaging/OWSFormat.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalMessaging/UIUtil.h>
-#import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/OWSMessageSender.h>
 #import <SignalServiceKit/OWSMessageUtils.h>
 #import <SignalServiceKit/TSAccountManager.h>
 #import <SignalServiceKit/TSOutgoingMessage.h>
-#import <SignalServiceKit/Threading.h>
 #import <StoreKit/StoreKit.h>
 #import <YapDatabase/YapDatabase.h>
 #import <YapDatabase/YapDatabaseViewChange.h>
--- a/Signal/src/ViewControllers/NewGroupViewController.m
+++ b/Signal/src/ViewControllers/NewGroupViewController.m
@ -9,6 +9,7 @@
 #import "Signal-Swift.h"
 #import "SignalApp.h"
 #import <Curve25519Kit/Randomness.h>
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalMessaging/BlockListUIUtils.h>
 #import <SignalMessaging/ContactTableViewCell.h>
 #import <SignalMessaging/ContactsViewHelper.h>
@ -20,7 +21,6 @@
 #import <SignalMessaging/UIUtil.h>
 #import <SignalMessaging/UIView+OWS.h>
 #import <SignalMessaging/UIViewController+OWS.h>
-#import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/OWSMessageSender.h>
 #import <SignalServiceKit/SignalAccount.h>
 #import <SignalServiceKit/TSGroupModel.h>
--- a/Signal/src/ViewControllers/ProfileViewController.m
+++ b/Signal/src/ViewControllers/ProfileViewController.m
@ -12,11 +12,11 @@
 #import "UIColor+OWS.h"
 #import "UIFont+OWS.h"
 #import "UIView+OWS.h"
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalMessaging/NSString+OWS.h>
 #import <SignalMessaging/OWSNavigationController.h>
 #import <SignalMessaging/OWSProfileManager.h>
 #import <SignalMessaging/UIViewController+OWS.h>
-#import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/OWSPrimaryStorage.h>

 NS_ASSUME_NONNULL_BEGIN
--- a/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m
+++ b/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m
@ -9,10 +9,10 @@
 #import "UIColor+OWS.h"
 #import "UIFont+OWS.h"
 #import "UIView+OWS.h"
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSContactsManager.h>
 #import <SignalMessaging/UIUtil.h>
-#import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/OWSError.h>
 #import <SignalServiceKit/OWSFingerprint.h>
 #import <SignalServiceKit/OWSFingerprintBuilder.h>
--- a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
+++ b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
@ -16,6 +16,7 @@
 #import "UIView+OWS.h"
 #import "UpdateGroupViewController.h"
 #import <Curve25519Kit/Curve25519.h>
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSAvatarBuilder.h>
 #import <SignalMessaging/OWSContactsManager.h>
@ -24,7 +25,6 @@
 #import <SignalMessaging/OWSUserProfile.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalMessaging/UIUtil.h>
-#import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/OWSDisappearingConfigurationUpdateInfoMessage.h>
 #import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
 #import <SignalServiceKit/OWSMessageSender.h>
--- a/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m
+++ b/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m
@ -8,6 +8,7 @@
 #import "OWSNavigationController.h"
 #import "Signal-Swift.h"
 #import "ViewControllerUtils.h"
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalMessaging/BlockListUIUtils.h>
 #import <SignalMessaging/ContactTableViewCell.h>
 #import <SignalMessaging/ContactsViewHelper.h>
@ -19,7 +20,6 @@
 #import <SignalMessaging/UIUtil.h>
 #import <SignalMessaging/UIView+OWS.h>
 #import <SignalMessaging/UIViewController+OWS.h>
-#import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/OWSMessageSender.h>
 #import <SignalServiceKit/SignalAccount.h>
 #import <SignalServiceKit/TSGroupModel.h>
--- a/Signal/src/environment/NotificationsManager.m
+++ b/Signal/src/environment/NotificationsManager.m
@ -6,18 +6,18 @@
 #import "PushManager.h"
 #import "Signal-Swift.h"
 #import <AudioToolbox/AudioServices.h>
+#import <SignalCoreKit/NSString+SSK.h>
+#import <SignalCoreKit/Threading.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/NSString+OWS.h>
 #import <SignalMessaging/OWSContactsManager.h>
 #import <SignalMessaging/OWSPreferences.h>
 #import <SignalMessaging/OWSSounds.h>
-#import <SignalServiceKit/NSString+SSK.h>
 #import <SignalServiceKit/SSKEnvironment.h>
 #import <SignalServiceKit/TSCall.h>
 #import <SignalServiceKit/TSContactThread.h>
 #import <SignalServiceKit/TSErrorMessage.h>
 #import <SignalServiceKit/TSIncomingMessage.h>
-#import <SignalServiceKit/Threading.h>
 #import <YapDatabase/YapDatabaseTransaction.h>

@interface NotificationsManager ()
--- a/Signal/src/environment/SignalApp.m
+++ b/Signal/src/environment/SignalApp.m
@ -6,12 +6,12 @@
 #import "ConversationViewController.h"
 #import "HomeViewController.h"
 #import "Signal-Swift.h"
+#import <SignalCoreKit/Threading.h>
 #import <SignalMessaging/DebugLogger.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalServiceKit/OWSPrimaryStorage.h>
 #import <SignalServiceKit/TSContactThread.h>
 #import <SignalServiceKit/TSGroupThread.h>
-#import <SignalServiceKit/Threading.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/Signal/src/network/PushManager.m
+++ b/Signal/src/network/PushManager.m
@ -8,10 +8,10 @@
 #import "Signal-Swift.h"
 #import "SignalApp.h"
 #import "ThreadUtil.h"
+#import <SignalCoreKit/NSDate+OWS.h>
+#import <SignalCoreKit/NSString+SSK.h>
 #import <SignalMessaging/OWSContactsManager.h>
 #import <SignalServiceKit/AppReadiness.h>
-#import <SignalServiceKit/NSDate+OWS.h>
-#import <SignalServiceKit/NSString+SSK.h>
 #import <SignalServiceKit/OWSDevice.h>
 #import <SignalServiceKit/OWSMessageSender.h>
 #import <SignalServiceKit/OWSReadReceiptManager.h>
--- a/Signal/src/util/DateUtil.m
+++ b/Signal/src/util/DateUtil.m
@ -3,9 +3,9 @@
 //

 #import "DateUtil.h"
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalMessaging/NSString+OWS.h>
 #import <SignalMessaging/OWSFormat.h>
-#import <SignalServiceKit/NSDate+OWS.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/Signal/src/util/MainAppContext.m
+++ b/Signal/src/util/MainAppContext.m
@ -4,11 +4,11 @@

 #import "MainAppContext.h"
 #import "Signal-Swift.h"
+#import <SignalCoreKit/Threading.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSProfileManager.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/OWSIdentityManager.h>
-#import <SignalServiceKit/Threading.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/Signal/src/util/OWSBackupExportJob.m
+++ b/Signal/src/util/OWSBackupExportJob.m
@ -6,8 +6,9 @@
 #import "OWSBackupIO.h"
 #import "OWSDatabaseMigration.h"
 #import "Signal-Swift.h"
-#import <SignalServiceKit/NSData+OWS.h>
-#import <SignalServiceKit/NSDate+OWS.h>
+#import <SignalCoreKit/NSData+OWS.h>
+#import <SignalCoreKit/NSDate+OWS.h>
+#import <SignalCoreKit/Threading.h>
 #import <SignalServiceKit/OWSBackgroundTask.h>
 #import <SignalServiceKit/OWSError.h>
 #import <SignalServiceKit/OWSFileSystem.h>
@ -15,7 +16,6 @@
 #import <SignalServiceKit/TSAttachmentStream.h>
 #import <SignalServiceKit/TSMessage.h>
 #import <SignalServiceKit/TSThread.h>
-#import <SignalServiceKit/Threading.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/Signal/src/util/OWSBackupImportJob.m
+++ b/Signal/src/util/OWSBackupImportJob.m
@ -7,7 +7,7 @@
 #import "OWSDatabaseMigration.h"
 #import "OWSDatabaseMigrationRunner.h"
 #import "Signal-Swift.h"
-#import <SignalServiceKit/NSData+OWS.h>
+#import <SignalCoreKit/NSData+OWS.h>
 #import <SignalServiceKit/OWSBackgroundTask.h>
 #import <SignalServiceKit/OWSFileSystem.h>
 #import <SignalServiceKit/TSAttachment.h>
--- a/Signal/src/util/OWSOrphanDataCleaner.m
+++ b/Signal/src/util/OWSOrphanDataCleaner.m
@ -4,11 +4,11 @@

 #import "OWSOrphanDataCleaner.h"
 #import "DateUtil.h"
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalMessaging/OWSProfileManager.h>
 #import <SignalMessaging/OWSUserProfile.h>
 #import <SignalServiceKit/AppReadiness.h>
 #import <SignalServiceKit/AppVersion.h>
-#import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/OWSContact.h>
 #import <SignalServiceKit/OWSFileSystem.h>
 #import <SignalServiceKit/OWSPrimaryStorage.h>
--- a/Signal/src/util/Pastelog.m
+++ b/Signal/src/util/Pastelog.m
@ -8,6 +8,7 @@
 #import "zlib.h"
 #import <AFNetworking/AFNetworking.h>
 #import <SSZipArchive/SSZipArchive.h>
+#import <SignalCoreKit/Threading.h>
 #import <SignalMessaging/AttachmentSharing.h>
 #import <SignalMessaging/DebugLogger.h>
 #import <SignalMessaging/Environment.h>
@ -16,7 +17,6 @@
 #import <SignalServiceKit/OWSPrimaryStorage.h>
 #import <SignalServiceKit/TSAccountManager.h>
 #import <SignalServiceKit/TSContactThread.h>
-#import <SignalServiceKit/Threading.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/Signal/src/util/UIViewController+Permissions.m
+++ b/Signal/src/util/UIViewController+Permissions.m
@ -6,8 +6,8 @@
 #import "Signal-Swift.h"
 #import <AVFoundation/AVFoundation.h>
 #import <Photos/Photos.h>
+#import <SignalCoreKit/Threading.h>
 #import <SignalMessaging/UIUtil.h>
-#import <SignalServiceKit/Threading.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/Signal/src/views/RemoteVideoView.m
+++ b/Signal/src/views/RemoteVideoView.m
@ -7,7 +7,7 @@
 #import "UIView+OWS.h"
 #import <MetalKit/MetalKit.h>
 #import <PureLayout/PureLayout.h>
-#import <SignalServiceKit/Threading.h>
+#import <SignalCoreKit/Threading.h>
 #import <WebRTC/RTCEAGLVideoView.h>
 #import <WebRTC/RTCMTLVideoView.h>
 #import <WebRTC/RTCVideoRenderer.h>
--- a/Signal/test/Models/OWSDeviceProvisioningURLParserTest.m
+++ b/Signal/test/Models/OWSDeviceProvisioningURLParserTest.m
@ -4,7 +4,7 @@

 #import "OWSDeviceProvisioningURLParser.h"
 #import "SignalBaseTest.h"
-#import <SignalServiceKit/NSData+OWS.h>
+#import <SignalCoreKit/NSData+OWS.h>

@interface OWSDeviceProvisioningURLParserTest : SignalBaseTest

--- a/Signal/test/util/CDSSigningCertificateTest.m
+++ b/Signal/test/util/CDSSigningCertificateTest.m
@ -3,8 +3,8 @@
 //

 #import "SignalBaseTest.h"
+#import <SignalCoreKit/NSData+OWS.h>
 #import <SignalServiceKit/CDSSigningCertificate.h>
-#import <SignalServiceKit/NSData+OWS.h>

@interface CDSSigningCertificateTest : SignalBaseTest

--- a/Signal/test/util/OWSDatabaseConverterTest.m
+++ b/Signal/test/util/OWSDatabaseConverterTest.m
@ -4,7 +4,7 @@

 #import "OWSDatabaseConverterTest.h"
 #import <Curve25519Kit/Randomness.h>
-#import <SignalServiceKit/NSData+OWS.h>
+#import <SignalCoreKit/NSData+OWS.h>
 #import <SignalServiceKit/OWSFileSystem.h>
 #import <SignalServiceKit/OWSStorage.h>
 #import <SignalServiceKit/YapDatabaseConnection+OWS.h>
--- a/Signal/test/util/ProtoParsingTest.m
+++ b/Signal/test/util/ProtoParsingTest.m
@ -4,8 +4,8 @@

 #import "SignalBaseTest.h"
 #import <Curve25519Kit/Randomness.h>
+#import <SignalCoreKit/NSData+OWS.h>
 #import <SignalServiceKit/ContactsManagerProtocol.h>
-#import <SignalServiceKit/NSData+OWS.h>
 #import <SignalServiceKit/OWSContactsOutputStream.h>
 #import <SignalServiceKit/OWSGroupsOutputStream.h>
 #import <SignalServiceKit/SignalAccount.h>
--- a/Signal/test/util/UtilTest.m
+++ b/Signal/test/util/UtilTest.m
@ -5,10 +5,10 @@
 #import "UtilTest.h"
 #import "DateUtil.h"
 #import "TestUtil.h"
+#import <SignalCoreKit/NSDate+OWS.h>
+#import <SignalCoreKit/NSObject+OWS.h>
+#import <SignalCoreKit/NSString+SSK.h>
 #import <SignalMessaging/NSString+OWS.h>
-#import <SignalServiceKit/NSDate+OWS.h>
-#import <SignalServiceKit/NSObject+OWS.h>
-#import <SignalServiceKit/NSString+SSK.h>

@interface DateUtil (Test)

--- a/SignalMessaging/SignalMessaging-Prefix.pch
+++ b/SignalMessaging/SignalMessaging-Prefix.pch
@ -15,7 +15,8 @@
    static const NSUInteger ddLogLevel = DDLogLevelInfo;
    #endif

-    #import <SignalServiceKit/OWSAsserts.h>
+    #import <SignalCoreKit/OWSAsserts.h>
+    #import <SignalCoreKit/NSObject+OWS.h>
    #import <SignalServiceKit/OWSAnalytics.h>
-    #import <SignalServiceKit/NSObject+OWS.h>
+    #import <SignalServiceKit/SSKAsserts.h>
 #endif
--- a/SignalMessaging/ViewControllers/SelectThreadViewController.m
+++ b/SignalMessaging/ViewControllers/SelectThreadViewController.m
@ -7,7 +7,6 @@
 #import "ContactTableViewCell.h"
 #import "ContactsViewHelper.h"
 #import "Environment.h"
-#import "NSString+OWS.h"
 #import "NewNonContactConversationViewController.h"
 #import "OWSContactsManager.h"
 #import "OWSSearchBar.h"
@ -16,6 +15,7 @@
 #import "UIColor+OWS.h"
 #import "UIFont+OWS.h"
 #import "UIView+OWS.h"
+#import <SignalCoreKit/NSString+SSK.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/PhoneNumber.h>
 #import <SignalServiceKit/SignalAccount.h>
--- a/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m
+++ b/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m
@ -4,12 +4,12 @@

 #import "SharingThreadPickerViewController.h"
 #import "Environment.h"
-#import "NSString+OWS.h"
 #import "SignalApp.h"
 #import "ThreadUtil.h"
 #import "UIColor+OWS.h"
 #import "UIFont+OWS.h"
 #import "UIView+OWS.h"
+#import <SignalCoreKit/NSString+SSK.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/OWSError.h>
 #import <SignalServiceKit/OWSMessageSender.h>
--- a/SignalMessaging/Views/ContactsViewHelper.m
+++ b/SignalMessaging/Views/ContactsViewHelper.m
@ -4,8 +4,8 @@

 #import "ContactsViewHelper.h"
 #import "Environment.h"
-#import "NSString+OWS.h"
 #import "UIUtil.h"
+#import <SignalCoreKit/NSString+SSK.h>
 #import <SignalMessaging/OWSProfileManager.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/AppContext.h>
--- a/SignalMessaging/attachments/AttachmentSharing.m
+++ b/SignalMessaging/attachments/AttachmentSharing.m
@ -4,9 +4,9 @@

 #import "AttachmentSharing.h"
 #import "UIUtil.h"
+#import <SignalCoreKit/Threading.h>
 #import <SignalServiceKit/AppContext.h>
 #import <SignalServiceKit/TSAttachmentStream.h>
-#import <SignalServiceKit/Threading.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/SignalMessaging/categories/NSString+OWS.h
+++ b/SignalMessaging/categories/NSString+OWS.h
@ -2,7 +2,7 @@
 //  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //

-#import <SignalServiceKit/NSString+SSK.h>
+#import <SignalCoreKit/NSString+SSK.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/SignalMessaging/categories/UIView+OWS.m
+++ b/SignalMessaging/categories/UIView+OWS.m
@ -4,8 +4,8 @@

 #import "UIView+OWS.h"
 #import "OWSMath.h"
+#import <SignalCoreKit/iOSVersions.h>
 #import <SignalServiceKit/AppContext.h>
-#import <SignalServiceKit/iOSVersions.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/SignalMessaging/categories/UIViewController+OWS.m
+++ b/SignalMessaging/categories/UIViewController+OWS.m
@ -6,8 +6,8 @@
 #import "UIColor+OWS.h"
 #import "UIView+OWS.h"
 #import "UIViewController+OWS.h"
+#import <SignalCoreKit/iOSVersions.h>
 #import <SignalServiceKit/AppContext.h>
-#import <SignalServiceKit/iOSVersions.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/SignalMessaging/contacts/OWSContactsManager.m
+++ b/SignalMessaging/contacts/OWSContactsManager.m
@ -9,17 +9,18 @@
 #import "OWSProfileManager.h"
 #import "OWSUserProfile.h"
 #import "ViewControllerUtils.h"
+#import <SignalCoreKit/NSDate+OWS.h>
+#import <SignalCoreKit/NSString+SSK.h>
+#import <SignalCoreKit/iOSVersions.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalMessaging/UIColor+OWS.h>
 #import <SignalMessaging/UIFont+OWS.h>
 #import <SignalServiceKit/ContactsUpdater.h>
 #import <SignalServiceKit/NSNotificationCenter+OWS.h>
-#import <SignalServiceKit/NSString+SSK.h>
 #import <SignalServiceKit/OWSError.h>
 #import <SignalServiceKit/OWSPrimaryStorage.h>
 #import <SignalServiceKit/PhoneNumber.h>
 #import <SignalServiceKit/SignalAccount.h>
-#import <SignalServiceKit/iOSVersions.h>

@import Contacts;

--- a/SignalMessaging/profiles/OWSProfileManager.m
+++ b/SignalMessaging/profiles/OWSProfileManager.m
@ -4,15 +4,15 @@

 #import "OWSProfileManager.h"
 #import "Environment.h"
-#import "NSString+OWS.h"
 #import "OWSUserProfile.h"
+#import <SignalCoreKit/NSData+OWS.h>
+#import <SignalCoreKit/NSDate+OWS.h>
+#import <SignalCoreKit/NSString+SSK.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/AppContext.h>
 #import <SignalServiceKit/Cryptography.h>
 #import <SignalServiceKit/MIMETypeUtil.h>
 #import <SignalServiceKit/NSData+Image.h>
-#import <SignalServiceKit/NSData+OWS.h>
-#import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/NSNotificationCenter+OWS.h>
 #import <SignalServiceKit/OWSFileSystem.h>
 #import <SignalServiceKit/OWSMessageSender.h>
--- a/SignalMessaging/profiles/OWSUserProfile.m
+++ b/SignalMessaging/profiles/OWSUserProfile.m
@ -3,10 +3,10 @@
 //

 #import "OWSUserProfile.h"
-#import "NSString+OWS.h"
+#import <SignalCoreKit/NSData+OWS.h>
+#import <SignalCoreKit/NSString+SSK.h>
 #import <SignalServiceKit/AppContext.h>
 #import <SignalServiceKit/Cryptography.h>
-#import <SignalServiceKit/NSData+OWS.h>
 #import <SignalServiceKit/NSNotificationCenter+OWS.h>
 #import <SignalServiceKit/OWSFileSystem.h>
 #import <SignalServiceKit/OWSPrimaryStorage.h>
--- a/SignalMessaging/utils/DebugLogger.m
+++ b/SignalMessaging/utils/DebugLogger.m
@ -4,8 +4,8 @@

 #import "DebugLogger.h"
 #import "OWSScrubbingLogFormatter.h"
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalServiceKit/AppContext.h>
-#import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/OWSFileSystem.h>

 #pragma mark Logging - Production logging wants us to write some logs to a file in case we need it for debugging.
--- a/SignalMessaging/utils/ThreadUtil.m
+++ b/SignalMessaging/utils/ThreadUtil.m
@ -8,9 +8,9 @@
 #import "OWSQuotedReplyModel.h"
 #import "OWSUnreadIndicator.h"
 #import "TSUnreadIndicatorInteraction.h"
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalMessaging/OWSProfileManager.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
-#import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/OWSAddToContactsOfferMessage.h>
 #import <SignalServiceKit/OWSAddToProfileWhitelistOfferMessage.h>
 #import <SignalServiceKit/OWSBlockingManager.h>
--- a/SignalServiceKit.podspec
+++ b/SignalServiceKit.podspec
@ -50,6 +50,7 @@ An Objective-C library for communicating with the Signal messaging service.
  s.dependency 'SAMKeychain'
  s.dependency 'Reachability'
  s.dependency 'SwiftProtobuf'
+  s.dependency 'SignalCoreKit'

  # Avoid PromiseKit 5/6 for now.
  # From the maintainer:
--- a/SignalServiceKit/src/Account/TSAccountManager.m
+++ b/SignalServiceKit/src/Account/TSAccountManager.m
@ -4,7 +4,6 @@

 #import "TSAccountManager.h"
 #import "AppContext.h"
-#import "NSData+OWS.h"
 #import "NSNotificationCenter+OWS.h"
 #import "NSURLSessionDataTask+StatusCode.h"
 #import "OWSError.h"
@ -16,6 +15,7 @@
 #import "YapDatabaseConnection+OWS.h"
 #import "YapDatabaseTransaction+OWS.h"
 #import <Curve25519Kit/Randomness.h>
+#import <SignalCoreKit/NSData+OWS.h>
 #import <YapDatabase/YapDatabase.h>

 NS_ASSUME_NONNULL_BEGIN
--- a/SignalServiceKit/src/Account/TSPreKeyManager.m
+++ b/SignalServiceKit/src/Account/TSPreKeyManager.m
@ -4,12 +4,12 @@

 #import "TSPreKeyManager.h"
 #import "AppContext.h"
-#import "NSDate+OWS.h"
 #import "NSURLSessionDataTask+StatusCode.h"
 #import "OWSIdentityManager.h"
 #import "OWSPrimaryStorage+SignedPreKeyStore.h"
 #import "TSNetworkManager.h"
 #import "TSStorageHeaders.h"
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>

 // Time before deletion of signed prekeys (measured in seconds)
--- a/SignalServiceKit/src/Contacts/CDSSigningCertificate.m
+++ b/SignalServiceKit/src/Contacts/CDSSigningCertificate.m
@ -4,8 +4,8 @@

 #import "CDSSigningCertificate.h"
 #import "Cryptography.h"
-#import "NSData+OWS.h"
 #import <CommonCrypto/CommonCrypto.h>
+#import <SignalCoreKit/NSData+OWS.h>
 #import <openssl/x509.h>

 NS_ASSUME_NONNULL_BEGIN
--- a/SignalServiceKit/src/Contacts/Contact.m
+++ b/SignalServiceKit/src/Contacts/Contact.m
@ -4,12 +4,12 @@

 #import "Contact.h"
 #import "Cryptography.h"
-#import "NSString+SSK.h"
 #import "OWSPrimaryStorage.h"
 #import "PhoneNumber.h"
 #import "SSKEnvironment.h"
 #import "SignalRecipient.h"
 #import "TSAccountManager.h"
+#import <SignalCoreKit/NSString+SSK.h>

@import Contacts;

--- a/SignalServiceKit/src/Contacts/ContactDiscoveryService.m
+++ b/SignalServiceKit/src/Contacts/ContactDiscoveryService.m
@ -6,13 +6,13 @@
 #import "CDSQuote.h"
 #import "CDSSigningCertificate.h"
 #import "Cryptography.h"
-#import "NSData+OWS.h"
-#import "NSDate+OWS.h"
 #import "OWSError.h"
 #import "OWSRequestFactory.h"
 #import "TSNetworkManager.h"
 #import <Curve25519Kit/Curve25519.h>
 #import <HKDFKit/HKDFKit.h>
+#import <SignalCoreKit/NSData+OWS.h>
+#import <SignalCoreKit/NSDate+OWS.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/SignalServiceKit/src/Contacts/ContactsUpdater.m
+++ b/SignalServiceKit/src/Contacts/ContactsUpdater.m
@ -10,7 +10,7 @@
 #import "PhoneNumber.h"
 #import "SSKEnvironment.h"
 #import "TSNetworkManager.h"
-#import "Threading.h"
+#import <SignalCoreKit/Threading.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <YapDatabase/YapDatabase.h>

--- a/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.m
+++ b/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.m
@ -3,8 +3,8 @@
 //

 #import "OWSDisappearingMessagesConfiguration.h"
-#import "NSDate+OWS.h"
-#import "NSString+SSK.h"
+#import <SignalCoreKit/NSDate+OWS.h>
+#import <SignalCoreKit/NSString+SSK.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/SignalServiceKit/src/Contacts/SignalAccount.m
+++ b/SignalServiceKit/src/Contacts/SignalAccount.m
@ -4,9 +4,9 @@

 #import "SignalAccount.h"
 #import "Contact.h"
-#import "NSString+SSK.h"
 #import "OWSPrimaryStorage.h"
 #import "SignalRecipient.h"
+#import <SignalCoreKit/NSString+SSK.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/SignalServiceKit/src/Contacts/TSThread.m
+++ b/SignalServiceKit/src/Contacts/TSThread.m
@ -4,8 +4,6 @@

 #import "TSThread.h"
 #import "Cryptography.h"
-#import "NSDate+OWS.h"
-#import "NSString+SSK.h"
 #import "OWSDisappearingMessagesConfiguration.h"
 #import "OWSPrimaryStorage.h"
 #import "OWSReadTracking.h"
@ -15,6 +13,8 @@
 #import "TSInteraction.h"
 #import "TSInvalidIdentityKeyReceivingErrorMessage.h"
 #import "TSOutgoingMessage.h"
+#import <SignalCoreKit/NSDate+OWS.h>
+#import <SignalCoreKit/NSString+SSK.h>
 #import <YapDatabase/YapDatabase.h>

 NS_ASSUME_NONNULL_BEGIN
--- a/SignalServiceKit/src/Contacts/Threads/TSGroupThread.m
+++ b/SignalServiceKit/src/Contacts/Threads/TSGroupThread.m
@ -3,8 +3,8 @@
 //

 #import "TSGroupThread.h"
-#import "NSData+OWS.h"
 #import "TSAttachmentStream.h"
+#import <SignalCoreKit/NSData+OWS.h>
 #import <SignalServiceKit/TSAccountManager.h>
 #import <YapDatabase/YapDatabaseConnection.h>
 #import <YapDatabase/YapDatabaseTransaction.h>
--- a/SignalServiceKit/src/Devices/OWSChunkedOutputStream.m
+++ b/SignalServiceKit/src/Devices/OWSChunkedOutputStream.m
@ -3,7 +3,7 @@
 //

 #import "OWSChunkedOutputStream.h"
-#import "NSData+OWS.h"
+#import <SignalCoreKit/NSData+OWS.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/SignalServiceKit/src/Devices/OWSContactsOutputStream.m
+++ b/SignalServiceKit/src/Devices/OWSContactsOutputStream.m
@ -7,13 +7,13 @@
 #import "ContactsManagerProtocol.h"
 #import "Cryptography.h"
 #import "MIMETypeUtil.h"
-#import "NSData+OWS.h"
 #import "NSData+keyVersionByte.h"
 #import "OWSBlockingManager.h"
 #import "OWSDisappearingMessagesConfiguration.h"
 #import "OWSRecipientIdentity.h"
 #import "SignalAccount.h"
 #import "TSContactThread.h"
+#import <SignalCoreKit/NSData+OWS.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>

 NS_ASSUME_NONNULL_BEGIN
--- a/SignalServiceKit/src/Devices/OWSDevice.m
+++ b/SignalServiceKit/src/Devices/OWSDevice.m
@ -3,13 +3,13 @@
 //

 #import "OWSDevice.h"
-#import "NSDate+OWS.h"
 #import "OWSError.h"
 #import "OWSPrimaryStorage.h"
 #import "YapDatabaseConnection+OWS.h"
 #import "YapDatabaseConnection.h"
 #import "YapDatabaseTransaction.h"
 #import <Mantle/MTLValueTransformer.h>
+#import <SignalCoreKit/NSDate+OWS.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/SignalServiceKit/src/Devices/OWSReadReceiptsForSenderMessage.m
+++ b/SignalServiceKit/src/Devices/OWSReadReceiptsForSenderMessage.m
@ -3,8 +3,8 @@
 //

 #import "OWSReadReceiptsForSenderMessage.h"
-#import "NSDate+OWS.h"
 #import "SignalRecipient.h"
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>

 NS_ASSUME_NONNULL_BEGIN
--- a/SignalServiceKit/src/Messages/Attachments/TSAttachment.m
+++ b/SignalServiceKit/src/Messages/Attachments/TSAttachment.m
@ -4,8 +4,8 @@

 #import "TSAttachment.h"
 #import "MIMETypeUtil.h"
-#import "NSString+SSK.h"
-#import "iOSVersions.h"
+#import <SignalCoreKit/NSString+SSK.h>
+#import <SignalCoreKit/iOSVersions.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m
+++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m
@ -7,8 +7,8 @@
 #import "NSData+Image.h"
 #import "OWSFileSystem.h"
 #import "TSAttachmentPointer.h"
-#import "Threading.h"
 #import <AVFoundation/AVFoundation.h>
+#import <SignalCoreKit/Threading.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <YapDatabase/YapDatabase.h>

--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m
@ -4,8 +4,8 @@

 #import "OWSOutgoingSyncMessage.h"
 #import "Cryptography.h"
-#import "NSDate+OWS.h"
 #import "ProtoUtils.h"
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>

 NS_ASSUME_NONNULL_BEGIN
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.m
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.m
@ -5,7 +5,6 @@
 #import "OWSSyncContactsMessage.h"
 #import "Contact.h"
 #import "ContactsManagerProtocol.h"
-#import "NSDate+OWS.h"
 #import "OWSContactsOutputStream.h"
 #import "OWSIdentityManager.h"
 #import "ProfileManagerProtocol.h"
@ -14,6 +13,7 @@
 #import "TSAttachment.h"
 #import "TSAttachmentStream.h"
 #import "TSContactThread.h"
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>

 NS_ASSUME_NONNULL_BEGIN
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.m
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.m
@ -3,13 +3,13 @@
 //

 #import "OWSSyncGroupsMessage.h"
-#import "NSDate+OWS.h"
 #import "OWSGroupsOutputStream.h"
 #import "TSAttachment.h"
 #import "TSAttachmentStream.h"
 #import "TSContactThread.h"
 #import "TSGroupModel.h"
 #import "TSGroupThread.h"
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>

 NS_ASSUME_NONNULL_BEGIN
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsRequestMessage.m
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsRequestMessage.m
@ -3,7 +3,7 @@
 //

 #import "OWSSyncGroupsRequestMessage.h"
-#import "NSDate+OWS.h"
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>

 NS_ASSUME_NONNULL_BEGIN
--- a/SignalServiceKit/src/Messages/Interactions/OWSContact.m
+++ b/SignalServiceKit/src/Messages/Interactions/OWSContact.m
@ -5,12 +5,12 @@
 #import "OWSContact.h"
 #import "Contact.h"
 #import "MimeTypeUtil.h"
-#import "NSString+SSK.h"
 #import "OWSContact+Private.h"
 #import "PhoneNumber.h"
 #import "TSAttachment.h"
 #import "TSAttachmentPointer.h"
 #import "TSAttachmentStream.h"
+#import <SignalCoreKit/NSString+SSK.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <YapDatabase/YapDatabaseTransaction.h>

--- a/SignalServiceKit/src/Messages/Interactions/OWSDisappearingConfigurationUpdateInfoMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/OWSDisappearingConfigurationUpdateInfoMessage.m
@ -3,8 +3,8 @@
 //

 #import "OWSDisappearingConfigurationUpdateInfoMessage.h"
-#import "NSString+SSK.h"
 #import "OWSDisappearingMessagesConfiguration.h"
+#import <SignalCoreKit/NSString+SSK.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.m
@ -3,8 +3,8 @@
 //

 #import "OWSDisappearingMessagesConfigurationMessage.h"
-#import "NSDate+OWS.h"
 #import "OWSDisappearingMessagesConfiguration.h"
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>

 NS_ASSUME_NONNULL_BEGIN
--- a/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.m
@ -3,7 +3,7 @@
 //

 #import "OWSDynamicOutgoingMessage.h"
-#import "NSDate+OWS.h"
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>

 NS_ASSUME_NONNULL_BEGIN
--- a/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.m
@ -4,11 +4,11 @@

 #import "TSErrorMessage.h"
 #import "ContactsManagerProtocol.h"
-#import "NSDate+OWS.h"
 #import "OWSMessageManager.h"
 #import "SSKEnvironment.h"
 #import "TSContactThread.h"
 #import "TSErrorMessage_privateConstructor.h"
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <YapDatabase/YapDatabaseConnection.h>

--- a/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m
@ -3,7 +3,6 @@
 //

 #import "TSIncomingMessage.h"
-#import "NSDate+OWS.h"
 #import "NSNotificationCenter+OWS.h"
 #import "OWSDisappearingMessagesConfiguration.h"
 #import "OWSDisappearingMessagesJob.h"
@ -12,6 +11,7 @@
 #import "TSContactThread.h"
 #import "TSDatabaseSecondaryIndexes.h"
 #import "TSGroupThread.h"
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <YapDatabase/YapDatabaseConnection.h>

 NS_ASSUME_NONNULL_BEGIN
--- a/SignalServiceKit/src/Messages/Interactions/TSInfoMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSInfoMessage.m
@ -4,8 +4,8 @@

 #import "TSInfoMessage.h"
 #import "ContactsManagerProtocol.h"
-#import "NSDate+OWS.h"
 #import "SSKEnvironment.h"
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <YapDatabase/YapDatabaseConnection.h>

 NS_ASSUME_NONNULL_BEGIN
--- a/SignalServiceKit/src/Messages/Interactions/TSInteraction.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSInteraction.m
@ -3,10 +3,10 @@
 //

 #import "TSInteraction.h"
-#import "NSDate+OWS.h"
 #import "OWSPrimaryStorage+messageIDs.h"
 #import "TSDatabaseSecondaryIndexes.h"
 #import "TSThread.h"
+#import <SignalCoreKit/NSDate+OWS.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/SignalServiceKit/src/Messages/Interactions/TSMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSMessage.m
@ -5,14 +5,14 @@
 #import "TSMessage.h"
 #import "AppContext.h"
 #import "MIMETypeUtil.h"
-#import "NSDate+OWS.h"
-#import "NSString+SSK.h"
 #import "OWSContact.h"
 #import "OWSDisappearingMessagesConfiguration.h"
 #import "TSAttachment.h"
 #import "TSAttachmentStream.h"
 #import "TSQuotedMessage.h"
 #import "TSThread.h"
+#import <SignalCoreKit/NSDate+OWS.h>
+#import <SignalCoreKit/NSString+SSK.h>
 #import <YapDatabase/YapDatabase.h>
 #import <YapDatabase/YapDatabaseTransaction.h>

--- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
@ -3,8 +3,6 @@
 //

 #import "TSOutgoingMessage.h"
-#import "NSDate+OWS.h"
-#import "NSString+SSK.h"
 #import "OWSContact.h"
 #import "OWSMessageSender.h"
 #import "OWSOutgoingSyncMessage.h"
@ -17,6 +15,8 @@
 #import "TSContactThread.h"
 #import "TSGroupThread.h"
 #import "TSQuotedMessage.h"
+#import <SignalCoreKit/NSDate+OWS.h>
+#import <SignalCoreKit/NSString+SSK.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <YapDatabase/YapDatabase.h>
 #import <YapDatabase/YapDatabaseTransaction.h>
--- a/SignalServiceKit/src/Messages/OWSBatchMessageProcessor.m
+++ b/SignalServiceKit/src/Messages/OWSBatchMessageProcessor.m
@ -17,7 +17,7 @@
 #import "TSDatabaseView.h"
 #import "TSErrorMessage.h"
 #import "TSYapDatabaseObject.h"
-#import "Threading.h"
+#import <SignalCoreKit/Threading.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <YapDatabase/YapDatabaseAutoView.h>
 #import <YapDatabase/YapDatabaseConnection.h>
--- a/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m
+++ b/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m
@ -3,12 +3,12 @@
 //

 #import "OWSDisappearingMessagesFinder.h"
-#import "NSDate+OWS.h"
 #import "OWSPrimaryStorage.h"
 #import "TSIncomingMessage.h"
 #import "TSMessage.h"
 #import "TSOutgoingMessage.h"
 #import "TSThread.h"
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <YapDatabase/YapDatabase.h>
 #import <YapDatabase/YapDatabaseQuery.h>
 #import <YapDatabase/YapDatabaseSecondaryIndex.h>
--- a/SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.m
+++ b/SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.m
@ -6,7 +6,6 @@
 #import "AppContext.h"
 #import "AppReadiness.h"
 #import "ContactsManagerProtocol.h"
-#import "NSDate+OWS.h"
 #import "NSTimer+OWS.h"
 #import "OWSBackgroundTask.h"
 #import "OWSDisappearingConfigurationUpdateInfoMessage.h"
@ -16,6 +15,7 @@
 #import "TSIncomingMessage.h"
 #import "TSMessage.h"
 #import "TSThread.h"
+#import <SignalCoreKit/NSDate+OWS.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/SignalServiceKit/src/Messages/OWSIdentityManager.m
+++ b/SignalServiceKit/src/Messages/OWSIdentityManager.m
@ -5,7 +5,6 @@
 #import "OWSIdentityManager.h"
 #import "AppContext.h"
 #import "AppReadiness.h"
-#import "NSDate+OWS.h"
 #import "NSNotificationCenter+OWS.h"
 #import "NotificationsProtocol.h"
 #import "OWSError.h"
@ -26,6 +25,7 @@
 #import "YapDatabaseTransaction+OWS.h"
 #import <AxolotlKit/NSData+keyVersionByte.h>
 #import <Curve25519Kit/Curve25519.h>
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <YapDatabase/YapDatabase.h>

--- a/SignalServiceKit/src/Messages/OWSIncompleteCallsJob.m
+++ b/SignalServiceKit/src/Messages/OWSIncompleteCallsJob.m
@ -4,9 +4,9 @@

 #import "OWSIncompleteCallsJob.h"
 #import "AppContext.h"
-#import "NSDate+OWS.h"
 #import "OWSPrimaryStorage.h"
 #import "TSCall.h"
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <YapDatabase/YapDatabase.h>
 #import <YapDatabase/YapDatabaseQuery.h>
 #import <YapDatabase/YapDatabaseSecondaryIndex.h>
--- a/SignalServiceKit/src/Messages/OWSMessageManager.m
+++ b/SignalServiceKit/src/Messages/OWSMessageManager.m
@ -8,8 +8,6 @@
 #import "ContactsManagerProtocol.h"
 #import "Cryptography.h"
 #import "MimeTypeUtil.h"
-#import "NSDate+OWS.h"
-#import "NSString+SSK.h"
 #import "NotificationsProtocol.h"
 #import "OWSAttachmentsProcessor.h"
 #import "OWSBlockingManager.h"
@ -47,6 +45,8 @@
 #import "TSNetworkManager.h"
 #import "TSOutgoingMessage.h"
 #import "TSQuotedMessage.h"
+#import <SignalCoreKit/NSDate+OWS.h>
+#import <SignalCoreKit/NSString+SSK.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <YapDatabase/YapDatabase.h>

--- a/SignalServiceKit/src/Messages/OWSMessageReceiver.m
+++ b/SignalServiceKit/src/Messages/OWSMessageReceiver.m
@ -17,7 +17,7 @@
 #import "TSDatabaseView.h"
 #import "TSErrorMessage.h"
 #import "TSYapDatabaseObject.h"
-#import "Threading.h"
+#import <SignalCoreKit/Threading.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <YapDatabase/YapDatabaseAutoView.h>
 #import <YapDatabase/YapDatabaseConnection.h>
--- a/SignalServiceKit/src/Messages/OWSMessageSender.m
+++ b/SignalServiceKit/src/Messages/OWSMessageSender.m
@ -6,7 +6,6 @@
 #import "AppContext.h"
 #import "NSData+keyVersionByte.h"
 #import "NSData+messagePadding.h"
-#import "NSDate+OWS.h"
 #import "NSError+MessageSending.h"
 #import "OWSBackgroundTask.h"
 #import "OWSBlockingManager.h"
@ -42,13 +41,14 @@
 #import "TSQuotedMessage.h"
 #import "TSSocketManager.h"
 #import "TSThread.h"
-#import "Threading.h"
 #import <AxolotlKit/AxolotlExceptions.h>
 #import <AxolotlKit/CipherMessage.h>
 #import <AxolotlKit/PreKeyBundle.h>
 #import <AxolotlKit/SessionBuilder.h>
 #import <AxolotlKit/SessionCipher.h>
 #import <PromiseKit/AnyPromise.h>
+#import <SignalCoreKit/NSDate+OWS.h>
+#import <SignalCoreKit/Threading.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>

 NS_ASSUME_NONNULL_BEGIN
--- a/SignalServiceKit/src/Messages/OWSMessageServiceParams.m
+++ b/SignalServiceKit/src/Messages/OWSMessageServiceParams.m
@ -3,8 +3,8 @@
 //

 #import "OWSMessageServiceParams.h"
-#import "NSData+OWS.h"
 #import "TSConstants.h"
+#import <SignalCoreKit/NSData+OWS.h>

@implementation OWSMessageServiceParams

--- a/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.m
+++ b/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.m
@ -3,10 +3,10 @@
 //

 #import "OWSOutgoingCallMessage.h"
-#import "NSDate+OWS.h"
 #import "ProtoUtils.h"
 #import "SignalRecipient.h"
 #import "TSContactThread.h"
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>

 NS_ASSUME_NONNULL_BEGIN
--- a/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m
+++ b/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m
@ -4,9 +4,9 @@

 #import "OWSOutgoingNullMessage.h"
 #import "Cryptography.h"
-#import "NSDate+OWS.h"
 #import "OWSVerificationStateSyncMessage.h"
 #import "TSContactThread.h"
+#import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>

 NS_ASSUME_NONNULL_BEGIN
--- a/SignalServiceKit/src/Messages/OWSReadReceiptManager.m
+++ b/SignalServiceKit/src/Messages/OWSReadReceiptManager.m
@ -4,7 +4,6 @@

 #import "OWSReadReceiptManager.h"
 #import "AppReadiness.h"
-#import "NSDate+OWS.h"
 #import "NSNotificationCenter+OWS.h"
 #import "OWSLinkedDeviceReadReceipt.h"
 #import "OWSMessageSender.h"
@ -18,8 +17,9 @@
 #import "TSContactThread.h"
 #import "TSDatabaseView.h"
 #import "TSIncomingMessage.h"
-#import "Threading.h"
 #import "YapDatabaseConnection+OWS.h"
+#import <SignalCoreKit/NSDate+OWS.h>
+#import <SignalCoreKit/Threading.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <YapDatabase/YapDatabase.h>

--- a/SignalServiceKit/src/Messages/PreKeyBundle+jsonDict.m
+++ b/SignalServiceKit/src/Messages/PreKeyBundle+jsonDict.m
@ -2,8 +2,8 @@
 //  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //

-#import "NSData+OWS.h"
 #import "PreKeyBundle+jsonDict.h"
+#import <SignalCoreKit/NSData+OWS.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/SignalServiceKit/src/Messages/TSGroupModel.m
+++ b/SignalServiceKit/src/Messages/TSGroupModel.m
@ -4,7 +4,7 @@

 #import "TSGroupModel.h"
 #import "FunctionalUtil.h"
-#import "NSString+SSK.h"
+#import <SignalCoreKit/NSString+SSK.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/SignalServiceKit/src/Network/API/OWSRequestBuilder.m
+++ b/SignalServiceKit/src/Network/API/OWSRequestBuilder.m
@ -3,9 +3,9 @@
 //

 #import "OWSRequestBuilder.h"
-#import "NSData+OWS.h"
 #import "TSConstants.h"
 #import "TSRequest.h"
+#import <SignalCoreKit/NSData+OWS.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m
+++ b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m
@ -3,7 +3,6 @@
 //

 #import "OWSRequestFactory.h"
-#import "NSData+OWS.h"
 #import "OWS2FAManager.h"
 #import "OWSDevice.h"
 #import "TSAttributes.h"
@ -12,6 +11,7 @@
 #import <AxolotlKit/NSData+keyVersionByte.h>
 #import <AxolotlKit/SignedPreKeyRecord.h>
 #import <Curve25519Kit/Curve25519.h>
+#import <SignalCoreKit/NSData+OWS.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/SignalServiceKit/src/Network/API/TSNetworkManager.m
+++ b/SignalServiceKit/src/Network/API/TSNetworkManager.m
@ -4,7 +4,6 @@

 #import "TSNetworkManager.h"
 #import "AppContext.h"
-#import "NSData+OWS.h"
 #import "NSError+messageSending.h"
 #import "NSURLSessionDataTask+StatusCode.h"
 #import "OWSSignalService.h"
@ -12,6 +11,7 @@
 #import "TSAccountManager.h"
 #import "TSVerifyCodeRequest.h"
 #import <AFNetworking/AFNetworking.h>
+#import <SignalCoreKit/NSData+OWS.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>

 NSString *const TSNetworkManagerDomain = @"org.whispersystems.signal.networkManager";
--- a/SignalServiceKit/src/Network/WebSockets/TSSocketManager.m
+++ b/SignalServiceKit/src/Network/WebSockets/TSSocketManager.m
@ -21,7 +21,7 @@
 #import "TSConstants.h"
 #import "TSErrorMessage.h"
 #import "TSRequest.h"
-#import "Threading.h"
+#import <SignalCoreKit/Threading.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>

 NS_ASSUME_NONNULL_BEGIN
--- a/SignalServiceKit/src/Security/OWSFingerprint.m
+++ b/SignalServiceKit/src/Security/OWSFingerprint.m
@ -3,10 +3,10 @@
 //

 #import "OWSFingerprint.h"
-#import "NSData+OWS.h"
 #import "OWSError.h"
 #import <AxolotlKit/NSData+keyVersionByte.h>
 #import <CommonCrypto/CommonDigest.h>
+#import <SignalCoreKit/NSData+OWS.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <UIKit/UIImage.h>

--- a/SignalServiceKit/src/Storage/OWSStorage.m
+++ b/SignalServiceKit/src/Storage/OWSStorage.m
@ -4,7 +4,6 @@

 #import "OWSStorage.h"
 #import "AppContext.h"
-#import "NSData+OWS.h"
 #import "NSNotificationCenter+OWS.h"
 #import "NSUserDefaults+OWS.h"
 #import "OWSBackgroundTask.h"
@ -13,6 +12,7 @@
 #import "OWSStorage+Subclass.h"
 #import "TSAttachmentStream.h"
 #import <Curve25519Kit/Randomness.h>
+#import <SignalCoreKit/NSData+OWS.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <YapDatabase/YapDatabase.h>
 #import <YapDatabase/YapDatabaseAutoView.h>
--- a/Show More
+++ b/Show More