From f29ca7851fe83eb851248a3356973f74772989c1 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael.code@endoftheworl.de>
Date: Thu, 23 Mar 2017 21:44:07 -0400
Subject: [PATCH] Move PureLayout back to cocoapods for now

This introduced some unexpected crashes related to frameworks in Swift.

// FREEBIE
---
 Cartfile                         | 1 -
 Cartfile.resolved                | 1 -
 Carthage                         | 2 +-
 Podfile                          | 1 +
 Podfile.lock                     | 5 ++++-
 Signal.xcodeproj/project.pbxproj | 1 -
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Cartfile b/Cartfile
index c396ca96a..543e2fd94 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,4 +1,3 @@
 github "mxcl/PromiseKit"
 github "TheLevelUp/ZXingObjC"
-github "PureLayout/PureLayout"
 
diff --git a/Cartfile.resolved b/Cartfile.resolved
index 53a361538..fad392f6d 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,3 +1,2 @@
 github "mxcl/PromiseKit" "4.1.8"
-github "PureLayout/PureLayout" "v3.0.2"
 github "TheLevelUp/ZXingObjC" "3.2.1"
diff --git a/Carthage b/Carthage
index c52834e19..fc8eebb92 160000
--- a/Carthage
+++ b/Carthage
@@ -1 +1 @@
-Subproject commit c52834e1987ffe93dac39113b7cec876dcfe4a70
+Subproject commit fc8eebb92367031f60ea337c897551cc54baa4b2
diff --git a/Podfile b/Podfile
index 06f40022c..52b196b6c 100644
--- a/Podfile
+++ b/Podfile
@@ -10,6 +10,7 @@ target 'Signal' do
     pod 'OpenSSL'
     pod 'SCWaveformView',             '~> 1.0'
     pod 'JSQMessagesViewController'
+    pod 'PureLayout'
     target 'SignalTests' do
         inherit! :search_paths
     end
diff --git a/Podfile.lock b/Podfile.lock
index 239d0e7df..509d60e9c 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -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
diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj
index 54b508a41..22d850f7c 100644
--- a/Signal.xcodeproj/project.pbxproj
+++ b/Signal.xcodeproj/project.pbxproj
@@ -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 = (