Skip to content

Commit 8e2c7b7

Browse files
authored
[Firestore] Cleanup compilation guards for building on older SDKs (#12936)
1 parent d9f9382 commit 8e2c7b7

File tree

1 file changed

+0
-16
lines changed

1 file changed

+0
-16
lines changed

Firestore/core/test/unit/FSTGoogleTestTests.mm

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -235,12 +235,8 @@ void XCTestMethod(XCTestCase* self, SEL _cmd) {
235235
XCTAssertTrue(true);
236236
return;
237237
} else if (result->Skipped()) {
238-
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130400 || \
239-
__TV_OS_VERSION_MAX_ALLOWED >= 130400 || \
240-
__MAC_OS_X_VERSION_MAX_ALLOWED >= 101504
241238
// Let Xcode know that the test was skipped.
242239
XCTSkip();
243-
#endif
244240
}
245241

246242
// Test failed :-(. Record the failure such that Xcode will navigate directly
@@ -251,9 +247,6 @@ void XCTestMethod(XCTestCase* self, SEL _cmd) {
251247
const char* path = part.file_name() ? part.file_name() : "";
252248
int line = part.line_number() > 0 ? part.line_number() : 0;
253249

254-
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 140000 || \
255-
__MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
256-
// Xcode 12
257250
auto* location = [[XCTSourceCodeLocation alloc] initWithFilePath:@(path)
258251
lineNumber:line];
259252
auto* context = [[XCTSourceCodeContext alloc] initWithLocation:location];
@@ -264,15 +257,6 @@ void XCTestMethod(XCTestCase* self, SEL _cmd) {
264257
associatedError:nil
265258
attachments:@[]];
266259
[self recordIssue:issue];
267-
268-
#else
269-
// Xcode 11 and prior. recordFailureWithDescription:inFile:atLine:expected:
270-
// is deprecated in Xcode 12.
271-
[self recordFailureWithDescription:@(part.message())
272-
inFile:@(path)
273-
atLine:line
274-
expected:true];
275-
#endif
276260
}
277261
}
278262

0 commit comments

Comments
 (0)