From 13856acb029f16800a7440fe843644178c0b7fc0 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Sat, 15 Sep 2018 18:46:49 -0500
Subject: [PATCH 1/3] remove wrong import

---
 Signal/test/util/OWSOrphanDataCleanerTest.m | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Signal/test/util/OWSOrphanDataCleanerTest.m b/Signal/test/util/OWSOrphanDataCleanerTest.m
index 051d02c39..3cfc93165 100644
--- a/Signal/test/util/OWSOrphanDataCleanerTest.m
+++ b/Signal/test/util/OWSOrphanDataCleanerTest.m
@@ -5,12 +5,13 @@
 #import "OWSOrphanDataCleaner.h"
 #import "OWSDevice.h"
 #import "OWSPrimaryStorage.h"
+#import "SignalBaseTest.h"
 #import "TSAttachmentStream.h"
 #import "TSContactThread.h"
 #import "TSIncomingMessage.h"
 #import <XCTest/XCTest.h>
 
-@interface OWSOrphanDataCleanerTest : XCTestCase
+@interface OWSOrphanDataCleanerTest : SignalBaseTest
 
 @end
 

From 60a6128afdc620ab96e93e346fd4c64571e4f318 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Sun, 16 Sep 2018 20:40:10 -0500
Subject: [PATCH 2/3] Remove SSK tests from Signal-iOS xcode test run

Firstly, they aren't compiling (and haven't been for a while), and thus prevent
iOS tests from running and being written. This can and should be fixed.

Secondly, they don't respect the ubsan.supp file. I'm not sure how to fix this.
We may just not be able to run the SSK tests as part of the Signal-iOS test
runner, and instead have to revert to running them from within a separate test
app.
---
 Podfile      |  2 +-
 Podfile.lock | 17 +----------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/Podfile b/Podfile
index 485fd48ea..a161c4805 100644
--- a/Podfile
+++ b/Podfile
@@ -11,7 +11,7 @@ def shared_pods
   pod 'YapDatabase/SQLCipher', :git => 'https://github.com/signalapp/YapDatabase.git', branch: 'signal-release'
   pod 'AxolotlKit', git: 'https://github.com/signalapp/SignalProtocolKit.git'
   # pod 'AxolotlKit', path: '../SignalProtocolKit'
-  pod 'SignalServiceKit', path: '.', testspecs: ["Tests"]
+  pod 'SignalServiceKit', path: '.'
   pod 'HKDFKit', git: 'https://github.com/signalapp/HKDFKit.git'
   # pod 'HKDFKit', path: '../HKDFKit'
   pod 'Curve25519Kit', git: 'https://github.com/signalapp/Curve25519Kit'
diff --git a/Podfile.lock b/Podfile.lock
index 47dc24e4a..737098556 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -62,20 +62,6 @@ PODS:
     - SocketRocket
     - SwiftProtobuf
     - YapDatabase/SQLCipher
-  - SignalServiceKit/Tests (0.9.0):
-    - AFNetworking
-    - AxolotlKit
-    - CocoaLumberjack
-    - Curve25519Kit
-    - GRKOpenSSLFramework
-    - libPhoneNumber-iOS
-    - Mantle
-    - PromiseKit (~> 4.0)
-    - Reachability
-    - SAMKeychain
-    - SocketRocket
-    - SwiftProtobuf
-    - YapDatabase/SQLCipher
   - SocketRocket (0.5.1)
   - SQLCipher (3.4.2):
     - SQLCipher/standard (= 3.4.2)
@@ -160,7 +146,6 @@ DEPENDENCIES:
   - PureLayout
   - Reachability
   - SignalServiceKit (from `.`)
-  - SignalServiceKit/Tests (from `.`)
   - SocketRocket (from `https://github.com/signalapp/SocketRocket.git`, branch `mkirk/handle-sec-err`)
   - SQLCipher (from `https://github.com/sqlcipher/sqlcipher.git`, commit `d5c2bec`)
   - SSZipArchive
@@ -246,6 +231,6 @@ SPEC CHECKSUMS:
   YapDatabase: b418a4baa6906e8028748938f9159807fd039af4
   YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
 
-PODFILE CHECKSUM: 40c4fc7dfb6066c4fdb80bc08600096e172dd4d7
+PODFILE CHECKSUM: cb4f38eaa6b1bdf86cfe440ef964c628e6d8321d
 
 COCOAPODS: 1.5.3

From 25bec863251afade66e2a3045bdc7f6a8057e056 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Mon, 17 Sep 2018 12:38:36 -0600
Subject: [PATCH 3/3] update pods

---
 Pods | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Pods b/Pods
index c20b80e39..675e4be7f 160000
--- a/Pods
+++ b/Pods
@@ -1 +1 @@
-Subproject commit c20b80e3952ccdb215831c4063c79d479d1cd702
+Subproject commit 675e4be7f1a7c35d447965143ca0cadef99a179e