From 2d7ebc03a10ae372363770dd8a5eb8d174bbdfda Mon Sep 17 00:00:00 2001 From: Jordan Rose Date: Mon, 8 Feb 2021 12:02:43 -0800 Subject: [PATCH] Re-apply "Update and prebuild SignalClient" Also pulls in an update for SignalCoreKit build flags that were causing a problem. --- Podfile | 4 +++- Podfile.lock | 20 +++++++++++--------- Pods | 2 +- Signal.xcodeproj/project.pbxproj | 24 ++++++++++++++++++------ 4 files changed, 33 insertions(+), 17 deletions(-) diff --git a/Podfile b/Podfile index 717834aa38..1e65552e0d 100644 --- a/Podfile +++ b/Podfile @@ -12,7 +12,7 @@ pod 'SwiftProtobuf', "1.7.0" pod 'SignalCoreKit', git: 'https://github.com/signalapp/SignalCoreKit.git', testspecs: ["Tests"] # pod 'SignalCoreKit', path: '../SignalCoreKit', testspecs: ["Tests"] -pod 'SignalClient', git: 'https://github.com/signalapp/libsignal-client.git', testspecs: ["Tests"] +pod 'SignalClient', git: 'https://github.com/signalapp/libsignal-client.git', testspecs: ["Tests"], binary: true # pod 'SignalClient', path: '../libsignal-client', testspecs: ["Tests"] pod 'AxolotlKit', git: 'https://github.com/signalapp/SignalProtocolKit.git', branch: 'master', testspecs: ["Tests"] @@ -84,6 +84,8 @@ pod 'BonMot', inhibit_warnings: true pod 'ZXingObjC', git: 'https://github.com/zxingify/zxingify-objc.git', inhibit_warnings: true, binary: true target 'Signal' do + project 'Signal.xcodeproj', 'Debug' => :debug, 'Release' => :release + # Pods only available inside the main Signal app pod 'SSZipArchive', :inhibit_warnings => true pod 'SignalRingRTC', path: 'ThirdParty/SignalRingRTC.podspec', inhibit_warnings: true diff --git a/Podfile.lock b/Podfile.lock index 7d17e9cfe2..1157bf3b82 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -23,6 +23,8 @@ PODS: - CocoaLumberjack (3.7.0): - CocoaLumberjack/Core (= 3.7.0) - CocoaLumberjack/Core (3.7.0) + - CocoaLumberjack/Swift (3.7.0): + - CocoaLumberjack/Core - Curve25519Kit (2.1.0): - CocoaLumberjack - SignalClient @@ -83,10 +85,10 @@ PODS: - SAMKeychain (1.5.3) - SignalArgon2 (1.3.2) - SignalArgon2/Tests (1.3.2) - - SignalClient (0.1.1): - - SignalCoreKit - - SignalClient/Tests (0.1.1): - - SignalCoreKit + - SignalClient (0.1.2): + - CocoaLumberjack/Swift + - SignalClient/Tests (0.1.2): + - CocoaLumberjack/Swift - SignalCoreKit (1.0.0): - CocoaLumberjack - GRKOpenSSLFramework @@ -371,10 +373,10 @@ CHECKOUT OPTIONS: :git: https://github.com/signalapp/Argon2.git :submodules: true SignalClient: - :commit: 32604e1d35e0ebeb5a8530dc30620b7f7dea3299 + :commit: 28618d37b63ded1a530483c418ddcfd13d537293 :git: https://github.com/signalapp/libsignal-client.git SignalCoreKit: - :commit: 21c092e94b307690957b50f2305e5e65d28fa89e + :commit: 5aa9431912fbd959ec7c70292faeee1481f5cbd9 :git: https://github.com/signalapp/SignalCoreKit.git SignalMetadataKit: :commit: c0b114797a31a5e87d03b92d4563f90effbc397c @@ -414,8 +416,8 @@ SPEC CHECKSUMS: Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c SignalArgon2: 1c24183835ca861e6af06631c18b1671cdf35571 - SignalClient: 48f5b0faf7e50a36e0fc0949cb3f68d8f499986e - SignalCoreKit: 4562b2bbd9830077439ca003f952a798457d4ea5 + SignalClient: 91b917679b15bdf469934aca026787493efdbe1b + SignalCoreKit: 43daa8f15d6125d54705f35628ac35051bb205c6 SignalMetadataKit: a40217605426975468175eb9328a170e2162be94 SignalRingRTC: d59de0ae05da586f043f83e5a6f7e5bc0c60a482 SignalServiceKit: af084384e66b5b2ea468261a15eb01552677d600 @@ -428,6 +430,6 @@ SPEC CHECKSUMS: ZKGroup: 15a08eed5870a44b9dd14af0824ac95f6eed7380 ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb -PODFILE CHECKSUM: 050edf147d3218ab942be27e8c6c7b5407687ae4 +PODFILE CHECKSUM: 58b0dcf90e54a3d6d59eebe376b19dc5606b4419 COCOAPODS: 1.9.2 diff --git a/Pods b/Pods index 9f08c0cd0f..af972658e0 160000 --- a/Pods +++ b/Pods @@ -1 +1 @@ -Subproject commit 9f08c0cd0f5a68e5c4ddc1a59adad7dbbcc29bd9 +Subproject commit af972658e00d4104e2dc3eb87c39e8ad669e2c5b diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 62891dd168..b295c128fe 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -4552,7 +4552,8 @@ "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework", "${BUILT_PRODUCTS_DIR}/AxolotlKit/AxolotlKit.framework", "${BUILT_PRODUCTS_DIR}/BonMot/BonMot.framework", - "${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework", + "${PODS_ROOT}/CocoaLumberjack/CocoaLumberjack.framework", + "${PODS_ROOT}/CocoaLumberjack/CocoaLumberjack.framework.dSYM", "${BUILT_PRODUCTS_DIR}/Curve25519Kit/Curve25519Kit.framework", "${BUILT_PRODUCTS_DIR}/GRDB.swift/GRDB.framework", "${PODS_ROOT}/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework", @@ -4564,7 +4565,8 @@ "${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework", "${BUILT_PRODUCTS_DIR}/SQLCipher/SQLCipher.framework", "${BUILT_PRODUCTS_DIR}/SignalArgon2/SignalArgon2.framework", - "${BUILT_PRODUCTS_DIR}/SignalClient/SignalClient.framework", + "${PODS_ROOT}/SignalClient/SignalClient.framework", + "${PODS_ROOT}/SignalClient/SignalClient.framework.dSYM", "${BUILT_PRODUCTS_DIR}/SignalCoreKit/SignalCoreKit.framework", "${BUILT_PRODUCTS_DIR}/SignalMetadataKit/SignalMetadataKit.framework", "${BUILT_PRODUCTS_DIR}/SignalServiceKit/SignalServiceKit.framework", @@ -4589,6 +4591,7 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AxolotlKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BonMot.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaLumberjack.framework", + "${DWARF_DSYM_FOLDER_PATH}/CocoaLumberjack.framework.dSYM", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Curve25519Kit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GRDB.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework", @@ -4601,6 +4604,7 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SQLCipher.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalArgon2.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalClient.framework", + "${DWARF_DSYM_FOLDER_PATH}/SignalClient.framework.dSYM", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalCoreKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalMetadataKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalServiceKit.framework", @@ -4652,7 +4656,8 @@ "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework", "${BUILT_PRODUCTS_DIR}/AxolotlKit/AxolotlKit.framework", "${BUILT_PRODUCTS_DIR}/BonMot/BonMot.framework", - "${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework", + "${PODS_ROOT}/CocoaLumberjack/CocoaLumberjack.framework", + "${PODS_ROOT}/CocoaLumberjack/CocoaLumberjack.framework.dSYM", "${BUILT_PRODUCTS_DIR}/Curve25519Kit/Curve25519Kit.framework", "${BUILT_PRODUCTS_DIR}/GRDB.swift/GRDB.framework", "${PODS_ROOT}/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework", @@ -4664,7 +4669,8 @@ "${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework", "${BUILT_PRODUCTS_DIR}/SQLCipher/SQLCipher.framework", "${BUILT_PRODUCTS_DIR}/SignalArgon2/SignalArgon2.framework", - "${BUILT_PRODUCTS_DIR}/SignalClient/SignalClient.framework", + "${PODS_ROOT}/SignalClient/SignalClient.framework", + "${PODS_ROOT}/SignalClient/SignalClient.framework.dSYM", "${BUILT_PRODUCTS_DIR}/SignalCoreKit/SignalCoreKit.framework", "${BUILT_PRODUCTS_DIR}/SignalMetadataKit/SignalMetadataKit.framework", "${BUILT_PRODUCTS_DIR}/SignalServiceKit/SignalServiceKit.framework", @@ -4686,6 +4692,7 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AxolotlKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BonMot.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaLumberjack.framework", + "${DWARF_DSYM_FOLDER_PATH}/CocoaLumberjack.framework.dSYM", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Curve25519Kit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GRDB.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework", @@ -4698,6 +4705,7 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SQLCipher.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalArgon2.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalClient.framework", + "${DWARF_DSYM_FOLDER_PATH}/SignalClient.framework.dSYM", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalCoreKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalMetadataKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalServiceKit.framework", @@ -4746,7 +4754,8 @@ "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework", "${BUILT_PRODUCTS_DIR}/AxolotlKit/AxolotlKit.framework", "${BUILT_PRODUCTS_DIR}/BonMot/BonMot.framework", - "${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework", + "${PODS_ROOT}/CocoaLumberjack/CocoaLumberjack.framework", + "${PODS_ROOT}/CocoaLumberjack/CocoaLumberjack.framework.dSYM", "${BUILT_PRODUCTS_DIR}/Curve25519Kit/Curve25519Kit.framework", "${BUILT_PRODUCTS_DIR}/GRDB.swift/GRDB.framework", "${PODS_ROOT}/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework", @@ -4758,7 +4767,8 @@ "${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework", "${BUILT_PRODUCTS_DIR}/SQLCipher/SQLCipher.framework", "${BUILT_PRODUCTS_DIR}/SignalArgon2/SignalArgon2.framework", - "${BUILT_PRODUCTS_DIR}/SignalClient/SignalClient.framework", + "${PODS_ROOT}/SignalClient/SignalClient.framework", + "${PODS_ROOT}/SignalClient/SignalClient.framework.dSYM", "${BUILT_PRODUCTS_DIR}/SignalCoreKit/SignalCoreKit.framework", "${BUILT_PRODUCTS_DIR}/SignalMetadataKit/SignalMetadataKit.framework", "${BUILT_PRODUCTS_DIR}/SignalServiceKit/SignalServiceKit.framework", @@ -4780,6 +4790,7 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AxolotlKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BonMot.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaLumberjack.framework", + "${DWARF_DSYM_FOLDER_PATH}/CocoaLumberjack.framework.dSYM", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Curve25519Kit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GRDB.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework", @@ -4792,6 +4803,7 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SQLCipher.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalArgon2.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalClient.framework", + "${DWARF_DSYM_FOLDER_PATH}/SignalClient.framework.dSYM", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalCoreKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalMetadataKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalServiceKit.framework",