Skip to content

Unblock Xcode 12 beta 4#535

Merged
acoates-ms merged 6 commits intomicrosoft:0.60-stablefrom
HeyImChris:0.60-stable
Aug 13, 2020
Merged

Unblock Xcode 12 beta 4#535
acoates-ms merged 6 commits intomicrosoft:0.60-stablefrom
HeyImChris:0.60-stable

Conversation

@HeyImChris
Copy link
Copy Markdown

@HeyImChris HeyImChris commented Aug 11, 2020

Please select one of the following

  • I am removing an existing difference between facebook/react-native and microsoft/react-native-macos 👍
  • I am cherry-picking a change from Facebook's react-native into microsoft/react-native-macos 👍
  • I am making a fix / change for the macOS implementation of react-native
  • I am making a change required for Microsoft usage of react-native

Summary

This change is in master but we need to bring it over to the 0.60-stable branch as well since this is the branch sdx-platform is currently consuming.

This is needed to compile on Xcode12 beta 4. Previously we were successfully compiling on beta 2, but as things change between the betas this broke.

The compiler error is that it can't find the definition to a c++ function used for internal performance tracking/logging. We can explicitly include that framework (quartz) for macOS.

Created an OSS issue in this repo to track changes needed for the transition to Xcode 12 via issue #533 .

Changelog

[macOS] [Fixed] - Fix Xcode 12 beta 4 compiler error that we're missing a definition

Test Plan

If it compiles on macOS then it's fixed and shouldn't break anything. Built for iOS/macOS locally on Xcode 12 beta 4. CI will test again on Xcode 11 and soon on Xcode 12 beta 4.

Microsoft Reviewers: Open in CodeFlow

@HeyImChris HeyImChris self-assigned this Aug 11, 2020
@pull-bot
Copy link
Copy Markdown

pull-bot commented Aug 11, 2020

Warnings
⚠️

❔ Base Branch - The base branch for this PR is something other than master. Are you sure you want to merge these changes into a stable release? If you are interested in backporting updates to an older release, the suggested approach is to land those changes on master first and then cherry-pick the commits into the branch for that release. The Releases Guide has more information.

⚠️ 🔒 package.json - Changes were made to package.json. This will require a manual import by a Facebook employee.
Messages
📖

📋 Verify Changelog Format - A changelog entry has the following format: [CATEGORY] [TYPE] - Message.

DetailsCATEGORY may be:
  • General
  • iOS
  • Android
  • JavaScript
  • Internal (for changes that do not need to be called out in the release notes)

TYPE may be:

  • Added, for new features.
  • Changed, for changes in existing functionality.
  • Deprecated, for soon-to-be removed features.
  • Removed, for now removed features.
  • Fixed, for any bug fixes.
  • Security, in case of vulnerabilities.

MESSAGE may answer "what and why" on a feature level. Use this to briefly tell React Native users about notable changes.

Generated by 🚫 dangerJS against 84d90fa

@HeyImChris HeyImChris changed the title Unblock xcocde 12 beta 4 Unblock Xcode 12 beta 4 Aug 11, 2020
@HeyImChris HeyImChris requested a review from amgleitman August 11, 2020 17:38
@ghost ghost removed the Needs: Author Feedback label Aug 13, 2020

#include <TargetConditionals.h>

#import <QuartzCore/CADisplayLink.h> // TODO GH#533, we need to explicitly pull in the framework to get the definition for CACurrentMediaTime()
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

What does the TODO indicate in this case? From the perspective of a developer who might touch this code next, it's not clear to me what I should keep in mind or try to work towards.

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.

5 participants