Skip to content

Commit 932a2b8

Browse files
HeyImChrisacoates-ms
authored andcommitted
Copy over ios/mac header files that polyester references to fix the 0.60 merg… (#181)
* copy over header files that polyester references to fix the 0.60 merge into sdx-platform * remove unnecessary header inclusions * copy these files over in a separate copy headers. Having them in the same copy headers causes duplicate symbol problems when building * Mac VM environment error requires we disable mac integration tests to unblock the 60 merge progress * Add support for debug/release builds and on iOS, run tests only for iOS debug for now. disable them for Mac debug/release
1 parent 291a1a2 commit 932a2b8

File tree

3 files changed

+22
-13
lines changed

3 files changed

+22
-13
lines changed

.ado/apple-pr.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ jobs:
1616
xcode_sdk: iphonesimulator
1717
xcode_scheme: 'RNTester'
1818
xcode_destination: 'platform=iOS Simulator,OS=latest,name=iPhone 8'
19+
xcode_actions_debug: 'build test'
20+
xcode_actions_release: 'build'
1921
# Microsoft- We don't use tvOS, so don't bother maintaining the infra
2022
# tvos:
2123
# packager_platform: 'ios'
@@ -27,6 +29,11 @@ jobs:
2729
xcode_sdk: macosx
2830
xcode_scheme: 'RNTester-macOS'
2931
xcode_destination: 'platform=macOS,arch=x86_64'
32+
# TODO: There's a build failure on ADO Mac VMs where XCodeHelper lost Accessibility permission to control the computer. The issue is tracked here
33+
# https://developercommunity.visualstudio.com/content/problem/788271/xcode-helper-not-configured-for-accessibility-on-m.html
34+
# 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.
35+
xcode_actions_debug: 'build'
36+
xcode_actions_release: 'build'
3037
pool:
3138
vmImage: macOS-10.14
3239
demands: ['xcode', 'sh', 'npm']
@@ -39,5 +46,6 @@ jobs:
3946
xcode_sdk: $(xcode_sdk)
4047
xcode_configuration: $(xcode_configuration)
4148
xcode_scheme: $(xcode_scheme)
42-
xcode_actions: $(xcode_actions)
49+
xcode_actions_debug: $(xcode_actions_debug)
50+
xcode_actions_release: $(xcode_actions_release)
4351
xcode_destination: $(xcode_destination)

.ado/templates/apple-job-react-native.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ parameters:
33
xcode_sdk: ''
44
xcode_configuration: ''
55
xcode_scheme: ''
6-
xcode_actions: ''
6+
xcode_actions_debug: ''
7+
xcode_actions_release: ''
78
xcode_destination: ''
89

910
steps:
@@ -46,7 +47,7 @@ steps:
4647
xcode_configuration: Debug
4748
xcode_workspacePath: RNTester/RNTester.xcodeproj
4849
xcode_scheme: ${{ parameters.xcode_scheme }}
49-
xcode_actions: 'build test'
50+
xcode_actions: ${{ parameters.xcode_actions_debug }}
5051
xcode_useXcpretty: true
5152
xcode_destination: ${{ parameters.xcode_destination }}
5253

@@ -56,7 +57,7 @@ steps:
5657
xcode_configuration: Release
5758
xcode_workspacePath: RNTester/RNTester.xcodeproj
5859
xcode_scheme: ${{ parameters.xcode_scheme }}
59-
xcode_actions: 'build'
60+
xcode_actions: ${{ parameters.xcode_actions_release }}
6061
xcode_useXcpretty: false
6162
xcode_destination: ${{ parameters.xcode_destination }}
6263

Libraries/Text/RCTText.xcodeproj/project.pbxproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@
107107
8F2807C7202D2B6B005D65E6 /* RCTInputAccessoryViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2807C1202D2B6A005D65E6 /* RCTInputAccessoryViewManager.m */; };
108108
8F2807C8202D2B6B005D65E6 /* RCTInputAccessoryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2807C3202D2B6A005D65E6 /* RCTInputAccessoryView.m */; };
109109
8F2807C9202D2B6B005D65E6 /* RCTInputAccessoryViewContent.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2807C5202D2B6B005D65E6 /* RCTInputAccessoryViewContent.m */; };
110-
9F4658BD23563A92000929DF /* RCTBackedTextInputViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 5956B112200FEBA9008D9D16 /* RCTBackedTextInputViewProtocol.h */; };
111-
9F4658BE23563A92000929DF /* RCTBackedTextInputViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 5956B112200FEBA9008D9D16 /* RCTBackedTextInputViewProtocol.h */; };
112-
9F4658BF23563AB8000929DF /* RCTBackedTextInputDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5956B10C200FEBA9008D9D16 /* RCTBackedTextInputDelegate.h */; };
113-
9F4658C023563AB8000929DF /* RCTBackedTextInputDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5956B10C200FEBA9008D9D16 /* RCTBackedTextInputDelegate.h */; };
110+
9F4659E2236262E9000929DF /* RCTBackedTextInputDelegate.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B10C200FEBA9008D9D16 /* RCTBackedTextInputDelegate.h */; };
111+
9F4659E3236262E9000929DF /* RCTBackedTextInputViewProtocol.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B112200FEBA9008D9D16 /* RCTBackedTextInputViewProtocol.h */; };
112+
9F4659E42362634A000929DF /* RCTBackedTextInputDelegate.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B10C200FEBA9008D9D16 /* RCTBackedTextInputDelegate.h */; };
113+
9F4659E52362634A000929DF /* RCTBackedTextInputViewProtocol.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B112200FEBA9008D9D16 /* RCTBackedTextInputViewProtocol.h */; };
114114
9F5C189A230DD5E600E3E5A7 /* RCTVirtualTextViewManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B12D200FEBAA008D9D16 /* RCTVirtualTextViewManager.h */; };
115115
9F5C189C230DD67C00E3E5A7 /* RCTVirtualTextShadowView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B12C200FEBAA008D9D16 /* RCTVirtualTextShadowView.h */; };
116116
9F5C189D230DD68B00E3E5A7 /* RCTUITextField.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B105200FEBA9008D9D16 /* RCTUITextField.h */; };
@@ -165,9 +165,11 @@
165165
183496EA1F5DF07600C0A1B4 /* Copy Headers */ = {
166166
isa = PBXCopyFilesBuildPhase;
167167
buildActionMask = 2147483647;
168-
dstPath = include/React;
168+
dstPath = include/RCTText;
169169
dstSubfolderSpec = 16;
170170
files = (
171+
9F4659E2236262E9000929DF /* RCTBackedTextInputDelegate.h in Copy Headers */,
172+
9F4659E3236262E9000929DF /* RCTBackedTextInputViewProtocol.h in Copy Headers */,
171173
);
172174
name = "Copy Headers";
173175
runOnlyForDeploymentPostprocessing = 0;
@@ -281,6 +283,8 @@
281283
dstPath = include/React;
282284
dstSubfolderSpec = 16;
283285
files = (
286+
9F4659E42362634A000929DF /* RCTBackedTextInputDelegate.h in Copy Headers */,
287+
9F4659E52362634A000929DF /* RCTBackedTextInputViewProtocol.h in Copy Headers */,
284288
);
285289
name = "Copy Headers";
286290
runOnlyForDeploymentPostprocessing = 0;
@@ -497,8 +501,6 @@
497501
isa = PBXHeadersBuildPhase;
498502
buildActionMask = 2147483647;
499503
files = (
500-
9F4658BD23563A92000929DF /* RCTBackedTextInputViewProtocol.h in Headers */,
501-
9F4658BF23563AB8000929DF /* RCTBackedTextInputDelegate.h in Headers */,
502504
9F5C1912230DF3E700E3E5A7 /* RCTTextUIKit.h in Headers */,
503505
);
504506
runOnlyForDeploymentPostprocessing = 0;
@@ -507,8 +509,6 @@
507509
isa = PBXHeadersBuildPhase;
508510
buildActionMask = 2147483647;
509511
files = (
510-
9F4658BE23563A92000929DF /* RCTBackedTextInputViewProtocol.h in Headers */,
511-
9F4658C023563AB8000929DF /* RCTBackedTextInputDelegate.h in Headers */,
512512
9F5C1913230DF3E700E3E5A7 /* RCTTextUIKit.h in Headers */,
513513
);
514514
runOnlyForDeploymentPostprocessing = 0;

0 commit comments

Comments
 (0)