From 8e2c7b7d0973445b405521b1f249234d4784aab0 Mon Sep 17 00:00:00 2001 From: Nick Cooke <36927374+ncooke3@users.noreply.github.com> Date: Fri, 10 May 2024 13:26:20 -0400 Subject: [PATCH] [Firestore] Cleanup compilation guards for building on older SDKs (#12936) --- Firestore/core/test/unit/FSTGoogleTestTests.mm | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/Firestore/core/test/unit/FSTGoogleTestTests.mm b/Firestore/core/test/unit/FSTGoogleTestTests.mm index f0120857d76..2b4c51389a9 100644 --- a/Firestore/core/test/unit/FSTGoogleTestTests.mm +++ b/Firestore/core/test/unit/FSTGoogleTestTests.mm @@ -235,12 +235,8 @@ void XCTestMethod(XCTestCase* self, SEL _cmd) { XCTAssertTrue(true); return; } else if (result->Skipped()) { -#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130400 || \ - __TV_OS_VERSION_MAX_ALLOWED >= 130400 || \ - __MAC_OS_X_VERSION_MAX_ALLOWED >= 101504 // Let Xcode know that the test was skipped. XCTSkip(); -#endif } // Test failed :-(. Record the failure such that Xcode will navigate directly @@ -251,9 +247,6 @@ void XCTestMethod(XCTestCase* self, SEL _cmd) { const char* path = part.file_name() ? part.file_name() : ""; int line = part.line_number() > 0 ? part.line_number() : 0; -#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 140000 || \ - __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500 - // Xcode 12 auto* location = [[XCTSourceCodeLocation alloc] initWithFilePath:@(path) lineNumber:line]; auto* context = [[XCTSourceCodeContext alloc] initWithLocation:location]; @@ -264,15 +257,6 @@ void XCTestMethod(XCTestCase* self, SEL _cmd) { associatedError:nil attachments:@[]]; [self recordIssue:issue]; - -#else - // Xcode 11 and prior. recordFailureWithDescription:inFile:atLine:expected: - // is deprecated in Xcode 12. - [self recordFailureWithDescription:@(part.message()) - inFile:@(path) - atLine:line - expected:true]; -#endif } }