From cb1f65dfcf78a6cfc11915c2c5695fa023cf3e09 Mon Sep 17 00:00:00 2001 From: "Ben Hamilton (Ben Gertzfield)" 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. --- Functions/Example/IntegrationTests/FIRIntegrationTests.m | 2 +- Functions/Example/TestUtils/FUNFakeApp.m | 2 ++ Functions/Example/Tests/FIRFunctionsTests.m | 2 +- Functions/Example/Tests/FUNSerializerTests.m | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) (limited to 'Functions') diff --git a/Functions/Example/IntegrationTests/FIRIntegrationTests.m b/Functions/Example/IntegrationTests/FIRIntegrationTests.m index 15a5af5..bd4b127 100644 --- a/Functions/Example/IntegrationTests/FIRIntegrationTests.m +++ b/Functions/Example/IntegrationTests/FIRIntegrationTests.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -@import XCTest; +#import #import "FIRError.h" #import "FIRFunctions+Internal.h" diff --git a/Functions/Example/TestUtils/FUNFakeApp.m b/Functions/Example/TestUtils/FUNFakeApp.m index 5b31d01..370273b 100644 --- a/Functions/Example/TestUtils/FUNFakeApp.m +++ b/Functions/Example/TestUtils/FUNFakeApp.m @@ -14,6 +14,8 @@ * limitations under the License. */ +#import + #import "FUNFakeApp.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Functions/Example/Tests/FIRFunctionsTests.m b/Functions/Example/Tests/FIRFunctionsTests.m index bec96e6..5d11601 100644 --- a/Functions/Example/Tests/FIRFunctionsTests.m +++ b/Functions/Example/Tests/FIRFunctionsTests.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -@import XCTest; +#import #import "FIRFunctions+Internal.h" #import "FIRFunctions.h" diff --git a/Functions/Example/Tests/FUNSerializerTests.m b/Functions/Example/Tests/FUNSerializerTests.m index 707c3e7..ca2198e 100644 --- a/Functions/Example/Tests/FUNSerializerTests.m +++ b/Functions/Example/Tests/FUNSerializerTests.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -@import XCTest; +#import #import "FIRError.h" #import "FUNSerializer.h" -- cgit v1.2.3