Merge pull request #129 from NickEntin/entin/modular-imports

Use modular imports for cross-framework dependencies
square · Sep 17, 2021 · 226a577 · 226a577
2 parents 2a582c0 + 0a24198
commit 226a577
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/Sources/AardvarkLoggingUI/LogViewing/ARKLogTableViewController_Testing.h b/Sources/AardvarkLoggingUI/LogViewing/ARKLogTableViewController_Testing.h
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-#import <CoreAardvark/ARKLogMessage.h>
+@import CoreAardvark;
 
 
 @interface ARKLogTableViewController (Private)

diff --git a/Sources/AardvarkLoggingUI/LogViewing/ARKScreenshotViewController.m b/Sources/AardvarkLoggingUI/LogViewing/ARKScreenshotViewController.m
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-#import <CoreAardvark/ARKLogMessage.h>
+@import CoreAardvark;
 
 #import "ARKScreenshotViewController.h"
 

diff --git a/Sources/AardvarkMailUI/ARKEmailBugReporter.h b/Sources/AardvarkMailUI/ARKEmailBugReporter.h
@@ -14,11 +14,10 @@
 //  limitations under the License.
 //
 
+@import Aardvark;
 @import MessageUI;
 @import UIKit;
 
-#import <Aardvark/Aardvark-Swift.h>
-
 @class ARKBugReportAttachment;
 @class ARKEmailBugReportConfiguration;
 @class ARKEmailBugReporter;

diff --git a/Sources/AardvarkMailUI/ARKEmailBugReporter.m b/Sources/AardvarkMailUI/ARKEmailBugReporter.m
@@ -14,24 +14,17 @@
 //  limitations under the License.
 //
 
+@import Aardvark;
+@import CoreAardvark;
 @import MessageUI;
 
-#import <Aardvark/ARKScreenshotLogging.h>
-#import <CoreAardvark/AardvarkDefines.h>
-#import <CoreAardvark/ARKDefaultLogFormatter.h>
-#import <CoreAardvark/ARKLogMessage.h>
-#import <CoreAardvark/ARKLogStore.h>
-
 #import "ARKEmailBugReporter.h"
 #import "ARKEmailBugReporter_Testing.h"
 
 #import "ARKEmailBugReportConfiguration.h"
 #import "ARKEmailBugReportConfiguration_Protected.h"
 
 
-#import <Aardvark/Aardvark-Swift.h>
-
-
 NSString *const ARKScreenshotFlashAnimationKey = @"ScreenshotFlashAnimation";