Skip to content

Commit df29c23

Browse files
yungbludyungblud
authored
feat(fabric): updated ios podspec for implementing new architecture (#3961)
* chore: 🔥 updated FabricExample/Gemfile.lock (bundle install) * feat: updated react-native-video.podspec for implementing new architecture * feat: updated FabricExample/ios/Podfile.lock (pod install) * chore: updated examples/basic Gemfile.lock (bundle install) * chore: ⚡ updated examples/basic ios Podfile.lock (pod install)
1 parent 3f11894 commit df29c23

File tree

5 files changed

+49
-13
lines changed

5 files changed

+49
-13
lines changed

‎examples/FabricExample/Gemfile.lock

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ GEM
55
base64
66
nkf
77
rexml
8-
activesupport (7.0.4.3)
8+
activesupport (6.1.7.8)
99
concurrent-ruby (~> 1.0, >= 1.0.2)
1010
i18n (>= 1.6, < 2)
1111
minitest (>= 5.1)
1212
tzinfo (~> 2.0)
13+
zeitwerk (~> 2.3)
1314
addressable (2.8.7)
1415
public_suffix (>= 2.0.2, < 7.0)
1516
algoliasearch (1.27.5)
@@ -90,6 +91,7 @@ GEM
9091
colored2 (~> 3.1)
9192
nanaimo (~> 0.3.0)
9293
rexml (~> 3.2.4)
94+
zeitwerk (2.6.16)
9395

9496
PLATFORMS
9597
ruby

‎examples/FabricExample/ios/Podfile.lock

+21-1
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,25 @@ PODS:
905905
- ReactCommon/turbomodule/bridging
906906
- ReactCommon/turbomodule/core
907907
- Yoga
908+
- react-native-video/Fabric (6.3.0):
909+
- glog
910+
- hermes-engine
911+
- RCT-Folly (= 2022.05.16.00)
912+
- RCTRequired
913+
- RCTTypeSafety
914+
- React-Codegen
915+
- React-Core
916+
- React-debug
917+
- React-Fabric
918+
- React-graphics
919+
- React-ImageManager
920+
- React-NativeModulesApple
921+
- React-RCTFabric
922+
- React-rendererdebug
923+
- React-utils
924+
- ReactCommon/turbomodule/bridging
925+
- ReactCommon/turbomodule/core
926+
- Yoga
908927
- react-native-video/Video (6.3.0):
909928
- glog
910929
- hermes-engine
@@ -917,6 +936,7 @@ PODS:
917936
- React-Fabric
918937
- React-graphics
919938
- React-ImageManager
939+
- react-native-video/Fabric
920940
- React-NativeModulesApple
921941
- React-RCTFabric
922942
- React-rendererdebug
@@ -1358,7 +1378,7 @@ SPEC CHECKSUMS:
13581378
React-jsitracing: 7c77101b38fcc8fa7f198de7e1d834350a85af90
13591379
React-logger: 66b168e2b2bee57bd8ce9e69f739d805732a5570
13601380
React-Mapbuffer: 9ee041e1d7be96da6d76a251f92e72b711c651d6
1361-
react-native-video: 382353af62f6cbf8002a6de8d6633769edd2af07
1381+
react-native-video: 033a57e0fffd1a8fa5cbe8ae3a01b71029032f62
13621382
React-nativeconfig: d753fbbc8cecc8ae413d615599ac378bbf6999bb
13631383
React-NativeModulesApple: 964f4eeab1b4325e8b6a799cf4444c3fd4eb0a9c
13641384
React-perflogger: 29efe63b7ef5fbaaa50ef6eaa92482f98a24b97e

‎examples/basic/Gemfile.lock

+5-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ GEM
33
specs:
44
CFPropertyList (3.0.6)
55
rexml
6-
activesupport (7.0.8)
6+
activesupport (6.1.7.8)
77
concurrent-ruby (~> 1.0, >= 1.0.2)
88
i18n (>= 1.6, < 2)
99
minitest (>= 5.1)
1010
tzinfo (~> 2.0)
11+
zeitwerk (~> 2.3)
1112
addressable (2.8.5)
1213
public_suffix (>= 2.0.2, < 6.0)
1314
algoliasearch (1.27.5)
@@ -84,10 +85,11 @@ GEM
8485
colored2 (~> 3.1)
8586
nanaimo (~> 0.3.0)
8687
rexml (~> 3.2.4)
88+
zeitwerk (2.6.16)
8789

8890
PLATFORMS
8991
arm64-darwin-21
90-
ruby
92+
arm64-darwin-23
9193

9294
DEPENDENCIES
9395
activesupport (>= 6.1.7.5, < 7.1.0)
@@ -97,4 +99,4 @@ RUBY VERSION
9799
ruby 2.7.5p203
98100

99101
BUNDLED WITH
100-
2.4.19
102+
2.4.5

‎examples/basic/ios/Podfile.lock

+5-5
Original file line numberDiff line numberDiff line change
@@ -994,7 +994,7 @@ PODS:
994994
- React-Mapbuffer (0.74.2):
995995
- glog
996996
- React-debug
997-
- react-native-video (6.2.0):
997+
- react-native-video (6.3.0):
998998
- DoubleConversion
999999
- glog
10001000
- hermes-engine
@@ -1008,7 +1008,7 @@ PODS:
10081008
- React-featureflags
10091009
- React-graphics
10101010
- React-ImageManager
1011-
- react-native-video/Video (= 6.2.0)
1011+
- react-native-video/Video (= 6.3.0)
10121012
- React-NativeModulesApple
10131013
- React-RCTFabric
10141014
- React-rendererdebug
@@ -1038,7 +1038,7 @@ PODS:
10381038
- ReactCommon/turbomodule/bridging
10391039
- ReactCommon/turbomodule/core
10401040
- Yoga
1041-
- react-native-video/Video (6.2.0):
1041+
- react-native-video/Video (6.3.0):
10421042
- DoubleConversion
10431043
- glog
10441044
- hermes-engine
@@ -1559,7 +1559,7 @@ SPEC CHECKSUMS:
15591559
React-jsitracing: 34bc0fbc606f69e66f05286d94d5cd6cbf2ef562
15601560
React-logger: 29fa3e048f5f67fe396bc08af7606426d9bd7b5d
15611561
React-Mapbuffer: 86703e9e4f6522053568300827b436ccc01e1101
1562-
react-native-video: 59f262a2d87c998b747ca1f031efb6eba1c156b5
1562+
react-native-video: c44719c9a5261ad54fdad49e6dd0e98439e0e1b3
15631563
react-native-video-plugin-sample: d3a93b7ad777cad7fa2c30473de75a2635ce5feb
15641564
React-nativeconfig: 5d452e509d6fbedc1522e21b566451fc673ac6b7
15651565
React-NativeModulesApple: 6560431301ffdab8df6212cc8c8eff779396d8e0
@@ -1594,4 +1594,4 @@ SPEC CHECKSUMS:
15941594

15951595
PODFILE CHECKSUM: a73d485df51877001f2b04a5a4379cfa5a3ba8fa
15961596

1597-
COCOAPODS: 1.15.2
1597+
COCOAPODS: 1.13.0

‎react-native-video.podspec

+15-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ package = JSON.parse(File.read(File.join(__dir__, "package.json")))
44

55
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
66

7+
fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
8+
79
Pod::Spec.new do |s|
810
s.name = 'react-native-video'
911
s.version = package['version']
@@ -16,8 +18,18 @@ Pod::Spec.new do |s|
1618
s.source = { :git => "https://github.com/TheWidlarzGroup/react-native-video.git", :tag => "v#{s.version}" }
1719
s.platforms = { :ios => "13.0", :tvos => "13.0", :visionos => "1.0" }
1820

21+
if fabric_enabled
22+
s.subspec "Fabric" do |ss|
23+
ss.source_files = "ios/Fabric/**/*.{h,mm}"
24+
end
25+
end
26+
1927
s.subspec "Video" do |ss|
20-
ss.source_files = "ios/Video/**/*.{h,m,swift}"
28+
ss.source_files = "ios/Video/**/*.{h,m,swift,mm}"
29+
30+
if fabric_enabled
31+
ss.dependency "react-native-video/Fabric"
32+
end
2133

2234
if defined?($RNVideoUseGoogleIMA)
2335
Pod::UI.puts "RNVideo: enable IMA SDK"
@@ -32,7 +44,7 @@ Pod::Spec.new do |s|
3244
Pod::UI.puts "RNVideo: enable Video caching"
3345
ss.dependency "SPTPersistentCache", "~> 1.1.0"
3446
ss.dependency "DVAssetLoaderDelegate", "~> 0.3.1"
35-
ss.source_files = "ios/*/**/*.{h,m,swift}"
47+
ss.source_files = "ios/*/**/*.{h,m,swift,mm}"
3648
ss.pod_target_xcconfig = {
3749
'OTHER_SWIFT_FLAGS' => '$(inherited) -D USE_VIDEO_CACHING'
3850
}
@@ -47,7 +59,7 @@ Pod::Spec.new do |s|
4759
s.dependency "React-Core"
4860

4961
# Don't install the dependencies when we run `pod install` in the old architecture.
50-
if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
62+
if fabric_enabled then
5163
s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
5264
s.pod_target_xcconfig = {
5365
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",

0 commit comments

Comments
 (0)