Merge branch 'mkirk/fixup-test-build' into release/2.31.0

Signal.xcodeproj/project.pbxproj

@@ -2960,8 +2960,8 @@
 			files = (
 			);
 			inputPaths = (
-				"$(SRCROOT)/Carthage/Build/iOS/WebRTC.framework",
+				"$(SRCROOT)/ThirdParty/WebRTC/Build/WebRTC.framework",
-				"$(SRCROOT)/Carthage/Build/iOS/ZXingObjC.framework",
+				"$(SRCROOT)/ThirdParty/Carthage/Build/iOS/ZXingObjC.framework",
 			);
 			name = "[Carthage] Copy Frameworks";
 			outputPaths = (

Signal/test/mocks/MockEnvironment.m

@@ -8,6 +8,7 @@
 #import <SignalMessaging/LockInteractionController.h>
 #import <SignalMessaging/OWSPreferences.h>
 #import <SignalMessaging/OWSSounds.h>
+#import <SignalMessaging/SignalMessaging-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -26,15 +27,20 @@ NS_ASSUME_NONNULL_BEGIN
     OWSAssertDebug(primaryStorage);
 
     // TODO: We should probably mock this out.
+    OWSAudioSession *audioSession = [OWSAudioSession new];
+    LockInteractionController *lockInteractionController = [[LockInteractionController alloc] initDefault];
     OWSPreferences *preferences = [OWSPreferences new];
     OWSSounds *sounds = [[OWSSounds alloc] initWithPrimaryStorage:primaryStorage];
-    LockInteractionController *lockInteractionController = [[LockInteractionController alloc] initDefault];
+    id<OWSProximityMonitoringManager> proximityMonitoringManager = [OWSProximityMonitoringManagerImpl new];
     OWSWindowManager *windowManager = [[OWSWindowManager alloc] initDefault];
 
-    self = [super initWithPreferences:preferences
+    self = [super initWithAudioSession:audioSession
-                               sounds:sounds
+             lockInteractionController:lockInteractionController
-            lockInteractionController:lockInteractionController
+                           preferences:preferences
-                        windowManager:windowManager];
+            proximityMonitoringManager:proximityMonitoringManager
+                                sounds:sounds
+                         windowManager:windowManager];
+
     OWSAssertDebug(self);
     return self;
 }

Signal/test/util/SearcherTest.swift

@@ -9,6 +9,9 @@ import XCTest
 // TODO: We might be able to merge this with OWSFakeContactsManager.
 @objc
 class ConversationSearcherContactsManager: NSObject, ContactsManagerProtocol {
+    func displayName(forPhoneIdentifier recipientId: String?, transaction: YapDatabaseReadTransaction) -> String {
+        return self.displayName(forPhoneIdentifier: recipientId)
+    }
 
     func displayName(forPhoneIdentifier phoneNumber: String?) -> String {
         if phoneNumber == aliceRecipientId {