diff --git a/.gitignore b/.gitignore index 690ea7b2b..27d8ca3f1 100644 --- a/.gitignore +++ b/.gitignore @@ -11,9 +11,11 @@ bundle.map .watchmanconfig # iOS / Xcode +*.xcworkspace **/Pods/ **/xcuserdata/ build/ +Podfile.lock android/third-party/external/ diff --git a/FlipperKit.podspec b/FlipperKit.podspec index 2823d5f72..02c1ddc68 100644 --- a/FlipperKit.podspec +++ b/FlipperKit.podspec @@ -121,6 +121,7 @@ Pod::Spec.new do |spec| 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKSwizzle.h', 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKYogaKitHelper.h' ss.source_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/**/*.{h,cpp,m,mm}' + ss.exclude_files = ['iOS/Plugins/FlipperKitLayoutPlugin/fb/*','iOS/Plugins/FlipperKitLayoutPlugin/facebook/*','iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/fb/*' ,'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/facebook/*'] ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**", "ONLY_ACTIVE_ARCH": "YES" } end @@ -135,6 +136,7 @@ Pod::Spec.new do |spec| ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h', 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKSubDescriptor.h' ss.source_files = "iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/**/*.{h,cpp,m,mm}" + ss.exclude_files = ['iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/fb/*','iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/facebook/*'] ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**","ONLY_ACTIVE_ARCH": "YES" } end diff --git a/iOS/Sample/Podfile.lock b/iOS/Sample/Podfile.lock deleted file mode 100644 index 616b722c5..000000000 --- a/iOS/Sample/Podfile.lock +++ /dev/null @@ -1,120 +0,0 @@ -PODS: - - boost-for-react-native (1.63.0) - - CocoaAsyncSocket (7.6.4) - - CocoaLibEvent (1.0.0) - - ComponentKit (0.30): - - RenderCore (= 0.30) - - Yoga (~> 1.14) - - Flipper (0.33.1): - - Flipper-Folly (~> 2.1) - - Flipper-RSocket (~> 1.0) - - Flipper-DoubleConversion (1.1.7) - - Flipper-Folly (2.1.1): - - boost-for-react-native - - CocoaLibEvent (~> 1.0) - - Flipper-DoubleConversion - - Flipper-Glog - - OpenSSL-Universal (= 1.0.2.19) - - Flipper-Glog (0.3.6) - - Flipper-PeerTalk (0.0.4) - - Flipper-RSocket (1.0.0): - - Flipper-Folly (~> 2.0) - - FlipperKit (0.33.1): - - FlipperKit/Core (= 0.33.1) - - FlipperKit/Core (0.33.1): - - Flipper (~> 0.33.1) - - FlipperKit/CppBridge - - FlipperKit/FBCxxFollyDynamicConvert - - FlipperKit/FBDefines - - FlipperKit/FKPortForwarding - - FlipperKit/CppBridge (0.33.1): - - Flipper (~> 0.33.1) - - FlipperKit/FBCxxFollyDynamicConvert (0.33.1): - - Flipper-Folly (~> 2.1) - - FlipperKit/FBDefines (0.33.1) - - FlipperKit/FKPortForwarding (0.33.1): - - CocoaAsyncSocket (~> 7.6) - - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitExamplePlugin (0.33.1): - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay (0.33.1) - - FlipperKit/FlipperKitLayoutComponentKitSupport (0.33.1): - - ComponentKit (~> 0.0) - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay - - FlipperKit/FlipperKitLayoutPlugin - - FlipperKit/FlipperKitLayoutTextSearchable - - FlipperKit/FlipperKitLayoutPlugin (0.33.1): - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay - - FlipperKit/FlipperKitLayoutTextSearchable - - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutTextSearchable (0.33.1) - - FlipperKit/FlipperKitNetworkPlugin (0.33.1): - - FlipperKit/Core - - FlipperKit/FlipperKitReactPlugin (0.33.1): - - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.33.1): - - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.33.1): - - FlipperKit/Core - - FlipperKit/FlipperKitNetworkPlugin - - OpenSSL-Universal (1.0.2.19): - - OpenSSL-Universal/Static (= 1.0.2.19) - - OpenSSL-Universal/Static (1.0.2.19) - - RenderCore (0.30) - - Yoga (1.14.0) - - YogaKit (1.18.1): - - Yoga (~> 1.14) - -DEPENDENCIES: - - Flipper (from `../../Flipper.podspec`) - - FlipperKit (from `../../FlipperKit.podspec`) - - FlipperKit/FlipperKitExamplePlugin (from `../../FlipperKit.podspec`) - - FlipperKit/FlipperKitLayoutComponentKitSupport (from `../../FlipperKit.podspec`) - - FlipperKit/FlipperKitReactPlugin (from `../../FlipperKit.podspec`) - - FlipperKit/FlipperKitUserDefaultsPlugin (from `../../FlipperKit.podspec`) - - FlipperKit/SKIOSNetworkPlugin (from `../../FlipperKit.podspec`) - -SPEC REPOS: - https://github.com/CocoaPods/Specs.git: - - boost-for-react-native - - CocoaAsyncSocket - - CocoaLibEvent - - ComponentKit - - Flipper-DoubleConversion - - Flipper-Folly - - Flipper-Glog - - Flipper-PeerTalk - - Flipper-RSocket - - OpenSSL-Universal - - RenderCore - - Yoga - - YogaKit - -EXTERNAL SOURCES: - Flipper: - :path: "../../Flipper.podspec" - FlipperKit: - :path: "../../FlipperKit.podspec" - -SPEC CHECKSUMS: - boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c - CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845 - CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f - ComponentKit: c34da1ab3515cf18db68a4ba22c6599568d1de74 - Flipper: 6c1f484f9a88d30ab3e272800d53688439e50f69 - Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 - Flipper-Folly: 2de3d03e0acc7064d5e4ed9f730e2f217486f162 - Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 - Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 - Flipper-RSocket: 1260a31c05c238eabfa9bb8a64e3983049048371 - FlipperKit: 6dc9b8f4ef60d9e5ded7f0264db299c91f18832e - OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 - RenderCore: d779c47622b313ce2d51bb36d084517af38b0dc1 - Yoga: cff67a400f6b74dc38eb0bad4f156673d9aa980c - YogaKit: f782866e155069a2cca2517aafea43200b01fd5a - -PODFILE CHECKSUM: 37dc8c12480aa35b9c8602e24be44aa0fbd08f9b - -COCOAPODS: 1.9.0 diff --git a/iOS/Sample/Sample.xcworkspace/contents.xcworkspacedata b/iOS/Sample/Sample.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 7b5a2f305..000000000 --- a/iOS/Sample/Sample.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/iOS/SampleSwift/Podfile.lock b/iOS/SampleSwift/Podfile.lock deleted file mode 100644 index 60f9bff76..000000000 --- a/iOS/SampleSwift/Podfile.lock +++ /dev/null @@ -1,117 +0,0 @@ -PODS: - - boost-for-react-native (1.63.0) - - CocoaAsyncSocket (7.6.4) - - CocoaLibEvent (1.0.0) - - ComponentKit (0.30): - - RenderCore (= 0.30) - - Yoga (~> 1.14) - - Flipper (0.33.1): - - Flipper-Folly (~> 2.1) - - Flipper-RSocket (~> 1.0) - - Flipper-DoubleConversion (1.1.7) - - Flipper-Folly (2.1.1): - - boost-for-react-native - - CocoaLibEvent (~> 1.0) - - Flipper-DoubleConversion - - Flipper-Glog - - OpenSSL-Universal (= 1.0.2.19) - - Flipper-Glog (0.3.6) - - Flipper-PeerTalk (0.0.4) - - Flipper-RSocket (1.0.0): - - Flipper-Folly (~> 2.0) - - FlipperKit (0.33.1): - - FlipperKit/Core (= 0.33.1) - - FlipperKit/Core (0.33.1): - - Flipper (~> 0.33.1) - - FlipperKit/CppBridge - - FlipperKit/FBCxxFollyDynamicConvert - - FlipperKit/FBDefines - - FlipperKit/FKPortForwarding - - FlipperKit/CppBridge (0.33.1): - - Flipper (~> 0.33.1) - - FlipperKit/FBCxxFollyDynamicConvert (0.33.1): - - Flipper-Folly (~> 2.1) - - FlipperKit/FBDefines (0.33.1) - - FlipperKit/FKPortForwarding (0.33.1): - - CocoaAsyncSocket (~> 7.6) - - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitExamplePlugin (0.33.1): - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay (0.33.1) - - FlipperKit/FlipperKitLayoutComponentKitSupport (0.33.1): - - ComponentKit (~> 0.0) - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay - - FlipperKit/FlipperKitLayoutPlugin - - FlipperKit/FlipperKitLayoutTextSearchable - - FlipperKit/FlipperKitLayoutPlugin (0.33.1): - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay - - FlipperKit/FlipperKitLayoutTextSearchable - - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutTextSearchable (0.33.1) - - FlipperKit/FlipperKitNetworkPlugin (0.33.1): - - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.33.1): - - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.33.1): - - FlipperKit/Core - - FlipperKit/FlipperKitNetworkPlugin - - OpenSSL-Universal (1.0.2.19): - - OpenSSL-Universal/Static (= 1.0.2.19) - - OpenSSL-Universal/Static (1.0.2.19) - - RenderCore (0.30) - - Yoga (1.14.0) - - YogaKit (1.18.1): - - Yoga (~> 1.14) - -DEPENDENCIES: - - Flipper (from `../../Flipper.podspec`) - - FlipperKit (from `../../FlipperKit.podspec`) - - FlipperKit/FlipperKitExamplePlugin (from `../../FlipperKit.podspec`) - - FlipperKit/FlipperKitLayoutComponentKitSupport (from `../../FlipperKit.podspec`) - - FlipperKit/FlipperKitUserDefaultsPlugin (from `../../FlipperKit.podspec`) - - FlipperKit/SKIOSNetworkPlugin (from `../../FlipperKit.podspec`) - -SPEC REPOS: - https://github.com/CocoaPods/Specs.git: - - boost-for-react-native - - CocoaAsyncSocket - - CocoaLibEvent - - ComponentKit - - Flipper-DoubleConversion - - Flipper-Folly - - Flipper-Glog - - Flipper-PeerTalk - - Flipper-RSocket - - OpenSSL-Universal - - RenderCore - - Yoga - - YogaKit - -EXTERNAL SOURCES: - Flipper: - :path: "../../Flipper.podspec" - FlipperKit: - :path: "../../FlipperKit.podspec" - -SPEC CHECKSUMS: - boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c - CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845 - CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f - ComponentKit: c34da1ab3515cf18db68a4ba22c6599568d1de74 - Flipper: 6c1f484f9a88d30ab3e272800d53688439e50f69 - Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 - Flipper-Folly: 2de3d03e0acc7064d5e4ed9f730e2f217486f162 - Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 - Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 - Flipper-RSocket: 1260a31c05c238eabfa9bb8a64e3983049048371 - FlipperKit: 6dc9b8f4ef60d9e5ded7f0264db299c91f18832e - OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 - RenderCore: d779c47622b313ce2d51bb36d084517af38b0dc1 - Yoga: cff67a400f6b74dc38eb0bad4f156673d9aa980c - YogaKit: f782866e155069a2cca2517aafea43200b01fd5a - -PODFILE CHECKSUM: 1352f81773f44dee75f6f5460c15edd4e29a2d47 - -COCOAPODS: 1.9.0 diff --git a/iOS/SampleSwift/SampleSwift.xcworkspace/contents.xcworkspacedata b/iOS/SampleSwift/SampleSwift.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 304e0e29a..000000000 --- a/iOS/SampleSwift/SampleSwift.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/iOS/Tutorial/Podfile.lock b/iOS/Tutorial/Podfile.lock deleted file mode 100644 index 4edd9e669..000000000 --- a/iOS/Tutorial/Podfile.lock +++ /dev/null @@ -1,105 +0,0 @@ -PODS: - - boost-for-react-native (1.63.0) - - CocoaAsyncSocket (7.6.4) - - CocoaLibEvent (1.0.0) - - ComponentKit (0.29): - - Yoga (~> 1.14) - - Flipper (0.32.2): - - Flipper-Folly (~> 2.1) - - Flipper-RSocket (~> 1.0) - - Flipper-DoubleConversion (1.1.7) - - Flipper-Folly (2.1.1): - - boost-for-react-native - - CocoaLibEvent (~> 1.0) - - Flipper-DoubleConversion - - Flipper-Glog - - OpenSSL-Universal (= 1.0.2.19) - - Flipper-Glog (0.3.6) - - Flipper-PeerTalk (0.0.4) - - Flipper-RSocket (1.0.0): - - Flipper-Folly (~> 2.0) - - FlipperKit (0.32.2): - - FlipperKit/Core (= 0.32.2) - - FlipperKit/Core (0.32.2): - - Flipper (~> 0.32.2) - - FlipperKit/CppBridge - - FlipperKit/FBCxxFollyDynamicConvert - - FlipperKit/FBDefines - - FlipperKit/FKPortForwarding - - FlipperKit/CppBridge (0.32.2): - - Flipper (~> 0.32.2) - - FlipperKit/FBCxxFollyDynamicConvert (0.32.2): - - Flipper-Folly (~> 2.1) - - FlipperKit/FBDefines (0.32.2) - - FlipperKit/FKPortForwarding (0.32.2): - - CocoaAsyncSocket (~> 7.6) - - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitHighlightOverlay (0.32.2) - - FlipperKit/FlipperKitLayoutComponentKitSupport (0.32.2): - - ComponentKit (~> 0.0) - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay - - FlipperKit/FlipperKitLayoutPlugin - - FlipperKit/FlipperKitLayoutTextSearchable - - FlipperKit/FlipperKitLayoutPlugin (0.32.2): - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay - - FlipperKit/FlipperKitLayoutTextSearchable - - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutTextSearchable (0.32.2) - - FlipperKit/FlipperKitNetworkPlugin (0.32.2): - - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.32.2): - - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.32.2): - - FlipperKit/Core - - FlipperKit/FlipperKitNetworkPlugin - - OpenSSL-Universal (1.0.2.19): - - OpenSSL-Universal/Static (= 1.0.2.19) - - OpenSSL-Universal/Static (1.0.2.19) - - Yoga (1.14.0) - - YogaKit (1.18.1): - - Yoga (~> 1.14) - -DEPENDENCIES: - - FlipperKit (~> 0.32.2) - - FlipperKit/FlipperKitLayoutComponentKitSupport (~> 0.32.2) - - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.32.2) - - FlipperKit/SKIOSNetworkPlugin (~> 0.32.2) - -SPEC REPOS: - trunk: - - boost-for-react-native - - CocoaAsyncSocket - - CocoaLibEvent - - ComponentKit - - Flipper - - Flipper-DoubleConversion - - Flipper-Folly - - Flipper-Glog - - Flipper-PeerTalk - - Flipper-RSocket - - FlipperKit - - OpenSSL-Universal - - Yoga - - YogaKit - -SPEC CHECKSUMS: - boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c - CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845 - CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f - ComponentKit: f8ceb6ffdf33e0c229eac8aadac5df2329902d41 - Flipper: 7694a9d92c67a921aae7adb24c92017e07565734 - Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 - Flipper-Folly: 2de3d03e0acc7064d5e4ed9f730e2f217486f162 - Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 - Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 - Flipper-RSocket: 1260a31c05c238eabfa9bb8a64e3983049048371 - FlipperKit: 16c1f57eb5b3e726196508b1b23018a7577f6730 - OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 - Yoga: cff67a400f6b74dc38eb0bad4f156673d9aa980c - YogaKit: f782866e155069a2cca2517aafea43200b01fd5a - -PODFILE CHECKSUM: 8450c8b24d58fab2aca017064210162c7853fbb7 - -COCOAPODS: 1.9.0 diff --git a/iOS/Tutorial/Tutorial.xcworkspace/contents.xcworkspacedata b/iOS/Tutorial/Tutorial.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index c96d59c6f..000000000 --- a/iOS/Tutorial/Tutorial.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/iOS/Tutorial/Tutorial.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/iOS/Tutorial/Tutorial.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003..000000000 --- a/iOS/Tutorial/Tutorial.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - -