Merge pull request #596 from smartdevicelink/hotfix/issue_595

Remove uses of @import

11 files changed, 14 insertions, 19 deletions

diff --git a/SmartDeviceLink/SDLArtwork.h b/SmartDeviceLink/SDLArtwork.h
index 9bbd81cb9..d9e82dff2 100644
--- a/SmartDeviceLink/SDLArtwork.h
+++ b/SmartDeviceLink/SDLArtwork.h
@@ -6,7 +6,7 @@
 //  Copyright © 2015 smartdevicelink. All rights reserved.
 //
 
-@import UIKit;
+#import <UIKit/UIKit.h>
 
 #import "SDLFile.h"
 
@@ -67,4 +67,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-NS_ASSUME_NONNULL_END
\ No newline at end of file
+NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLLifecycleConfiguration.h b/SmartDeviceLink/SDLLifecycleConfiguration.h
index 638c1703a..84a6d9efb 100644
--- a/SmartDeviceLink/SDLLifecycleConfiguration.h
+++ b/SmartDeviceLink/SDLLifecycleConfiguration.h
@@ -6,9 +6,7 @@
 //  Copyright © 2015 smartdevicelink. All rights reserved.
 //
 
-@import UIKit;
-
-#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 @class SDLAppHMIType;
 @class SDLFile;
diff --git a/SmartDeviceLink/SDLLockScreenConfiguration.h b/SmartDeviceLink/SDLLockScreenConfiguration.h
index 4bf55e9a0..cf1287cc3 100644
--- a/SmartDeviceLink/SDLLockScreenConfiguration.h
+++ b/SmartDeviceLink/SDLLockScreenConfiguration.h
@@ -6,9 +6,7 @@
 //  Copyright © 2015 smartdevicelink. All rights reserved.
 //
 
-@import UIKit;
-
-#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLProxyFactory.m b/SmartDeviceLink/SDLProxyFactory.m
index b2320c641..9f9f7b1da 100644
--- a/SmartDeviceLink/SDLProxyFactory.m
+++ b/SmartDeviceLink/SDLProxyFactory.m
@@ -34,4 +34,4 @@
     return ret;
 }
 
-@end
\ No newline at end of file
+@end
diff --git a/SmartDeviceLink/SDLProxyListener.h b/SmartDeviceLink/SDLProxyListener.h
index 9b6f460f4..0de048633 100644
--- a/SmartDeviceLink/SDLProxyListener.h
+++ b/SmartDeviceLink/SDLProxyListener.h
@@ -1,7 +1,7 @@
 //  SDLProxyListener.h
 //
 
-@import UIKit;
+#import <UIKit/UIKit.h>
 
 @class SDLAddCommandResponse;
 @class SDLAddSubMenuResponse;
diff --git a/SmartDeviceLink/SDLStreamingMediaManager.h b/SmartDeviceLink/SDLStreamingMediaManager.h
index 401622b7b..027b39304 100644
--- a/SmartDeviceLink/SDLStreamingMediaManager.h
+++ b/SmartDeviceLink/SDLStreamingMediaManager.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-@import VideoToolbox;
+#import <VideoToolbox/VideoToolbox.h>
 
 #import "SDLProtocolListener.h"
 
diff --git a/SmartDeviceLink/SDLStreamingMediaManager.m b/SmartDeviceLink/SDLStreamingMediaManager.m
index ab7cde8c5..3fceff4df 100644
--- a/SmartDeviceLink/SDLStreamingMediaManager.m
+++ b/SmartDeviceLink/SDLStreamingMediaManager.m
@@ -8,7 +8,7 @@
 
 #import "SDLStreamingMediaManager.h"
 
-@import UIKit;
+#import <UIKit/UIKit.h>
 
 #import "SDLAbstractProtocol.h"
 #import "SDLDebugTool.h"
diff --git a/SmartDeviceLink/SDLTouchManagerDelegate.h b/SmartDeviceLink/SDLTouchManagerDelegate.h
index 9bbcb433d..924780612 100644
--- a/SmartDeviceLink/SDLTouchManagerDelegate.h
+++ b/SmartDeviceLink/SDLTouchManagerDelegate.h
@@ -6,7 +6,7 @@
 //  Copyright © 2016 smartdevicelink. All rights reserved.
 //
 
-@import UIKit;
+#import <UIKit/UIKit.h>
 
 @class SDLTouchManager;
 
@@ -103,4 +103,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-NS_ASSUME_NONNULL_END
\ No newline at end of file
+NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLLockScreenViewControllerSnapshotTests.m b/SmartDeviceLinkTests/DevAPISpecs/SDLLockScreenViewControllerSnapshotTests.m
index 7eedccfe2..341e10105 100644
--- a/SmartDeviceLinkTests/DevAPISpecs/SDLLockScreenViewControllerSnapshotTests.m
+++ b/SmartDeviceLinkTests/DevAPISpecs/SDLLockScreenViewControllerSnapshotTests.m
@@ -6,7 +6,7 @@
 //  Copyright © 2016 smartdevicelink. All rights reserved.
 //
 
-@import UIKit;
+#import <UIKit/UIKit.h>
 #import <FBSnapshotTestCase/FBSnapshotTestCase.h>
 
 #import "SDLLockScreenConfiguration.h"
diff --git a/SmartDeviceLink_Example/Classes/ConnectionTCPTableViewController.m b/SmartDeviceLink_Example/Classes/ConnectionTCPTableViewController.m
index 7861bb321..b32b2c215 100644
--- a/SmartDeviceLink_Example/Classes/ConnectionTCPTableViewController.m
+++ b/SmartDeviceLink_Example/Classes/ConnectionTCPTableViewController.m
@@ -2,7 +2,8 @@
 //  ConnectionTCPTableViewController.m
 //  SmartDeviceLink-iOS
 
-@import AVFoundation;
+#import <AVFoundation/AVFoundation.h>
+#import <MobileCoreServices/MobileCoreServices.h>
 
 #import "ConnectionTCPTableViewController.h"
 
@@ -10,8 +11,6 @@
 #import "ProxyManager.h"
 #import "SDLStreamingMediaManager.h"
 
-#import <MobileCoreServices/MobileCoreServices.h>
-
 @interface ConnectionTCPTableViewController ()
 
 @property (weak, nonatomic) IBOutlet UITextField *ipAddressTextField;
diff --git a/SmartDeviceLink_Example/Classes/ProxyManager.m b/SmartDeviceLink_Example/Classes/ProxyManager.m
index c7272b6c5..891783100 100644
--- a/SmartDeviceLink_Example/Classes/ProxyManager.m
+++ b/SmartDeviceLink_Example/Classes/ProxyManager.m
@@ -2,7 +2,7 @@
 //  ProxyManager.m
 //  SmartDeviceLink-iOS
 
-@import SmartDeviceLink;
+#import "SmartDeviceLink.h"
 
 #import "ProxyManager.h"