Skip to content
This repository was archived by the owner on Nov 22, 2024. It is now read-only.

Commit 6c43d39

Browse files
NickGerlemanfacebook-github-bot
authored andcommitted
Remove YogaKit Integration (#4830)
Summary: Pull Request resolved: #4830 YogaKit is a library which allows integrating Yoga layouts directly with UIKit. It is not used by higher level libraries like ComponentKit or React Native, but is used by a smattering of surfaces and shared components in Origami Studio and Instagram. See the following search for `YogaKit/UIView+Yoga.h`. {F1026467213} It is not really being developed anymore, and doesn't have much of a future, so I am deprecating it in OSS, to remove after the next OSS Yoga release. This means Flipper in OSS will not be able to rely on it. Instead of special-casing for OSS vs not, this change removes the current YogaKit integration with the layout plugin, since it sounds like we are building a new layout plugin anyway, and I'm not aware of any new surfaces being built on top of YogaKit. Removing Yoga as a dependency from Flipper should also allow us to fixup the current OSS Flipper build, along with a whole bunch of hacks RN's open source build currently does to produce a Yoga pod compatible with both RN and Flipper. There are probably some OSS related lockfiles that can be updated after this, for things like the FlipperKit sample app. I did not do that as part of this change, since I don't know how healthy all of that infra is or how it integrates with the offline mirror used. Reviewed By: passy Differential Revision: D46664918 fbshipit-source-id: 9d4dd56aa4c7f55e97ac643aa6e4deb9375e582c
1 parent ce47681 commit 6c43d39

File tree

3 files changed

+2
-331
lines changed

3 files changed

+2
-331
lines changed

FlipperKit.podspec

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# LICENSE file in the root directory of this source tree.
55

66
folly_compiler_flags = '-DDEBUG=1 -DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=1 -DFOLLY_HAVE_BACKTRACE=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_HAVE_LIBGFLAGS=0 -DFOLLY_HAVE_LIBJEMALLOC=0 -DFOLLY_HAVE_PREADV=0 -DFOLLY_HAVE_PWRITEV=0 -DFOLLY_HAVE_TFO=0 -DFOLLY_USE_SYMBOLIZER=0'
7-
yogakit_version = '~> 1.18'
87
flipperkit_version = '0.195.0'
98
Pod::Spec.new do |spec|
109
spec.name = 'FlipperKit'
@@ -119,16 +118,14 @@ Pod::Spec.new do |spec|
119118
ss.private_header_files = 'iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKObject.h',
120119
'iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/UIColor+SKSonarValueCoder.h',
121120
'iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKObjectHash.h',
122-
'iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKSwizzle.h',
123-
'iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKYogaKitHelper.h'
121+
'iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/utils/SKSwizzle.h'
124122
end
125123

126124
spec.subspec 'FlipperKitLayoutIOSDescriptors' do |ss|
127125
ss.header_dir = 'FlipperKitLayoutIOSDescriptors'
128126
ss.dependency 'FlipperKit/Core'
129127
ss.dependency 'FlipperKit/FlipperKitHighlightOverlay'
130128
ss.dependency 'FlipperKit/FlipperKitLayoutHelpers'
131-
ss.dependency 'YogaKit', yogakit_version
132129
ss.compiler_flags = folly_compiler_flags
133130
ss.source_files = 'iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutIOSDescriptors/**/*.{h,mm,m}'
134131
end
@@ -140,7 +137,6 @@ Pod::Spec.new do |spec|
140137
ss.dependency 'FlipperKit/FlipperKitHighlightOverlay'
141138
ss.dependency 'FlipperKit/FlipperKitLayoutHelpers'
142139
ss.dependency 'FlipperKit/FlipperKitLayoutIOSDescriptors'
143-
ss.dependency 'YogaKit', yogakit_version
144140
ss.compiler_flags = folly_compiler_flags
145141
ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h',
146142
'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h'

iOS/Plugins/FlipperKitPluginUtils/FlipperKitLayoutHelpers/FlipperKitLayoutHelpers/SKYogaKitHelper.h

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)