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

Fix target conditional for vision simulator #131

Closed
wants to merge 2 commits into from

Conversation

aaron-foreflight
Copy link

Fix for issue #130

@google-cla
Copy link

google-cla bot commented Oct 5, 2023

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@paulb777
Copy link
Member

paulb777 commented Oct 5, 2023

Thanks for the PR. We'll need a CLA to review. Based on the title, may be similar to #129

@aaron-foreflight
Copy link
Author

Thanks for the PR. We'll need a CLA to review. Based on the title, may be similar to #129

CLA signed.

#129 does look similar and the final solution should probably be a combination of these two fixes. I should probably be returning a value for the vision simulator here rather than omitting it.

@paulb777 paulb777 requested a review from andrewheard October 5, 2023 18:04
Copy link
Collaborator

@andrewheard andrewheard left a comment

Choose a reason for hiding this comment

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

Thanks for the contribution @aaron-foreflight!

@@ -179,6 +179,8 @@ + (NSString *)deviceSimulatorModel {
model = @"iOS Simulator (Unknown)";
break;
}
#elif TARGET_OS_VISION
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think moving #elif TARGET_OS_VISION above #elif TARGET_OS_IOS would allow this to work on both Xcode 15.0 and Xcode 15.1 Beta.

Note: In the current ordering, it'll go in the TARGET_OS_IOS path on Xcode 15.0 where the value of TARGET_OS_IOS is still 1 on visionOS.

@andrewheard
Copy link
Collaborator

Thanks for pointing this out! This is now resolved in #132.

@andrewheard andrewheard closed this Oct 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants