From 8ae200ac211d6f8ca03eb7d0b7e85fc5e8061636 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 25 Sep 2018 12:49:02 -0400 Subject: [PATCH] Fix build breakage around SignalCoreKit. --- Podfile | 14 +++--- Signal.xcodeproj/project.pbxproj | 4 ++ .../xcshareddata/xcschemes/Signal.xcscheme | 46 +++++++++++++++++-- .../ViewControllers/DebugUI/DebugUIBackup.m | 2 +- .../ViewControllers/DebugUI/DebugUIContacts.m | 2 +- .../ViewControllers/DebugUI/DebugUIMessages.m | 2 +- .../DebugUI/DebugUIMessagesAssetLoader.m | 2 +- .../ViewControllers/DebugUI/DebugUIStress.m | 2 +- .../DebugUI/DebugUISyncMessages.m | 2 +- .../ViewControllers/NewGroupViewController.m | 2 +- Signal/src/util/OWSBackup.m | 2 +- Signal/src/util/OWSBackupIO.m | 2 +- Signal/src/util/OWSBackupJob.m | 2 +- Signal/test/util/OWSDatabaseConverterTest.m | 2 +- Signal/test/util/ProtoParsingTest.m | 2 +- .../environment/SignalKeyingStorage.m | 2 +- SignalServiceKit.podspec | 1 + .../src/Account/TSAccountManager.m | 2 +- SignalServiceKit/src/Storage/OWSStorage.m | 2 +- SignalServiceKit/src/Util/Cryptography.m | 2 +- SignalServiceKit/src/Util/OWSError.h | 1 - .../Storage/TSStorageIdentityKeyStoreTests.m | 2 +- 22 files changed, 73 insertions(+), 27 deletions(-) diff --git a/Podfile b/Podfile index 6e382494a..c70239713 100644 --- a/Podfile +++ b/Podfile @@ -11,12 +11,14 @@ def shared_pods pod 'SQLCipher', :git => 'https://github.com/sqlcipher/sqlcipher.git', :commit => 'd5c2bec' # pod 'YapDatabase/SQLCipher', path: '../YapDatabase' pod 'YapDatabase/SQLCipher', :git => 'https://github.com/signalapp/YapDatabase.git', branch: 'signal-release' - # pod 'AxolotlKit', git: 'https://github.com/signalapp/SignalProtocolKit.git' - pod 'AxolotlKit', path: '../SignalProtocolKit' - # pod 'HKDFKit', git: 'https://github.com/signalapp/HKDFKit.git' - pod 'HKDFKit', path: '../HKDFKit' - # pod 'Curve25519Kit', git: 'https://github.com/signalapp/Curve25519Kit' - pod 'Curve25519Kit', path: '../Curve25519Kit' + # pod 'AxolotlKit', git: 'https://github.com/signalapp/SignalProtocolKit.git', testspecs: ["Tests"] + pod 'AxolotlKit', path: '../SignalProtocolKit', testspecs: ["Tests"] + # pod 'HKDFKit', git: 'https://github.com/signalapp/HKDFKit.git', testspecs: ["Tests"] + pod 'HKDFKit', path: '../HKDFKit', testspecs: ["Tests"] + # pod 'Curve25519Kit', git: 'https://github.com/signalapp/Curve25519Kit', testspecs: ["Tests"] + pod 'Curve25519Kit', path: '../Curve25519Kit', testspecs: ["Tests"] + # pod 'SignalMetadataKit', git: 'https://github.com/signalapp/SignalMetadataKit', testspecs: ["Tests"] + pod 'SignalMetadataKit', path: '../SignalMetadataKit', testspecs: ["Tests"] pod 'SignalServiceKit', path: '.', testspecs: ["Tests"] pod 'GRKOpenSSLFramework', git: 'https://github.com/signalapp/GRKOpenSSLFramework' #pod 'GRKOpenSSLFramework', path: '../GRKOpenSSLFramework' diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index e06753d37..dee016a60 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -3006,6 +3006,7 @@ "${BUILT_PRODUCTS_DIR}/SQLCipher/SQLCipher.framework", "${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework", "${BUILT_PRODUCTS_DIR}/SignalCoreKit/SignalCoreKit.framework", + "${BUILT_PRODUCTS_DIR}/SignalMetadataKit/SignalMetadataKit.framework", "${BUILT_PRODUCTS_DIR}/SignalServiceKit/SignalServiceKit.framework", "${BUILT_PRODUCTS_DIR}/SocketRocket/SocketRocket.framework", "${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework", @@ -3029,6 +3030,7 @@ "${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}/SignalMetadataKit.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", @@ -3079,6 +3081,7 @@ "${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework", "${BUILT_PRODUCTS_DIR}/SQLCipher/SQLCipher.framework", "${BUILT_PRODUCTS_DIR}/SignalCoreKit/SignalCoreKit.framework", + "${BUILT_PRODUCTS_DIR}/SignalMetadataKit/SignalMetadataKit.framework", "${BUILT_PRODUCTS_DIR}/SignalServiceKit/SignalServiceKit.framework", "${BUILT_PRODUCTS_DIR}/SocketRocket/SocketRocket.framework", "${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework", @@ -3101,6 +3104,7 @@ "${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}/SignalMetadataKit.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", diff --git a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme index 34e517a55..6d070f70d 100644 --- a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme +++ b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme @@ -28,7 +28,7 @@ buildForAnalyzing = "YES"> @@ -56,7 +56,7 @@ skipped = "NO"> @@ -66,12 +66,52 @@ skipped = "NO"> + + + + + + + + + + + + + + + + +#import @import CloudKit; diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIContacts.m b/Signal/src/ViewControllers/DebugUI/DebugUIContacts.m index acb043375..b2e6a4375 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIContacts.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIContacts.m @@ -8,7 +8,7 @@ #import "Signal-Swift.h" #import "SignalApp.h" #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m index 5cb52160c..34a999ca6 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m @@ -8,8 +8,8 @@ #import "DebugUIMessagesAssetLoader.h" #import "OWSTableViewController.h" #import "Signal-Swift.h" -#import #import +#import #import #import #import diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessagesAssetLoader.m b/Signal/src/ViewControllers/DebugUI/DebugUIMessagesAssetLoader.m index 6b3bb79d0..daa540771 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIMessagesAssetLoader.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessagesAssetLoader.m @@ -5,7 +5,7 @@ #import "DebugUIMessagesAssetLoader.h" #import #import -#import +#import #import #import #import diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIStress.m b/Signal/src/ViewControllers/DebugUI/DebugUIStress.m index d08395b16..7e8527c8e 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIStress.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIStress.m @@ -7,8 +7,8 @@ #import "OWSTableViewController.h" #import "SignalApp.h" #import "ThreadUtil.h" -#import #import +#import #import #import #import diff --git a/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m index 2dfd10c41..208997d1d 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m @@ -8,7 +8,7 @@ #import "Signal-Swift.h" #import "ThreadUtil.h" #import -#import +#import #import #import #import diff --git a/Signal/src/ViewControllers/NewGroupViewController.m b/Signal/src/ViewControllers/NewGroupViewController.m index c4040dcba..30f3e9184 100644 --- a/Signal/src/ViewControllers/NewGroupViewController.m +++ b/Signal/src/ViewControllers/NewGroupViewController.m @@ -8,8 +8,8 @@ #import "OWSNavigationController.h" #import "Signal-Swift.h" #import "SignalApp.h" -#import #import +#import #import #import #import diff --git a/Signal/src/util/OWSBackup.m b/Signal/src/util/OWSBackup.m index abaef388d..27651eedb 100644 --- a/Signal/src/util/OWSBackup.m +++ b/Signal/src/util/OWSBackup.m @@ -7,7 +7,7 @@ #import "OWSBackupIO.h" #import "OWSBackupImportJob.h" #import "Signal-Swift.h" -#import +#import #import NSString *const NSNotificationNameBackupStateDidChange = @"NSNotificationNameBackupStateDidChange"; diff --git a/Signal/src/util/OWSBackupIO.m b/Signal/src/util/OWSBackupIO.m index abcb8d7aa..1b3b6c104 100644 --- a/Signal/src/util/OWSBackupIO.m +++ b/Signal/src/util/OWSBackupIO.m @@ -3,7 +3,7 @@ // #import "OWSBackupIO.h" -#import +#import #import @import Compression; diff --git a/Signal/src/util/OWSBackupJob.m b/Signal/src/util/OWSBackupJob.m index 1633f07b0..15252431b 100644 --- a/Signal/src/util/OWSBackupJob.m +++ b/Signal/src/util/OWSBackupJob.m @@ -5,7 +5,7 @@ #import "OWSBackupJob.h" #import "OWSBackupIO.h" #import "Signal-Swift.h" -#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/test/util/OWSDatabaseConverterTest.m b/Signal/test/util/OWSDatabaseConverterTest.m index 65af0f558..60dfc24a1 100644 --- a/Signal/test/util/OWSDatabaseConverterTest.m +++ b/Signal/test/util/OWSDatabaseConverterTest.m @@ -3,8 +3,8 @@ // #import "OWSDatabaseConverterTest.h" -#import #import +#import #import #import #import diff --git a/Signal/test/util/ProtoParsingTest.m b/Signal/test/util/ProtoParsingTest.m index 77efc6b60..6bb0e75d0 100644 --- a/Signal/test/util/ProtoParsingTest.m +++ b/Signal/test/util/ProtoParsingTest.m @@ -3,8 +3,8 @@ // #import "SignalBaseTest.h" -#import #import +#import #import #import #import diff --git a/SignalMessaging/environment/SignalKeyingStorage.m b/SignalMessaging/environment/SignalKeyingStorage.m index aa68689e8..b76cc9f5a 100644 --- a/SignalMessaging/environment/SignalKeyingStorage.m +++ b/SignalMessaging/environment/SignalKeyingStorage.m @@ -3,7 +3,7 @@ // #import "SignalKeyingStorage.h" -#import +#import #import #import diff --git a/SignalServiceKit.podspec b/SignalServiceKit.podspec index 406a62ed2..9b049ca39 100644 --- a/SignalServiceKit.podspec +++ b/SignalServiceKit.podspec @@ -51,6 +51,7 @@ An Objective-C library for communicating with the Signal messaging service. s.dependency 'Reachability' s.dependency 'SwiftProtobuf' s.dependency 'SignalCoreKit' + s.dependency 'SignalMetadataKit' # Avoid PromiseKit 5/6 for now. # From the maintainer: diff --git a/SignalServiceKit/src/Account/TSAccountManager.m b/SignalServiceKit/src/Account/TSAccountManager.m index c8b3f732c..3fe05de2a 100644 --- a/SignalServiceKit/src/Account/TSAccountManager.m +++ b/SignalServiceKit/src/Account/TSAccountManager.m @@ -14,8 +14,8 @@ #import "TSVerifyCodeRequest.h" #import "YapDatabaseConnection+OWS.h" #import "YapDatabaseTransaction+OWS.h" -#import #import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Storage/OWSStorage.m b/SignalServiceKit/src/Storage/OWSStorage.m index 02664fb8d..a931c8f07 100644 --- a/SignalServiceKit/src/Storage/OWSStorage.m +++ b/SignalServiceKit/src/Storage/OWSStorage.m @@ -11,8 +11,8 @@ #import "OWSPrimaryStorage.h" #import "OWSStorage+Subclass.h" #import "TSAttachmentStream.h" -#import #import +#import #import #import #import diff --git a/SignalServiceKit/src/Util/Cryptography.m b/SignalServiceKit/src/Util/Cryptography.m index 8b44cfa97..808e7aee9 100755 --- a/SignalServiceKit/src/Util/Cryptography.m +++ b/SignalServiceKit/src/Util/Cryptography.m @@ -6,8 +6,8 @@ #import "OWSError.h" #import #import -#import #import +#import #import #define HMAC256_KEY_LENGTH 32 diff --git a/SignalServiceKit/src/Util/OWSError.h b/SignalServiceKit/src/Util/OWSError.h index 729683f08..a67b9b138 100644 --- a/SignalServiceKit/src/Util/OWSError.h +++ b/SignalServiceKit/src/Util/OWSError.h @@ -16,7 +16,6 @@ typedef NS_ENUM(NSInteger, OWSErrorCode) { OWSErrorCodeUntrustedIdentity = 25, OWSErrorCodeFailedToSendOutgoingMessage = 30, OWSErrorCodeAssertionFailure = 31, - OWSErrorCodeFailedToDecryptMessage = 100, OWSErrorCodeFailedToEncryptMessage = 110, OWSErrorCodeSignalServiceFailure = 1001, OWSErrorCodeSignalServiceRateLimited = 1010, diff --git a/SignalServiceKit/tests/Storage/TSStorageIdentityKeyStoreTests.m b/SignalServiceKit/tests/Storage/TSStorageIdentityKeyStoreTests.m index 1290aff7b..3c257ce7a 100644 --- a/SignalServiceKit/tests/Storage/TSStorageIdentityKeyStoreTests.m +++ b/SignalServiceKit/tests/Storage/TSStorageIdentityKeyStoreTests.m @@ -10,7 +10,7 @@ #import "SSKEnvironment.h" #import "YapDatabaseConnection+OWS.h" #import -#import +#import extern NSString *const OWSPrimaryStorageTrustedKeysCollection;