Skip to content

Commit fbcb7b6

Browse files
derekblankderekblank
committed
Add intial iOS changes for RN 0.69.4 upgrade
1 parent 579868e commit fbcb7b6

File tree

6 files changed

+302
-263
lines changed

6 files changed

+302
-263
lines changed

‎packages/react-native-bridge/ios/Gutenberg.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ extension Gutenberg: RCTBridgeDelegate {
256256
return Bundle.main.url(forResource: "main", withExtension: "jsbundle")
257257
}
258258
#endif
259-
return RCTBundleURLProvider.sharedSettings()?.jsBundleURL(forBundleRoot: "index", fallbackResource: "")
259+
return RCTBundleURLProvider.sharedSettings()?.jsBundleURL(forBundleRoot: "index", fallbackExtension: "")
260260
}
261261

262262
public func extraModules(for bridge: RCTBridge!) -> [RCTBridgeModule]! {

‎packages/react-native-editor/ios/Gemfile.lock‎

Lines changed: 38 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.3)
5-
activesupport (5.2.5)
4+
CFPropertyList (3.0.5)
5+
rexml
6+
activesupport (6.1.6.1)
67
concurrent-ruby (~> 1.0, >= 1.0.2)
7-
i18n (>= 0.7, < 2)
8-
minitest (~> 5.1)
9-
tzinfo (~> 1.1)
8+
i18n (>= 1.6, < 2)
9+
minitest (>= 5.1)
10+
tzinfo (~> 2.0)
11+
zeitwerk (~> 2.3)
1012
addressable (2.8.0)
1113
public_suffix (>= 2.0.2, < 5.0)
1214
algoliasearch (1.27.5)
1315
httpclient (~> 2.8, >= 2.8.3)
1416
json (>= 1.5.1)
1517
atomos (0.1.3)
16-
claide (1.0.3)
17-
cocoapods (1.10.1)
18-
addressable (~> 2.6)
18+
claide (1.1.0)
19+
cocoapods (1.11.3)
20+
addressable (~> 2.8)
1921
claide (>= 1.0.2, < 2.0)
20-
cocoapods-core (= 1.10.1)
22+
cocoapods-core (= 1.11.3)
2123
cocoapods-deintegrate (>= 1.0.3, < 2.0)
2224
cocoapods-downloader (>= 1.4.0, < 2.0)
2325
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -28,50 +30,50 @@ GEM
2830
escape (~> 0.0.4)
2931
fourflusher (>= 2.3.0, < 3.0)
3032
gh_inspector (~> 1.0)
31-
molinillo (~> 0.6.6)
33+
molinillo (~> 0.8.0)
3234
nap (~> 1.0)
33-
ruby-macho (~> 1.4)
34-
xcodeproj (>= 1.19.0, < 2.0)
35-
cocoapods-core (1.10.1)
36-
activesupport (> 5.0, < 6)
37-
addressable (~> 2.6)
35+
ruby-macho (>= 1.0, < 3.0)
36+
xcodeproj (>= 1.21.0, < 2.0)
37+
cocoapods-core (1.11.3)
38+
activesupport (>= 5.0, < 7)
39+
addressable (~> 2.8)
3840
algoliasearch (~> 1.0)
3941
concurrent-ruby (~> 1.1)
4042
fuzzy_match (~> 2.0.4)
4143
nap (~> 1.0)
4244
netrc (~> 0.11)
43-
public_suffix
45+
public_suffix (~> 4.0)
4446
typhoeus (~> 1.0)
45-
cocoapods-deintegrate (1.0.4)
47+
cocoapods-deintegrate (1.0.5)
4648
cocoapods-downloader (1.6.3)
4749
cocoapods-plugins (1.0.0)
4850
nap
49-
cocoapods-search (1.0.0)
50-
cocoapods-trunk (1.5.0)
51+
cocoapods-search (1.0.1)
52+
cocoapods-trunk (1.6.0)
5153
nap (>= 0.8, < 2.0)
5254
netrc (~> 0.11)
5355
cocoapods-try (1.2.0)
5456
colored2 (3.1.2)
55-
concurrent-ruby (1.1.8)
57+
concurrent-ruby (1.1.10)
5658
escape (0.0.4)
57-
ethon (0.14.0)
59+
ethon (0.15.0)
5860
ffi (>= 1.15.0)
59-
ffi (1.15.0)
61+
ffi (1.15.5)
6062
fourflusher (2.3.1)
6163
fuzzy_match (2.0.4)
6264
gh_inspector (1.1.3)
6365
httpclient (2.8.3)
64-
i18n (1.8.10)
66+
i18n (1.12.0)
6567
concurrent-ruby (~> 1.0)
66-
json (2.5.1)
67-
minitest (5.14.4)
68-
molinillo (0.6.6)
68+
json (2.6.2)
69+
minitest (5.16.3)
70+
molinillo (0.8.0)
6971
nanaimo (0.3.0)
7072
nap (1.1.0)
7173
netrc (0.11.0)
72-
public_suffix (4.0.6)
73-
ruby-macho (1.4.0)
74-
thread_safe (0.3.6)
74+
public_suffix (4.0.7)
75+
rexml (3.2.5)
76+
ruby-macho (2.5.1)
7577
typhoeus (1.4.0)
7678
ethon (>= 0.9.0)
7779
tzinfo (1.2.10)
@@ -82,12 +84,17 @@ GEM
8284
claide (>= 1.0.2, < 2.0)
8385
colored2 (~> 3.1)
8486
nanaimo (~> 0.3.0)
87+
rexml (~> 3.2.4)
88+
zeitwerk (2.6.0)
8589

8690
PLATFORMS
8791
ruby
8892

8993
DEPENDENCIES
90-
cocoapods (~> 1.10.0)
94+
cocoapods (~> 1.11, >= 1.11.2)
95+
96+
RUBY VERSION
97+
ruby 2.7.5p203
9198

9299
BUNDLED WITH
93-
2.2.27
100+
2.3.18

‎packages/react-native-editor/ios/GutenbergDemo.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,6 @@
331331
"${PODS_ROOT}/Target Support Files/Pods-GutenbergDemo/Pods-GutenbergDemo-frameworks.sh",
332332
"${BUILT_PRODUCTS_DIR}/BVLinearGradient/BVLinearGradient.framework",
333333
"${BUILT_PRODUCTS_DIR}/DoubleConversion/DoubleConversion.framework",
334-
"${BUILT_PRODUCTS_DIR}/FBReactNativeSpec/FBReactNativeSpec.framework",
335334
"${BUILT_PRODUCTS_DIR}/Gutenberg/Gutenberg.framework",
336335
"${BUILT_PRODUCTS_DIR}/RCT-Folly/folly.framework",
337336
"${BUILT_PRODUCTS_DIR}/RCTTypeSafety/RCTTypeSafety.framework",
@@ -343,6 +342,7 @@
343342
"${BUILT_PRODUCTS_DIR}/RNSVG/RNSVG.framework",
344343
"${BUILT_PRODUCTS_DIR}/RNScreens/RNScreens.framework",
345344
"${BUILT_PRODUCTS_DIR}/RNTAztecView/RNTAztecView.framework",
345+
"${BUILT_PRODUCTS_DIR}/React-Codegen/React_Codegen.framework",
346346
"${BUILT_PRODUCTS_DIR}/React-Core/React.framework",
347347
"${BUILT_PRODUCTS_DIR}/React-CoreModules/CoreModules.framework",
348348
"${BUILT_PRODUCTS_DIR}/React-RCTAnimation/RCTAnimation.framework",
@@ -353,6 +353,7 @@
353353
"${BUILT_PRODUCTS_DIR}/React-RCTSettings/RCTSettings.framework",
354354
"${BUILT_PRODUCTS_DIR}/React-RCTText/RCTText.framework",
355355
"${BUILT_PRODUCTS_DIR}/React-RCTVibration/RCTVibration.framework",
356+
"${BUILT_PRODUCTS_DIR}/React-bridging/react_bridging.framework",
356357
"${BUILT_PRODUCTS_DIR}/React-cxxreact/cxxreact.framework",
357358
"${BUILT_PRODUCTS_DIR}/React-jsi/jsi.framework",
358359
"${BUILT_PRODUCTS_DIR}/React-jsiexecutor/jsireact.framework",
@@ -379,7 +380,6 @@
379380
outputPaths = (
380381
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BVLinearGradient.framework",
381382
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DoubleConversion.framework",
382-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBReactNativeSpec.framework",
383383
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Gutenberg.framework",
384384
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/folly.framework",
385385
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTTypeSafety.framework",
@@ -391,6 +391,7 @@
391391
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RNSVG.framework",
392392
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RNScreens.framework",
393393
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RNTAztecView.framework",
394+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/React_Codegen.framework",
394395
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/React.framework",
395396
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CoreModules.framework",
396397
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTAnimation.framework",
@@ -401,6 +402,7 @@
401402
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTSettings.framework",
402403
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTText.framework",
403404
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTVibration.framework",
405+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/react_bridging.framework",
404406
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/cxxreact.framework",
405407
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/jsi.framework",
406408
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/jsireact.framework",
@@ -459,7 +461,6 @@
459461
"${PODS_ROOT}/Target Support Files/Pods-GutenbergDemo-GutenbergDemoTests/Pods-GutenbergDemo-GutenbergDemoTests-frameworks.sh",
460462
"${BUILT_PRODUCTS_DIR}/BVLinearGradient/BVLinearGradient.framework",
461463
"${BUILT_PRODUCTS_DIR}/DoubleConversion/DoubleConversion.framework",
462-
"${BUILT_PRODUCTS_DIR}/FBReactNativeSpec/FBReactNativeSpec.framework",
463464
"${BUILT_PRODUCTS_DIR}/Gutenberg/Gutenberg.framework",
464465
"${BUILT_PRODUCTS_DIR}/RCT-Folly/folly.framework",
465466
"${BUILT_PRODUCTS_DIR}/RCTTypeSafety/RCTTypeSafety.framework",
@@ -471,6 +472,7 @@
471472
"${BUILT_PRODUCTS_DIR}/RNSVG/RNSVG.framework",
472473
"${BUILT_PRODUCTS_DIR}/RNScreens/RNScreens.framework",
473474
"${BUILT_PRODUCTS_DIR}/RNTAztecView/RNTAztecView.framework",
475+
"${BUILT_PRODUCTS_DIR}/React-Codegen/React_Codegen.framework",
474476
"${BUILT_PRODUCTS_DIR}/React-Core/React.framework",
475477
"${BUILT_PRODUCTS_DIR}/React-CoreModules/CoreModules.framework",
476478
"${BUILT_PRODUCTS_DIR}/React-RCTAnimation/RCTAnimation.framework",
@@ -481,6 +483,7 @@
481483
"${BUILT_PRODUCTS_DIR}/React-RCTSettings/RCTSettings.framework",
482484
"${BUILT_PRODUCTS_DIR}/React-RCTText/RCTText.framework",
483485
"${BUILT_PRODUCTS_DIR}/React-RCTVibration/RCTVibration.framework",
486+
"${BUILT_PRODUCTS_DIR}/React-bridging/react_bridging.framework",
484487
"${BUILT_PRODUCTS_DIR}/React-cxxreact/cxxreact.framework",
485488
"${BUILT_PRODUCTS_DIR}/React-jsi/jsi.framework",
486489
"${BUILT_PRODUCTS_DIR}/React-jsiexecutor/jsireact.framework",
@@ -507,7 +510,6 @@
507510
outputPaths = (
508511
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BVLinearGradient.framework",
509512
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DoubleConversion.framework",
510-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBReactNativeSpec.framework",
511513
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Gutenberg.framework",
512514
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/folly.framework",
513515
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTTypeSafety.framework",
@@ -519,6 +521,7 @@
519521
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RNSVG.framework",
520522
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RNScreens.framework",
521523
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RNTAztecView.framework",
524+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/React_Codegen.framework",
522525
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/React.framework",
523526
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CoreModules.framework",
524527
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTAnimation.framework",
@@ -529,6 +532,7 @@
529532
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTSettings.framework",
530533
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTText.framework",
531534
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTVibration.framework",
535+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/react_bridging.framework",
532536
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/cxxreact.framework",
533537
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/jsi.framework",
534538
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/jsireact.framework",
@@ -798,6 +802,7 @@
798802
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
799803
MTL_ENABLE_DEBUG_INFO = YES;
800804
ONLY_ACTIVE_ARCH = YES;
805+
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
801806
SDKROOT = iphoneos;
802807
SWIFT_VERSION = 5.0;
803808
};
@@ -834,6 +839,7 @@
834839
GCC_WARN_UNUSED_VARIABLE = YES;
835840
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
836841
MTL_ENABLE_DEBUG_INFO = NO;
842+
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
837843
SDKROOT = iphoneos;
838844
SWIFT_VERSION = 5.0;
839845
VALIDATE_PRODUCT = YES;

‎packages/react-native-editor/ios/Podfile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,21 @@ require_relative '../../../node_modules/@react-native-community/cli-platform-ios
66
# Uncomment the next line to define a global platform for your project
77
app_ios_deployment_target = Gem::Version.new('13.0')
88
platform :ios, app_ios_deployment_target.version
9+
install! 'cocoapods', :deterministic_uuids => false
910

1011
target 'GutenbergDemo' do
1112
# Comment the next line if you don't want to use dynamic frameworks
1213
use_frameworks!
1314

1415
config = use_native_modules!
16+
1517
use_react_native!(
1618
:path => config[:reactNativePath],
1719
# to enable hermes on iOS, change `false` to `true` and then install pods
18-
:hermes_enabled => false
20+
:hermes_enabled => false,
21+
:fabric_enabled => false,
22+
# An absolute path to the application root
23+
:app_path => "#{Pod::Config.instance.installation_root}/.."
1924
)
2025

2126
target 'GutenbergDemoTests' do

0 commit comments

Comments
 (0)