aboutsummaryrefslogtreecommitdiffhomepage
path: root/Example
diff options
context:
space:
mode:
authorGravatar Ben Hamilton (Ben Gertzfield) <bhamiltoncx@gmail.com>2018-03-29 09:44:48 -0600
committerGravatar Paul Beusterien <paulbeusterien@google.com>2018-03-29 08:44:48 -0700
commitcb1f65dfcf78a6cfc11915c2c5695fa023cf3e09 (patch)
tree51ffdb63e1e461a1af1ce7e28291f2c40e5bb834 /Example
parent13ff01e20ca796676ba74d0b99065199eca9d309 (diff)
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.
Diffstat (limited to 'Example')
-rw-r--r--Example/Auth/Tests/FIRPhoneAuthProviderTests.m2
-rw-r--r--Example/Firebase.xcodeproj/project.pbxproj16
-rw-r--r--Example/Messaging/Tests/FIRMessagingClientTest.m2
-rw-r--r--Example/Messaging/Tests/FIRMessagingCodedInputStreamTest.m2
-rw-r--r--Example/Messaging/Tests/FIRMessagingConnectionTest.m2
-rw-r--r--Example/Messaging/Tests/FIRMessagingDataMessageManagerTest.m2
-rw-r--r--Example/Messaging/Tests/FIRMessagingLinkHandlingTest.m2
-rw-r--r--Example/Messaging/Tests/FIRMessagingPubSubTest.m2
-rw-r--r--Example/Messaging/Tests/FIRMessagingRegistrarTest.m4
-rw-r--r--Example/Messaging/Tests/FIRMessagingRemoteNotificationsProxyTest.m4
-rw-r--r--Example/Messaging/Tests/FIRMessagingSecureSocketTest.m2
-rw-r--r--Example/Messaging/Tests/FIRMessagingServiceTest.m4
-rw-r--r--Example/Messaging/Tests/FIRMessagingTest.m2
13 files changed, 31 insertions, 15 deletions
diff --git a/Example/Auth/Tests/FIRPhoneAuthProviderTests.m b/Example/Auth/Tests/FIRPhoneAuthProviderTests.m
index 0dc0b44..2b58270 100644
--- a/Example/Auth/Tests/FIRPhoneAuthProviderTests.m
+++ b/Example/Auth/Tests/FIRPhoneAuthProviderTests.m
@@ -44,7 +44,7 @@
#import "OCMStubRecorder+FIRAuthUnitTests.h"
#import "Phone/FIRPhoneAuthCredential_Internal.h"
-@import SafariServices;
+#import <SafariServices/SafariServices.h>
NS_ASSUME_NONNULL_BEGIN
diff --git a/Example/Firebase.xcodeproj/project.pbxproj b/Example/Firebase.xcodeproj/project.pbxproj
index 57fbfc9..5b887a9 100644
--- a/Example/Firebase.xcodeproj/project.pbxproj
+++ b/Example/Firebase.xcodeproj/project.pbxproj
@@ -120,6 +120,11 @@
7EE21F7A1FE89193009B1370 /* FIREmailLinkRequestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EE21F791FE89193009B1370 /* FIREmailLinkRequestTests.m */; };
7EE21F7C1FE8919E009B1370 /* FIREmailLinkSignInResponseTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EE21F7B1FE8919D009B1370 /* FIREmailLinkSignInResponseTests.m */; };
7EFA2E041F71C93300DD354F /* FIRUserMetadataTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EFA2E031F71C93300DD354F /* FIRUserMetadataTests.m */; };
+ 923F824C206C4D8000034974 /* SafariServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 923F824B206C4D8000034974 /* SafariServices.framework */; };
+ 923F824E206C4D8B00034974 /* SafariServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 923F824D206C4D8B00034974 /* SafariServices.framework */; };
+ 923F824F206C4DA500034974 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE45C6641E7DA8CB009E6ACD /* XCTest.framework */; };
+ 923F8251206C4DC600034974 /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 923F8250206C4DC500034974 /* UserNotifications.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+ 923F8252206C4DD500034974 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; };
AFAF36F51EC28C25004BDEE5 /* Shared.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AFAF36F41EC28C25004BDEE5 /* Shared.xcassets */; };
AFAF36F61EC28C25004BDEE5 /* Shared.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AFAF36F41EC28C25004BDEE5 /* Shared.xcassets */; };
AFAF36F71EC28C25004BDEE5 /* Shared.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AFAF36F41EC28C25004BDEE5 /* Shared.xcassets */; };
@@ -951,6 +956,9 @@
7EE21F7B1FE8919D009B1370 /* FIREmailLinkSignInResponseTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIREmailLinkSignInResponseTests.m; sourceTree = "<group>"; };
7EFA2E031F71C93300DD354F /* FIRUserMetadataTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRUserMetadataTests.m; sourceTree = "<group>"; };
8496034D8156555C5FCF8F14 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
+ 923F824B206C4D8000034974 /* SafariServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SafariServices.framework; path = System/Library/Frameworks/SafariServices.framework; sourceTree = SDKROOT; };
+ 923F824D206C4D8B00034974 /* SafariServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SafariServices.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/System/Library/Frameworks/SafariServices.framework; sourceTree = DEVELOPER_DIR; };
+ 923F8250206C4DC500034974 /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; };
AFAF36F41EC28C25004BDEE5 /* Shared.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Shared.xcassets; path = Shared/Shared.xcassets; sourceTree = "<group>"; };
AFC8BA9C1EBD230E00B8EEAE /* NotificationsController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationsController.swift; sourceTree = "<group>"; };
AFC8BA9E1EBD51A700B8EEAE /* Environment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Environment.swift; sourceTree = "<group>"; };
@@ -1316,6 +1324,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 923F824E206C4D8B00034974 /* SafariServices.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1456,6 +1465,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 923F824C206C4D8000034974 /* SafariServices.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1463,6 +1473,9 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 923F8252206C4DD500034974 /* UIKit.framework in Frameworks */,
+ 923F8251206C4DC600034974 /* UserNotifications.framework in Frameworks */,
+ 923F824F206C4DA500034974 /* XCTest.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1660,6 +1673,9 @@
6003F58C195388D20070C39A /* Frameworks */ = {
isa = PBXGroup;
children = (
+ 923F8250206C4DC500034974 /* UserNotifications.framework */,
+ 923F824B206C4D8000034974 /* SafariServices.framework */,
+ 923F824D206C4D8B00034974 /* SafariServices.framework */,
D09005301EDB32D600154410 /* OCMock-iOS/OCMock.framework */,
DE45C6641E7DA8CB009E6ACD /* XCTest.framework */,
DEB61E781E7C542600C04B96 /* libsqlite3.tbd */,
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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-29 14:56:01 +0000