Skip to content

Copy over ios/mac header files that polyester references to fix the 0.60 merg… #181

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
merged 5 commits into from
Oct 25, 2019
Merged

Copy over ios/mac header files that polyester references to fix the 0.60 merg… #181

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
087ba96
copy over header files that polyester references to fix the 0.60 merg…
HeyImChris Oct 24, 2019
dbdbd57
remove unnecessary header inclusions
HeyImChris Oct 24, 2019
74c9c37
copy these files over in a separate copy headers. Having them in the …
HeyImChris Oct 24, 2019
ca87f36
Mac VM environment error requires we disable mac integration tests to…
HeyImChris Oct 25, 2019
e6f837e
Add support for debug/release builds and on iOS, run tests only for i…
HeyImChris Oct 25, 2019
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
10 changes: 9 additions & 1 deletion .ado/apple-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ jobs:
xcode_sdk: iphonesimulator
xcode_scheme: 'RNTester'
xcode_destination: 'platform=iOS Simulator,OS=latest,name=iPhone 8'
xcode_actions_debug: 'build test'
xcode_actions_release: 'build'
# Microsoft- We don't use tvOS, so don't bother maintaining the infra
# tvos:
# packager_platform: 'ios'
Expand All @@ -27,6 +29,11 @@ jobs:
xcode_sdk: macosx
xcode_scheme: 'RNTester-macOS'
xcode_destination: 'platform=macOS,arch=x86_64'
# TODO: There's a build failure on ADO Mac VMs where XCodeHelper lost Accessibility permission to control the computer. The issue is tracked here
# https://developercommunity.visualstudio.com/content/problem/788271/xcode-helper-not-configured-for-accessibility-on-m.html
# To unblock Mac loop builds, we need to temporarily disable integration tests since they consistently fail without proper access. Once the ticket is resolved, we can uncomment the tests below.
xcode_actions_debug: 'build'
xcode_actions_release: 'build'
pool:
vmImage: macOS-10.14
demands: ['xcode', 'sh', 'npm']
Expand All @@ -39,5 +46,6 @@ jobs:
xcode_sdk: $(xcode_sdk)
xcode_configuration: $(xcode_configuration)
xcode_scheme: $(xcode_scheme)
xcode_actions: $(xcode_actions)
xcode_actions_debug: $(xcode_actions_debug)
xcode_actions_release: $(xcode_actions_release)
xcode_destination: $(xcode_destination)
7 changes: 4 additions & 3 deletions .ado/templates/apple-job-react-native.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ parameters:
xcode_sdk: ''
xcode_configuration: ''
xcode_scheme: ''
xcode_actions: ''
xcode_actions_debug: ''
xcode_actions_release: ''
xcode_destination: ''

steps:
Expand Down Expand Up @@ -46,7 +47,7 @@ steps:
xcode_configuration: Debug
xcode_workspacePath: RNTester/RNTester.xcodeproj
xcode_scheme: ${{ parameters.xcode_scheme }}
xcode_actions: 'build test'
xcode_actions: ${{ parameters.xcode_actions_debug }}
xcode_useXcpretty: true
xcode_destination: ${{ parameters.xcode_destination }}

Expand All @@ -56,7 +57,7 @@ steps:
xcode_configuration: Release
xcode_workspacePath: RNTester/RNTester.xcodeproj
xcode_scheme: ${{ parameters.xcode_scheme }}
xcode_actions: 'build'
xcode_actions: ${{ parameters.xcode_actions_release }}
xcode_useXcpretty: false
xcode_destination: ${{ parameters.xcode_destination }}

Expand Down
18 changes: 9 additions & 9 deletions Libraries/Text/RCTText.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@
8F2807C7202D2B6B005D65E6 /* RCTInputAccessoryViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2807C1202D2B6A005D65E6 /* RCTInputAccessoryViewManager.m */; };
8F2807C8202D2B6B005D65E6 /* RCTInputAccessoryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2807C3202D2B6A005D65E6 /* RCTInputAccessoryView.m */; };
8F2807C9202D2B6B005D65E6 /* RCTInputAccessoryViewContent.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2807C5202D2B6B005D65E6 /* RCTInputAccessoryViewContent.m */; };
9F4658BD23563A92000929DF /* RCTBackedTextInputViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 5956B112200FEBA9008D9D16 /* RCTBackedTextInputViewProtocol.h */; };
9F4658BE23563A92000929DF /* RCTBackedTextInputViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 5956B112200FEBA9008D9D16 /* RCTBackedTextInputViewProtocol.h */; };
9F4658BF23563AB8000929DF /* RCTBackedTextInputDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5956B10C200FEBA9008D9D16 /* RCTBackedTextInputDelegate.h */; };
9F4658C023563AB8000929DF /* RCTBackedTextInputDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5956B10C200FEBA9008D9D16 /* RCTBackedTextInputDelegate.h */; };
9F4659E2236262E9000929DF /* RCTBackedTextInputDelegate.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B10C200FEBA9008D9D16 /* RCTBackedTextInputDelegate.h */; };
9F4659E3236262E9000929DF /* RCTBackedTextInputViewProtocol.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B112200FEBA9008D9D16 /* RCTBackedTextInputViewProtocol.h */; };
9F4659E42362634A000929DF /* RCTBackedTextInputDelegate.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B10C200FEBA9008D9D16 /* RCTBackedTextInputDelegate.h */; };
9F4659E52362634A000929DF /* RCTBackedTextInputViewProtocol.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B112200FEBA9008D9D16 /* RCTBackedTextInputViewProtocol.h */; };
9F5C189A230DD5E600E3E5A7 /* RCTVirtualTextViewManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B12D200FEBAA008D9D16 /* RCTVirtualTextViewManager.h */; };
9F5C189C230DD67C00E3E5A7 /* RCTVirtualTextShadowView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B12C200FEBAA008D9D16 /* RCTVirtualTextShadowView.h */; };
9F5C189D230DD68B00E3E5A7 /* RCTUITextField.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B105200FEBA9008D9D16 /* RCTUITextField.h */; };
Expand Down Expand Up @@ -165,9 +165,11 @@
183496EA1F5DF07600C0A1B4 /* Copy Headers */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = include/React;
dstPath = include/RCTText;
dstSubfolderSpec = 16;
files = (
9F4659E2236262E9000929DF /* RCTBackedTextInputDelegate.h in Copy Headers */,
9F4659E3236262E9000929DF /* RCTBackedTextInputViewProtocol.h in Copy Headers */,
);
name = "Copy Headers";
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -281,6 +283,8 @@
dstPath = include/React;
dstSubfolderSpec = 16;
files = (
9F4659E42362634A000929DF /* RCTBackedTextInputDelegate.h in Copy Headers */,
9F4659E52362634A000929DF /* RCTBackedTextInputViewProtocol.h in Copy Headers */,
);
name = "Copy Headers";
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -497,8 +501,6 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
9F4658BD23563A92000929DF /* RCTBackedTextInputViewProtocol.h in Headers */,
9F4658BF23563AB8000929DF /* RCTBackedTextInputDelegate.h in Headers */,
9F5C1912230DF3E700E3E5A7 /* RCTTextUIKit.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -507,8 +509,6 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
9F4658BE23563A92000929DF /* RCTBackedTextInputViewProtocol.h in Headers */,
9F4658C023563AB8000929DF /* RCTBackedTextInputDelegate.h in Headers */,
9F5C1913230DF3E700E3E5A7 /* RCTTextUIKit.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down