Skip to content
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.

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

[WIP] change min iOS build to 16.0 #1480

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
4 changes: 2 additions & 2 deletions IdentityCore/IdentityCore.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8990,7 +8990,7 @@
"$(MSID_WEBKIT)",

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This pull request does not update changelog.txt.

Please consider if this change would be noticeable to a partner or user and either update changelog.txt or resolve this conversation.

"$(MSID_SYSTEMWV)",
);
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos xrsimulator xros";
TARGETED_DEVICE_FAMILY = "1,2,7";
};
Expand All @@ -9005,7 +9005,7 @@
"$(MSID_SYSTEMWV)",
"$(MSID_WEBKIT)",
);
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos xrsimulator xros";
TARGETED_DEVICE_FAMILY = "1,2,7";
};
Expand Down
20 changes: 19 additions & 1 deletion IdentityCore/src/util/ios/UIApplication+MSIDExtensions.m
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,25 @@ + (UIViewController *)msidCurrentViewController:(UIViewController *)parentContro

for (UIWindow *window in windows)
#else
for (UIWindow *window in [MSIDAppExtensionUtil sharedApplication].windows)
NSArray<UIScene *> *scenes=[[[UIApplication sharedApplication] connectedScenes] allObjects];
if (!scenes) return nil;
UIWindowScene *windowScene = nil;
for (int i=0; i<=scenes.count - 1; i++) {
if ([scenes[i] isKindOfClass:UIWindowScene.class])
{
continue;
}
else
{
// get the 1st window scene
windowScene = (UIWindowScene *)scenes[i];
break;
}
}
if (!windowScene) return nil;
NSArray *windows=[windowScene windows];

for (UIWindow *window in windows)
#endif
{
if (window.isKeyWindow)
Expand Down
Loading