diff options
author | Ben Hamilton (Ben Gertzfield) <bhamiltoncx@gmail.com> | 2018-03-29 09:44:48 -0600 |
---|---|---|
committer | Paul Beusterien <paulbeusterien@google.com> | 2018-03-29 08:44:48 -0700 |
commit | cb1f65dfcf78a6cfc11915c2c5695fa023cf3e09 (patch) | |
tree | 51ffdb63e1e461a1af1ce7e28291f2c40e5bb834 /Firebase | |
parent | 13ff01e20ca796676ba74d0b99065199eca9d309 (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 'Firebase')
-rw-r--r-- | Firebase/Core/FIRNetworkConstants.m | 2 | ||||
-rw-r--r-- | Firebase/Core/Private/FIRMutableDictionary.h | 2 | ||||
-rw-r--r-- | Firebase/Core/Private/FIRNetwork.h | 2 | ||||
-rw-r--r-- | Firebase/Core/Private/FIRNetworkConstants.h | 2 | ||||
-rw-r--r-- | Firebase/Core/Private/FIRNetworkLoggerProtocol.h | 2 | ||||
-rw-r--r-- | Firebase/Core/Private/FIRNetworkURLSession.h | 2 | ||||
-rw-r--r-- | Firebase/Core/Private/FIRReachabilityChecker.h | 4 |
7 files changed, 8 insertions, 8 deletions
diff --git a/Firebase/Core/FIRNetworkConstants.m b/Firebase/Core/FIRNetworkConstants.m index a92e0e2..c958201 100644 --- a/Firebase/Core/FIRNetworkConstants.m +++ b/Firebase/Core/FIRNetworkConstants.m @@ -14,7 +14,7 @@ #import "Private/FIRNetworkConstants.h" -@import Foundation; +#import <Foundation/Foundation.h> NSString *const kFIRNetworkBackgroundSessionConfigIDPrefix = @"com.firebase.network.background-upload"; diff --git a/Firebase/Core/Private/FIRMutableDictionary.h b/Firebase/Core/Private/FIRMutableDictionary.h index ebe2d33..6829dbc 100644 --- a/Firebase/Core/Private/FIRMutableDictionary.h +++ b/Firebase/Core/Private/FIRMutableDictionary.h @@ -14,7 +14,7 @@ * limitations under the License. */ -@import Foundation; +#import <Foundation/Foundation.h> /// A mutable dictionary that provides atomic accessor and mutators. @interface FIRMutableDictionary : NSObject diff --git a/Firebase/Core/Private/FIRNetwork.h b/Firebase/Core/Private/FIRNetwork.h index aac0bca..32be35a 100644 --- a/Firebase/Core/Private/FIRNetwork.h +++ b/Firebase/Core/Private/FIRNetwork.h @@ -14,7 +14,7 @@ * limitations under the License. */ -@import Foundation; +#import <Foundation/Foundation.h> #import "FIRNetworkConstants.h" #import "FIRNetworkLoggerProtocol.h" diff --git a/Firebase/Core/Private/FIRNetworkConstants.h b/Firebase/Core/Private/FIRNetworkConstants.h index 5878088..d318581 100644 --- a/Firebase/Core/Private/FIRNetworkConstants.h +++ b/Firebase/Core/Private/FIRNetworkConstants.h @@ -14,7 +14,7 @@ * limitations under the License. */ -@import Foundation; +#import <Foundation/Foundation.h> /// Error codes in Firebase Network error domain. /// Note: these error codes should never change. It would make it harder to decode the errors if diff --git a/Firebase/Core/Private/FIRNetworkLoggerProtocol.h b/Firebase/Core/Private/FIRNetworkLoggerProtocol.h index 4a4315b..add70fc 100644 --- a/Firebase/Core/Private/FIRNetworkLoggerProtocol.h +++ b/Firebase/Core/Private/FIRNetworkLoggerProtocol.h @@ -14,7 +14,7 @@ * limitations under the License. */ -@import Foundation; +#import <Foundation/Foundation.h> #import "FIRLoggerLevel.h" #import "FIRNetworkMessageCode.h" diff --git a/Firebase/Core/Private/FIRNetworkURLSession.h b/Firebase/Core/Private/FIRNetworkURLSession.h index 3b60317..a51b8a9 100644 --- a/Firebase/Core/Private/FIRNetworkURLSession.h +++ b/Firebase/Core/Private/FIRNetworkURLSession.h @@ -14,7 +14,7 @@ * limitations under the License. */ -@import Foundation; +#import <Foundation/Foundation.h> #import "FIRNetworkLoggerProtocol.h" diff --git a/Firebase/Core/Private/FIRReachabilityChecker.h b/Firebase/Core/Private/FIRReachabilityChecker.h index afbc89b..3a6a531 100644 --- a/Firebase/Core/Private/FIRReachabilityChecker.h +++ b/Firebase/Core/Private/FIRReachabilityChecker.h @@ -14,8 +14,8 @@ * limitations under the License. */ -@import Foundation; -@import SystemConfiguration; +#import <Foundation/Foundation.h> +#import <SystemConfiguration/SystemConfiguration.h> /// Reachability Status typedef enum { |