keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated pod submodules.

Browse Source
pull/4/head
Mikunj 6 years ago
parent 9c46c9d7be
commit 71cc25fbd6
6 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File

4
.gitmodules vendored
Unescape Escape View File

@ -1,9 +1,9 @@
[submodule "ThirdParty/Carthage"] [submodule "ThirdParty/Carthage"]
path = ThirdParty/Carthage path = ThirdParty/Carthage
url = https://github.com/signalapp/Signal-Carthage.git url = https://github.com/loki-project/Signal-Carthage.git
[submodule "Pods"] [submodule "Pods"]
path = Pods path = Pods
url = https://github.com/signalapp/Signal-Pods.git url = https://github.com/loki-project/Signal-Pods.git
[submodule "ThirdParty/WebRTC"] [submodule "ThirdParty/WebRTC"]
path = ThirdParty/WebRTC path = ThirdParty/WebRTC
url = https://github.com/signalapp/signal-webrtc-ios-artifacts url = https://github.com/signalapp/signal-webrtc-ios-artifacts

3
Podfile
Unescape Escape View File

@ -50,7 +50,7 @@ def shared_pods
pod 'GRKOpenSSLFramework', git: 'https://github.com/signalapp/GRKOpenSSLFramework' pod 'GRKOpenSSLFramework', git: 'https://github.com/signalapp/GRKOpenSSLFramework'
#pod 'GRKOpenSSLFramework', path: '../GRKOpenSSLFramework' #pod 'GRKOpenSSLFramework', path: '../GRKOpenSSLFramework'
pod 'Starscream', git: 'git@github.com:signalapp/Starscream.git', branch: 'signal-release' pod 'Starscream', git: 'https://github.com/signalapp/Starscream.git', branch: 'signal-release'
# pod 'Starscream', path: '../Starscream' # pod 'Starscream', path: '../Starscream'
### ###
@ -61,6 +61,7 @@ def shared_pods
pod 'PureLayout', :inhibit_warnings => true pod 'PureLayout', :inhibit_warnings => true
pod 'Reachability', :inhibit_warnings => true pod 'Reachability', :inhibit_warnings => true
pod 'YYImage', :inhibit_warnings => true pod 'YYImage', :inhibit_warnings => true
pod 'CryptoSwift', :inhibit_warnings => true
end end
target 'Signal' do target 'Signal' do

43
Podfile.lock
Unescape Escape View File

@ -26,12 +26,10 @@ PODS:
- HKDFKit (~> 0.0.3) - HKDFKit (~> 0.0.3)
- SignalCoreKit - SignalCoreKit
- SwiftProtobuf - SwiftProtobuf
- CocoaLumberjack (3.4.2): - CocoaLumberjack (3.5.3):
- CocoaLumberjack/Default (= 3.4.2) - CocoaLumberjack/Core (= 3.5.3)
- CocoaLumberjack/Extensions (= 3.4.2) - CocoaLumberjack/Core (3.5.3)
- CocoaLumberjack/Default (3.4.2) - CryptoSwift (1.0.0)
- CocoaLumberjack/Extensions (3.4.2):
- CocoaLumberjack/Default
- Curve25519Kit (2.1.0): - Curve25519Kit (2.1.0):
- CocoaLumberjack - CocoaLumberjack
- SignalCoreKit - SignalCoreKit
@ -113,14 +111,14 @@ PODS:
- Starscream - Starscream
- SwiftProtobuf - SwiftProtobuf
- YapDatabase/SQLCipher - YapDatabase/SQLCipher
- SQLCipher (4.0.1): - SQLCipher (4.1.0):
- SQLCipher/standard (= 4.0.1) - SQLCipher/standard (= 4.1.0)
- SQLCipher/common (4.0.1) - SQLCipher/common (4.1.0)
- SQLCipher/standard (4.0.1): - SQLCipher/standard (4.1.0):
- SQLCipher/common - SQLCipher/common
- SSZipArchive (2.1.4) - SSZipArchive (2.1.5)
- Starscream (3.0.6) - Starscream (3.0.6)
- SwiftProtobuf (1.3.1) - SwiftProtobuf (1.5.0)
- YapDatabase/SQLCipher (3.1.1): - YapDatabase/SQLCipher (3.1.1):
- YapDatabase/SQLCipher/Core (= 3.1.1) - YapDatabase/SQLCipher/Core (= 3.1.1)
- YapDatabase/SQLCipher/Extensions (= 3.1.1) - YapDatabase/SQLCipher/Extensions (= 3.1.1)
@ -191,6 +189,7 @@ DEPENDENCIES:
- AFNetworking - AFNetworking
- AxolotlKit (from `https://github.com/signalapp/SignalProtocolKit.git`, branch `master`) - AxolotlKit (from `https://github.com/signalapp/SignalProtocolKit.git`, branch `master`)
- AxolotlKit/Tests (from `https://github.com/signalapp/SignalProtocolKit.git`, branch `master`) - AxolotlKit/Tests (from `https://github.com/signalapp/SignalProtocolKit.git`, branch `master`)
- CryptoSwift
- Curve25519Kit (from `https://github.com/signalapp/Curve25519Kit`) - Curve25519Kit (from `https://github.com/signalapp/Curve25519Kit`)
- Curve25519Kit/Tests (from `https://github.com/signalapp/Curve25519Kit`) - Curve25519Kit/Tests (from `https://github.com/signalapp/Curve25519Kit`)
- GRKOpenSSLFramework (from `https://github.com/signalapp/GRKOpenSSLFramework`) - GRKOpenSSLFramework (from `https://github.com/signalapp/GRKOpenSSLFramework`)
@ -208,7 +207,7 @@ DEPENDENCIES:
- SignalServiceKit/Tests (from `.`) - SignalServiceKit/Tests (from `.`)
- SQLCipher (>= 4.0.1) - SQLCipher (>= 4.0.1)
- SSZipArchive - SSZipArchive
- "Starscream (from `git@github.com:signalapp/Starscream.git`, branch `signal-release`)" - Starscream (from `https://github.com/signalapp/Starscream.git`, branch `signal-release`)
- YapDatabase/SQLCipher (from `https://github.com/signalapp/YapDatabase.git`, branch `signal-release`) - YapDatabase/SQLCipher (from `https://github.com/signalapp/YapDatabase.git`, branch `signal-release`)
- YYImage - YYImage
@ -216,6 +215,7 @@ SPEC REPOS:
https://github.com/cocoapods/specs.git: https://github.com/cocoapods/specs.git:
- AFNetworking - AFNetworking
- CocoaLumberjack - CocoaLumberjack
- CryptoSwift
- libPhoneNumber-iOS - libPhoneNumber-iOS
- PromiseKit - PromiseKit
- PureLayout - PureLayout
@ -247,7 +247,7 @@ EXTERNAL SOURCES:
:path: "." :path: "."
Starscream: Starscream:
:branch: signal-release :branch: signal-release
:git: "git@github.com:signalapp/Starscream.git" :git: https://github.com/signalapp/Starscream.git
YapDatabase: YapDatabase:
:branch: signal-release :branch: signal-release
:git: https://github.com/signalapp/YapDatabase.git :git: https://github.com/signalapp/YapDatabase.git
@ -269,14 +269,14 @@ CHECKOUT OPTIONS:
:commit: 9599b1d9796280c97cb2f786f34984fc98a3b6ef :commit: 9599b1d9796280c97cb2f786f34984fc98a3b6ef
:git: https://github.com/signalapp/Mantle :git: https://github.com/signalapp/Mantle
SignalCoreKit: SignalCoreKit:
:commit: 0326310d32744902539bd6a2f170ee7413805754 :commit: 521615304b0448b5edcab43d7fcef7724c7dd10c
:git: https://github.com/signalapp/SignalCoreKit.git :git: https://github.com/signalapp/SignalCoreKit.git
SignalMetadataKit: SignalMetadataKit:
:commit: 56f28fc3a6e35d548d034ef7d0009f233ca0aa62 :commit: 56f28fc3a6e35d548d034ef7d0009f233ca0aa62
:git: https://github.com/signalapp/SignalMetadataKit :git: https://github.com/signalapp/SignalMetadataKit
Starscream: Starscream:
:commit: b09ea163c3cb305152c65b299cb024610f52e735 :commit: b09ea163c3cb305152c65b299cb024610f52e735
:git: "git@github.com:signalapp/Starscream.git" :git: https://github.com/signalapp/Starscream.git
YapDatabase: YapDatabase:
:commit: 8e2b69110efd9499a5b553fda0165d2cea4e818d :commit: 8e2b69110efd9499a5b553fda0165d2cea4e818d
:git: https://github.com/signalapp/YapDatabase.git :git: https://github.com/signalapp/YapDatabase.git
@ -284,7 +284,8 @@ CHECKOUT OPTIONS:
SPEC CHECKSUMS: SPEC CHECKSUMS:
AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057 AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
AxolotlKit: bb02741a93400b915df1be3365ad13d3768b0103 AxolotlKit: bb02741a93400b915df1be3365ad13d3768b0103
CocoaLumberjack: db7cc9e464771f12054c22ff6947c5a58d43a0fd CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947
CryptoSwift: d81eeaa59dc5a8d03720fe919a6fd07b51f7439f
Curve25519Kit: b3e77b7152ebe95fee2b3fb6c955449492bc14f7 Curve25519Kit: b3e77b7152ebe95fee2b3fb6c955449492bc14f7
GRKOpenSSLFramework: 8a3735ad41e7dc1daff460467bccd32ca5d6ae3e GRKOpenSSLFramework: 8a3735ad41e7dc1daff460467bccd32ca5d6ae3e
HKDFKit: 3b6dbbb9d59c221cc6c52c3aa915700cbf24e376 HKDFKit: 3b6dbbb9d59c221cc6c52c3aa915700cbf24e376
@ -297,13 +298,13 @@ SPEC CHECKSUMS:
SignalCoreKit: c2d8132cdedb95d35eb2f8ae7eac0957695d0a8b SignalCoreKit: c2d8132cdedb95d35eb2f8ae7eac0957695d0a8b
SignalMetadataKit: 6fa5e9a53c7f104568662521a2f3874672ff7a02 SignalMetadataKit: 6fa5e9a53c7f104568662521a2f3874672ff7a02
SignalServiceKit: c637b66e485538dda76836a1ec560dc556035430 SignalServiceKit: c637b66e485538dda76836a1ec560dc556035430
SQLCipher: 4636a257060f6f1b4e143a143028b61a2b462d0d SQLCipher: efbdb52cdbe340bcd892b1b14297df4e07241b7f
SSZipArchive: 41455d4b8d2b6ab93990820b50dc697c2554a322 SSZipArchive: cefe1364104a0231268a5deb8495bdf2861f52f0
Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5 Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5
SwiftProtobuf: 84cd6b8f4fd2fc3d9fbd80a0aaf2e957d52824ec SwiftProtobuf: 241400280f912735c1e1b9fe675fdd2c6c4d42e2
YapDatabase: b418a4baa6906e8028748938f9159807fd039af4 YapDatabase: b418a4baa6906e8028748938f9159807fd039af4
YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54 YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
PODFILE CHECKSUM: b0748e1cca7826f2ed132c495589e6aea9b7d743 PODFILE CHECKSUM: 71de0ab6116c92a1a144e5889d07cc57a0d61f77
COCOAPODS: 1.5.3 COCOAPODS: 1.5.3

2
Pods

@ -1 +1 @@
Subproject commit c4790d3de7ec4a04166d761d532f3eaf7aafcf1c Subproject commit aed207f026696cbb76066748fba6689a9c04194e

7
Signal.xcodeproj/project.pbxproj
Unescape Escape View File

@ -3220,7 +3220,6 @@
inputPaths = ( inputPaths = (
"$(SRCROOT)/ThirdParty/WebRTC/Build/WebRTC.framework", "$(SRCROOT)/ThirdParty/WebRTC/Build/WebRTC.framework",
"$(SRCROOT)/ThirdParty/Carthage/Build/iOS/ZXingObjC.framework", "$(SRCROOT)/ThirdParty/Carthage/Build/iOS/ZXingObjC.framework",
"$(SRCROOT)/ThirdParty/Carthage/Build/iOS/CryptoSwift.framework",
); );
name = "[Carthage] Copy Frameworks"; name = "[Carthage] Copy Frameworks";
outputPaths = ( outputPaths = (
@ -3257,7 +3256,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "if which swiftlint >/dev/null; then\n# disabled for now. too many lint errors outside of the scope of this branch\n#(cd Signal && swiftlint)\n# never fail.\nexit 0\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi"; shellScript = "if which swiftlint >/dev/null; then\n# disabled for now. too many lint errors outside of the scope of this branch\n#(cd Signal && swiftlint)\n# never fail.\nexit 0\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
}; };
59C9DBA462715B5C999FFB02 /* [CP] Embed Pods Frameworks */ = { 59C9DBA462715B5C999FFB02 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
@ -3269,6 +3268,7 @@
"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework", "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
"${BUILT_PRODUCTS_DIR}/AxolotlKit/AxolotlKit.framework", "${BUILT_PRODUCTS_DIR}/AxolotlKit/AxolotlKit.framework",
"${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework", "${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework",
"${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework",
"${BUILT_PRODUCTS_DIR}/Curve25519Kit/Curve25519Kit.framework", "${BUILT_PRODUCTS_DIR}/Curve25519Kit/Curve25519Kit.framework",
"${PODS_ROOT}/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework", "${PODS_ROOT}/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework",
"${BUILT_PRODUCTS_DIR}/HKDFKit/HKDFKit.framework", "${BUILT_PRODUCTS_DIR}/HKDFKit/HKDFKit.framework",
@ -3293,6 +3293,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AxolotlKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AxolotlKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaLumberjack.framework", "${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}/Curve25519Kit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HKDFKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HKDFKit.framework",
@ -3345,6 +3346,7 @@
"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework", "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
"${BUILT_PRODUCTS_DIR}/AxolotlKit/AxolotlKit.framework", "${BUILT_PRODUCTS_DIR}/AxolotlKit/AxolotlKit.framework",
"${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework", "${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework",
"${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework",
"${BUILT_PRODUCTS_DIR}/Curve25519Kit/Curve25519Kit.framework", "${BUILT_PRODUCTS_DIR}/Curve25519Kit/Curve25519Kit.framework",
"${PODS_ROOT}/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework", "${PODS_ROOT}/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework",
"${BUILT_PRODUCTS_DIR}/HKDFKit/HKDFKit.framework", "${BUILT_PRODUCTS_DIR}/HKDFKit/HKDFKit.framework",
@ -3368,6 +3370,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AxolotlKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AxolotlKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaLumberjack.framework", "${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}/Curve25519Kit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HKDFKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HKDFKit.framework",

2
Signal/Signal-Info.plist
Unescape Escape View File

@ -5,7 +5,7 @@
<key>BuildDetails</key> <key>BuildDetails</key>
<dict> <dict>
<key>CarthageVersion</key> <key>CarthageVersion</key>
<string>0.32.0</string> <string>0.33.0</string>
<key>OSXVersion</key> <key>OSXVersion</key>
<string>10.14.4</string> <string>10.14.4</string>
<key>WebRTCCommit</key> <key>WebRTCCommit</key>

Write Preview
Loading…
Cancel
Save