From ab1394025242ffca460f07efd1da2f001d846816 Mon Sep 17 00:00:00 2001 From: Mikunj Date: Tue, 21 May 2019 15:56:30 +1000 Subject: [PATCH] Added GCDWebServer. --- Podfile | 3 +++ Podfile.lock | 8 +++++++- Pods | 2 +- Signal.xcodeproj/project.pbxproj | 2 ++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Podfile b/Podfile index 90011102c..0c18e171f 100644 --- a/Podfile +++ b/Podfile @@ -69,6 +69,9 @@ target 'Signal' do project 'Signal' shared_pods pod 'SSZipArchive', :inhibit_warnings => true + + # Loki + pod 'GCDWebServer', '~> 3.0' target 'SignalTests' do inherit! :search_paths diff --git a/Podfile.lock b/Podfile.lock index 7ea048b0d..dd272bda9 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -36,6 +36,9 @@ PODS: - Curve25519Kit/Tests (2.1.0): - CocoaLumberjack - SignalCoreKit + - GCDWebServer (3.5.2): + - GCDWebServer/Core (= 3.5.2) + - GCDWebServer/Core (3.5.2) - GRKOpenSSLFramework (1.0.2.12) - HKDFKit (0.0.4): - CocoaLumberjack @@ -194,6 +197,7 @@ DEPENDENCIES: - CryptoSwift - Curve25519Kit (from `https://github.com/signalapp/Curve25519Kit`) - Curve25519Kit/Tests (from `https://github.com/signalapp/Curve25519Kit`) + - GCDWebServer (~> 3.0) - GRKOpenSSLFramework (from `https://github.com/signalapp/GRKOpenSSLFramework`) - HKDFKit (from `https://github.com/signalapp/HKDFKit.git`) - HKDFKit/Tests (from `https://github.com/signalapp/HKDFKit.git`) @@ -218,6 +222,7 @@ SPEC REPOS: - AFNetworking - CocoaLumberjack - CryptoSwift + - GCDWebServer - libPhoneNumber-iOS - PromiseKit - PureLayout @@ -289,6 +294,7 @@ SPEC CHECKSUMS: CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947 CryptoSwift: d81eeaa59dc5a8d03720fe919a6fd07b51f7439f Curve25519Kit: b3e77b7152ebe95fee2b3fb6c955449492bc14f7 + GCDWebServer: ead88cd14596dd4eae4f5830b8877c87c8728990 GRKOpenSSLFramework: 8a3735ad41e7dc1daff460467bccd32ca5d6ae3e HKDFKit: 3b6dbbb9d59c221cc6c52c3aa915700cbf24e376 libPhoneNumber-iOS: e444379ac18bbfbdefad571da735b2cd7e096caa @@ -307,6 +313,6 @@ SPEC CHECKSUMS: YapDatabase: b418a4baa6906e8028748938f9159807fd039af4 YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54 -PODFILE CHECKSUM: beb49888a2355e89f15280fcfa5105ddc59a5c0a +PODFILE CHECKSUM: 708b5bc644a63e9bc55c409ac292c88c8ee78fad COCOAPODS: 1.5.3 diff --git a/Pods b/Pods index e5b45b28d..d2c312cc2 160000 --- a/Pods +++ b/Pods @@ -1 +1 @@ -Subproject commit e5b45b28d5e8e409c1acf15c32d3734bb3e8acd7 +Subproject commit d2c312cc2152c929ecfe4fe61ea2e7a3eef90fdf diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index c5a7426fb..ad7131bfb 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -3257,6 +3257,7 @@ "${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework", "${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework", "${BUILT_PRODUCTS_DIR}/Curve25519Kit/Curve25519Kit.framework", + "${BUILT_PRODUCTS_DIR}/GCDWebServer/GCDWebServer.framework", "${PODS_ROOT}/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework", "${BUILT_PRODUCTS_DIR}/HKDFKit/HKDFKit.framework", "${BUILT_PRODUCTS_DIR}/Mantle/Mantle.framework", @@ -3282,6 +3283,7 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaLumberjack.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CryptoSwift.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Curve25519Kit.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GCDWebServer.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HKDFKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mantle.framework",