Merge branch 'master' of https://github.com/christophhagen/SignalProt…

…ocolSwift
christophhagen · May 25, 2018 · 39e479c · 39e479c
2 parents 0a237d2 + eca31eb
commit 39e479c
Show file tree

Hide file tree

Showing 43 changed files with 1,078 additions and 948 deletions.
diff --git a/Podfile.lock b/Podfile.lock
@@ -8,11 +8,17 @@ DEPENDENCIES:
   - Curve25519
   - SwiftProtobuf
 
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - CommonCryptoModule
+    - Curve25519
+    - SwiftProtobuf
+
 SPEC CHECKSUMS:
   CommonCryptoModule: 63a68b57abed79655b3a01011419bf037a05b0a0
   Curve25519: 849314b353906cffa572125f31c2d006ce635f32
   SwiftProtobuf: 5ccc0e4054e37c75800e5744acb2aa80bb72b39c
 
 PODFILE CHECKSUM: b5550621b144cb6064196a28676c938b681e2db2
 
-COCOAPODS: 1.4.0
+COCOAPODS: 1.5.2
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Pods/Target Support Files/CommonCryptoModule-iOS/CommonCryptoModule-iOS.xcconfig b/Pods/Target Support Files/CommonCryptoModule-iOS/CommonCryptoModule-iOS.xcconfig
diff --git a/Pods/Target Support Files/CommonCryptoModule-macOS/CommonCryptoModule-macOS.xcconfig b/Pods/Target Support Files/CommonCryptoModule-macOS/CommonCryptoModule-macOS.xcconfig
diff --git a/Pods/Target Support Files/CommonCryptoModule-tvOS/CommonCryptoModule-tvOS.xcconfig b/Pods/Target Support Files/CommonCryptoModule-tvOS/CommonCryptoModule-tvOS.xcconfig
diff --git a/Pods/Target Support Files/CommonCryptoModule-watchOS/CommonCryptoModule-watchOS.xcconfig b/Pods/Target Support Files/CommonCryptoModule-watchOS/CommonCryptoModule-watchOS.xcconfig
diff --git a/Pods/Target Support Files/Curve25519-iOS/Curve25519-iOS.xcconfig b/Pods/Target Support Files/Curve25519-iOS/Curve25519-iOS.xcconfig
diff --git a/Pods/Target Support Files/Curve25519-macOS/Curve25519-macOS.xcconfig b/Pods/Target Support Files/Curve25519-macOS/Curve25519-macOS.xcconfig
diff --git a/Pods/Target Support Files/Curve25519-tvOS/Curve25519-tvOS.xcconfig b/Pods/Target Support Files/Curve25519-tvOS/Curve25519-tvOS.xcconfig
diff --git a/Pods/Target Support Files/Curve25519-watchOS/Curve25519-watchOS.xcconfig b/Pods/Target Support Files/Curve25519-watchOS/Curve25519-watchOS.xcconfig
diff --git a/...tocolSwift-SignalProtocol iOS/Pods-LibSignalProtocolSwift-SignalProtocol iOS-resources.sh b/...tocolSwift-SignalProtocol iOS/Pods-LibSignalProtocolSwift-SignalProtocol iOS-resources.sh
diff --git a/...lSwift-SignalProtocol macOS/Pods-LibSignalProtocolSwift-SignalProtocol macOS-resources.sh b/...lSwift-SignalProtocol macOS/Pods-LibSignalProtocolSwift-SignalProtocol macOS-resources.sh
diff --git a/...colSwift-SignalProtocol tvOS/Pods-LibSignalProtocolSwift-SignalProtocol tvOS-resources.sh b/...colSwift-SignalProtocol tvOS/Pods-LibSignalProtocolSwift-SignalProtocol tvOS-resources.sh
diff --git a/...ft-SignalProtocol watchOS/Pods-LibSignalProtocolSwift-SignalProtocol watchOS-resources.sh b/...ft-SignalProtocol watchOS/Pods-LibSignalProtocolSwift-SignalProtocol watchOS-resources.sh
diff --git a/Pods/Target Support Files/Pods-SignalProtocol Tests/Pods-SignalProtocol Tests-frameworks.sh b/Pods/Target Support Files/Pods-SignalProtocol Tests/Pods-SignalProtocol Tests-frameworks.sh
diff --git a/Pods/Target Support Files/Pods-SignalProtocol Tests/Pods-SignalProtocol Tests-resources.sh b/Pods/Target Support Files/Pods-SignalProtocol Tests/Pods-SignalProtocol Tests-resources.sh
diff --git a/Pods/Target Support Files/SwiftProtobuf-iOS/SwiftProtobuf-iOS.xcconfig b/Pods/Target Support Files/SwiftProtobuf-iOS/SwiftProtobuf-iOS.xcconfig