Move PureLayout back to cocoapods for now

This introduced some unexpected crashes related to frameworks in Swift.

// FREEBIE
This commit is contained in:
Michael Kirk 2017-03-23 21:44:07 -04:00
parent 55a44c8c4e
commit f29ca7851f
6 changed files with 6 additions and 5 deletions

View File

@ -1,4 +1,3 @@
github "mxcl/PromiseKit"
github "TheLevelUp/ZXingObjC"
github "PureLayout/PureLayout"

View File

@ -1,3 +1,2 @@
github "mxcl/PromiseKit" "4.1.8"
github "PureLayout/PureLayout" "v3.0.2"
github "TheLevelUp/ZXingObjC" "3.2.1"

@ -1 +1 @@
Subproject commit c52834e1987ffe93dac39113b7cec876dcfe4a70
Subproject commit fc8eebb92367031f60ea337c897551cc54baa4b2

View File

@ -10,6 +10,7 @@ target 'Signal' do
pod 'OpenSSL'
pod 'SCWaveformView', '~> 1.0'
pod 'JSQMessagesViewController'
pod 'PureLayout'
target 'SignalTests' do
inherit! :search_paths
end

View File

@ -37,6 +37,7 @@ PODS:
- Mantle/extobjc (2.1.0)
- OpenSSL (1.0.210)
- ProtocolBuffers (1.9.11)
- PureLayout (3.0.2)
- Reachability (3.2)
- SAMKeychain (1.5.2)
- SCWaveformView (1.0.0)
@ -112,6 +113,7 @@ DEPENDENCIES:
- AxolotlKit (from `https://github.com/WhisperSystems/SignalProtocolKit.git`)
- JSQMessagesViewController
- OpenSSL
- PureLayout
- SCWaveformView (~> 1.0)
- SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`)
- SocketRocket (from `https://github.com/facebook/SocketRocket.git`)
@ -147,6 +149,7 @@ SPEC CHECKSUMS:
Mantle: 2fa750afa478cd625a94230fbf1c13462f29395b
OpenSSL: 246ffb948e9d56466727fd318134af35f5aa764e
ProtocolBuffers: d509225eb2ea43d9582a59e94348fcf86e2abd65
PureLayout: 4d550abe49a94f24c2808b9b95db9131685fe4cd
Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
SAMKeychain: 1865333198217411f35327e8da61b43de79b635b
SCWaveformView: 52a96750255d817e300565a80c81fb643e233e07
@ -157,6 +160,6 @@ SPEC CHECKSUMS:
UnionFind: c33be5adb12983981d6e827ea94fc7f9e370f52d
YapDatabase: b1e43555a34a5298e23a045be96817a5ef0da58f
PODFILE CHECKSUM: c4ba1b6a6e6d71830df353075ba164e346303c27
PODFILE CHECKSUM: a060377074cb361576f346a58d1503b3bd708440
COCOAPODS: 1.2.0

View File

@ -3046,7 +3046,6 @@
"$(SRCROOT)/Carthage/Build/iOS/PromiseKit.framework",
"$(SRCROOT)/Carthage/Build/iOS/WebRTC.framework",
"$(SRCROOT)/Carthage/Build/iOS/ZXingObjC.framework",
"$(SRCROOT)/Carthage/Build/iOS/PureLayout.framework",
);
name = "[Carthage] Copy Frameworks";
outputPaths = (