Skip to content

Commit 5672b8c

Browse files
SaadnajmishwantonShawn Dempsey
authored
[Fabric] Use RCT_NEW_ARCH_ENABLED flag for enabling new arch (#1782) (#1783)
* Replace USE_FABRIC w/ RCT_NEW_ARCH_ENABLED flag for enabling new arch * Native CXX TM builds for macOS * Update RNTester podfile w/ correct flag --------- Co-authored-by: Shawn Dempsey <[email protected]> Co-authored-by: Shawn Dempsey <[email protected]>
1 parent 49d2366 commit 5672b8c

File tree

4 files changed

+38
-40
lines changed

4 files changed

+38
-40
lines changed

‎.ado/apple-pr.yml‎

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ jobs:
3838
xcode_configuration: 'Debug'
3939
xcode_destination: 'platform=iOS Simulator,OS=latest,name=iPhone 14'
4040
xcode_actions: 'build test'
41-
xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
42-
use_fabric: '0'
41+
xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
42+
new_arch_enabled: '0'
4343
use_hermes: '0'
4444
'iOS Paper Release JSC':
4545
packager_platform: 'ios'
@@ -48,8 +48,8 @@ jobs:
4848
xcode_configuration: 'Release'
4949
xcode_destination: 'platform=iOS Simulator,OS=latest,name=iPhone 14'
5050
xcode_actions: 'build'
51-
xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/release_overrides.xcconfig'
52-
use_fabric: '0'
51+
xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/release_overrides.xcconfig'
52+
new_arch_enabled: '0'
5353
use_hermes: '0'
5454
'macOS Paper Debug JSC':
5555
packager_platform: 'macos'
@@ -58,8 +58,8 @@ jobs:
5858
xcode_configuration: 'Debug'
5959
xcode_destination: 'platform=macOS,arch=x86_64'
6060
xcode_actions: 'build test'
61-
xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
62-
use_fabric: '0'
61+
xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
62+
new_arch_enabled: '0'
6363
use_hermes: '0'
6464
'macOS Paper Release JSC':
6565
packager_platform: 'macos'
@@ -68,8 +68,8 @@ jobs:
6868
xcode_configuration: 'Release'
6969
xcode_destination: 'platform=macOS,arch=x86_64'
7070
xcode_actions: 'build'
71-
xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/release_overrides.xcconfig'
72-
use_fabric: '0'
71+
xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/release_overrides.xcconfig'
72+
new_arch_enabled: '0'
7373
use_hermes: '0'
7474
'iOS Fabric Debug JSC':
7575
packager_platform: 'ios'
@@ -78,8 +78,8 @@ jobs:
7878
xcode_configuration: 'Debug'
7979
xcode_destination: 'platform=iOS Simulator,OS=latest,name=iPhone 14'
8080
xcode_actions: 'build test'
81-
xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
82-
use_fabric: '1'
81+
xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
82+
new_arch_enabled: '1'
8383
use_hermes: '0'
8484
'iOS Fabric Release JSC':
8585
packager_platform: 'ios'
@@ -88,8 +88,8 @@ jobs:
8888
xcode_configuration: 'Release'
8989
xcode_destination: 'platform=iOS Simulator,OS=latest,name=iPhone 14'
9090
xcode_actions: 'build'
91-
xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/release_overrides.xcconfig'
92-
use_fabric: '1'
91+
xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/release_overrides.xcconfig'
92+
new_arch_enabled: '1'
9393
use_hermes: '0'
9494
'macOS Fabric Debug JSC':
9595
packager_platform: 'macos'
@@ -98,8 +98,8 @@ jobs:
9898
xcode_configuration: 'Debug'
9999
xcode_destination: 'platform=macOS,arch=x86_64'
100100
xcode_actions: 'build test'
101-
xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
102-
use_fabric: '1'
101+
xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
102+
new_arch_enabled: '1'
103103
use_hermes: '0'
104104
'macOS Fabric Release JSC':
105105
packager_platform: 'macos'
@@ -108,8 +108,8 @@ jobs:
108108
xcode_configuration: 'Release'
109109
xcode_destination: 'platform=macOS,arch=x86_64'
110110
xcode_actions: 'build'
111-
xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/release_overrides.xcconfig'
112-
use_fabric: '1'
111+
xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/release_overrides.xcconfig'
112+
new_arch_enabled: '1'
113113
use_hermes: '0'
114114
# Disable Hermes Jobs for now
115115
# 'iOS Paper Debug Hermes':
@@ -119,18 +119,18 @@ jobs:
119119
# xcode_configuration: 'Debug'
120120
# xcode_destination: 'platform=iOS Simulator,OS=latest,name=iPhone 14'
121121
# xcode_actions: 'build test'
122-
# xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
123-
# use_fabric: '0'
122+
# xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
123+
# new_arch_enabled: '0'
124124
# use_hermes: '1'
125125
# 'iOS Paper Release Hermes':
126126
# packager_platform: 'ios'
127127
# xcode_sdk: iphonesimulator
128128
# xcode_scheme: 'RNTester'
129129
# xcode_configuration: 'Release'
130130
# xcode_destination: 'platform=iOS Simulator,OS=latest,name=iPhone 14'
131-
# xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/release_overrides.xcconfig'
131+
# xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/release_overrides.xcconfig'
132132
# xcode_actions: 'build'
133-
# use_fabric: '0'
133+
# new_arch_enabled: '0'
134134
# use_hermes: '1'
135135
# 'macOS Paper Debug Hermes':
136136
# packager_platform: 'macos'
@@ -139,8 +139,8 @@ jobs:
139139
# xcode_configuration: 'Debug'
140140
# xcode_destination: 'platform=macOS,arch=x86_64'
141141
# xcode_actions: 'build test'
142-
# xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
143-
# use_fabric: '0'
142+
# xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
143+
# new_arch_enabled: '0'
144144
# use_hermes: '1'
145145
# 'macOS Paper Release Hermes':
146146
# packager_platform: 'macos'
@@ -149,28 +149,28 @@ jobs:
149149
# xcode_configuration: 'Release'
150150
# xcode_destination: 'platform=macOS,arch=x86_64'
151151
# xcode_actions: 'build'
152-
# xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/release_overrides.xcconfig'
153-
# use_fabric: '0'
152+
# xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/release_overrides.xcconfig'
153+
# new_arch_enabled: '0'
154154
# use_hermes: '1'
155-
# 'iOS Fabric Debug Hermes':
155+
# 'iOS Fabric Debug Hermes':
156156
# packager_platform: 'ios'
157157
# xcode_sdk: iphonesimulator
158158
# xcode_scheme: 'RNTester'
159159
# xcode_configuration: 'Debug'
160160
# xcode_destination: 'platform=iOS Simulator,OS=latest,name=iPhone 14'
161161
# xcode_actions: 'build test'
162-
# xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
163-
# use_fabric: '1'
162+
# xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
163+
# new_arch_enabled: '1'
164164
# use_hermes: '1'
165-
# 'iOS Fabric Release Hermes':
165+
# 'iOS Fabric Release Hermes':
166166
# packager_platform: 'ios'
167167
# xcode_sdk: iphonesimulator
168168
# xcode_scheme: 'RNTester'
169169
# xcode_configuration: 'Release'
170170
# xcode_destination: 'platform=iOS Simulator,OS=latest,name=iPhone 14'
171171
# xcode_actions: 'build'
172-
# xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/release_overrides.xcconfig'
173-
# use_fabric: '1'
172+
# xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/release_overrides.xcconfig'
173+
# new_arch_enabled: '1'
174174
# use_hermes: '0'
175175
# 'macOS Fabric Debug Hermes':
176176
# packager_platform: 'macos'
@@ -179,8 +179,8 @@ jobs:
179179
# xcode_configuration: 'Debug'
180180
# xcode_destination: 'platform=macOS,arch=x86_64'
181181
# xcode_actions: 'build test'
182-
# xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
183-
# use_fabric: '1'
182+
# xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
183+
# new_arch_enabled: '1'
184184
# use_hermes: '1'
185185
# 'macOS Fabric Release Hermes':
186186
# packager_platform: 'macos'
@@ -189,8 +189,8 @@ jobs:
189189
# xcode_configuration: 'Release'
190190
# xcode_destination: 'platform=macOS,arch=x86_64'
191191
# xcode_actions: 'build'
192-
# xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/release_overrides.xcconfig'
193-
# use_fabric: '1'
192+
# xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/release_overrides.xcconfig'
193+
# new_arch_enabled: '1'
194194
# use_hermes: '1'
195195
pool:
196196
vmImage: $(VmImageApple)
@@ -241,4 +241,3 @@ jobs:
241241
- template: templates/apple-job-publish.yml
242242
parameters:
243243
build_type: 'dry-run'
244-

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ parameters:
88
xcode_extraArgs: ''
99
slice_name: ''
1010
xcode_version: ''
11-
use_fabric: ''
11+
new_arch_enabled: ''
1212
use_hermes: ''
1313

1414
steps:
@@ -33,7 +33,7 @@ steps:
3333
bundle install
3434
bundle exec pod install
3535
env:
36-
USE_FABRIC: $(use_fabric)
36+
RCT_NEW_ARCH_ENABLED: $(new_arch_enabled)
3737
USE_HERMES: $(use_hermes)
3838

3939
- task: ShellScript@2
@@ -78,4 +78,3 @@ steps:
7878
disableAutoCwd: true
7979
cwd: ''
8080
condition: always()
81-

‎packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
1414
s.description = "NativeCxxModuleExample"
1515
s.homepage = "https://github.com/facebook/react-native.git"
1616
s.license = "MIT"
17-
s.platforms = { :ios => "12.4", :osx => "10.15" } # [macOS]
17+
s.platforms = { :ios => "12.4", :osx => "10.15" } # [macos]
1818
s.compiler_flags = '-Wno-nullability-completeness'
1919
s.author = "Meta Platforms, Inc. and its affiliates"
2020
s.source = { :git => "https://github.com/facebook/react-native.git", :tag => "#{s.version}" }

‎packages/rn-tester/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def pods(target_name, options = {}, use_flipper: !IN_CI && !USE_FRAMEWORKS)
1919
project 'RNTesterPods.xcodeproj'
2020

2121
# [macOS Disable Fabric by default till macOS supports it
22-
fabric_enabled = ENV['USE_FABRIC'] == '1' || ENV['RCT_NEW_ARCH_ENABLED'] == '1'
22+
fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
2323
# macOS]
2424

2525
# Hermes is now enabled by default.

0 commit comments

Comments
 (0)