Prefer forward-declaration over import in Objective-C header files

Per @pixlwave, this helps prevent build failures: > We had random cycle errors while building a while back and it was > eventually solved by removing all imports of `GeneratedInterface-Swift.h` > in every [Objective-C header] file.
element-hq · Jul 5, 2022 · 6e761f8 · 6e761f8
1 parent 4cf16e9
commit 6e761f8
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 3 deletions.
diff --git a/SiriIntents/IntentHandlers/SendMessage/SendMessageIntentHandler.h b/SiriIntents/IntentHandlers/SendMessage/SendMessageIntentHandler.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 @import Intents;
-#import "GeneratedInterface-Swift.h"
+@protocol ContactResolving;
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/SiriIntents/IntentHandlers/SendMessage/SendMessageIntentHandler.m b/SiriIntents/IntentHandlers/SendMessage/SendMessageIntentHandler.m
@@ -17,6 +17,7 @@
 #import "SendMessageIntentHandler.h"
 #import "ContactResolver.h"
 #import "MXKAccountManager.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface SendMessageIntentHandler ()
 

diff --git a/SiriIntents/IntentHandlers/StartAudioCall/StartAudioCallIntentHandler.h b/SiriIntents/IntentHandlers/StartAudioCall/StartAudioCallIntentHandler.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 @import Intents;
-#import "GeneratedInterface-Swift.h"
+@protocol ContactResolving;
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/SiriIntents/IntentHandlers/StartAudioCall/StartAudioCallIntentHandler.m b/SiriIntents/IntentHandlers/StartAudioCall/StartAudioCallIntentHandler.m
@@ -17,6 +17,7 @@
 #import "StartAudioCallIntentHandler.h"
 #import "MXKAccountManager.h"
 #import "ContactResolver.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface StartAudioCallIntentHandler ()
 

diff --git a/SiriIntents/IntentHandlers/StartVideoCall/StartVideoCallIntentHandler.h b/SiriIntents/IntentHandlers/StartVideoCall/StartVideoCallIntentHandler.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 @import Intents;
-#import "GeneratedInterface-Swift.h"
+@protocol ContactResolving;
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/SiriIntents/IntentHandlers/StartVideoCall/StartVideoCallIntentHandler.m b/SiriIntents/IntentHandlers/StartVideoCall/StartVideoCallIntentHandler.m
@@ -17,6 +17,7 @@
 #import "StartVideoCallIntentHandler.h"
 #import "ContactResolver.h"
 #import "MXKAccountManager.h"
+#import "GeneratedInterface-Swift.h"
 
 @interface StartVideoCallIntentHandler ()