Skip to content

Prevent a build error on Xcode 12 and earlier #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
petea merged 5 commits into from
May 27, 2022
Merged

Prevent a build error on Xcode 12 and earlier #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ff359ef
Prevent build error on Xcode 12 and earlier.
petea May 26, 2022
97fbeb6
Condense.
petea May 26, 2022
afd6f13
Merge branch 'main' into petea-xcode12
petea May 27, 2022
30c0c58
Update test as well.
petea May 27, 2022
9c049ec
Merge branch 'main' into petea-xcode12
petea May 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion GoogleSignIn/Sources/GIDEMMErrorHandler.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,14 +148,17 @@ - (BOOL)handleErrorFromResponse:(NSDictionary<NSString *, id> *)response

// This method is exposed to the unit test.
- (nullable UIWindow *)keyWindow {
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 150000
if (@available(iOS 15, *)) {
for (UIScene *scene in UIApplication.sharedApplication.connectedScenes) {
if ([scene isKindOfClass:[UIWindowScene class]] &&
scene.activationState == UISceneActivationStateForegroundActive) {
return ((UIWindowScene *)scene).keyWindow;
}
}
} else {
} else
#endif // __IPHONE_OS_VERSION_MAX_ALLOWED >= 150000
{
#if __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_15_0
if (@available(iOS 13, *)) {
for (UIWindow *window in UIApplication.sharedApplication.windows) {
Expand Down
5 changes: 4 additions & 1 deletion GoogleSignIn/Tests/Unit/GIDEMMErrorHandlerTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,12 +494,15 @@ - (void)testKeyWindow {
selector:@selector(sharedApplication)
isClassSelector:YES
withBlock:^{ return mockApplication; }];
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 150000
if (@available(iOS 15, *)) {
UIWindowScene *mockWindowScene = OCMClassMock([UIWindowScene class]);
OCMStub(mockApplication.connectedScenes).andReturn(@[mockWindowScene]);
OCMStub(mockWindowScene.activationState).andReturn(UISceneActivationStateForegroundActive);
OCMStub(mockWindowScene.keyWindow).andReturn(mockKeyWindow);
} else {
} else
#endif // __IPHONE_OS_VERSION_MAX_ALLOWED >= 150000
{
#if __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_15_0
if (@available(iOS 13, *)) {
OCMStub(mockApplication.windows).andReturn(@[mockKeyWindow]);
Expand Down