From cb1f65dfcf78a6cfc11915c2c5695fa023cf3e09 Mon Sep 17 00:00:00 2001
From: "Ben Hamilton (Ben Gertzfield)" <bhamiltoncx@gmail.com>
Date: Thu, 29 Mar 2018 09:44:48 -0600
Subject: Migrate Firebase off ObjC module @import statements (#992)

* Migrate Firebase off @import statements

* - Migrate tests and test utils from @import to #import.
  - Update Xcode projects for tests to explicitly link in framework deps.
  - Update check_no_module_imports.sh to look for @imports in tests/test utils/
    integration tests.

* Ensure check_no_module_imports.sh explicitly exits with code 0 on success.
---
 Example/Messaging/Tests/FIRMessagingClientTest.m                   | 2 +-
 Example/Messaging/Tests/FIRMessagingCodedInputStreamTest.m         | 2 +-
 Example/Messaging/Tests/FIRMessagingConnectionTest.m               | 2 +-
 Example/Messaging/Tests/FIRMessagingDataMessageManagerTest.m       | 2 +-
 Example/Messaging/Tests/FIRMessagingLinkHandlingTest.m             | 2 +-
 Example/Messaging/Tests/FIRMessagingPubSubTest.m                   | 2 +-
 Example/Messaging/Tests/FIRMessagingRegistrarTest.m                | 4 ++--
 Example/Messaging/Tests/FIRMessagingRemoteNotificationsProxyTest.m | 4 ++--
 Example/Messaging/Tests/FIRMessagingSecureSocketTest.m             | 2 +-
 Example/Messaging/Tests/FIRMessagingServiceTest.m                  | 4 ++--
 Example/Messaging/Tests/FIRMessagingTest.m                         | 2 +-
 11 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'Example/Messaging')

diff --git a/Example/Messaging/Tests/FIRMessagingClientTest.m b/Example/Messaging/Tests/FIRMessagingClientTest.m
index 5505b70..9c60d9c 100644
--- a/Example/Messaging/Tests/FIRMessagingClientTest.m
+++ b/Example/Messaging/Tests/FIRMessagingClientTest.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-@import XCTest;
+#import <XCTest/XCTest.h>
 
 #import <OCMock/OCMock.h>
 
diff --git a/Example/Messaging/Tests/FIRMessagingCodedInputStreamTest.m b/Example/Messaging/Tests/FIRMessagingCodedInputStreamTest.m
index 7cc2d97..bafa714 100644
--- a/Example/Messaging/Tests/FIRMessagingCodedInputStreamTest.m
+++ b/Example/Messaging/Tests/FIRMessagingCodedInputStreamTest.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-@import XCTest;
+#import <XCTest/XCTest.h>
 
 #import "FIRMessagingCodedInputStream.h"
 
diff --git a/Example/Messaging/Tests/FIRMessagingConnectionTest.m b/Example/Messaging/Tests/FIRMessagingConnectionTest.m
index 47b29d2..b770cf5 100644
--- a/Example/Messaging/Tests/FIRMessagingConnectionTest.m
+++ b/Example/Messaging/Tests/FIRMessagingConnectionTest.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-@import XCTest;
+#import <XCTest/XCTest.h>
 
 #import <OCMock/OCMock.h>
 
diff --git a/Example/Messaging/Tests/FIRMessagingDataMessageManagerTest.m b/Example/Messaging/Tests/FIRMessagingDataMessageManagerTest.m
index 5771337..8aaad51 100644
--- a/Example/Messaging/Tests/FIRMessagingDataMessageManagerTest.m
+++ b/Example/Messaging/Tests/FIRMessagingDataMessageManagerTest.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-@import XCTest;
+#import <XCTest/XCTest.h>
 
 #import <OCMock/OCMock.h>
 
diff --git a/Example/Messaging/Tests/FIRMessagingLinkHandlingTest.m b/Example/Messaging/Tests/FIRMessagingLinkHandlingTest.m
index 8f93240..4ef2525 100644
--- a/Example/Messaging/Tests/FIRMessagingLinkHandlingTest.m
+++ b/Example/Messaging/Tests/FIRMessagingLinkHandlingTest.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-@import XCTest;
+#import <XCTest/XCTest.h>
 
 #import <OCMock/OCMock.h>
 
diff --git a/Example/Messaging/Tests/FIRMessagingPubSubTest.m b/Example/Messaging/Tests/FIRMessagingPubSubTest.m
index 2981b54..3af1402 100644
--- a/Example/Messaging/Tests/FIRMessagingPubSubTest.m
+++ b/Example/Messaging/Tests/FIRMessagingPubSubTest.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-@import XCTest;
+#import <XCTest/XCTest.h>
 
 #import "FIRMessagingPubSub.h"
 
diff --git a/Example/Messaging/Tests/FIRMessagingRegistrarTest.m b/Example/Messaging/Tests/FIRMessagingRegistrarTest.m
index b32851c..863ba4b 100644
--- a/Example/Messaging/Tests/FIRMessagingRegistrarTest.m
+++ b/Example/Messaging/Tests/FIRMessagingRegistrarTest.m
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-@import UIKit;
-@import XCTest;
+#import <UIKit/UIKit.h>
+#import <XCTest/XCTest.h>
 
 #import <OCMock/OCMock.h>
 
diff --git a/Example/Messaging/Tests/FIRMessagingRemoteNotificationsProxyTest.m b/Example/Messaging/Tests/FIRMessagingRemoteNotificationsProxyTest.m
index 1e1cbf3..3453f11 100644
--- a/Example/Messaging/Tests/FIRMessagingRemoteNotificationsProxyTest.m
+++ b/Example/Messaging/Tests/FIRMessagingRemoteNotificationsProxyTest.m
@@ -15,9 +15,9 @@
  */
 
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
-@import UserNotifications;
+#import <UserNotifications/UserNotifications.h>
 #endif
-@import XCTest;
+#import <XCTest/XCTest.h>
 
 #import <OCMock/OCMock.h>
 
diff --git a/Example/Messaging/Tests/FIRMessagingSecureSocketTest.m b/Example/Messaging/Tests/FIRMessagingSecureSocketTest.m
index 9f6186b..b86592c 100644
--- a/Example/Messaging/Tests/FIRMessagingSecureSocketTest.m
+++ b/Example/Messaging/Tests/FIRMessagingSecureSocketTest.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-@import XCTest;
+#import <XCTest/XCTest.h>
 
 #import <OCMock/OCMock.h>
 
diff --git a/Example/Messaging/Tests/FIRMessagingServiceTest.m b/Example/Messaging/Tests/FIRMessagingServiceTest.m
index c8d61c2..0a41314 100644
--- a/Example/Messaging/Tests/FIRMessagingServiceTest.m
+++ b/Example/Messaging/Tests/FIRMessagingServiceTest.m
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-@import UIKit;
-@import XCTest;
+#import <UIKit/UIKit.h>
+#import <XCTest/XCTest.h>
 
 #import <OCMock/OCMock.h>
 
diff --git a/Example/Messaging/Tests/FIRMessagingTest.m b/Example/Messaging/Tests/FIRMessagingTest.m
index 3521290..c2a136a 100644
--- a/Example/Messaging/Tests/FIRMessagingTest.m
+++ b/Example/Messaging/Tests/FIRMessagingTest.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-@import XCTest;
+#import <XCTest/XCTest.h>
 
 #import <OCMock/OCMock.h>
 #import <FirebaseInstanceID/FirebaseInstanceID.h>
-- 
cgit v1.2.3