Merge branch 'charlesmchen/assertsVsPch'

src/Network/OWSCensorshipConfiguration.m

@@ -3,7 +3,6 @@
 
 #import "OWSCensorshipConfiguration.h"
 #import "TSStorageManager.h"
-#import "Asserts.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

src/Network/OWSSignalService.m

@@ -8,7 +8,6 @@
 #import "OWSHTTPSecurityPolicy.h"
 #import "TSConstants.h"
 #import "TSAccountManager.h"
-#import "Asserts.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

src/TSPrefix.h

@@ -1,5 +1,6 @@
 #import <CocoaLumberjack/CocoaLumberjack.h>
 #import <Foundation/Foundation.h>
+#import "Asserts.h"
 
 #ifdef DEBUG
 static const NSUInteger ddLogLevel = DDLogLevelAll;
@@ -26,4 +27,4 @@ static const NSUInteger ddLogLevel = DDLogLevelInfo;
         return sharedInstance;               \
     }
 
-#define MacrosSingletonInterface +(instancetype)sharedInstance;
+#define MacrosSingletonInterface +(instancetype)sharedInstance;