Fix rebase breakage.

Signal/src/ViewControllers/AppSettings/AboutTableViewController.m

@@ -195,7 +195,8 @@
 
     // Strip prefix from category, otherwise it's too long to fit into cell on a small device.
     NSString *audioCategory =
-        [AVAudioSession.shared.category stringByReplacingOccurrencesOfString:@"AVAudioSessionCategory" withString:@""];
+        [AVAudioSession.sharedInstance.category stringByReplacingOccurrencesOfString:@"AVAudioSessionCategory"
+                                                                          withString:@""];
     [debugSection
         addItem:[OWSTableItem labelItemWithText:[NSString stringWithFormat:@"Audio Category: %@", audioCategory]]];
 

Signal/src/call/CallAudioService.swift

@@ -36,7 +36,7 @@ protocol CallAudioServiceDelegate: class {
     }
 
     var avAudioSession: AVAudioSession {
-        return AVAudioSession.shared()
+        return AVAudioSession.sharedInstance()
     }
 
     // MARK: - Initializers

Signal/src/call/SignalCall.swift

@@ -188,7 +188,7 @@ public class SignalCall: NSObject, SignalCallNotificationInfo {
     // We start out muted if the record permission isn't granted. This should generally
     // only happen for incoming calls, because we proactively ask about it before you
     // can make an outgoing call.
-    public var isMuted = AVAudioSession.shared().recordPermission != .granted {
+    public var isMuted = AVAudioSession.sharedInstance().recordPermission != .granted {
         didSet {
             AssertIsOnMainThread()
 

SignalMessaging/ViewControllers/UIViewController+Permissions.m

@@ -163,7 +163,7 @@ NS_ASSUME_NONNULL_BEGIN
         return;
     }
 
-    [[AVAudioSession shared] requestRecordPermission:callback];
+    [[AVAudioSession sharedInstance] requestRecordPermission:callback];
 }
 
 - (void)ows_showNoMicrophonePermissionActionSheet

SignalMessaging/environment/OWSAudioSession.swift

@@ -66,7 +66,7 @@ public class OWSAudioSession: NSObject {
         return Environment.shared.proximityMonitoringManager
     }
 
-    private let avAudioSession = AVAudioSession.shared()
+    private let avAudioSession = AVAudioSession.sharedInstance()
 
     private let device = UIDevice.current
 
@@ -232,7 +232,7 @@ public class OWSAudioSession: NSObject {
     /**
      * The private class that manages AVAudioSession for WebRTC
      */
-    private let rtcAudioSession = RTCAudioSession.shared()
+    private let rtcAudioSession = RTCAudioSession.sharedInstance()
 
     /**
      * This must be called before any audio tracks are added to the peerConnection, else we'll start recording before all

SignalMessaging/utils/DebugLogger.m

@@ -83,7 +83,7 @@ const NSUInteger kMaxDebugLogFileSize = 1024 * 1024 * 3;
 
 - (void)enableTTYLogging
 {
-    [DDLog addLogger:DDTTYLogger.shared];
+    [DDLog addLogger:DDTTYLogger.sharedInstance];
 }
 
 - (NSURL *)errorLogsDir

SignalServiceKit/tests/SSKBaseTestObjC.m

@@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
 
     [super setUp];
 
-    [DDLog addLogger:DDTTYLogger.shared];
+    [DDLog addLogger:DDTTYLogger.sharedInstance];
 
     ClearCurrentAppContextForTests();
     SetCurrentAppContext([TestAppContext new]);

SignalServiceKit/tests/SSKBaseTestSwift.swift

@@ -21,7 +21,7 @@ public class SSKBaseTestSwift: XCTestCase {
     public override func setUp() {
         super.setUp()
 
-        DDLog.add(DDTTYLogger.shared!)
+        DDLog.add(DDTTYLogger.sharedInstance!)
 
         ClearCurrentAppContextForTests()
         SetCurrentAppContext(TestAppContext())