From 51c8881fc742972e33b5301fd29a31f26aac933e Mon Sep 17 00:00:00 2001 From: generatedunixname89002005306973 Date: Mon, 16 Oct 2023 11:31:18 -0700 Subject: [PATCH 01/80] Flipper Snapshot Bump: v0.227.1-SNAPSHOT Summary: Releasing snapshot version 0.227.1-SNAPSHOT Reviewed By: lblasa Differential Revision: D50327904 fbshipit-source-id: 183239129828174249eda9782995e5e1aec3538e --- docs/getting-started/android-native.mdx | 4 ++-- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/getting-started/android-native.mdx b/docs/getting-started/android-native.mdx index 7abc10326..80cfa72fa 100644 --- a/docs/getting-started/android-native.mdx +++ b/docs/getting-started/android-native.mdx @@ -124,10 +124,10 @@ repositories { } dependencies { - debugImplementation 'com.facebook.flipper:flipper:0.226.1-SNAPSHOT' + debugImplementation 'com.facebook.flipper:flipper:0.227.1-SNAPSHOT' debugImplementation 'com.facebook.soloader:soloader:0.10.5' - releaseImplementation 'com.facebook.flipper:flipper-noop:0.226.1-SNAPSHOT' + releaseImplementation 'com.facebook.flipper:flipper-noop:0.227.1-SNAPSHOT' } ``` diff --git a/gradle.properties b/gradle.properties index bc269f6b2..b5a3a0830 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. # POM publishing constants -VERSION_NAME=0.227.0 +VERSION_NAME=0.227.1-SNAPSHOT GROUP=com.facebook.flipper SONATYPE_STAGING_PROFILE=comfacebook POM_URL=https://github.com/facebook/flipper From 17103ce1fafd451a3f2d27811768efd248486d6e Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa Date: Tue, 17 Oct 2023 08:05:53 -0700 Subject: [PATCH 02/80] If failure, track client type Summary: Add client type information to client errors Reviewed By: aigoncharov Differential Revision: D50365929 fbshipit-source-id: f1544b3974c5dfa4fc9b3b6229d6ebb6334dc0d9 --- desktop/flipper-ui-browser/src/index.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/desktop/flipper-ui-browser/src/index.tsx b/desktop/flipper-ui-browser/src/index.tsx index 2833d01cf..f7fcc645e 100644 --- a/desktop/flipper-ui-browser/src/index.tsx +++ b/desktop/flipper-ui-browser/src/index.tsx @@ -151,6 +151,7 @@ start().catch((e) => { logger.track('success-rate', 'flipper-ui-browser-started', { value: 0, error: getStringFromErrorLike(e), + pwa: window.matchMedia('(display-mode: standalone)').matches, }); window.flipperShowMessage?.('Failed to start UI with error: ' + e); }); From cc76a21d808969290208159303d0f002a7e58803 Mon Sep 17 00:00:00 2001 From: Andrey Goncharov Date: Tue, 17 Oct 2023 08:28:02 -0700 Subject: [PATCH 03/80] Add more tracking data for UI startup Reviewed By: lblasa Differential Revision: D50365803 fbshipit-source-id: b6a601e7bf987738400a86be6814de7cafd50d3d --- desktop/.eslintignore | 1 + desktop/flipper-server-core/src/server/startServer.tsx | 5 ++++- desktop/flipper-ui-browser/src/global.tsx | 2 ++ desktop/static/index.web.dev.html | 2 ++ desktop/static/index.web.html | 2 ++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/desktop/.eslintignore b/desktop/.eslintignore index 08105f881..996a2974f 100644 --- a/desktop/.eslintignore +++ b/desktop/.eslintignore @@ -13,5 +13,6 @@ react-native/ReactNativeFlipperExample scripts/generate-changelog.js static/index.js static/defaultPlugins/* +static/facebook/flipper-server-app-template generated flipper-server/static diff --git a/desktop/flipper-server-core/src/server/startServer.tsx b/desktop/flipper-server-core/src/server/startServer.tsx index 4531de67a..66bcf1f5f 100644 --- a/desktop/flipper-server-core/src/server/startServer.tsx +++ b/desktop/flipper-server-core/src/server/startServer.tsx @@ -22,6 +22,7 @@ import {validateAuthToken} from '../app-connectivity/certificate-exchange/certif import {tracker} from '../tracker'; import {EnvironmentInfo, isProduction} from 'flipper-common'; import {GRAPH_SECRET} from '../fb-stubs/constants'; +import {sessionId} from '../sessionId'; type Config = { port: number; @@ -151,7 +152,9 @@ async function startHTTPServer( const processedContent = content .toString() .replace('GRAPH_SECRET_REPLACE_ME', GRAPH_SECRET) - .replace('FLIPPER_APP_VERSION_REPLACE_ME', environmentInfo.appVersion); + .replace('FLIPPER_APP_VERSION_REPLACE_ME', environmentInfo.appVersion) + .replace('FLIPPER_UNIXNAME_REPLACE_ME', environmentInfo.os.unixname) + .replace('FLIPPER_SESSION_ID_REPLACE_ME', sessionId); res.end(processedContent); }); }); diff --git a/desktop/flipper-ui-browser/src/global.tsx b/desktop/flipper-ui-browser/src/global.tsx index 849b40a32..39705a833 100644 --- a/desktop/flipper-ui-browser/src/global.tsx +++ b/desktop/flipper-ui-browser/src/global.tsx @@ -18,6 +18,8 @@ declare global { }; GRAPH_SECRET: string; FLIPPER_APP_VERSION: string; + FLIPPER_SESSION_ID: string; + FLIPPER_UNIXNAME: string; flipperShowMessage?(message: string): void; flipperHideMessage?(): void; diff --git a/desktop/static/index.web.dev.html b/desktop/static/index.web.dev.html index 90aa871b8..d5eda16f5 100644 --- a/desktop/static/index.web.dev.html +++ b/desktop/static/index.web.dev.html @@ -139,6 +139,8 @@ window.GRAPH_SECRET = 'GRAPH_SECRET_REPLACE_ME'; window.FLIPPER_APP_VERSION = 'FLIPPER_APP_VERSION_REPLACE_ME'; + window.FLIPPER_SESSION_ID = 'FLIPPER_SESSION_ID_REPLACE_ME'; + window.FLIPPER_UNIXNAME = 'FLIPPER_UNIXNAME_REPLACE_ME'; const params = new URL(location.href).searchParams; let token = params.get('token'); diff --git a/desktop/static/index.web.html b/desktop/static/index.web.html index d21b6b231..c724d7041 100644 --- a/desktop/static/index.web.html +++ b/desktop/static/index.web.html @@ -88,6 +88,8 @@ window.GRAPH_SECRET = 'GRAPH_SECRET_REPLACE_ME'; window.FLIPPER_APP_VERSION = 'FLIPPER_APP_VERSION_REPLACE_ME'; + window.FLIPPER_SESSION_ID = 'FLIPPER_SESSION_ID_REPLACE_ME'; + window.FLIPPER_UNIXNAME = 'FLIPPER_UNIXNAME_REPLACE_ME'; // load correct theme (n.b. this doesn't handle system value specifically, will assume light in such cases) try { From 7040e561851804e6c2e86d8fc94063317bd25efe Mon Sep 17 00:00:00 2001 From: Andrey Goncharov Date: Tue, 17 Oct 2023 09:27:30 -0700 Subject: [PATCH 04/80] Add loader while waiting for an emulator to start Reviewed By: lblasa Differential Revision: D50367884 fbshipit-source-id: cdc7c408bf2eb4ea3f7f4f03c27ca72e8bbe2947 --- .../appinspect/LaunchEmulator.tsx | 68 ++++++++++++++----- 1 file changed, 51 insertions(+), 17 deletions(-) diff --git a/desktop/flipper-ui-core/src/sandy-chrome/appinspect/LaunchEmulator.tsx b/desktop/flipper-ui-core/src/sandy-chrome/appinspect/LaunchEmulator.tsx index 8e93da8e1..c90a444c3 100644 --- a/desktop/flipper-ui-core/src/sandy-chrome/appinspect/LaunchEmulator.tsx +++ b/desktop/flipper-ui-core/src/sandy-chrome/appinspect/LaunchEmulator.tsx @@ -32,6 +32,7 @@ import SettingsSheet from '../../chrome/SettingsSheet'; import {Link} from '../../ui'; import {chain, uniq, without} from 'lodash'; import {ReactNode} from 'react-markdown'; +import {produce} from 'immer'; const COLD_BOOT = 'cold-boot'; @@ -108,6 +109,8 @@ export const LaunchEmulatorDialog = withTrackingScope( setFavoriteVirtualDevices(without(favoriteVirtualDevices, deviceName)); }; + const [pendingEmulators, setPendingEmulators] = useState(new Set()); + useEffect(() => { const getiOSSimulators = async () => { if (!iosEnabled) { @@ -172,14 +175,29 @@ export const LaunchEmulatorDialog = withTrackingScope( ) .sortBy((item) => [!item.isFavorite, item.name]) .map(({name, isFavorite}) => { - const launch = (coldBoot: boolean) => { - getRenderHostInstance() - .flipperServer.exec('android-launch-emulator', name, coldBoot) - .then(onClose) - .catch((e) => { - console.error('Failed to start emulator: ', e); - message.error('Failed to start emulator: ' + e); - }); + const launch = async (coldBoot: boolean) => { + try { + setPendingEmulators( + produce((draft) => { + draft.add(name); + }), + ); + await getRenderHostInstance().flipperServer.exec( + 'android-launch-emulator', + name, + coldBoot, + ); + onClose(); + } catch (e) { + console.error('Failed to start emulator: ', e); + message.error('Failed to start emulator: ' + e); + } finally { + setPendingEmulators( + produce((draft) => { + draft.delete(name); + }), + ); + } }; const menu = ( } + loading={pendingEmulators.has(name)} onClick={() => launch(false)}> {name} @@ -237,15 +256,30 @@ export const LaunchEmulatorDialog = withTrackingScope( type="default" key={device.udid} style={{width: '100%'}} - onClick={() => - getRenderHostInstance() - .flipperServer.exec('ios-launch-simulator', device.udid) - .catch((e) => { - console.warn('Failed to start simulator: ', e); - message.error('Failed to start simulator: ' + e); - }) - .then(onClose) - }> + loading={pendingEmulators.has(device.udid)} + onClick={async () => { + try { + setPendingEmulators( + produce((draft) => { + draft.add(device.udid); + }), + ); + await getRenderHostInstance().flipperServer.exec( + 'ios-launch-simulator', + device.udid, + ); + onClose(); + } catch (e) { + console.warn('Failed to start simulator: ', e); + message.error('Failed to start simulator: ' + e); + } finally { + setPendingEmulators( + produce((draft) => { + draft.delete(device.udid); + }), + ); + } + }}> {device.name} {device.osVersion ? ` (${device.osVersion})` : ''} From 1a6e0ef42e9ca32a646cdbd104028032a722f34b Mon Sep 17 00:00:00 2001 From: Vitalii Ganzha Date: Tue, 17 Oct 2023 09:49:11 -0700 Subject: [PATCH 05/80] Update FlipperPlugin C++ code so it can be compiled for Windows Summary: I am working in Horizon Worlds and I would like to integrate Flipper with HzW app. Currently FlipperPlugin C++ code won't compile on Windows since it uses Linux-only headers like `netdb.h` and `sys/fcntl.h`, I posted here and looks like it is not currently supported: https://fb.workplace.com/groups/flippersupport/posts/1704837183330266 The problem seem to be in only in `FlipperConnectionEndpointVerifier.cpp`, and I'm updating it to make it compatible with Windows. Also apparently there's some issue with `#include` of few files and namespaces, leading to "struct redefinition" errors where `#pragma once` does not help https://fb.workplace.com/groups/474291069286180/posts/25313067014981908/ Solving it with manual #define Reviewed By: lblasa Differential Revision: D50337573 fbshipit-source-id: affdf1aee2b9dfe615227827fedf324a5f17d8b0 --- .../FlipperConnectionEndpointVerifier.cpp | 47 +++++++++++++++++-- xplat/Flipper/FlipperScheduler.h | 3 ++ xplat/Flipper/FlipperSocketProvider.h | 3 ++ 3 files changed, 50 insertions(+), 3 deletions(-) diff --git a/xplat/Flipper/FlipperConnectionEndpointVerifier.cpp b/xplat/Flipper/FlipperConnectionEndpointVerifier.cpp index 02211592a..fec09a065 100644 --- a/xplat/Flipper/FlipperConnectionEndpointVerifier.cpp +++ b/xplat/Flipper/FlipperConnectionEndpointVerifier.cpp @@ -6,16 +6,57 @@ */ #include "FlipperConnectionEndpointVerifier.h" -#include #include + +#ifdef _MSC_VER /* MSVC */ + +#include +#include +#define getsockopt(a, b, c, d, e) getsockopt(a, b, c, (char*)d, e) +typedef int socklen_t; + +#else /* !_WIN32 */ + +#include #include #include #include +using SOCKET = int; +#endif + #include namespace facebook { namespace flipper { +static bool setSocketNonBlocking(SOCKET socket) { +#ifndef _WIN32 + int flags = fcntl(socket, F_GETFL, 0); + if (flags < 0) { + return false; + } + return (fcntl(socket, F_SETFL, flags | O_NONBLOCK) == 0); +#else + // If nonBlocking = 0, blocking is enabled; + // If nonBlocking != 0, non-blocking mode is enabled. + u_long nonBlocking = 1; + int32_t nonBlockResult = ioctlsocket(socket, FIONBIO, &nonBlocking); + if (nonBlockResult != 0) { + return false; + } else { + return true; + } +#endif +} + +static void closeSocket(SOCKET socket) { +#ifndef _WIN32 + close(socket); +#else + closesocket(socket); +#endif +} + bool ConnectionEndpointVerifier::verify(const std::string& host, int port) { auto sport = std::to_string(port); @@ -31,7 +72,7 @@ bool ConnectionEndpointVerifier::verify(const std::string& host, int port) { int sfd = socket(address->ai_family, address->ai_socktype, address->ai_protocol); - fcntl(sfd, F_SETFL, O_NONBLOCK); + setSocketNonBlocking(sfd); connect(sfd, address->ai_addr, address->ai_addrlen); fd_set fdset; @@ -58,7 +99,7 @@ bool ConnectionEndpointVerifier::verify(const std::string& host, int port) { } freeaddrinfo(address); - close(sfd); + closeSocket(sfd); return listening; } diff --git a/xplat/Flipper/FlipperScheduler.h b/xplat/Flipper/FlipperScheduler.h index a8b2f545a..473ee9085 100644 --- a/xplat/Flipper/FlipperScheduler.h +++ b/xplat/Flipper/FlipperScheduler.h @@ -6,6 +6,8 @@ */ #pragma once +#ifndef _FLIPPERSCHEDULER_H_ +#define _FLIPPERSCHEDULER_H_ #include @@ -24,3 +26,4 @@ struct Scheduler { } // namespace flipper } // namespace facebook +#endif diff --git a/xplat/Flipper/FlipperSocketProvider.h b/xplat/Flipper/FlipperSocketProvider.h index 99c6e9bff..ba622e3c0 100644 --- a/xplat/Flipper/FlipperSocketProvider.h +++ b/xplat/Flipper/FlipperSocketProvider.h @@ -6,6 +6,8 @@ */ #pragma once +#ifndef _FLIPPERSOCKETPROVIDER_H_ +#define _FLIPPERSOCKETPROVIDER_H_ #include #include "FlipperScheduler.h" @@ -76,3 +78,4 @@ class FlipperSocketProvider { } // namespace flipper } // namespace facebook +#endif From 73862c9408107504f633b4053c9119265ef15016 Mon Sep 17 00:00:00 2001 From: Anton Kastritskiy Date: Tue, 17 Oct 2023 16:01:08 -0700 Subject: [PATCH 06/80] refine typescript type of `tryExecuteComand` Summary: You can now descriminate based on `hasProblem`. Thus removing asserting operator Reviewed By: LukeDefeo Differential Revision: D50366398 fbshipit-source-id: a16a5419ce946831bd2d1624b1baa75c89a47aa3 --- desktop/doctor/src/index.tsx | 2 +- desktop/flipper-common/src/doctor.tsx | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/desktop/doctor/src/index.tsx b/desktop/doctor/src/index.tsx index b2f353d64..6e71aa736 100644 --- a/desktop/doctor/src/index.tsx +++ b/desktop/doctor/src/index.tsx @@ -183,7 +183,7 @@ export function getHealthchecks(): FlipperDoctor.Healthchecks { message: `Xcode version is not selected. You can select it using command "sudo xcode-select -switch Xcode.app". ${result.message}.`, }; } - const selectedXcode = result.stdout!.toString().trim(); + const selectedXcode = result.stdout.toString().trim(); if (selectedXcode == '/Library/Developer/CommandLineTools') { return { hasProblem: true, diff --git a/desktop/flipper-common/src/doctor.tsx b/desktop/flipper-common/src/doctor.tsx index aabb07728..909d281ec 100644 --- a/desktop/flipper-common/src/doctor.tsx +++ b/desktop/flipper-common/src/doctor.tsx @@ -69,9 +69,14 @@ export namespace FlipperDoctor { message: string; }; - export type SubprocessHealtcheckRunResult = HealthcheckRunResult & { - stdout?: string; - }; + export type SubprocessHealtcheckRunResult = + | (HealthcheckRunResult & { + hasProblem: true; + }) + | (HealthcheckRunResult & { + hasProblem: false; + stdout: string; + }); export type CategoryResult = [ string, From b6560e1c74388670c23baf6d7e967b68fe945235 Mon Sep 17 00:00:00 2001 From: Anton Kastritskiy Date: Tue, 17 Oct 2023 16:01:08 -0700 Subject: [PATCH 07/80] check xcode-select is using the latest major version available Reviewed By: mweststrate Differential Revision: D50369254 fbshipit-source-id: 140a044ca55ec1f445b38e02c7df13cb667d89c6 --- .../fb-stubs/validateSelectedXcodeVersion.tsx | 19 +++++++++++++++++++ desktop/doctor/src/index.tsx | 6 ++++++ 2 files changed, 25 insertions(+) create mode 100644 desktop/doctor/src/fb-stubs/validateSelectedXcodeVersion.tsx diff --git a/desktop/doctor/src/fb-stubs/validateSelectedXcodeVersion.tsx b/desktop/doctor/src/fb-stubs/validateSelectedXcodeVersion.tsx new file mode 100644 index 000000000..b00b39c9e --- /dev/null +++ b/desktop/doctor/src/fb-stubs/validateSelectedXcodeVersion.tsx @@ -0,0 +1,19 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @format + */ + +import {FlipperDoctor} from 'flipper-common'; + +export async function validateSelectedXcodeVersion( + _selectedPath: string, +): Promise { + return { + hasProblem: false, + message: '', + }; +} diff --git a/desktop/doctor/src/index.tsx b/desktop/doctor/src/index.tsx index 6e71aa736..b03d687e6 100644 --- a/desktop/doctor/src/index.tsx +++ b/desktop/doctor/src/index.tsx @@ -18,6 +18,7 @@ import * as path from 'path'; import type {FlipperDoctor} from 'flipper-common'; import * as fs_extra from 'fs-extra'; import {getIdbInstallationInstructions} from './fb-stubs/idbInstallationInstructions'; +import {validateSelectedXcodeVersion} from './fb-stubs/validateSelectedXcodeVersion'; export function getHealthchecks(): FlipperDoctor.Healthchecks { return { @@ -196,6 +197,11 @@ export function getHealthchecks(): FlipperDoctor.Healthchecks { message: `xcode-select has path of ${selectedXcode}, however this path does not exist on disk. Run "sudo xcode-select --switch" with a valid Xcode.app path.`, }; } + const validatedXcodeVersion = + await validateSelectedXcodeVersion(selectedXcode); + if (validatedXcodeVersion.hasProblem) { + return validatedXcodeVersion; + } return { hasProblem: false, message: `xcode-select has path of ${selectedXcode}.`, From 65fef5fbc3e61168f5e5aac57a40552e2920716d Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa Date: Wed, 18 Oct 2023 03:40:59 -0700 Subject: [PATCH 08/80] Remove token from URL query string Summary: This can be provided as an override, but is not needed for regular usage. Reviewed By: antonk52 Differential Revision: D50405097 fbshipit-source-id: 7238f99ef08bfdf5c7adda0e8c3294341ae86e89 --- desktop/flipper-server/src/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop/flipper-server/src/index.tsx b/desktop/flipper-server/src/index.tsx index 2a4cf381e..36b54ef44 100644 --- a/desktop/flipper-server/src/index.tsx +++ b/desktop/flipper-server/src/index.tsx @@ -309,9 +309,9 @@ async function launch() { const openInBrowser = async () => { console.info('[flipper-server] Open in browser'); + const url = new URL(`http://localhost:${argv.port}`); - const searchParams = new URLSearchParams({token: token ?? ''}); - const url = new URL(`http://localhost:${argv.port}?${searchParams}`); + console.info(`[flipper-server] Go to: ${chalk.blue(url.toString())}`); open(url.toString(), {app: {name: open.apps.chrome}}); }; From 3d4b36f14ebebd27bb68cf932dda7c8a4081a835 Mon Sep 17 00:00:00 2001 From: Andrey Goncharov Date: Wed, 18 Oct 2023 04:12:21 -0700 Subject: [PATCH 09/80] Hide emulator loading page for disabkled platforms Reviewed By: lblasa Differential Revision: D50405264 fbshipit-source-id: c051414ad3b269cf2bc145aa4da13c20517edb36 --- .../appinspect/LaunchEmulator.tsx | 249 +++++++++--------- 1 file changed, 128 insertions(+), 121 deletions(-) diff --git a/desktop/flipper-ui-core/src/sandy-chrome/appinspect/LaunchEmulator.tsx b/desktop/flipper-ui-core/src/sandy-chrome/appinspect/LaunchEmulator.tsx index c90a444c3..894c23f4d 100644 --- a/desktop/flipper-ui-core/src/sandy-chrome/appinspect/LaunchEmulator.tsx +++ b/desktop/flipper-ui-core/src/sandy-chrome/appinspect/LaunchEmulator.tsx @@ -160,133 +160,140 @@ export const LaunchEmulatorDialog = withTrackingScope( return ; } - const items = [ - , - androidEmulators.length == 0 ? ( - <Typography.Paragraph style={{textAlign: 'center'}}> - {androidMessage} - </Typography.Paragraph> - ) : null, - ...chain( - androidEmulators.map((name) => ({ - name, - isFavorite: favoriteVirtualDevices.includes(name), - })), - ) - .sortBy((item) => [!item.isFavorite, item.name]) - .map(({name, isFavorite}) => { - const launch = async (coldBoot: boolean) => { - try { - setPendingEmulators( - produce((draft) => { - draft.add(name); - }), - ); - await getRenderHostInstance().flipperServer.exec( - 'android-launch-emulator', - name, - coldBoot, - ); - onClose(); - } catch (e) { - console.error('Failed to start emulator: ', e); - message.error('Failed to start emulator: ' + e); - } finally { - setPendingEmulators( - produce((draft) => { - draft.delete(name); - }), - ); - } - }; - const menu = ( - <Menu - onClick={({key}) => { - switch (key) { - case COLD_BOOT: { - launch(true); - break; + let items: (JSX.Element | null)[] = []; + if (androidEnabled) { + items.push( + <Title key="android-title" name="Android emulators" />, + androidEmulators.length == 0 ? ( + <Typography.Paragraph style={{textAlign: 'center'}}> + {androidMessage} + </Typography.Paragraph> + ) : null, + ...chain( + androidEmulators.map((name) => ({ + name, + isFavorite: favoriteVirtualDevices.includes(name), + })), + ) + .sortBy((item) => [!item.isFavorite, item.name]) + .map(({name, isFavorite}) => { + const launch = async (coldBoot: boolean) => { + try { + setPendingEmulators( + produce((draft) => { + draft.add(name); + }), + ); + await getRenderHostInstance().flipperServer.exec( + 'android-launch-emulator', + name, + coldBoot, + ); + onClose(); + } catch (e) { + console.error('Failed to start emulator: ', e); + message.error('Failed to start emulator: ' + e); + } finally { + setPendingEmulators( + produce((draft) => { + draft.delete(name); + }), + ); + } + }; + const menu = ( + <Menu + onClick={({key}) => { + switch (key) { + case COLD_BOOT: { + launch(true); + break; + } } - } - }}> - <Menu.Item key={COLD_BOOT} icon={<PoweroffOutlined />}> - Cold Boot - </Menu.Item> - </Menu> - ); - return ( + }}> + <Menu.Item key={COLD_BOOT} icon={<PoweroffOutlined />}> + Cold Boot + </Menu.Item> + </Menu> + ); + return ( + <VirtualDeviceRow + key={name} + addToFavorites={addToFavorites} + removeFromFavorites={removeFromFavorites} + isFavorite={isFavorite} + name={name}> + <Dropdown.Button + overlay={menu} + icon={<MoreOutlined />} + loading={pendingEmulators.has(name)} + onClick={() => launch(false)}> + {name} + </Dropdown.Button> + </VirtualDeviceRow> + ); + }) + .value(), + ); + } + if (iosEnabled) { + items.push( + <Title key="ios-title" name="iOS Simulators" />, + iosEmulators.length == 0 ? ( + <Typography.Paragraph style={{textAlign: 'center'}}> + {iOSMessage} + </Typography.Paragraph> + ) : null, + ...chain(iosEmulators) + .map((device) => ({ + device, + isFavorite: favoriteVirtualDevices.includes(device.name), + })) + .sortBy((item) => [!item.isFavorite, item.device.name]) + .map(({device, isFavorite}) => ( <VirtualDeviceRow - key={name} + key={device.udid} addToFavorites={addToFavorites} removeFromFavorites={removeFromFavorites} isFavorite={isFavorite} - name={name}> - <Dropdown.Button - overlay={menu} - icon={<MoreOutlined />} - loading={pendingEmulators.has(name)} - onClick={() => launch(false)}> - {name} - </Dropdown.Button> + name={device.name}> + <Button + type="default" + key={device.udid} + style={{width: '100%'}} + loading={pendingEmulators.has(device.udid)} + onClick={async () => { + try { + setPendingEmulators( + produce((draft) => { + draft.add(device.udid); + }), + ); + await getRenderHostInstance().flipperServer.exec( + 'ios-launch-simulator', + device.udid, + ); + onClose(); + } catch (e) { + console.warn('Failed to start simulator: ', e); + message.error('Failed to start simulator: ' + e); + } finally { + setPendingEmulators( + produce((draft) => { + draft.delete(device.udid); + }), + ); + } + }}> + {device.name} + {device.osVersion ? ` (${device.osVersion})` : ''} + </Button> </VirtualDeviceRow> - ); - }) - .value(), - - <Title key="ios-title" name="iOS Simulators" />, - iosEmulators.length == 0 ? ( - <Typography.Paragraph style={{textAlign: 'center'}}> - {iOSMessage} - </Typography.Paragraph> - ) : null, - ...chain(iosEmulators) - .map((device) => ({ - device, - isFavorite: favoriteVirtualDevices.includes(device.name), - })) - .sortBy((item) => [!item.isFavorite, item.device.name]) - .map(({device, isFavorite}) => ( - <VirtualDeviceRow - key={device.udid} - addToFavorites={addToFavorites} - removeFromFavorites={removeFromFavorites} - isFavorite={isFavorite} - name={device.name}> - <Button - type="default" - key={device.udid} - style={{width: '100%'}} - loading={pendingEmulators.has(device.udid)} - onClick={async () => { - try { - setPendingEmulators( - produce((draft) => { - draft.add(device.udid); - }), - ); - await getRenderHostInstance().flipperServer.exec( - 'ios-launch-simulator', - device.udid, - ); - onClose(); - } catch (e) { - console.warn('Failed to start simulator: ', e); - message.error('Failed to start simulator: ' + e); - } finally { - setPendingEmulators( - produce((draft) => { - draft.delete(device.udid); - }), - ); - } - }}> - {device.name} - {device.osVersion ? ` (${device.osVersion})` : ''} - </Button> - </VirtualDeviceRow> - )) - .value(), - ].filter((item) => item != null); + )) + .value(), + ); + } + items = items.filter((item) => item != null); const loadingSpinner = ( <> From a0a9465c0be98bed4066681e240a48af17cde99d Mon Sep 17 00:00:00 2001 From: Andrey Goncharov <aigoncharov@meta.com> Date: Wed, 18 Oct 2023 04:15:05 -0700 Subject: [PATCH 10/80] Fix dark theme support Reviewed By: lblasa Differential Revision: D50406262 fbshipit-source-id: eda5c73efcd50dbe572cab078d3c04a4cd845601 --- .../flipper-plugin/src/ui/PowerSearch/PowerSearchContainer.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/flipper-plugin/src/ui/PowerSearch/PowerSearchContainer.tsx b/desktop/flipper-plugin/src/ui/PowerSearch/PowerSearchContainer.tsx index 8645cc38e..3d67666bb 100644 --- a/desktop/flipper-plugin/src/ui/PowerSearch/PowerSearchContainer.tsx +++ b/desktop/flipper-plugin/src/ui/PowerSearch/PowerSearchContainer.tsx @@ -13,7 +13,7 @@ import {theme} from '../theme'; const containerStyle = css` flex: 1 0 auto; - background-color: ${theme.white}; + background-color: ${theme.backgroundDefault}; display: flex; flex-direction: row; border-radius: ${theme.borderRadius}; From 683fbfd6fb34277cb5e4c901b3c3b907dd6a8881 Mon Sep 17 00:00:00 2001 From: Anton Kastritskiy <antonk52@meta.com> Date: Wed, 18 Oct 2023 05:55:23 -0700 Subject: [PATCH 11/80] doctor result can display copiable CLI commands Reviewed By: lblasa, ivanmisuno Differential Revision: D50383150 fbshipit-source-id: 201f239cc7d69bd03011ec817156163f9f6ed653 --- desktop/flipper-common/src/doctor.tsx | 10 +++++++++ .../src/utils/runHealthchecks.tsx | 2 ++ .../src/sandy-chrome/SetupDoctorScreen.tsx | 22 ++++++++++++++++++- 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/desktop/flipper-common/src/doctor.tsx b/desktop/flipper-common/src/doctor.tsx index 909d281ec..0c5cec8ae 100644 --- a/desktop/flipper-common/src/doctor.tsx +++ b/desktop/flipper-common/src/doctor.tsx @@ -64,9 +64,18 @@ export namespace FlipperDoctor { ) => Promise<HealthcheckRunResult>; }; + export type CliCommand = { + title: string; + command: string; + }; + export type HealthcheckRunResult = { hasProblem: boolean; message: string; + /** + * Commands to show to mitigate a problem or hint for more information + */ + commands?: CliCommand[]; }; export type SubprocessHealtcheckRunResult = @@ -104,6 +113,7 @@ export namespace FlipperDoctor { status: HealthcheckStatus; isAcknowledged?: boolean; message?: string; + commands?: CliCommand[]; }; export type HealthcheckReportItem = { diff --git a/desktop/flipper-server-core/src/utils/runHealthchecks.tsx b/desktop/flipper-server-core/src/utils/runHealthchecks.tsx index c60f61c94..0c0890996 100644 --- a/desktop/flipper-server-core/src/utils/runHealthchecks.tsx +++ b/desktop/flipper-server-core/src/utils/runHealthchecks.tsx @@ -71,11 +71,13 @@ export async function runHealthcheck( ? { status: 'FAILED', message: checkResult.message, + commands: checkResult.commands, } : checkResult.hasProblem && !check.isRequired ? { status: 'WARNING', message: checkResult.message, + commands: checkResult.commands, } : {status: 'SUCCESS', message: checkResult.message}; } diff --git a/desktop/flipper-ui-core/src/sandy-chrome/SetupDoctorScreen.tsx b/desktop/flipper-ui-core/src/sandy-chrome/SetupDoctorScreen.tsx index 29d75620e..ba9a3ee9a 100644 --- a/desktop/flipper-ui-core/src/sandy-chrome/SetupDoctorScreen.tsx +++ b/desktop/flipper-ui-core/src/sandy-chrome/SetupDoctorScreen.tsx @@ -13,6 +13,7 @@ import { Typography, Collapse, Button, + List, Modal, Checkbox, Alert, @@ -133,6 +134,25 @@ function CollapsableCategory(props: { header={check.label} extra={<CheckIcon status={check.result.status} />}> <Paragraph>{check.result.message}</Paragraph> + {check.result.commands && ( + <List> + {check.result.commands.map(({title, command}, i) => ( + <List.Item key={i}> + <div + style={{ + display: 'flex', + flexDirection: 'column', + marginBottom: 8, + }}> + <Typography.Text type="secondary">{title}</Typography.Text> + <Typography.Text code copyable> + {command} + </Typography.Text> + </div> + </List.Item> + ))} + </List> + )} </Collapse.Panel> ))} </Collapse> @@ -274,7 +294,7 @@ export default function SetupDoctorScreen({ return modal ? ( <Modal centered - width={570} + width={620} title="Setup Doctor" open={visible} destroyOnClose From b9952410b32ecfaf007dcab13c24da7a00939440 Mon Sep 17 00:00:00 2001 From: Anton Kastritskiy <antonk52@meta.com> Date: Wed, 18 Oct 2023 05:55:23 -0700 Subject: [PATCH 12/80] xcode-select copiable command Reviewed By: ivanmisuno Differential Revision: D50383695 fbshipit-source-id: 094c0477e44180591b479468fd365959e485da8a --- desktop/doctor/src/index.tsx | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/desktop/doctor/src/index.tsx b/desktop/doctor/src/index.tsx index b03d687e6..22fb87da6 100644 --- a/desktop/doctor/src/index.tsx +++ b/desktop/doctor/src/index.tsx @@ -178,23 +178,32 @@ export function getHealthchecks(): FlipperDoctor.Healthchecks { isRequired: true, run: async (_: FlipperDoctor.EnvironmentInfo) => { const result = await tryExecuteCommand('xcode-select -p'); + const selectXcodeCommands = [ + { + title: 'Select Xcode version', + command: `sudo xcode-select -switch <path/to/>Xcode.app`, + }, + ]; if (result.hasProblem) { return { hasProblem: true, - message: `Xcode version is not selected. You can select it using command "sudo xcode-select -switch <path/to/>Xcode.app". ${result.message}.`, + message: `Xcode version is not selected. ${result.message}.`, + commands: selectXcodeCommands, }; } const selectedXcode = result.stdout.toString().trim(); if (selectedXcode == '/Library/Developer/CommandLineTools') { return { hasProblem: true, - message: `xcode-select has no Xcode selected, You can select it using command "sudo xcode-select -switch <path/to/>Xcode.app".`, + message: `xcode-select has no Xcode selected.`, + commands: selectXcodeCommands, }; } if ((await fs_extra.pathExists(selectedXcode)) == false) { return { hasProblem: true, - message: `xcode-select has path of ${selectedXcode}, however this path does not exist on disk. Run "sudo xcode-select --switch" with a valid Xcode.app path.`, + message: `xcode-select has path of ${selectedXcode}, however this path does not exist on disk.`, + commands: selectXcodeCommands, }; } const validatedXcodeVersion = From f12fc5c983ceea929db1be113e28ccc0b410f46e Mon Sep 17 00:00:00 2001 From: generatedunixname89002005306973 <generatedunixname89002005306973@meta.com> Date: Wed, 18 Oct 2023 06:50:02 -0700 Subject: [PATCH 13/80] Flipper Release: v0.228.0 Summary: Releasing version 0.228.0 Reviewed By: lblasa Differential Revision: D50407780 fbshipit-source-id: b015e08f21fc4f0182e8a6589785e772505163f1 --- desktop/package.json | 2 +- desktop/plugins/public/layout/docs/setup.mdx | 2 +- desktop/plugins/public/leak_canary/docs/setup.mdx | 2 +- desktop/plugins/public/network/docs/setup.mdx | 2 +- docs/getting-started/android-native.mdx | 4 ++-- docs/getting-started/react-native-ios.mdx | 2 +- docs/getting-started/react-native.mdx | 4 ++-- gradle.properties | 2 +- js/js-flipper/package.json | 2 +- react-native/react-native-flipper/package.json | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/desktop/package.json b/desktop/package.json index 37b292ded..486c344ea 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -170,7 +170,7 @@ "npm": "use yarn instead", "yarn": "^1.16" }, - "version": "0.227.0", + "version": "0.228.0", "workspaces": { "packages": [ "scripts", diff --git a/desktop/plugins/public/layout/docs/setup.mdx b/desktop/plugins/public/layout/docs/setup.mdx index e2411c8ee..01a4f3838 100644 --- a/desktop/plugins/public/layout/docs/setup.mdx +++ b/desktop/plugins/public/layout/docs/setup.mdx @@ -27,7 +27,7 @@ You also need to compile in the `litho-annotations` package, as Flipper reflects ```groovy dependencies { - debugImplementation 'com.facebook.flipper:flipper-litho-plugin:0.227.0' + debugImplementation 'com.facebook.flipper:flipper-litho-plugin:0.228.0' debugImplementation 'com.facebook.litho:litho-annotations:0.19.0' // ... } diff --git a/desktop/plugins/public/leak_canary/docs/setup.mdx b/desktop/plugins/public/leak_canary/docs/setup.mdx index c370bc8c9..29a35a942 100644 --- a/desktop/plugins/public/leak_canary/docs/setup.mdx +++ b/desktop/plugins/public/leak_canary/docs/setup.mdx @@ -8,7 +8,7 @@ To setup the <Link to={useBaseUrl("/docs/features/plugins/leak-canary")}>LeakCan ```groovy dependencies { - debugImplementation 'com.facebook.flipper:flipper-leakcanary2-plugin:0.227.0' + debugImplementation 'com.facebook.flipper:flipper-leakcanary2-plugin:0.228.0' debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.8.1' } ``` diff --git a/desktop/plugins/public/network/docs/setup.mdx b/desktop/plugins/public/network/docs/setup.mdx index 8c97345dc..77d94307a 100644 --- a/desktop/plugins/public/network/docs/setup.mdx +++ b/desktop/plugins/public/network/docs/setup.mdx @@ -12,7 +12,7 @@ The network plugin is shipped as a separate Maven artifact, as follows: ```groovy dependencies { - debugImplementation 'com.facebook.flipper:flipper-network-plugin:0.227.0' + debugImplementation 'com.facebook.flipper:flipper-network-plugin:0.228.0' } ``` diff --git a/docs/getting-started/android-native.mdx b/docs/getting-started/android-native.mdx index 80cfa72fa..dc25c33e8 100644 --- a/docs/getting-started/android-native.mdx +++ b/docs/getting-started/android-native.mdx @@ -24,10 +24,10 @@ repositories { } dependencies { - debugImplementation 'com.facebook.flipper:flipper:0.227.0' + debugImplementation 'com.facebook.flipper:flipper:0.228.0' debugImplementation 'com.facebook.soloader:soloader:0.10.5' - releaseImplementation 'com.facebook.flipper:flipper-noop:0.227.0' + releaseImplementation 'com.facebook.flipper:flipper-noop:0.228.0' } ``` diff --git a/docs/getting-started/react-native-ios.mdx b/docs/getting-started/react-native-ios.mdx index 4a853eb67..8b5aabf30 100644 --- a/docs/getting-started/react-native-ios.mdx +++ b/docs/getting-started/react-native-ios.mdx @@ -51,7 +51,7 @@ Add all of the code below to your `ios/Podfile`: platform :ios, '9.0' def flipper_pods() - flipperkit_version = '0.227.0' # should match the version of your Flipper client app + flipperkit_version = '0.228.0' # should match the version of your Flipper client app pod 'FlipperKit', '~>' + flipperkit_version, :configuration => 'Debug' pod 'FlipperKit/FlipperKitLayoutPlugin', '~>' + flipperkit_version, :configuration => 'Debug' pod 'FlipperKit/SKIOSNetworkPlugin', '~>' + flipperkit_version, :configuration => 'Debug' diff --git a/docs/getting-started/react-native.mdx b/docs/getting-started/react-native.mdx index 54d0de2bb..8ee16a713 100644 --- a/docs/getting-started/react-native.mdx +++ b/docs/getting-started/react-native.mdx @@ -34,7 +34,7 @@ Latest version of Flipper requires react-native 0.69+! If you use react-native < Android: -1. Bump the `FLIPPER_VERSION` variable in `android/gradle.properties`, for example: `FLIPPER_VERSION=0.227.0`. +1. Bump the `FLIPPER_VERSION` variable in `android/gradle.properties`, for example: `FLIPPER_VERSION=0.228.0`. 2. Run `./gradlew clean` in the `android` directory. iOS: @@ -44,7 +44,7 @@ react-native version => 0.69.0 2. Run `pod install --repo-update` in the `ios` directory. react-native version < 0.69.0 -1. Call `use_flipper` with a specific version in `ios/Podfile`, for example: `use_flipper!({ 'Flipper' => '0.227.0' })`. +1. Call `use_flipper` with a specific version in `ios/Podfile`, for example: `use_flipper!({ 'Flipper' => '0.228.0' })`. 2. Run `pod install --repo-update` in the `ios` directory. ## Manual Setup diff --git a/gradle.properties b/gradle.properties index b5a3a0830..99974fc87 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. # POM publishing constants -VERSION_NAME=0.227.1-SNAPSHOT +VERSION_NAME=0.228.0 GROUP=com.facebook.flipper SONATYPE_STAGING_PROFILE=comfacebook POM_URL=https://github.com/facebook/flipper diff --git a/js/js-flipper/package.json b/js/js-flipper/package.json index 2d4954750..4f95029f7 100644 --- a/js/js-flipper/package.json +++ b/js/js-flipper/package.json @@ -1,7 +1,7 @@ { "name": "js-flipper", "title": "JS Flipper Bindings for Web-Socket based clients", - "version": "0.227.0", + "version": "0.228.0", "main": "lib/index.js", "browser": { "os": false diff --git a/react-native/react-native-flipper/package.json b/react-native/react-native-flipper/package.json index e38fb5494..adf692315 100644 --- a/react-native/react-native-flipper/package.json +++ b/react-native/react-native-flipper/package.json @@ -1,7 +1,7 @@ { "name": "react-native-flipper", "title": "React Native Flipper Bindings", - "version": "0.227.0", + "version": "0.228.0", "description": "Flipper bindings for React Native", "main": "index.js", "types": "index.d.ts", From f10ea61ffc8ee193322479dfadfc9cb2d38dc0e6 Mon Sep 17 00:00:00 2001 From: generatedunixname89002005306973 <generatedunixname89002005306973@meta.com> Date: Wed, 18 Oct 2023 06:50:02 -0700 Subject: [PATCH 14/80] Flipper Snapshot Bump: v0.228.1-SNAPSHOT Summary: Releasing snapshot version 0.228.1-SNAPSHOT Reviewed By: lblasa Differential Revision: D50407781 fbshipit-source-id: cd2eb1084e2a7899b57267ad5a7364103f3c0678 --- docs/getting-started/android-native.mdx | 4 ++-- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/getting-started/android-native.mdx b/docs/getting-started/android-native.mdx index dc25c33e8..8069d5e28 100644 --- a/docs/getting-started/android-native.mdx +++ b/docs/getting-started/android-native.mdx @@ -124,10 +124,10 @@ repositories { } dependencies { - debugImplementation 'com.facebook.flipper:flipper:0.227.1-SNAPSHOT' + debugImplementation 'com.facebook.flipper:flipper:0.228.1-SNAPSHOT' debugImplementation 'com.facebook.soloader:soloader:0.10.5' - releaseImplementation 'com.facebook.flipper:flipper-noop:0.227.1-SNAPSHOT' + releaseImplementation 'com.facebook.flipper:flipper-noop:0.228.1-SNAPSHOT' } ``` diff --git a/gradle.properties b/gradle.properties index 99974fc87..12ab0fe10 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. # POM publishing constants -VERSION_NAME=0.228.0 +VERSION_NAME=0.228.1-SNAPSHOT GROUP=com.facebook.flipper SONATYPE_STAGING_PROFILE=comfacebook POM_URL=https://github.com/facebook/flipper From 8b24560bc03c7d126ea4b0e4387d0e38c93032c6 Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa <lblasa@meta.com> Date: Wed, 18 Oct 2023 08:53:46 -0700 Subject: [PATCH 15/80] Verify token before return Summary: If the token has already expired, generate another one. Reviewed By: aigoncharov Differential Revision: D50410431 fbshipit-source-id: 108a3b344a1bcafd93a8d9bc94cba5c133d099d7 --- .../certificate-exchange/certificate-utils.tsx | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/desktop/flipper-server-core/src/app-connectivity/certificate-exchange/certificate-utils.tsx b/desktop/flipper-server-core/src/app-connectivity/certificate-exchange/certificate-utils.tsx index e75f91240..ba7f9e326 100644 --- a/desktop/flipper-server-core/src/app-connectivity/certificate-exchange/certificate-utils.tsx +++ b/desktop/flipper-server-core/src/app-connectivity/certificate-exchange/certificate-utils.tsx @@ -338,6 +338,17 @@ export const getAuthToken = async (): Promise<string> => { } const token = await fs.readFile(serverAuthToken); + + try { + console.info('Verify authentication token'); + const serverCertificate = await fs.readFile(serverCert); + jwt.verify(token.toString(), serverCertificate); + console.info('Token verification succeeded'); + } catch (_) { + console.warn('Either token has expired or is invalid'); + return generateAuthToken(); + } + return token.toString(); }; From 30100989f4efa321c846522c080d3e37fdaf1e3e Mon Sep 17 00:00:00 2001 From: Anton Kastritskiy <antonk52@meta.com> Date: Wed, 18 Oct 2023 09:33:48 -0700 Subject: [PATCH 16/80] fix tabs + localStorage Summary: Key fix is ```diff - 'Tabs:' + localStorageKeyOverride ?? keys.join(','), + 'Tabs:' + (localStorageKeyOverride ?? keys.join(',')), ``` Previously it worked like `('Tabs:' + localStorageKeyOverride) ?? keys.join(','),` which always evaluated to `"Tabs:undefined"`. This means that all tabs that were not using localStorageKeyOverride were reusing the same localstorage key. If you open some tabs with A, B, and C tabs. And open tab B. Then open other tabs with D, E, and F. No tab would be selected as the default value would be B. The second part it extracing keys from `items` prop instead of children. Reviewed By: lblasa Differential Revision: D50411422 fbshipit-source-id: 30f70c4347649f29e8c8ff1f2f38fdca7e826198 --- desktop/flipper-plugin/src/ui/Tabs.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop/flipper-plugin/src/ui/Tabs.tsx b/desktop/flipper-plugin/src/ui/Tabs.tsx index 60730f523..46f88e880 100644 --- a/desktop/flipper-plugin/src/ui/Tabs.tsx +++ b/desktop/flipper-plugin/src/ui/Tabs.tsx @@ -25,7 +25,7 @@ export function Tabs({ localStorageKeyOverride, //set this if you need to have a dynamic number of tabs, you do *not* need to namespace with the plugin name ...baseProps }: {grow?: boolean; localStorageKeyOverride?: string} & TabsProps) { - const keys: string[] = []; + const keys: string[] = baseProps.items?.map((item) => item.key) ?? []; const keyedChildren = Children.map(children, (child: any, idx) => { if (!child || typeof child !== 'object') { return; @@ -53,7 +53,7 @@ export function Tabs({ }); const [activeTab, setActiveTab] = useLocalStorageState<string | undefined>( - 'Tabs:' + localStorageKeyOverride ?? keys.join(','), + 'Tabs:' + (localStorageKeyOverride ?? keys.join(',')), undefined, ); From 53e44da11636c85298bce4eb30b490370bebddb0 Mon Sep 17 00:00:00 2001 From: Anton Kastritskiy <antonk52@meta.com> Date: Wed, 18 Oct 2023 09:57:42 -0700 Subject: [PATCH 17/80] automatic update for docusaurus-plugin-internaldocs-fb@1.16.2 Reviewed By: lblasa Differential Revision: D50408568 fbshipit-source-id: 068675c51049cb24fd69417e3bd0f7820d558b5e --- website/package.json | 2 +- website/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/website/package.json b/website/package.json index 6423501d0..0b524b4ac 100644 --- a/website/package.json +++ b/website/package.json @@ -23,7 +23,7 @@ "@types/fs-extra": "^11.0.2", "antd": "^4.23.4", "docusaurus-lunr-search": "^3.0.0", - "docusaurus-plugin-internaldocs-fb": "1.16.1", + "docusaurus-plugin-internaldocs-fb": "1.16.2", "file-cli": "^1.2.0", "flipper-plugin": "^0.183.0", "fs-extra": "^11.1.1", diff --git a/website/yarn.lock b/website/yarn.lock index 0c2c3b261..899c34040 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -6337,10 +6337,10 @@ docusaurus-lunr-search@^3.0.0: unified "^9.0.0" unist-util-is "^4.0.2" -docusaurus-plugin-internaldocs-fb@1.16.1: - version "1.16.1" - resolved "https://registry.yarnpkg.com/docusaurus-plugin-internaldocs-fb/-/docusaurus-plugin-internaldocs-fb-1.16.1.tgz#ebee630f332843fb8010065129ed8c4239c9fdd7" - integrity sha512-dV5fopgoiV1sid9L4hTtM8ed2lnBKGUeZ0Hz0kptVOYj6TFmxJUzJBtOzJtPB2Fc7tvkNoWodUpVpb7wJLsL4w== +docusaurus-plugin-internaldocs-fb@1.16.2: + version "1.16.2" + resolved "https://registry.yarnpkg.com/docusaurus-plugin-internaldocs-fb/-/docusaurus-plugin-internaldocs-fb-1.16.2.tgz#00f8d52f2b2447545409073955f37ed28e6c1083" + integrity sha512-DqEiMuTG2qq0XsbKu1Jlv0oEINDvsN6D514zmuuppUF5WM8KUlOJdComuS+8JRoAMZhqCBoa7Id+J0AlyRdnJw== dependencies: "@mdx-js/mdx" "^2.1.1" "@mdx-js/react" "^1.6.22" From 82f0c0eb9e0c10e5aad80e2608fc4820c5d3f6d6 Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa <lblasa@meta.com> Date: Wed, 18 Oct 2023 12:12:59 -0700 Subject: [PATCH 18/80] Remove Specs directory (#5222) Summary: Pull Request resolved: https://github.com/facebook/flipper/pull/5222 No longer used and hasn't been updated in 2+ years. Reviewed By: LukeDefeo Differential Revision: D50409395 fbshipit-source-id: 4d64f31cce457737c6954834107a73dd6d1103bd --- Specs/Flipper/0.10.0/Flipper.podspec | 29 ---- Specs/Flipper/0.11.0/Flipper.podspec | 29 ---- Specs/Flipper/0.11.1/Flipper.podspec | 29 ---- Specs/Flipper/0.12.0/Flipper.podspec | 29 ---- Specs/Flipper/0.13.0/Flipper.podspec | 29 ---- Specs/Flipper/0.14.0/Flipper.podspec | 29 ---- Specs/Flipper/0.14.1/Flipper.podspec | 29 ---- Specs/Flipper/0.14.2/Flipper.podspec | 29 ---- Specs/Flipper/0.15.0/Flipper.podspec | 29 ---- Specs/Flipper/0.16.0/Flipper.podspec | 29 ---- Specs/Flipper/0.16.1/Flipper.podspec | 29 ---- Specs/Flipper/0.16.2/Flipper.podspec | 29 ---- Specs/Flipper/0.17.0/Flipper.podspec | 29 ---- Specs/Flipper/0.17.1/Flipper.podspec | 29 ---- Specs/Flipper/0.18.0/Flipper.podspec | 29 ---- Specs/Flipper/0.19.0/Flipper.podspec | 29 ---- Specs/Flipper/0.20.0/Flipper.podspec | 29 ---- Specs/Flipper/0.8.0/Flipper.podspec | 29 ---- Specs/Flipper/0.8.1/Flipper.podspec | 29 ---- Specs/Flipper/0.9.0/Flipper.podspec | 29 ---- Specs/FlipperKit/0.10.0/FlipperKit.podspec | 149 ----------------- Specs/FlipperKit/0.11.0/FlipperKit.podspec | 161 ------------------ Specs/FlipperKit/0.11.1/FlipperKit.podspec | 163 ------------------ Specs/FlipperKit/0.12.0/FlipperKit.podspec | 164 ------------------ Specs/FlipperKit/0.13.0/FlipperKit.podspec | 183 --------------------- Specs/FlipperKit/0.14.0/FlipperKit.podspec | 174 -------------------- Specs/FlipperKit/0.14.1/FlipperKit.podspec | 174 -------------------- Specs/FlipperKit/0.14.2/FlipperKit.podspec | 174 -------------------- Specs/FlipperKit/0.15.0/FlipperKit.podspec | 174 -------------------- Specs/FlipperKit/0.16.0/FlipperKit.podspec | 174 -------------------- Specs/FlipperKit/0.16.1/FlipperKit.podspec | 174 -------------------- Specs/FlipperKit/0.16.2/FlipperKit.podspec | 174 -------------------- Specs/FlipperKit/0.17.0/FlipperKit.podspec | 174 -------------------- Specs/FlipperKit/0.17.1/FlipperKit.podspec | 174 -------------------- Specs/FlipperKit/0.18.0/FlipperKit.podspec | 174 -------------------- Specs/FlipperKit/0.19.0/FlipperKit.podspec | 174 -------------------- Specs/FlipperKit/0.20.0/FlipperKit.podspec | 174 -------------------- Specs/FlipperKit/0.8.0/FlipperKit.podspec | 139 ---------------- Specs/FlipperKit/0.8.1/FlipperKit.podspec | 139 ---------------- Specs/FlipperKit/0.9.0/FlipperKit.podspec | 149 ----------------- Specs/Folly/1.0.0/Folly.podspec.json | 175 -------------------- Specs/Folly/1.1.0/Folly.podspec.json | 176 -------------------- Specs/Folly/1.2.0/Folly.podspec.json | 177 -------------------- Specs/PeerTalk/0.0.2/PeerTalk.podspec | 21 --- Specs/README.md | 4 - Specs/RSocket/0.10.0/RSocket.podspec | 59 ------- Specs/Sonar/0.0.1/Sonar.podspec | 31 ---- Specs/Sonar/0.6.12/Sonar.podspec | 28 ---- Specs/Sonar/0.6.13/Sonar.podspec | 29 ---- Specs/Sonar/0.6.14/Sonar.podspec | 29 ---- Specs/Sonar/0.6.15/Sonar.podspec | 29 ---- Specs/Sonar/0.6.16/Sonar.podspec | 29 ---- Specs/Sonar/0.7.0/Sonar.podspec | 29 ---- Specs/Sonar/0.7.1/Sonar.podspec | 29 ---- Specs/Sonar/0.7.2/Sonar.podspec | 29 ---- Specs/SonarKit/0.0.1/SonarKit.podspec | 99 ----------- Specs/SonarKit/0.6.12/SonarKit.podspec | 99 ----------- Specs/SonarKit/0.6.13/SonarKit.podspec | 131 --------------- Specs/SonarKit/0.6.14/SonarKit.podspec | 133 --------------- Specs/SonarKit/0.6.15/SonarKit.podspec | 133 --------------- Specs/SonarKit/0.6.16/SonarKit.podspec | 139 ---------------- Specs/SonarKit/0.7.0/SonarKit.podspec | 139 ---------------- Specs/SonarKit/0.7.1/SonarKit.podspec | 139 ---------------- Specs/SonarKit/0.7.2/SonarKit.podspec | 139 ---------------- 64 files changed, 5940 deletions(-) delete mode 100644 Specs/Flipper/0.10.0/Flipper.podspec delete mode 100644 Specs/Flipper/0.11.0/Flipper.podspec delete mode 100644 Specs/Flipper/0.11.1/Flipper.podspec delete mode 100644 Specs/Flipper/0.12.0/Flipper.podspec delete mode 100644 Specs/Flipper/0.13.0/Flipper.podspec delete mode 100644 Specs/Flipper/0.14.0/Flipper.podspec delete mode 100644 Specs/Flipper/0.14.1/Flipper.podspec delete mode 100644 Specs/Flipper/0.14.2/Flipper.podspec delete mode 100644 Specs/Flipper/0.15.0/Flipper.podspec delete mode 100644 Specs/Flipper/0.16.0/Flipper.podspec delete mode 100644 Specs/Flipper/0.16.1/Flipper.podspec delete mode 100644 Specs/Flipper/0.16.2/Flipper.podspec delete mode 100644 Specs/Flipper/0.17.0/Flipper.podspec delete mode 100644 Specs/Flipper/0.17.1/Flipper.podspec delete mode 100644 Specs/Flipper/0.18.0/Flipper.podspec delete mode 100644 Specs/Flipper/0.19.0/Flipper.podspec delete mode 100644 Specs/Flipper/0.20.0/Flipper.podspec delete mode 100644 Specs/Flipper/0.8.0/Flipper.podspec delete mode 100644 Specs/Flipper/0.8.1/Flipper.podspec delete mode 100644 Specs/Flipper/0.9.0/Flipper.podspec delete mode 100644 Specs/FlipperKit/0.10.0/FlipperKit.podspec delete mode 100644 Specs/FlipperKit/0.11.0/FlipperKit.podspec delete mode 100644 Specs/FlipperKit/0.11.1/FlipperKit.podspec delete mode 100644 Specs/FlipperKit/0.12.0/FlipperKit.podspec delete mode 100644 Specs/FlipperKit/0.13.0/FlipperKit.podspec delete mode 100644 Specs/FlipperKit/0.14.0/FlipperKit.podspec delete mode 100644 Specs/FlipperKit/0.14.1/FlipperKit.podspec delete mode 100644 Specs/FlipperKit/0.14.2/FlipperKit.podspec delete mode 100644 Specs/FlipperKit/0.15.0/FlipperKit.podspec delete mode 100644 Specs/FlipperKit/0.16.0/FlipperKit.podspec delete mode 100644 Specs/FlipperKit/0.16.1/FlipperKit.podspec delete mode 100644 Specs/FlipperKit/0.16.2/FlipperKit.podspec delete mode 100644 Specs/FlipperKit/0.17.0/FlipperKit.podspec delete mode 100644 Specs/FlipperKit/0.17.1/FlipperKit.podspec delete mode 100644 Specs/FlipperKit/0.18.0/FlipperKit.podspec delete mode 100644 Specs/FlipperKit/0.19.0/FlipperKit.podspec delete mode 100644 Specs/FlipperKit/0.20.0/FlipperKit.podspec delete mode 100644 Specs/FlipperKit/0.8.0/FlipperKit.podspec delete mode 100644 Specs/FlipperKit/0.8.1/FlipperKit.podspec delete mode 100644 Specs/FlipperKit/0.9.0/FlipperKit.podspec delete mode 100644 Specs/Folly/1.0.0/Folly.podspec.json delete mode 100644 Specs/Folly/1.1.0/Folly.podspec.json delete mode 100644 Specs/Folly/1.2.0/Folly.podspec.json delete mode 100644 Specs/PeerTalk/0.0.2/PeerTalk.podspec delete mode 100644 Specs/README.md delete mode 100644 Specs/RSocket/0.10.0/RSocket.podspec delete mode 100644 Specs/Sonar/0.0.1/Sonar.podspec delete mode 100644 Specs/Sonar/0.6.12/Sonar.podspec delete mode 100644 Specs/Sonar/0.6.13/Sonar.podspec delete mode 100644 Specs/Sonar/0.6.14/Sonar.podspec delete mode 100644 Specs/Sonar/0.6.15/Sonar.podspec delete mode 100644 Specs/Sonar/0.6.16/Sonar.podspec delete mode 100644 Specs/Sonar/0.7.0/Sonar.podspec delete mode 100644 Specs/Sonar/0.7.1/Sonar.podspec delete mode 100644 Specs/Sonar/0.7.2/Sonar.podspec delete mode 100644 Specs/SonarKit/0.0.1/SonarKit.podspec delete mode 100644 Specs/SonarKit/0.6.12/SonarKit.podspec delete mode 100644 Specs/SonarKit/0.6.13/SonarKit.podspec delete mode 100644 Specs/SonarKit/0.6.14/SonarKit.podspec delete mode 100644 Specs/SonarKit/0.6.15/SonarKit.podspec delete mode 100644 Specs/SonarKit/0.6.16/SonarKit.podspec delete mode 100644 Specs/SonarKit/0.7.0/SonarKit.podspec delete mode 100644 Specs/SonarKit/0.7.1/SonarKit.podspec delete mode 100644 Specs/SonarKit/0.7.2/SonarKit.podspec diff --git a/Specs/Flipper/0.10.0/Flipper.podspec b/Specs/Flipper/0.10.0/Flipper.podspec deleted file mode 100644 index f9d153be7..000000000 --- a/Specs/Flipper/0.10.0/Flipper.podspec +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -flipperkit_version = '0.10.0' -Pod::Spec.new do |spec| - spec.name = 'Flipper' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+flipperkit_version } - spec.module_name = 'Flipper' - spec.public_header_files = 'xplat/Flipper/*.h' - spec.source_files = 'xplat/Flipper/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Folly', '~>1.1' - spec.dependency 'RSocket', '~>0.10' - spec.compiler_flags = '-DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/Flipper/0.11.0/Flipper.podspec b/Specs/Flipper/0.11.0/Flipper.podspec deleted file mode 100644 index 894f9ecd3..000000000 --- a/Specs/Flipper/0.11.0/Flipper.podspec +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -flipperkit_version = '0.11.0' -Pod::Spec.new do |spec| - spec.name = 'Flipper' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+flipperkit_version } - spec.module_name = 'Flipper' - spec.public_header_files = 'xplat/Flipper/*.h' - spec.source_files = 'xplat/Flipper/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Folly', '~>1.1' - spec.dependency 'RSocket', '~>0.10' - spec.compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/Flipper/0.11.1/Flipper.podspec b/Specs/Flipper/0.11.1/Flipper.podspec deleted file mode 100644 index 32dd7387f..000000000 --- a/Specs/Flipper/0.11.1/Flipper.podspec +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -flipperkit_version = '0.11.1' -Pod::Spec.new do |spec| - spec.name = 'Flipper' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+flipperkit_version } - spec.module_name = 'Flipper' - spec.public_header_files = 'xplat/Flipper/*.h' - spec.source_files = 'xplat/Flipper/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Folly', '~>1.1' - spec.dependency 'RSocket', '~>0.10' - spec.compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/Flipper/0.12.0/Flipper.podspec b/Specs/Flipper/0.12.0/Flipper.podspec deleted file mode 100644 index 12098111e..000000000 --- a/Specs/Flipper/0.12.0/Flipper.podspec +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -flipperkit_version = '0.12.0' -Pod::Spec.new do |spec| - spec.name = 'Flipper' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+flipperkit_version } - spec.module_name = 'Flipper' - spec.public_header_files = 'xplat/Flipper/*.h' - spec.source_files = 'xplat/Flipper/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Folly', '~>1.1' - spec.dependency 'RSocket', '~>0.10' - spec.compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/Flipper/0.13.0/Flipper.podspec b/Specs/Flipper/0.13.0/Flipper.podspec deleted file mode 100644 index a9774b71c..000000000 --- a/Specs/Flipper/0.13.0/Flipper.podspec +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -flipperkit_version = '0.13.0' -Pod::Spec.new do |spec| - spec.name = 'Flipper' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+flipperkit_version } - spec.module_name = 'Flipper' - spec.public_header_files = 'xplat/Flipper/*.h' - spec.source_files = 'xplat/Flipper/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Folly', '~>1.1' - spec.dependency 'RSocket', '~>0.10' - spec.compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/Flipper/0.14.0/Flipper.podspec b/Specs/Flipper/0.14.0/Flipper.podspec deleted file mode 100644 index 771910fc7..000000000 --- a/Specs/Flipper/0.14.0/Flipper.podspec +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -flipperkit_version = '0.14.0' -Pod::Spec.new do |spec| - spec.name = 'Flipper' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+flipperkit_version } - spec.module_name = 'Flipper' - spec.public_header_files = 'xplat/Flipper/*.h' - spec.source_files = 'xplat/Flipper/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Folly', '~>1.1' - spec.dependency 'RSocket', '~>0.10' - spec.compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/Flipper/0.14.1/Flipper.podspec b/Specs/Flipper/0.14.1/Flipper.podspec deleted file mode 100644 index d40c28ce2..000000000 --- a/Specs/Flipper/0.14.1/Flipper.podspec +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -flipperkit_version = '0.14.1' -Pod::Spec.new do |spec| - spec.name = 'Flipper' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+flipperkit_version } - spec.module_name = 'Flipper' - spec.public_header_files = 'xplat/Flipper/*.h' - spec.source_files = 'xplat/Flipper/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Folly', '~>1.1' - spec.dependency 'RSocket', '~>0.10' - spec.compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/Flipper/0.14.2/Flipper.podspec b/Specs/Flipper/0.14.2/Flipper.podspec deleted file mode 100644 index dc36346eb..000000000 --- a/Specs/Flipper/0.14.2/Flipper.podspec +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -flipperkit_version = '0.14.2' -Pod::Spec.new do |spec| - spec.name = 'Flipper' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+flipperkit_version } - spec.module_name = 'Flipper' - spec.public_header_files = 'xplat/Flipper/*.h','xplat/utils/*.h' - spec.source_files = 'xplat/Flipper/*.{h,cpp,m,mm}','xplat/Flipper/utils/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Folly', '~>1.2' - spec.dependency 'RSocket', '~>0.10' - spec.compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/Flipper/0.15.0/Flipper.podspec b/Specs/Flipper/0.15.0/Flipper.podspec deleted file mode 100644 index 9ea13de02..000000000 --- a/Specs/Flipper/0.15.0/Flipper.podspec +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -flipperkit_version = '0.15.0' -Pod::Spec.new do |spec| - spec.name = 'Flipper' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+flipperkit_version } - spec.module_name = 'Flipper' - spec.public_header_files = 'xplat/Flipper/*.h','xplat/utils/*.h' - spec.source_files = 'xplat/Flipper/*.{h,cpp,m,mm}','xplat/Flipper/utils/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Folly', '~>1.2' - spec.dependency 'RSocket', '~>0.10' - spec.compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/Flipper/0.16.0/Flipper.podspec b/Specs/Flipper/0.16.0/Flipper.podspec deleted file mode 100644 index 164488f1c..000000000 --- a/Specs/Flipper/0.16.0/Flipper.podspec +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -flipperkit_version = '0.16.0' -Pod::Spec.new do |spec| - spec.name = 'Flipper' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+flipperkit_version } - spec.module_name = 'Flipper' - spec.public_header_files = 'xplat/Flipper/*.h','xplat/utils/*.h' - spec.source_files = 'xplat/Flipper/*.{h,cpp,m,mm}','xplat/Flipper/utils/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Folly', '~>1.2' - spec.dependency 'RSocket', '~>0.10' - spec.compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/Flipper/0.16.1/Flipper.podspec b/Specs/Flipper/0.16.1/Flipper.podspec deleted file mode 100644 index 4847b629d..000000000 --- a/Specs/Flipper/0.16.1/Flipper.podspec +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -flipperkit_version = '0.16.1' -Pod::Spec.new do |spec| - spec.name = 'Flipper' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+flipperkit_version } - spec.module_name = 'Flipper' - spec.public_header_files = 'xplat/Flipper/*.h','xplat/utils/*.h' - spec.source_files = 'xplat/Flipper/*.{h,cpp,m,mm}','xplat/Flipper/utils/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Folly', '~>1.2' - spec.dependency 'RSocket', '~>0.10' - spec.compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/Flipper/0.16.2/Flipper.podspec b/Specs/Flipper/0.16.2/Flipper.podspec deleted file mode 100644 index 98d54babe..000000000 --- a/Specs/Flipper/0.16.2/Flipper.podspec +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -flipperkit_version = '0.16.2' -Pod::Spec.new do |spec| - spec.name = 'Flipper' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+flipperkit_version } - spec.module_name = 'Flipper' - spec.public_header_files = 'xplat/Flipper/*.h','xplat/utils/*.h' - spec.source_files = 'xplat/Flipper/*.{h,cpp,m,mm}','xplat/Flipper/utils/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Folly', '~>1.2' - spec.dependency 'RSocket', '~>0.10' - spec.compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/Flipper/0.17.0/Flipper.podspec b/Specs/Flipper/0.17.0/Flipper.podspec deleted file mode 100644 index e49da8f6e..000000000 --- a/Specs/Flipper/0.17.0/Flipper.podspec +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -flipperkit_version = '0.17.0' -Pod::Spec.new do |spec| - spec.name = 'Flipper' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+flipperkit_version } - spec.module_name = 'Flipper' - spec.public_header_files = 'xplat/Flipper/*.h','xplat/utils/*.h' - spec.source_files = 'xplat/Flipper/*.{h,cpp,m,mm}','xplat/Flipper/utils/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Flipper-Folly', '~>1.2' - spec.dependency 'Flipper-RSocket', '~>0.10' - spec.compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Flipper-RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/Flipper/0.17.1/Flipper.podspec b/Specs/Flipper/0.17.1/Flipper.podspec deleted file mode 100644 index 20240d007..000000000 --- a/Specs/Flipper/0.17.1/Flipper.podspec +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -flipperkit_version = '0.17.1' -Pod::Spec.new do |spec| - spec.name = 'Flipper' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+flipperkit_version } - spec.module_name = 'Flipper' - spec.public_header_files = 'xplat/Flipper/*.h','xplat/utils/*.h' - spec.source_files = 'xplat/Flipper/*.{h,cpp,m,mm}','xplat/Flipper/utils/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Flipper-Folly', '~>1.2' - spec.dependency 'Flipper-RSocket', '~>0.10' - spec.compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Flipper-RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/Flipper/0.18.0/Flipper.podspec b/Specs/Flipper/0.18.0/Flipper.podspec deleted file mode 100644 index b257f7b5f..000000000 --- a/Specs/Flipper/0.18.0/Flipper.podspec +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -flipperkit_version = '0.18.0' -Pod::Spec.new do |spec| - spec.name = 'Flipper' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+flipperkit_version } - spec.module_name = 'Flipper' - spec.public_header_files = 'xplat/Flipper/*.h','xplat/utils/*.h' - spec.source_files = 'xplat/Flipper/*.{h,cpp,m,mm}','xplat/Flipper/utils/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Flipper-Folly', '~>1.2' - spec.dependency 'Flipper-RSocket', '~>0.10' - spec.compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Flipper-RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/Flipper/0.19.0/Flipper.podspec b/Specs/Flipper/0.19.0/Flipper.podspec deleted file mode 100644 index 28d7ae33d..000000000 --- a/Specs/Flipper/0.19.0/Flipper.podspec +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -flipperkit_version = '0.19.0' -Pod::Spec.new do |spec| - spec.name = 'Flipper' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+flipperkit_version } - spec.module_name = 'Flipper' - spec.public_header_files = 'xplat/Flipper/*.h','xplat/utils/*.h' - spec.source_files = 'xplat/Flipper/*.{h,cpp,m,mm}','xplat/Flipper/utils/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Flipper-Folly', '~>1.2' - spec.dependency 'Flipper-RSocket', '~>0.10' - spec.compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Flipper-RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/Flipper/0.20.0/Flipper.podspec b/Specs/Flipper/0.20.0/Flipper.podspec deleted file mode 100644 index c09ceb9f8..000000000 --- a/Specs/Flipper/0.20.0/Flipper.podspec +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -flipperkit_version = '0.20.0' -Pod::Spec.new do |spec| - spec.name = 'Flipper' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+flipperkit_version } - spec.module_name = 'Flipper' - spec.public_header_files = 'xplat/Flipper/*.h','xplat/utils/*.h' - spec.source_files = 'xplat/Flipper/*.{h,cpp,m,mm}','xplat/Flipper/utils/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Flipper-Folly', '1.3.0' - spec.dependency 'Flipper-RSocket', '0.10.4' - spec.compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Flipper-RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/Flipper/0.8.0/Flipper.podspec b/Specs/Flipper/0.8.0/Flipper.podspec deleted file mode 100644 index 132739127..000000000 --- a/Specs/Flipper/0.8.0/Flipper.podspec +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -flipperkit_version = '0.8.0' -Pod::Spec.new do |spec| - spec.name = 'Flipper' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+flipperkit_version } - spec.module_name = 'Flipper' - spec.public_header_files = 'xplat/Flipper/*.h' - spec.source_files = 'xplat/Flipper/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Folly', '~>1.1' - spec.dependency 'RSocket', '~>0.10' - spec.compiler_flags = '-DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/Flipper/0.8.1/Flipper.podspec b/Specs/Flipper/0.8.1/Flipper.podspec deleted file mode 100644 index 8fdebbf6d..000000000 --- a/Specs/Flipper/0.8.1/Flipper.podspec +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -flipperkit_version = '0.8.1' -Pod::Spec.new do |spec| - spec.name = 'Flipper' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+flipperkit_version } - spec.module_name = 'Flipper' - spec.public_header_files = 'xplat/Flipper/*.h' - spec.source_files = 'xplat/Flipper/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Folly', '~>1.1' - spec.dependency 'RSocket', '~>0.10' - spec.compiler_flags = '-DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/Flipper/0.9.0/Flipper.podspec b/Specs/Flipper/0.9.0/Flipper.podspec deleted file mode 100644 index e1f1fa620..000000000 --- a/Specs/Flipper/0.9.0/Flipper.podspec +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -flipperkit_version = '0.9.0' -Pod::Spec.new do |spec| - spec.name = 'Flipper' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+flipperkit_version } - spec.module_name = 'Flipper' - spec.public_header_files = 'xplat/Flipper/*.h' - spec.source_files = 'xplat/Flipper/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Folly', '~>1.1' - spec.dependency 'RSocket', '~>0.10' - spec.compiler_flags = '-DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/FlipperKit/0.10.0/FlipperKit.podspec b/Specs/FlipperKit/0.10.0/FlipperKit.podspec deleted file mode 100644 index a3fe64d55..000000000 --- a/Specs/FlipperKit/0.10.0/FlipperKit.podspec +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.8' -flipperkit_version = '0.10.0' -Pod::Spec.new do |spec| - spec.name = 'FlipperKit' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+flipperkit_version } - spec.module_name = 'FlipperKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBMacros.h is imported as <FBDefines/FBMacros.h> - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import <FlipperKit/t/FBDefines/FBMacros.h>) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/CppBridge/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other SonarKit source files - ss.private_header_files = 'iOS/FlipperKit/CppBridge/**/*.h' - ss.preserve_path = 'FlipperKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other SonarKit source files - ss.private_header_files = 'iOS/FlipperKit/FBCxxUtils/**/*.h' - end - - spec.subspec "Core" do |ss| - ss.dependency 'FlipperKit/FBDefines' - ss.dependency 'FlipperKit/FBCxxUtils' - ss.dependency 'FlipperKit/CppBridge' - ss.dependency 'Folly', '~>1.1' - ss.dependency 'Flipper', '~>'+flipperkit_version - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/FlipperKit/CppBridge/*.{h,mm}', 'iOS/FlipperKit/FBCxxUtils/*.{h,mm}', 'iOS/FlipperKit/Utilities/**/*.{h,m}', 'iOS/FlipperKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h', - 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h', - 'iOS/FBDefines/FBMacros.h', - 'iOS/FlipperKit/**/{FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit\" \"$(PODS_ROOT)\"/Headers/Private/FlipperKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "FlipperKitLayoutPlugin" do |ss| - ss.header_dir = "FlipperKitLayoutPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h', - '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}' - end - - spec.subspec "FlipperKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "FlipperKitLayoutComponentKitSupport" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h' - - ss.source_files = "iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitNetworkPlugin" do |ss| - ss.header_dir = "FlipperKitNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'FlipperKit/FlipperKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitUserDefaultsPlugin" do |ss| - ss.header_dir = "FlipperKitUserDefaultsPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitUserDefaultsPlugin/**/*.{h,m}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end -end diff --git a/Specs/FlipperKit/0.11.0/FlipperKit.podspec b/Specs/FlipperKit/0.11.0/FlipperKit.podspec deleted file mode 100644 index 062d91877..000000000 --- a/Specs/FlipperKit/0.11.0/FlipperKit.podspec +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.8' -flipperkit_version = '0.11.0' -Pod::Spec.new do |spec| - spec.name = 'FlipperKit' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+flipperkit_version } - spec.module_name = 'FlipperKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBMacros.h is imported as <FBDefines/FBMacros.h> - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import <FlipperKit/t/FBDefines/FBMacros.h>) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/CppBridge/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other SonarKit source files - ss.private_header_files = 'iOS/FlipperKit/CppBridge/**/*.h' - ss.preserve_path = 'FlipperKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other SonarKit source files - ss.private_header_files = 'iOS/FlipperKit/FBCxxUtils/**/*.h' - end - - spec.subspec "Core" do |ss| - ss.dependency 'FlipperKit/FBDefines' - ss.dependency 'FlipperKit/FBCxxUtils' - ss.dependency 'FlipperKit/CppBridge' - ss.dependency 'Folly', '~>1.1' - ss.dependency 'Flipper', '~>'+flipperkit_version - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/FlipperKit/CppBridge/*.{h,mm}', 'iOS/FlipperKit/FBCxxUtils/*.{h,mm}', 'iOS/FlipperKit/Utilities/**/*.{h,m}', 'iOS/FlipperKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h', - 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h', - 'iOS/FBDefines/FBMacros.h', - 'iOS/FlipperKit/**/{FlipperDiagnosticsViewController,FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit\" \"$(PODS_ROOT)\"/Headers/Private/FlipperKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "FlipperKitLayoutPlugin" do |ss| - ss.header_dir = "FlipperKitLayoutPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h' - ss.private_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h', - '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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "FlipperKitLayoutComponentKitSupport" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h' - ss.source_files = "iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitNetworkPlugin" do |ss| - ss.header_dir = "FlipperKitNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'FlipperKit/FlipperKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitUserDefaultsPlugin" do |ss| - ss.header_dir = "FlipperKitUserDefaultsPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitUserDefaultsPlugin/**/*.{h,m}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitExamplePlugin" do |ss| - ss.header_dir = "FlipperKitExamplePlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitExamplePlugin/**/*.{h,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end -end diff --git a/Specs/FlipperKit/0.11.1/FlipperKit.podspec b/Specs/FlipperKit/0.11.1/FlipperKit.podspec deleted file mode 100644 index 59d4aab8b..000000000 --- a/Specs/FlipperKit/0.11.1/FlipperKit.podspec +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.8' -flipperkit_version = '0.11.1' -Pod::Spec.new do |spec| - spec.name = 'FlipperKit' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+flipperkit_version } - spec.module_name = 'FlipperKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBMacros.h is imported as <FBDefines/FBMacros.h> - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import <FlipperKit/t/FBDefines/FBMacros.h>) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/CppBridge/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other SonarKit source files - ss.private_header_files = 'iOS/FlipperKit/CppBridge/**/*.h' - ss.preserve_path = 'FlipperKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other SonarKit source files - ss.private_header_files = 'iOS/FlipperKit/FBCxxUtils/**/*.h' - end - - spec.subspec "Core" do |ss| - ss.dependency 'FlipperKit/FBDefines' - ss.dependency 'FlipperKit/FBCxxUtils' - ss.dependency 'FlipperKit/CppBridge' - ss.dependency 'Folly', '~>1.1' - ss.dependency 'Flipper', '~>'+flipperkit_version - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/FlipperKit/CppBridge/*.{h,mm}', 'iOS/FlipperKit/FBCxxUtils/*.{h,mm}', 'iOS/FlipperKit/Utilities/**/*.{h,m}', 'iOS/FlipperKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h', - 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKSubDescriptor.h', - 'iOS/FBDefines/FBMacros.h', - 'iOS/FlipperKit/**/{FlipperDiagnosticsViewController,FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit\" \"$(PODS_ROOT)\"/Headers/Private/FlipperKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "FlipperKitLayoutPlugin" do |ss| - ss.header_dir = "FlipperKitLayoutPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h' - ss.private_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h', - '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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "FlipperKitLayoutComponentKitSupport" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - 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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitNetworkPlugin" do |ss| - ss.header_dir = "FlipperKitNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'FlipperKit/FlipperKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitUserDefaultsPlugin" do |ss| - ss.header_dir = "FlipperKitUserDefaultsPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitUserDefaultsPlugin/**/*.{h,m}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitExamplePlugin" do |ss| - ss.header_dir = "FlipperKitExamplePlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitExamplePlugin/**/*.{h,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end -end diff --git a/Specs/FlipperKit/0.12.0/FlipperKit.podspec b/Specs/FlipperKit/0.12.0/FlipperKit.podspec deleted file mode 100644 index e1db72f5b..000000000 --- a/Specs/FlipperKit/0.12.0/FlipperKit.podspec +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.8' -flipperkit_version = '0.12.0' -Pod::Spec.new do |spec| - spec.name = 'FlipperKit' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+flipperkit_version } - spec.module_name = 'FlipperKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBMacros.h is imported as <FBDefines/FBMacros.h> - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import <FlipperKit/t/FBDefines/FBMacros.h>) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/CppBridge/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/CppBridge/**/*.h' - ss.preserve_path = 'FlipperKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/FBCxxUtils/**/*.h' - end - - spec.subspec "Core" do |ss| - ss.dependency 'FlipperKit/FBDefines' - ss.dependency 'FlipperKit/FBCxxUtils' - ss.dependency 'FlipperKit/CppBridge' - ss.dependency 'Folly', '~>1.1' - ss.dependency 'Flipper', '~>'+flipperkit_version - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/FlipperKit/CppBridge/*.{h,mm}', 'iOS/FlipperKit/FBCxxUtils/*.{h,mm}', 'iOS/FlipperKit/Utilities/**/*.{h,m}', 'iOS/FlipperKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h', - 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKSubDescriptor.h', - 'iOS/FBDefines/FBMacros.h', - 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h', - 'iOS/FlipperKit/**/{FlipperDiagnosticsViewController,FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit\" \"$(PODS_ROOT)\"/Headers/Private/FlipperKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "FlipperKitLayoutPlugin" do |ss| - ss.header_dir = "FlipperKitLayoutPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h' - ss.private_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h', - '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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "FlipperKitLayoutComponentKitSupport" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - 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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitNetworkPlugin" do |ss| - ss.header_dir = "FlipperKitNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'FlipperKit/FlipperKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitUserDefaultsPlugin" do |ss| - ss.header_dir = "FlipperKitUserDefaultsPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitUserDefaultsPlugin/**/*.{h,m}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitExamplePlugin" do |ss| - ss.header_dir = "FlipperKitExamplePlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitExamplePlugin/**/*.{h,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end -end diff --git a/Specs/FlipperKit/0.13.0/FlipperKit.podspec b/Specs/FlipperKit/0.13.0/FlipperKit.podspec deleted file mode 100644 index dd9e185db..000000000 --- a/Specs/FlipperKit/0.13.0/FlipperKit.podspec +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.8' -flipperkit_version = '0.13.0' -Pod::Spec.new do |spec| - spec.name = 'FlipperKit' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+flipperkit_version } - spec.module_name = 'FlipperKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBMacros.h is imported as <FBDefines/FBMacros.h> - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import <FlipperKit/t/FBDefines/FBMacros.h>) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/CppBridge/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/CppBridge/**/*.h' - ss.preserve_path = 'FlipperKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/FBCxxUtils/**/*.h' - end - - spec.subspec "FKPortForwarding" do |ss| - ss.header_dir = "FKPortForwarding" - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.{h,m}' - ss.private_header_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.h' - end - - - spec.subspec "Core" do |ss| - ss.dependency 'FlipperKit/FBDefines' - ss.dependency 'FlipperKit/FBCxxUtils' - ss.dependency 'FlipperKit/CppBridge' - ss.dependency 'FlipperKit/FKPortForwarding' - ss.dependency 'Folly', '~>1.1' - ss.dependency 'Flipper', '~>'+flipperkit_version - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/FlipperKit/CppBridge/*.{h,mm}', 'iOS/FlipperKit/FBCxxUtils/*.{h,mm}', 'iOS/FlipperKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h', - 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKSubDescriptor.h', - 'iOS/FBDefines/FBMacros.h', - 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h', - 'iOS/Plugins/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin.h', - 'iOS/FlipperKit/**/{FlipperDiagnosticsViewController,FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit\" \"$(PODS_ROOT)\"/Headers/Private/FlipperKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "FlipperKitLayoutPlugin" do |ss| - ss.header_dir = "FlipperKitLayoutPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h' - ss.private_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h', - '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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "FlipperKitLayoutComponentKitSupport" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - 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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitNetworkPlugin" do |ss| - ss.header_dir = "FlipperKitNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'FlipperKit/FlipperKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitUserDefaultsPlugin" do |ss| - ss.header_dir = "FlipperKitUserDefaultsPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitUserDefaultsPlugin/**/*.{h,m}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitExamplePlugin" do |ss| - ss.header_dir = "FlipperKitExamplePlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitExamplePlugin/**/*.{h,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitCrashReporterPlugin" do |ss| - ss.header_dir = "FlipperKitCrashReporterPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitCrashReporterPlugin/**/*.{h,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end -end diff --git a/Specs/FlipperKit/0.14.0/FlipperKit.podspec b/Specs/FlipperKit/0.14.0/FlipperKit.podspec deleted file mode 100644 index 701cd92de..000000000 --- a/Specs/FlipperKit/0.14.0/FlipperKit.podspec +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.8' -flipperkit_version = '0.14.0' -Pod::Spec.new do |spec| - spec.name = 'FlipperKit' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+flipperkit_version } - spec.module_name = 'FlipperKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBMacros.h is imported as <FBDefines/FBMacros.h> - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import <FlipperKit/t/FBDefines/FBMacros.h>) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/CppBridge/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/CppBridge/**/*.h' - ss.preserve_path = 'FlipperKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/FBCxxUtils/**/*.h' - end - - spec.subspec "FKPortForwarding" do |ss| - ss.header_dir = "FKPortForwarding" - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.{h,m}' - ss.private_header_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.h' - end - - - spec.subspec "Core" do |ss| - ss.dependency 'FlipperKit/FBDefines' - ss.dependency 'FlipperKit/FBCxxUtils' - ss.dependency 'FlipperKit/CppBridge' - ss.dependency 'FlipperKit/FKPortForwarding' - ss.dependency 'Folly', '~>1.1' - ss.dependency 'Flipper', '~>'+flipperkit_version - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/FlipperKit/CppBridge/*.{h,mm}', 'iOS/FlipperKit/FBCxxUtils/*.{h,mm}', 'iOS/FlipperKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h', - 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKSubDescriptor.h', - 'iOS/FBDefines/FBMacros.h', - 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h', - 'iOS/Plugins/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin.h', - 'iOS/FlipperKit/**/{FlipperDiagnosticsViewController,FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit\" \"$(PODS_ROOT)\"/Headers/Private/FlipperKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "FlipperKitLayoutPlugin" do |ss| - ss.header_dir = "FlipperKitLayoutPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h' - ss.private_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h', - '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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "FlipperKitLayoutComponentKitSupport" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - 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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitNetworkPlugin" do |ss| - ss.header_dir = "FlipperKitNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'FlipperKit/FlipperKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitUserDefaultsPlugin" do |ss| - ss.header_dir = "FlipperKitUserDefaultsPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitUserDefaultsPlugin/**/*.{h,m}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitExamplePlugin" do |ss| - ss.header_dir = "FlipperKitExamplePlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitExamplePlugin/**/*.{h,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end -end diff --git a/Specs/FlipperKit/0.14.1/FlipperKit.podspec b/Specs/FlipperKit/0.14.1/FlipperKit.podspec deleted file mode 100644 index da970ab0e..000000000 --- a/Specs/FlipperKit/0.14.1/FlipperKit.podspec +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.8' -flipperkit_version = '0.14.1' -Pod::Spec.new do |spec| - spec.name = 'FlipperKit' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+flipperkit_version } - spec.module_name = 'FlipperKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBMacros.h is imported as <FBDefines/FBMacros.h> - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import <FlipperKit/t/FBDefines/FBMacros.h>) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/CppBridge/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/CppBridge/**/*.h' - ss.preserve_path = 'FlipperKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/FBCxxUtils/**/*.h' - end - - spec.subspec "FKPortForwarding" do |ss| - ss.header_dir = "FKPortForwarding" - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.{h,m}' - ss.private_header_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.h' - end - - - spec.subspec "Core" do |ss| - ss.dependency 'FlipperKit/FBDefines' - ss.dependency 'FlipperKit/FBCxxUtils' - ss.dependency 'FlipperKit/CppBridge' - ss.dependency 'FlipperKit/FKPortForwarding' - ss.dependency 'Folly', '~>1.1' - ss.dependency 'Flipper', '~>'+flipperkit_version - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/FlipperKit/CppBridge/*.{h,mm}', 'iOS/FlipperKit/FBCxxUtils/*.{h,mm}', 'iOS/FlipperKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h', - 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKSubDescriptor.h', - 'iOS/FBDefines/FBMacros.h', - 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h', - 'iOS/Plugins/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin.h', - 'iOS/FlipperKit/**/{FlipperDiagnosticsViewController,FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit\" \"$(PODS_ROOT)\"/Headers/Private/FlipperKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "FlipperKitLayoutPlugin" do |ss| - ss.header_dir = "FlipperKitLayoutPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h' - ss.private_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h', - '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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "FlipperKitLayoutComponentKitSupport" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - 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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitNetworkPlugin" do |ss| - ss.header_dir = "FlipperKitNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'FlipperKit/FlipperKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitUserDefaultsPlugin" do |ss| - ss.header_dir = "FlipperKitUserDefaultsPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitUserDefaultsPlugin/**/*.{h,m}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitExamplePlugin" do |ss| - ss.header_dir = "FlipperKitExamplePlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitExamplePlugin/**/*.{h,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end -end diff --git a/Specs/FlipperKit/0.14.2/FlipperKit.podspec b/Specs/FlipperKit/0.14.2/FlipperKit.podspec deleted file mode 100644 index a03be96d8..000000000 --- a/Specs/FlipperKit/0.14.2/FlipperKit.podspec +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.8' -flipperkit_version = '0.14.2' -Pod::Spec.new do |spec| - spec.name = 'FlipperKit' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+flipperkit_version } - spec.module_name = 'FlipperKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBMacros.h is imported as <FBDefines/FBMacros.h> - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import <FlipperKit/t/FBDefines/FBMacros.h>) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/CppBridge/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/CppBridge/**/*.h' - ss.preserve_path = 'FlipperKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/FBCxxUtils/**/*.h' - end - - spec.subspec "FKPortForwarding" do |ss| - ss.header_dir = "FKPortForwarding" - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.{h,m}' - ss.private_header_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.h' - end - - - spec.subspec "Core" do |ss| - ss.dependency 'FlipperKit/FBDefines' - ss.dependency 'FlipperKit/FBCxxUtils' - ss.dependency 'FlipperKit/CppBridge' - ss.dependency 'FlipperKit/FKPortForwarding' - ss.dependency 'Folly', '~>1.2' - ss.dependency 'Flipper', '~>'+flipperkit_version - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/FlipperKit/CppBridge/*.{h,mm}', 'iOS/FlipperKit/FBCxxUtils/*.{h,mm}', 'iOS/FlipperKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h', - 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKSubDescriptor.h', - 'iOS/FBDefines/FBMacros.h', - 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h', - 'iOS/Plugins/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin.h', - 'iOS/FlipperKit/**/{FlipperDiagnosticsViewController,FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit\" \"$(PODS_ROOT)\"/Headers/Private/FlipperKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "FlipperKitLayoutPlugin" do |ss| - ss.header_dir = "FlipperKitLayoutPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h' - ss.private_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h', - '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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "FlipperKitLayoutComponentKitSupport" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - 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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitNetworkPlugin" do |ss| - ss.header_dir = "FlipperKitNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'FlipperKit/FlipperKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitUserDefaultsPlugin" do |ss| - ss.header_dir = "FlipperKitUserDefaultsPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitUserDefaultsPlugin/**/*.{h,m}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitExamplePlugin" do |ss| - ss.header_dir = "FlipperKitExamplePlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitExamplePlugin/**/*.{h,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end -end diff --git a/Specs/FlipperKit/0.15.0/FlipperKit.podspec b/Specs/FlipperKit/0.15.0/FlipperKit.podspec deleted file mode 100644 index a60c506aa..000000000 --- a/Specs/FlipperKit/0.15.0/FlipperKit.podspec +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.8' -flipperkit_version = '0.15.0' -Pod::Spec.new do |spec| - spec.name = 'FlipperKit' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+flipperkit_version } - spec.module_name = 'FlipperKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBMacros.h is imported as <FBDefines/FBMacros.h> - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import <FlipperKit/t/FBDefines/FBMacros.h>) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/CppBridge/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/CppBridge/**/*.h' - ss.preserve_path = 'FlipperKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/FBCxxUtils/**/*.h' - end - - spec.subspec "FKPortForwarding" do |ss| - ss.header_dir = "FKPortForwarding" - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.{h,m}' - ss.private_header_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.h' - end - - - spec.subspec "Core" do |ss| - ss.dependency 'FlipperKit/FBDefines' - ss.dependency 'FlipperKit/FBCxxUtils' - ss.dependency 'FlipperKit/CppBridge' - ss.dependency 'FlipperKit/FKPortForwarding' - ss.dependency 'Folly', '~>1.2' - ss.dependency 'Flipper', '~>'+flipperkit_version - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/FlipperKit/CppBridge/*.{h,mm}', 'iOS/FlipperKit/FBCxxUtils/*.{h,mm}', 'iOS/FlipperKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h', - 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKSubDescriptor.h', - 'iOS/FBDefines/FBMacros.h', - 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h', - 'iOS/Plugins/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin.h', - 'iOS/FlipperKit/**/{FlipperDiagnosticsViewController,FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit\" \"$(PODS_ROOT)\"/Headers/Private/FlipperKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "FlipperKitLayoutPlugin" do |ss| - ss.header_dir = "FlipperKitLayoutPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h' - ss.private_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h', - '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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "FlipperKitLayoutComponentKitSupport" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - 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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitNetworkPlugin" do |ss| - ss.header_dir = "FlipperKitNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'FlipperKit/FlipperKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitUserDefaultsPlugin" do |ss| - ss.header_dir = "FlipperKitUserDefaultsPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitUserDefaultsPlugin/**/*.{h,m}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitExamplePlugin" do |ss| - ss.header_dir = "FlipperKitExamplePlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitExamplePlugin/**/*.{h,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end -end diff --git a/Specs/FlipperKit/0.16.0/FlipperKit.podspec b/Specs/FlipperKit/0.16.0/FlipperKit.podspec deleted file mode 100644 index 0b0bddfb8..000000000 --- a/Specs/FlipperKit/0.16.0/FlipperKit.podspec +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.10' -flipperkit_version = '0.16.0' -Pod::Spec.new do |spec| - spec.name = 'FlipperKit' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+flipperkit_version } - spec.module_name = 'FlipperKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBDefines.h is imported as <FBDefines/FBDefines.h> - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import <FlipperKit/t/FBDefines/FBDefines.h>) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/CppBridge/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/CppBridge/**/*.h' - ss.preserve_path = 'FlipperKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/FBCxxUtils/**/*.h' - end - - spec.subspec "FKPortForwarding" do |ss| - ss.header_dir = "FKPortForwarding" - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.{h,m}' - ss.private_header_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.h' - end - - - spec.subspec "Core" do |ss| - ss.dependency 'FlipperKit/FBDefines' - ss.dependency 'FlipperKit/FBCxxUtils' - ss.dependency 'FlipperKit/CppBridge' - ss.dependency 'FlipperKit/FKPortForwarding' - ss.dependency 'Folly', '~>1.2' - ss.dependency 'Flipper', '~>'+flipperkit_version - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/FlipperKit/CppBridge/*.{h,mm}', 'iOS/FlipperKit/FBCxxUtils/*.{h,mm}', 'iOS/FlipperKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h', - 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKSubDescriptor.h', - 'iOS/FBDefines/FBDefines.h', - 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h', - 'iOS/Plugins/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin.h', - 'iOS/FlipperKit/**/{FlipperDiagnosticsViewController,FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit\" \"$(PODS_ROOT)\"/Headers/Private/FlipperKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "FlipperKitLayoutPlugin" do |ss| - ss.header_dir = "FlipperKitLayoutPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h' - ss.private_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h', - '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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "FlipperKitLayoutComponentKitSupport" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - 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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitNetworkPlugin" do |ss| - ss.header_dir = "FlipperKitNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'FlipperKit/FlipperKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitUserDefaultsPlugin" do |ss| - ss.header_dir = "FlipperKitUserDefaultsPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitUserDefaultsPlugin/**/*.{h,m}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitExamplePlugin" do |ss| - ss.header_dir = "FlipperKitExamplePlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitExamplePlugin/**/*.{h,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end -end diff --git a/Specs/FlipperKit/0.16.1/FlipperKit.podspec b/Specs/FlipperKit/0.16.1/FlipperKit.podspec deleted file mode 100644 index f76379951..000000000 --- a/Specs/FlipperKit/0.16.1/FlipperKit.podspec +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.10' -flipperkit_version = '0.16.1' -Pod::Spec.new do |spec| - spec.name = 'FlipperKit' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+flipperkit_version } - spec.module_name = 'FlipperKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBDefines.h is imported as <FBDefines/FBDefines.h> - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import <FlipperKit/t/FBDefines/FBDefines.h>) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/CppBridge/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/CppBridge/**/*.h' - ss.preserve_path = 'FlipperKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/FBCxxUtils/**/*.h' - end - - spec.subspec "FKPortForwarding" do |ss| - ss.header_dir = "FKPortForwarding" - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.{h,m}' - ss.private_header_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.h' - end - - - spec.subspec "Core" do |ss| - ss.dependency 'FlipperKit/FBDefines' - ss.dependency 'FlipperKit/FBCxxUtils' - ss.dependency 'FlipperKit/CppBridge' - ss.dependency 'FlipperKit/FKPortForwarding' - ss.dependency 'Folly', '~>1.2' - ss.dependency 'Flipper', '~>'+flipperkit_version - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/FlipperKit/CppBridge/*.{h,mm}', 'iOS/FlipperKit/FBCxxUtils/*.{h,mm}', 'iOS/FlipperKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h', - 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKSubDescriptor.h', - 'iOS/FBDefines/FBDefines.h', - 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h', - 'iOS/Plugins/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin.h', - 'iOS/FlipperKit/**/{FlipperDiagnosticsViewController,FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit\" \"$(PODS_ROOT)\"/Headers/Private/FlipperKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "FlipperKitLayoutPlugin" do |ss| - ss.header_dir = "FlipperKitLayoutPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h' - ss.private_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h', - '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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "FlipperKitLayoutComponentKitSupport" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - 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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitNetworkPlugin" do |ss| - ss.header_dir = "FlipperKitNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'FlipperKit/FlipperKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitUserDefaultsPlugin" do |ss| - ss.header_dir = "FlipperKitUserDefaultsPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitUserDefaultsPlugin/**/*.{h,m}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitExamplePlugin" do |ss| - ss.header_dir = "FlipperKitExamplePlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitExamplePlugin/**/*.{h,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end -end diff --git a/Specs/FlipperKit/0.16.2/FlipperKit.podspec b/Specs/FlipperKit/0.16.2/FlipperKit.podspec deleted file mode 100644 index 369f7126d..000000000 --- a/Specs/FlipperKit/0.16.2/FlipperKit.podspec +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.10' -flipperkit_version = '0.16.2' -Pod::Spec.new do |spec| - spec.name = 'FlipperKit' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+flipperkit_version } - spec.module_name = 'FlipperKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBDefines.h is imported as <FBDefines/FBDefines.h> - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import <FlipperKit/t/FBDefines/FBDefines.h>) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/CppBridge/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/CppBridge/**/*.h' - ss.preserve_path = 'FlipperKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/FBCxxUtils/**/*.h' - end - - spec.subspec "FKPortForwarding" do |ss| - ss.header_dir = "FKPortForwarding" - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.{h,m}' - ss.private_header_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.h' - end - - - spec.subspec "Core" do |ss| - ss.dependency 'FlipperKit/FBDefines' - ss.dependency 'FlipperKit/FBCxxUtils' - ss.dependency 'FlipperKit/CppBridge' - ss.dependency 'FlipperKit/FKPortForwarding' - ss.dependency 'Folly', '~>1.2' - ss.dependency 'Flipper', '~>'+flipperkit_version - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/FlipperKit/CppBridge/*.{h,mm}', 'iOS/FlipperKit/FBCxxUtils/*.{h,mm}', 'iOS/FlipperKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h', - 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKSubDescriptor.h', - 'iOS/FBDefines/FBDefines.h', - 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h', - 'iOS/Plugins/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin.h', - 'iOS/FlipperKit/**/{FlipperDiagnosticsViewController,FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit\" \"$(PODS_ROOT)\"/Headers/Private/FlipperKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "FlipperKitLayoutPlugin" do |ss| - ss.header_dir = "FlipperKitLayoutPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h' - ss.private_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h', - '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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "FlipperKitLayoutComponentKitSupport" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - 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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitNetworkPlugin" do |ss| - ss.header_dir = "FlipperKitNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'FlipperKit/FlipperKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitUserDefaultsPlugin" do |ss| - ss.header_dir = "FlipperKitUserDefaultsPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitUserDefaultsPlugin/**/*.{h,m}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitExamplePlugin" do |ss| - ss.header_dir = "FlipperKitExamplePlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitExamplePlugin/**/*.{h,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end -end diff --git a/Specs/FlipperKit/0.17.0/FlipperKit.podspec b/Specs/FlipperKit/0.17.0/FlipperKit.podspec deleted file mode 100644 index b1615a0c0..000000000 --- a/Specs/FlipperKit/0.17.0/FlipperKit.podspec +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.10' -flipperkit_version = '0.17.0' -Pod::Spec.new do |spec| - spec.name = 'FlipperKit' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+flipperkit_version } - spec.module_name = 'FlipperKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBDefines.h is imported as <FBDefines/FBDefines.h> - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import <FlipperKit/t/FBDefines/FBDefines.h>) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/CppBridge/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/CppBridge/**/*.h' - ss.preserve_path = 'FlipperKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/FBCxxUtils/**/*.h' - end - - spec.subspec "FKPortForwarding" do |ss| - ss.header_dir = "FKPortForwarding" - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.{h,m}' - ss.private_header_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.h' - end - - - spec.subspec "Core" do |ss| - ss.dependency 'FlipperKit/FBDefines' - ss.dependency 'FlipperKit/FBCxxUtils' - ss.dependency 'FlipperKit/CppBridge' - ss.dependency 'FlipperKit/FKPortForwarding' - ss.dependency 'Flipper-Folly', '~>1.2' - ss.dependency 'Flipper', '~>'+flipperkit_version - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/FlipperKit/CppBridge/*.{h,mm}', 'iOS/FlipperKit/FBCxxUtils/*.{h,mm}', 'iOS/FlipperKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h', - 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKSubDescriptor.h', - 'iOS/FBDefines/FBDefines.h', - 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h', - 'iOS/Plugins/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin.h', - 'iOS/FlipperKit/**/{FlipperDiagnosticsViewController,FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit\" \"$(PODS_ROOT)\"/Headers/Private/FlipperKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "FlipperKitLayoutPlugin" do |ss| - ss.header_dir = "FlipperKitLayoutPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h' - ss.private_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h', - '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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "FlipperKitLayoutComponentKitSupport" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - 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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitNetworkPlugin" do |ss| - ss.header_dir = "FlipperKitNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'FlipperKit/FlipperKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitUserDefaultsPlugin" do |ss| - ss.header_dir = "FlipperKitUserDefaultsPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitUserDefaultsPlugin/**/*.{h,m}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitExamplePlugin" do |ss| - ss.header_dir = "FlipperKitExamplePlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitExamplePlugin/**/*.{h,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end -end diff --git a/Specs/FlipperKit/0.17.1/FlipperKit.podspec b/Specs/FlipperKit/0.17.1/FlipperKit.podspec deleted file mode 100644 index 88cee8368..000000000 --- a/Specs/FlipperKit/0.17.1/FlipperKit.podspec +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.10' -flipperkit_version = '0.17.1' -Pod::Spec.new do |spec| - spec.name = 'FlipperKit' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+flipperkit_version } - spec.module_name = 'FlipperKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBDefines.h is imported as <FBDefines/FBDefines.h> - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import <FlipperKit/t/FBDefines/FBDefines.h>) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/CppBridge/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/CppBridge/**/*.h' - ss.preserve_path = 'FlipperKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/FBCxxUtils/**/*.h' - end - - spec.subspec "FKPortForwarding" do |ss| - ss.header_dir = "FKPortForwarding" - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.{h,m}' - ss.private_header_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.h' - end - - - spec.subspec "Core" do |ss| - ss.dependency 'FlipperKit/FBDefines' - ss.dependency 'FlipperKit/FBCxxUtils' - ss.dependency 'FlipperKit/CppBridge' - ss.dependency 'FlipperKit/FKPortForwarding' - ss.dependency 'Flipper-Folly', '~>1.2' - ss.dependency 'Flipper', '~>'+flipperkit_version - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/FlipperKit/CppBridge/*.{h,mm}', 'iOS/FlipperKit/FBCxxUtils/*.{h,mm}', 'iOS/FlipperKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h', - 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKSubDescriptor.h', - 'iOS/FBDefines/FBDefines.h', - 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h', - 'iOS/Plugins/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin.h', - 'iOS/FlipperKit/**/{FlipperDiagnosticsViewController,FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit\" \"$(PODS_ROOT)\"/Headers/Private/FlipperKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "FlipperKitLayoutPlugin" do |ss| - ss.header_dir = "FlipperKitLayoutPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h' - ss.private_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h', - '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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "FlipperKitLayoutComponentKitSupport" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - 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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitNetworkPlugin" do |ss| - ss.header_dir = "FlipperKitNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'FlipperKit/FlipperKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitUserDefaultsPlugin" do |ss| - ss.header_dir = "FlipperKitUserDefaultsPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitUserDefaultsPlugin/**/*.{h,m}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitExamplePlugin" do |ss| - ss.header_dir = "FlipperKitExamplePlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitExamplePlugin/**/*.{h,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end -end diff --git a/Specs/FlipperKit/0.18.0/FlipperKit.podspec b/Specs/FlipperKit/0.18.0/FlipperKit.podspec deleted file mode 100644 index 6845daadb..000000000 --- a/Specs/FlipperKit/0.18.0/FlipperKit.podspec +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.10' -flipperkit_version = '0.18.0' -Pod::Spec.new do |spec| - spec.name = 'FlipperKit' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+flipperkit_version } - spec.module_name = 'FlipperKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBDefines.h is imported as <FBDefines/FBDefines.h> - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import <FlipperKit/t/FBDefines/FBDefines.h>) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/CppBridge/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/CppBridge/**/*.h' - ss.preserve_path = 'FlipperKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/FBCxxUtils/**/*.h' - end - - spec.subspec "FKPortForwarding" do |ss| - ss.header_dir = "FKPortForwarding" - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.{h,m}' - ss.private_header_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.h' - end - - - spec.subspec "Core" do |ss| - ss.dependency 'FlipperKit/FBDefines' - ss.dependency 'FlipperKit/FBCxxUtils' - ss.dependency 'FlipperKit/CppBridge' - ss.dependency 'FlipperKit/FKPortForwarding' - ss.dependency 'Flipper-Folly', '~>1.2' - ss.dependency 'Flipper', '~>'+flipperkit_version - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/FlipperKit/CppBridge/*.{h,mm}', 'iOS/FlipperKit/FBCxxUtils/*.{h,mm}', 'iOS/FlipperKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h', - 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKSubDescriptor.h', - 'iOS/FBDefines/FBDefines.h', - 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h', - 'iOS/Plugins/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin.h', - 'iOS/FlipperKit/**/{FlipperDiagnosticsViewController,FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit\" \"$(PODS_ROOT)\"/Headers/Private/FlipperKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "FlipperKitLayoutPlugin" do |ss| - ss.header_dir = "FlipperKitLayoutPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h' - ss.private_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h', - '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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "FlipperKitLayoutComponentKitSupport" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - 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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitNetworkPlugin" do |ss| - ss.header_dir = "FlipperKitNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'FlipperKit/FlipperKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitUserDefaultsPlugin" do |ss| - ss.header_dir = "FlipperKitUserDefaultsPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitUserDefaultsPlugin/**/*.{h,m}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitExamplePlugin" do |ss| - ss.header_dir = "FlipperKitExamplePlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitExamplePlugin/**/*.{h,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end -end diff --git a/Specs/FlipperKit/0.19.0/FlipperKit.podspec b/Specs/FlipperKit/0.19.0/FlipperKit.podspec deleted file mode 100644 index 017dc0e40..000000000 --- a/Specs/FlipperKit/0.19.0/FlipperKit.podspec +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.10' -flipperkit_version = '0.19.0' -Pod::Spec.new do |spec| - spec.name = 'FlipperKit' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+flipperkit_version } - spec.module_name = 'FlipperKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBDefines.h is imported as <FBDefines/FBDefines.h> - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import <FlipperKit/t/FBDefines/FBDefines.h>) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/CppBridge/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/CppBridge/**/*.h' - ss.preserve_path = 'FlipperKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/FBCxxUtils/**/*.h' - end - - spec.subspec "FKPortForwarding" do |ss| - ss.header_dir = "FKPortForwarding" - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.{h,m}' - ss.private_header_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.h' - end - - - spec.subspec "Core" do |ss| - ss.dependency 'FlipperKit/FBDefines' - ss.dependency 'FlipperKit/FBCxxUtils' - ss.dependency 'FlipperKit/CppBridge' - ss.dependency 'FlipperKit/FKPortForwarding' - ss.dependency 'Flipper-Folly', '~>1.2' - ss.dependency 'Flipper', '~>'+flipperkit_version - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/FlipperKit/CppBridge/*.{h,mm}', 'iOS/FlipperKit/FBCxxUtils/*.{h,mm}', 'iOS/FlipperKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h', - 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKSubDescriptor.h', - 'iOS/FBDefines/FBDefines.h', - 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h', - 'iOS/Plugins/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin.h', - 'iOS/FlipperKit/**/{FlipperDiagnosticsViewController,FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit\" \"$(PODS_ROOT)\"/Headers/Private/FlipperKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "FlipperKitLayoutPlugin" do |ss| - ss.header_dir = "FlipperKitLayoutPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h' - ss.private_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h', - '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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "FlipperKitLayoutComponentKitSupport" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - 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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitNetworkPlugin" do |ss| - ss.header_dir = "FlipperKitNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'FlipperKit/FlipperKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitUserDefaultsPlugin" do |ss| - ss.header_dir = "FlipperKitUserDefaultsPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitUserDefaultsPlugin/**/*.{h,m}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitExamplePlugin" do |ss| - ss.header_dir = "FlipperKitExamplePlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitExamplePlugin/**/*.{h,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end -end diff --git a/Specs/FlipperKit/0.20.0/FlipperKit.podspec b/Specs/FlipperKit/0.20.0/FlipperKit.podspec deleted file mode 100644 index fc2542d75..000000000 --- a/Specs/FlipperKit/0.20.0/FlipperKit.podspec +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.12.0-pre.1' -yogakit_version = '~> 1.12.0-pre.1' -flipperkit_version = '0.20.0' -Pod::Spec.new do |spec| - spec.name = 'FlipperKit' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+flipperkit_version } - spec.module_name = 'FlipperKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBDefines.h is imported as <FBDefines/FBDefines.h> - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import <FlipperKit/t/FBDefines/FBDefines.h>) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/CppBridge/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/CppBridge/**/*.h' - ss.preserve_path = 'FlipperKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other FlipperKit source files - ss.private_header_files = 'iOS/FlipperKit/FBCxxUtils/**/*.h' - end - - spec.subspec "FKPortForwarding" do |ss| - ss.header_dir = "FKPortForwarding" - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'Flipper-PeerTalk', '~>0.0.4' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.{h,m}' - ss.private_header_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.h' - end - - - spec.subspec "Core" do |ss| - ss.dependency 'FlipperKit/FBDefines' - ss.dependency 'FlipperKit/FBCxxUtils' - ss.dependency 'FlipperKit/CppBridge' - ss.dependency 'FlipperKit/FKPortForwarding' - ss.dependency 'Flipper-Folly', '1.3.0' - ss.dependency 'Flipper', '~>'+flipperkit_version - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/FlipperKit/CppBridge/*.{h,mm}', 'iOS/FlipperKit/FBCxxUtils/*.{h,mm}', 'iOS/FlipperKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h', - 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKSubDescriptor.h', - 'iOS/FBDefines/FBDefines.h', - 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h', - 'iOS/Plugins/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin.h', - 'iOS/FlipperKit/**/{FlipperDiagnosticsViewController,FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit\" \"$(PODS_ROOT)\"/Headers/Private/FlipperKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "FlipperKitLayoutPlugin" do |ss| - ss.header_dir = "FlipperKitLayoutPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h' - ss.private_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h', - '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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "FlipperKitLayoutComponentKitSupport" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit', '~> 0.25' - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - 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.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitNetworkPlugin" do |ss| - ss.header_dir = "FlipperKitNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'FlipperKit/FlipperKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitUserDefaultsPlugin" do |ss| - ss.header_dir = "FlipperKitUserDefaultsPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitUserDefaultsPlugin/**/*.{h,m}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitExamplePlugin" do |ss| - ss.header_dir = "FlipperKitExamplePlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitExamplePlugin/**/*.{h,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end -end diff --git a/Specs/FlipperKit/0.8.0/FlipperKit.podspec b/Specs/FlipperKit/0.8.0/FlipperKit.podspec deleted file mode 100644 index 58cc8953d..000000000 --- a/Specs/FlipperKit/0.8.0/FlipperKit.podspec +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.8' -flipperkit_version = '0.8.0' -Pod::Spec.new do |spec| - spec.name = 'FlipperKit' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+flipperkit_version } - spec.module_name = 'FlipperKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBMacros.h is imported as <FBDefines/FBMacros.h> - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import <FlipperKit/t/FBDefines/FBMacros.h>) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/CppBridge/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other SonarKit source files - ss.private_header_files = 'iOS/FlipperKit/CppBridge/**/*.h' - ss.preserve_path = 'FlipperKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other SonarKit source files - ss.private_header_files = 'iOS/FlipperKit/FBCxxUtils/**/*.h' - end - - spec.subspec "Core" do |ss| - ss.dependency 'FlipperKit/FBDefines' - ss.dependency 'FlipperKit/FBCxxUtils' - ss.dependency 'FlipperKit/CppBridge' - ss.dependency 'Folly', '~>1.1' - ss.dependency 'Flipper', '~>'+flipperkit_version - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/FlipperKit/CppBridge/*.{h,mm}', 'iOS/FlipperKit/FBCxxUtils/*.{h,mm}', 'iOS/FlipperKit/Utilities/**/*.{h,m}', 'iOS/FlipperKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h', - 'iOS/FBDefines/FBMacros.h', - 'iOS/FlipperKit/**/{FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit\" \"$(PODS_ROOT)\"/Headers/Private/FlipperKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "FlipperKitLayoutPlugin" do |ss| - ss.header_dir = "FlipperKitLayoutPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h', - '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}' - end - - spec.subspec "FlipperKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "FlipperKitLayoutComponentKitSupport" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h' - - ss.source_files = "iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitNetworkPlugin" do |ss| - ss.header_dir = "FlipperKitNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'FlipperKit/FlipperKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end -end diff --git a/Specs/FlipperKit/0.8.1/FlipperKit.podspec b/Specs/FlipperKit/0.8.1/FlipperKit.podspec deleted file mode 100644 index 0540851c2..000000000 --- a/Specs/FlipperKit/0.8.1/FlipperKit.podspec +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.8' -flipperkit_version = '0.8.1' -Pod::Spec.new do |spec| - spec.name = 'FlipperKit' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+flipperkit_version } - spec.module_name = 'FlipperKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBMacros.h is imported as <FBDefines/FBMacros.h> - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import <FlipperKit/t/FBDefines/FBMacros.h>) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/CppBridge/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other SonarKit source files - ss.private_header_files = 'iOS/FlipperKit/CppBridge/**/*.h' - ss.preserve_path = 'FlipperKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other SonarKit source files - ss.private_header_files = 'iOS/FlipperKit/FBCxxUtils/**/*.h' - end - - spec.subspec "Core" do |ss| - ss.dependency 'FlipperKit/FBDefines' - ss.dependency 'FlipperKit/FBCxxUtils' - ss.dependency 'FlipperKit/CppBridge' - ss.dependency 'Folly', '~>1.1' - ss.dependency 'Flipper', '~>'+flipperkit_version - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/FlipperKit/CppBridge/*.{h,mm}', 'iOS/FlipperKit/FBCxxUtils/*.{h,mm}', 'iOS/FlipperKit/Utilities/**/*.{h,m}', 'iOS/FlipperKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h', - 'iOS/FBDefines/FBMacros.h', - 'iOS/FlipperKit/**/{FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit\" \"$(PODS_ROOT)\"/Headers/Private/FlipperKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "FlipperKitLayoutPlugin" do |ss| - ss.header_dir = "FlipperKitLayoutPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h', - '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}' - end - - spec.subspec "FlipperKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "FlipperKitLayoutComponentKitSupport" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h' - - ss.source_files = "iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitNetworkPlugin" do |ss| - ss.header_dir = "FlipperKitNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'FlipperKit/FlipperKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end -end diff --git a/Specs/FlipperKit/0.9.0/FlipperKit.podspec b/Specs/FlipperKit/0.9.0/FlipperKit.podspec deleted file mode 100644 index fc1b33a0b..000000000 --- a/Specs/FlipperKit/0.9.0/FlipperKit.podspec +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.8' -flipperkit_version = '0.9.0' -Pod::Spec.new do |spec| - spec.name = 'FlipperKit' - spec.version = flipperkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+flipperkit_version } - spec.module_name = 'FlipperKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBMacros.h is imported as <FBDefines/FBMacros.h> - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import <FlipperKit/t/FBDefines/FBMacros.h>) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/CppBridge/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other SonarKit source files - ss.private_header_files = 'iOS/FlipperKit/CppBridge/**/*.h' - ss.preserve_path = 'FlipperKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other SonarKit source files - ss.private_header_files = 'iOS/FlipperKit/FBCxxUtils/**/*.h' - end - - spec.subspec "Core" do |ss| - ss.dependency 'FlipperKit/FBDefines' - ss.dependency 'FlipperKit/FBCxxUtils' - ss.dependency 'FlipperKit/CppBridge' - ss.dependency 'Folly', '~>1.1' - ss.dependency 'Flipper', '~>'+flipperkit_version - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FlipperKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/FlipperKit/CppBridge/*.{h,mm}', 'iOS/FlipperKit/FBCxxUtils/*.{h,mm}', 'iOS/FlipperKit/Utilities/**/*.{h,m}', 'iOS/FlipperKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h', - 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h', - 'iOS/FBDefines/FBMacros.h', - 'iOS/FlipperKit/**/{FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit\" \"$(PODS_ROOT)\"/Headers/Private/FlipperKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "FlipperKitLayoutPlugin" do |ss| - ss.header_dir = "FlipperKitLayoutPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/utils/SKObjectHash.h', - '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}' - end - - spec.subspec "FlipperKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "FlipperKitLayoutComponentKitSupport" - ss.dependency 'FlipperKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' - ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h', - 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h' - - ss.source_files = "iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitNetworkPlugin" do |ss| - ss.header_dir = "FlipperKitNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/FlipperKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'FlipperKit/Core' - ss.dependency 'FlipperKit/FlipperKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end - - spec.subspec "FlipperKitUserDefaultsPlugin" do |ss| - ss.header_dir = "FlipperKitUserDefaultsPlugin" - ss.dependency 'FlipperKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h' - ss.source_files = "iOS/Plugins/FlipperKitUserDefaultsPlugin/**/*.{h,m}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" } - end -end diff --git a/Specs/Folly/1.0.0/Folly.podspec.json b/Specs/Folly/1.0.0/Folly.podspec.json deleted file mode 100644 index 993f663f0..000000000 --- a/Specs/Folly/1.0.0/Folly.podspec.json +++ /dev/null @@ -1,175 +0,0 @@ -{ - "name": "Folly", - "version": "1.0.0", - "license": { - "type": "Apache License, Version 2.0" - }, - "homepage": "https://github.com/facebook/folly", - "summary": "An open-source C++ library developed and used at Facebook.", - "authors": "Facebook", - "source": { - "git": "https://github.com/facebook/folly.git", - "branch": "master" - }, - "module_name": "folly", - "dependencies": { - "boost-for-react-native": [ - - ], - "DoubleConversion": [ - - ], - "glog": [ - - ], - "OpenSSL-Static": [ - "1.0.2.c1" - ], - "CocoaLibEvent": [ - "~> 1.0" - ] - }, - "compiler_flags": "-DFOLLY_HAVE_PTHREAD=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 -frtti\n -fexceptions\n -std=c++14\n -Wno-error\n -Wno-unused-local-typedefs\n -Wno-unused-variable\n -Wno-sign-compare\n -Wno-comment\n -Wno-return-type\n -Wno-global-constructors", - "source_files": [ - "folly/system/*.cpp", - "folly/portability/Config.h", - "folly/Executor.h", - "folly/Function.h", - "folly/Utility.h", - "folly/Portability.h", - "folly/Traits.h", - "folly/functional/Invoke.h", - "folly/CPortability.h", - "folly/dynamic.h", - "folly/json_pointer.h", - "folly/Expected.h", - "folly/Preprocessor.h", - "folly/Optional.h", - "folly/Unit.h", - "folly/Utility.h", - "folly/lang/ColdClass.h", - "folly/CppAttributes.h", - "folly/json.h", - "folly/Range.h", - "folly/hash/SpookyHashV2.h", - "folly/lang/Exception.h", - "folly/portability/Constexpr.h", - "folly/CpuId.h", - "folly/Likely.h", - "folly/detail/RangeCommon.h", - "folly/detail/RangeSse42.h", - "folly/portability/String.h", - "folly/dynamic-inl.h", - "folly/Conv.h", - "folly/Demangle.h", - "folly/FBString.h", - "folly/hash/Hash.h", - "folly/memory/Malloc.h", - "folly/io/async/AsyncTimeout.h", - "folly/**/*.h", - "folly/memory/detail/MallocImpl.h", - "folly/String.h", - "folly/*.h", - "folly/portability/PThread.h", - "folly/futures/*.h", - "folly/futures/detail/*.h", - "folly/Executor.cpp", - "folly/memory/detail/MallocImpl.cpp", - "folly/String.cpp", - "folly/*.cpp", - "folly/detail/*.cpp", - "folly/hash/*.cpp", - "folly/portability/*.cpp", - "folly/ScopeGuard.h", - "folly/lang/ColdClass.cpp", - "folly/lang/Assume.h", - "folly/lang/Assume.cpp", - "folly/io/async/*.cpp", - "folly/io/async/ssl/*.cpp", - "folly/io/*.cpp", - "folly/synchronization/*.cpp", - "folly/lang/*.cpp", - "folly/memory/*.cpp", - "folly/futures/*.cpp", - "folly/futures/detail/*.cpp", - "folly/experimental/hazptr/*.cpp", - "folly/executors/*.cpp", - "folly/concurrency/*.cpp", - "folly/ssl/*.cpp", - "folly/ssl/detail/*.cpp" - ], - "preserve_paths": [ - "folly/*.h", - "folly/portability/*.h", - "folly/lang/*.h", - "folly/functional/*.h", - "folly/detail/*.h", - "folly/hash/*.h", - "folly/memory/*.h", - "folly/**/*.h", - "folly/futures/detail/*.h", - "folly/futures/*.h" - ], - "header_mappings_dir": "folly", - "header_dir": "folly", - "libraries": "stdc++", - "private_header_files": [ - "folly/portability/Stdlib.h", - "folly/portability/Stdio.h" - ], - "public_header_files": [ - "folly/portability/Config.h", - "folly/Executor.h", - "folly/Function.h", - "folly/Utility.h", - "folly/Portability.h", - "folly/Traits.h", - "folly/functional/Invoke.h", - "folly/CPortability.h", - "folly/dynamic.h", - "folly/json_pointer.h", - "folly/Expected.h", - "folly/Preprocessor.h", - "folly/Optional.h", - "folly/Unit.h", - "folly/Utility.h", - "folly/lang/ColdClass.h", - "folly/CppAttributes.h", - "folly/json.h", - "folly/Range.h", - "folly/hash/SpookyHashV2.h", - "folly/lang/Exception.h", - "folly/portability/Constexpr.h", - "folly/CpuId.h", - "folly/Likely.h", - "folly/detail/RangeCommon.h", - "folly/detail/RangeSse42.h", - "folly/portability/String.h", - "folly/dynamic-inl.h", - "folly/Conv.h", - "folly/Demangle.h", - "folly/FBString.h", - "folly/hash/Hash.h", - "folly/memory/Malloc.h", - "folly/io/async/AsyncTimeout.h", - "folly/**/*.h", - "folly/memory/detail/MallocImpl.h", - "folly/String.h", - "folly/*.h", - "folly/portability/PThread.h", - "folly/futures/*.h", - "folly/futures/detail/*.h" - ], - "user_target_xcconfig": { - "ONLY_ACTIVE_ARCH": "YES" - }, - "pod_target_xcconfig": { - "USE_HEADERMAP": "NO", - "ONLY_ACTIVE_ARCH": "YES", - "CLANG_CXX_LANGUAGE_STANDARD": "c++11", - "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\"" - }, - "platforms": { - "ios": "8.0" - } -} diff --git a/Specs/Folly/1.1.0/Folly.podspec.json b/Specs/Folly/1.1.0/Folly.podspec.json deleted file mode 100644 index 1193f1d5d..000000000 --- a/Specs/Folly/1.1.0/Folly.podspec.json +++ /dev/null @@ -1,176 +0,0 @@ -{ - "name": "Folly", - "version": "1.1.0", - "license": { - "type": "Apache License, Version 2.0" - }, - "homepage": "https://github.com/facebook/folly", - "summary": "An open-source C++ library developed and used at Facebook.", - "authors": "Facebook", - "source": { - "git": "https://github.com/facebook/folly.git", - "tag": "v2018.08.06.00" - }, - "module_name": "folly", - "dependencies": { - "boost-for-react-native": [ - - ], - "DoubleConversion": [ - - ], - "glog": [ - - ], - "OpenSSL-Static": [ - "1.0.2.c1" - ], - "CocoaLibEvent": [ - "~> 1.0" - ] - }, - "compiler_flags": "-DFOLLY_HAVE_PTHREAD=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 -frtti\n -fexceptions\n -std=c++14\n -Wno-error\n -Wno-unused-local-typedefs\n -Wno-unused-variable\n -Wno-sign-compare\n -Wno-comment\n -Wno-return-type\n -Wno-global-constructors", - "source_files": [ - "folly/system/*.cpp", - "folly/portability/Config.h", - "folly/Executor.h", - "folly/Function.h", - "folly/Utility.h", - "folly/Portability.h", - "folly/Traits.h", - "folly/functional/Invoke.h", - "folly/CPortability.h", - "folly/dynamic.h", - "folly/json_pointer.h", - "folly/Expected.h", - "folly/Preprocessor.h", - "folly/Optional.h", - "folly/Unit.h", - "folly/Utility.h", - "folly/lang/ColdClass.h", - "folly/CppAttributes.h", - "folly/json.h", - "folly/Range.h", - "folly/hash/SpookyHashV2.h", - "folly/lang/Exception.h", - "folly/portability/Constexpr.h", - "folly/CpuId.h", - "folly/Likely.h", - "folly/detail/RangeCommon.h", - "folly/detail/RangeSse42.h", - "folly/portability/String.h", - "folly/dynamic-inl.h", - "folly/Conv.h", - "folly/Demangle.h", - "folly/FBString.h", - "folly/hash/Hash.h", - "folly/memory/Malloc.h", - "folly/io/async/AsyncTimeout.h", - "folly/**/*.h", - "folly/memory/detail/MallocImpl.h", - "folly/String.h", - "folly/*.h", - "folly/portability/PThread.h", - "folly/futures/*.h", - "folly/futures/detail/*.h", - "folly/Executor.cpp", - "folly/memory/detail/MallocImpl.cpp", - "folly/String.cpp", - "folly/*.cpp", - "folly/detail/*.cpp", - "folly/hash/*.cpp", - "folly/portability/*.cpp", - "folly/ScopeGuard.h", - "folly/lang/ColdClass.cpp", - "folly/lang/Assume.h", - "folly/lang/Assume.cpp", - "folly/io/async/*.cpp", - "folly/io/async/ssl/*.cpp", - "folly/io/*.cpp", - "folly/synchronization/*.cpp", - "folly/lang/*.cpp", - "folly/memory/*.cpp", - "folly/futures/*.cpp", - "folly/futures/detail/*.cpp", - "folly/experimental/hazptr/*.cpp", - "folly/executors/*.cpp", - "folly/concurrency/*.cpp", - "folly/ssl/*.cpp", - "folly/ssl/detail/*.cpp", - "folly/container/detail/*.cpp" - ], - "preserve_paths": [ - "folly/*.h", - "folly/portability/*.h", - "folly/lang/*.h", - "folly/functional/*.h", - "folly/detail/*.h", - "folly/hash/*.h", - "folly/memory/*.h", - "folly/**/*.h", - "folly/futures/detail/*.h", - "folly/futures/*.h" - ], - "header_mappings_dir": "folly", - "header_dir": "folly", - "libraries": "stdc++", - "private_header_files": [ - "folly/portability/Stdlib.h", - "folly/portability/Stdio.h" - ], - "public_header_files": [ - "folly/portability/Config.h", - "folly/Executor.h", - "folly/Function.h", - "folly/Utility.h", - "folly/Portability.h", - "folly/Traits.h", - "folly/functional/Invoke.h", - "folly/CPortability.h", - "folly/dynamic.h", - "folly/json_pointer.h", - "folly/Expected.h", - "folly/Preprocessor.h", - "folly/Optional.h", - "folly/Unit.h", - "folly/Utility.h", - "folly/lang/ColdClass.h", - "folly/CppAttributes.h", - "folly/json.h", - "folly/Range.h", - "folly/hash/SpookyHashV2.h", - "folly/lang/Exception.h", - "folly/portability/Constexpr.h", - "folly/CpuId.h", - "folly/Likely.h", - "folly/detail/RangeCommon.h", - "folly/detail/RangeSse42.h", - "folly/portability/String.h", - "folly/dynamic-inl.h", - "folly/Conv.h", - "folly/Demangle.h", - "folly/FBString.h", - "folly/hash/Hash.h", - "folly/memory/Malloc.h", - "folly/io/async/AsyncTimeout.h", - "folly/**/*.h", - "folly/memory/detail/MallocImpl.h", - "folly/String.h", - "folly/*.h", - "folly/portability/PThread.h", - "folly/futures/*.h", - "folly/futures/detail/*.h" - ], - "user_target_xcconfig": { - "ONLY_ACTIVE_ARCH": "YES" - }, - "pod_target_xcconfig": { - "USE_HEADERMAP": "NO", - "ONLY_ACTIVE_ARCH": "YES", - "CLANG_CXX_LANGUAGE_STANDARD": "c++11", - "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\"" - }, - "platforms": { - "ios": "8.0" - } -} diff --git a/Specs/Folly/1.2.0/Folly.podspec.json b/Specs/Folly/1.2.0/Folly.podspec.json deleted file mode 100644 index f44591bb9..000000000 --- a/Specs/Folly/1.2.0/Folly.podspec.json +++ /dev/null @@ -1,177 +0,0 @@ -{ - "name": "Folly", - "version": "1.2.0", - "license": { - "type": "Apache License, Version 2.0" - }, - "homepage": "https://github.com/facebook/folly", - "summary": "An open-source C++ library developed and used at Facebook.", - "authors": "Facebook", - "source": { - "git": "https://github.com/facebook/folly.git", - "tag": "v2019.01.14.00" - }, - "module_name": "folly", - "dependencies": { - "boost-for-react-native": [ - - ], - "DoubleConversion": [ - - ], - "glog": [ - - ], - "OpenSSL-Static": [ - "1.0.2.c1" - ], - "CocoaLibEvent": [ - "~> 1.0" - ] - }, - "compiler_flags": "-DFOLLY_HAVE_PTHREAD=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 -frtti\n -fexceptions\n -std=c++14\n -Wno-error\n -Wno-unused-local-typedefs\n -Wno-unused-variable\n -Wno-sign-compare\n -Wno-comment\n -Wno-return-type\n -Wno-global-constructors", - "source_files": [ - "folly/system/*.cpp", - "folly/portability/Config.h", - "folly/Executor.h", - "folly/Function.h", - "folly/Utility.h", - "folly/Portability.h", - "folly/Traits.h", - "folly/functional/Invoke.h", - "folly/CPortability.h", - "folly/dynamic.h", - "folly/json_pointer.h", - "folly/Expected.h", - "folly/Preprocessor.h", - "folly/Optional.h", - "folly/Unit.h", - "folly/Utility.h", - "folly/lang/ColdClass.h", - "folly/CppAttributes.h", - "folly/json.h", - "folly/Range.h", - "folly/hash/SpookyHashV2.h", - "folly/lang/Exception.h", - "folly/portability/Constexpr.h", - "folly/CpuId.h", - "folly/Likely.h", - "folly/detail/RangeCommon.h", - "folly/detail/RangeSse42.h", - "folly/portability/String.h", - "folly/dynamic-inl.h", - "folly/Conv.h", - "folly/Demangle.h", - "folly/FBString.h", - "folly/hash/Hash.h", - "folly/memory/Malloc.h", - "folly/io/async/AsyncTimeout.h", - "folly/**/*.h", - "folly/memory/detail/MallocImpl.h", - "folly/String.h", - "folly/*.h", - "folly/portability/PThread.h", - "folly/futures/*.h", - "folly/futures/detail/*.h", - "folly/Executor.cpp", - "folly/memory/detail/MallocImpl.cpp", - "folly/String.cpp", - "folly/*.cpp", - "folly/net/*.cpp", - "folly/detail/*.cpp", - "folly/hash/*.cpp", - "folly/portability/*.cpp", - "folly/ScopeGuard.h", - "folly/lang/ColdClass.cpp", - "folly/lang/Assume.h", - "folly/lang/Assume.cpp", - "folly/io/async/*.cpp", - "folly/io/async/ssl/*.cpp", - "folly/io/*.cpp", - "folly/synchronization/*.cpp", - "folly/lang/*.cpp", - "folly/memory/*.cpp", - "folly/futures/*.cpp", - "folly/futures/detail/*.cpp", - "folly/experimental/hazptr/*.cpp", - "folly/executors/*.cpp", - "folly/concurrency/*.cpp", - "folly/ssl/*.cpp", - "folly/ssl/detail/*.cpp", - "folly/container/detail/*.cpp" - ], - "preserve_paths": [ - "folly/*.h", - "folly/portability/*.h", - "folly/lang/*.h", - "folly/functional/*.h", - "folly/detail/*.h", - "folly/hash/*.h", - "folly/memory/*.h", - "folly/**/*.h", - "folly/futures/detail/*.h", - "folly/futures/*.h" - ], - "header_mappings_dir": "folly", - "header_dir": "folly", - "libraries": "stdc++", - "private_header_files": [ - "folly/portability/Stdlib.h", - "folly/portability/Stdio.h" - ], - "public_header_files": [ - "folly/portability/Config.h", - "folly/Executor.h", - "folly/Function.h", - "folly/Utility.h", - "folly/Portability.h", - "folly/Traits.h", - "folly/functional/Invoke.h", - "folly/CPortability.h", - "folly/dynamic.h", - "folly/json_pointer.h", - "folly/Expected.h", - "folly/Preprocessor.h", - "folly/Optional.h", - "folly/Unit.h", - "folly/Utility.h", - "folly/lang/ColdClass.h", - "folly/CppAttributes.h", - "folly/json.h", - "folly/Range.h", - "folly/hash/SpookyHashV2.h", - "folly/lang/Exception.h", - "folly/portability/Constexpr.h", - "folly/CpuId.h", - "folly/Likely.h", - "folly/detail/RangeCommon.h", - "folly/detail/RangeSse42.h", - "folly/portability/String.h", - "folly/dynamic-inl.h", - "folly/Conv.h", - "folly/Demangle.h", - "folly/FBString.h", - "folly/hash/Hash.h", - "folly/memory/Malloc.h", - "folly/io/async/AsyncTimeout.h", - "folly/**/*.h", - "folly/memory/detail/MallocImpl.h", - "folly/String.h", - "folly/*.h", - "folly/portability/PThread.h", - "folly/futures/*.h", - "folly/futures/detail/*.h" - ], - "user_target_xcconfig": { - "ONLY_ACTIVE_ARCH": "YES" - }, - "pod_target_xcconfig": { - "USE_HEADERMAP": "NO", - "ONLY_ACTIVE_ARCH": "YES", - "CLANG_CXX_LANGUAGE_STANDARD": "c++11", - "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\"" - }, - "platforms": { - "ios": "8.0" - } -} diff --git a/Specs/PeerTalk/0.0.2/PeerTalk.podspec b/Specs/PeerTalk/0.0.2/PeerTalk.podspec deleted file mode 100644 index 03482e103..000000000 --- a/Specs/PeerTalk/0.0.2/PeerTalk.podspec +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -Pod::Spec.new do |spec| - spec.name = 'PeerTalk' - spec.version = '0.0.2' - spec.license = { :type => 'MIT' } - spec.homepage = 'http://rsms.me/peertalk/' - spec.authors = { 'Rasmus Andersson' => 'rasmus@notion.se' } - spec.summary = 'iOS and OS X Cocoa library for communicating over USB and TCP.' - - spec.source = { :git => "https://github.com/rsms/peertalk.git" } - spec.source_files = 'peertalk/*.{h,m}' - spec.requires_arc = true - spec.ios.deployment_target = '8.4' - spec.osx.deployment_target = '10.10' - - spec.description = " PeerTalk is a iOS and OS X Cocoa library for communicating over USB and TCP.\n\n Highlights:\n\n * Provides you with USB device attach/detach events and attached device's info\n * Can connect to TCP services on supported attached devices (e.g. an iPhone), bridging the communication over USB transport\n * Offers a higher-level API (PTChannel and PTProtocol) for convenient implementations.\n * Tested and designed for libdispatch (aka Grand Central Dispatch).\n" -end diff --git a/Specs/README.md b/Specs/README.md deleted file mode 100644 index d32b4854d..000000000 --- a/Specs/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# cocoapods-private-repo -A private CocoaPods repository to host podspecs like SonarKit or any of its dependencies. -In order to publish new podspecs to this private repository you must run `pod repo push` command: -`pod repo push [REPO] [NAME.podspec]`. Please refer to the `pod repo push --help` command in case you need to pass any specific flags to the command. diff --git a/Specs/RSocket/0.10.0/RSocket.podspec b/Specs/RSocket/0.10.0/RSocket.podspec deleted file mode 100644 index f47fc7476..000000000 --- a/Specs/RSocket/0.10.0/RSocket.podspec +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -Pod::Spec.new do |spec| - spec.name = 'RSocket' - spec.version = '0.10.0' - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/rsocket/rsocket-cpp' - spec.summary = 'C++ implementation of RSocket' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/rsocket/rsocket-cpp.git', :branch => "master"} - spec.module_name = 'RSocket' - spec.static_framework = 'true' - spec.source_files = 'rsocket/benchmarks/*.{h,cpp,m,mm}', - 'rsocket/framing/*.{h,cpp,m,mm}', - 'rsocket/internal/*.{h,cpp,m,mm}', - 'rsocket/statemachine/*.{h,cpp,m,mm}', - 'rsocket/transports/*.{h,cpp,m,mm}', - 'rsocket/transports/**/*.{h,cpp,m,mm}', - 'yarpl/observable/*.{h,cpp,m,mm}', - 'yarpl/flowable/*.{h,cpp,m,mm}', - 'rsocket/*.{h,cpp,m,mm}' - - spec.libraries = "stdc++" - spec.compiler_flags = '-std=c++1y' - spec.dependency 'Folly' - spec.compiler_flags = '-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 -frtti - -fexceptions - -std=c++14 - -Wno-error - -Wno-unused-local-typedefs - -Wno-unused-variable - -Wno-sign-compare - -Wno-comment - -Wno-return-type - -Wno-global-constructors' - spec.preserve_paths = 'rsocket/benchmarks/*.h', - 'rsocket/framing/*.h', - 'rsocket/internal/*.h', - 'rsocket/statemachine/*.h', - 'rsocket/transports/*.h', - 'rsocket/*.h', - 'yarpl/flowable/*.h', - 'yarpl/observable/*.h', - 'yarpl/perf/*.h', - 'yarpl/single/*.h', - 'yarpl/utils/*.h', - 'yarpl/*.h', - '**/*.h' - spec.header_mappings_dir = 'rsocket' - spec.header_dir = 'rsocket' - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/DoubleConversion\"/**" } - spec.platforms = { :ios => "8.0" } - -end diff --git a/Specs/Sonar/0.0.1/Sonar.podspec b/Specs/Sonar/0.0.1/Sonar.podspec deleted file mode 100644 index 3c81cd7d6..000000000 --- a/Specs/Sonar/0.0.1/Sonar.podspec +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -Pod::Spec.new do |spec| - spec.name = 'Sonar' - spec.version = '0.0.1' - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.static_framework = 'true' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :branch => 'master' } - spec.module_name = 'Sonar' - spec.header_dir = 'Sonar' - spec.header_mappings_dir = 'xplat/Sonar' - spec.public_header_files = 'xplat/Sonar/*.h' - spec.source_files = 'xplat/Sonar/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Folly' - spec.dependency 'RSocket' - spec.compiler_flags = '-DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/Sonar/0.6.12/Sonar.podspec b/Specs/Sonar/0.6.12/Sonar.podspec deleted file mode 100644 index 36b6f5beb..000000000 --- a/Specs/Sonar/0.6.12/Sonar.podspec +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -Pod::Spec.new do |spec| - spec.name = 'Sonar' - spec.version = '0.6.12' - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v0.6.12' } - spec.module_name = 'Sonar' - spec.public_header_files = 'xplat/Sonar/*.h' - spec.source_files = 'xplat/Sonar/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Folly', '~>1.0' - spec.dependency 'RSocket', '~>0.10' - spec.compiler_flags = '-DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/Sonar/0.6.13/Sonar.podspec b/Specs/Sonar/0.6.13/Sonar.podspec deleted file mode 100644 index 626769db0..000000000 --- a/Specs/Sonar/0.6.13/Sonar.podspec +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -sonarkit_version = '0.6.13' -Pod::Spec.new do |spec| - spec.name = 'Sonar' - spec.version = sonarkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+sonarkit_version } - spec.module_name = 'Sonar' - spec.public_header_files = 'xplat/Sonar/*.h' - spec.source_files = 'xplat/Sonar/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Folly', '~>1.0' - spec.dependency 'RSocket', '~>0.10' - spec.compiler_flags = '-DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/Sonar/0.6.14/Sonar.podspec b/Specs/Sonar/0.6.14/Sonar.podspec deleted file mode 100644 index 913821347..000000000 --- a/Specs/Sonar/0.6.14/Sonar.podspec +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -sonarkit_version = '0.6.14' -Pod::Spec.new do |spec| - spec.name = 'Sonar' - spec.version = sonarkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+sonarkit_version } - spec.module_name = 'Sonar' - spec.public_header_files = 'xplat/Sonar/*.h' - spec.source_files = 'xplat/Sonar/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Folly', '~>1.0' - spec.dependency 'RSocket', '~>0.10' - spec.compiler_flags = '-DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/Sonar/0.6.15/Sonar.podspec b/Specs/Sonar/0.6.15/Sonar.podspec deleted file mode 100644 index e328e2153..000000000 --- a/Specs/Sonar/0.6.15/Sonar.podspec +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -sonarkit_version = '0.6.15' -Pod::Spec.new do |spec| - spec.name = 'Sonar' - spec.version = sonarkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+sonarkit_version } - spec.module_name = 'Sonar' - spec.public_header_files = 'xplat/Sonar/*.h' - spec.source_files = 'xplat/Sonar/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Folly', '~>1.0' - spec.dependency 'RSocket', '~>0.10' - spec.compiler_flags = '-DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/Sonar/0.6.16/Sonar.podspec b/Specs/Sonar/0.6.16/Sonar.podspec deleted file mode 100644 index f73d92b84..000000000 --- a/Specs/Sonar/0.6.16/Sonar.podspec +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -sonarkit_version = '0.6.16' -Pod::Spec.new do |spec| - spec.name = 'Sonar' - spec.version = sonarkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+sonarkit_version } - spec.module_name = 'Sonar' - spec.public_header_files = 'xplat/Sonar/*.h' - spec.source_files = 'xplat/Sonar/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Folly', '~>1.1' - spec.dependency 'RSocket', '~>0.10' - spec.compiler_flags = '-DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/Sonar/0.7.0/Sonar.podspec b/Specs/Sonar/0.7.0/Sonar.podspec deleted file mode 100644 index 4e40dcc69..000000000 --- a/Specs/Sonar/0.7.0/Sonar.podspec +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -sonarkit_version = '0.7.0' -Pod::Spec.new do |spec| - spec.name = 'Sonar' - spec.version = sonarkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+sonarkit_version } - spec.module_name = 'Sonar' - spec.public_header_files = 'xplat/Sonar/*.h' - spec.source_files = 'xplat/Sonar/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Folly', '~>1.1' - spec.dependency 'RSocket', '~>0.10' - spec.compiler_flags = '-DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/Sonar/0.7.1/Sonar.podspec b/Specs/Sonar/0.7.1/Sonar.podspec deleted file mode 100644 index 5ca0348d7..000000000 --- a/Specs/Sonar/0.7.1/Sonar.podspec +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -sonarkit_version = '0.7.1' -Pod::Spec.new do |spec| - spec.name = 'Sonar' - spec.version = sonarkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+sonarkit_version } - spec.module_name = 'Sonar' - spec.public_header_files = 'xplat/Sonar/*.h' - spec.source_files = 'xplat/Sonar/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Folly', '~>1.1' - spec.dependency 'RSocket', '~>0.10' - spec.compiler_flags = '-DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/Sonar/0.7.2/Sonar.podspec b/Specs/Sonar/0.7.2/Sonar.podspec deleted file mode 100644 index 4e918b680..000000000 --- a/Specs/Sonar/0.7.2/Sonar.podspec +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -sonarkit_version = '0.7.2' -Pod::Spec.new do |spec| - spec.name = 'Sonar' - spec.version = sonarkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/sonar' - spec.summary = 'SonarKit core cpp code with network implementation' - spec.authors = 'Facebook' - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+sonarkit_version } - spec.module_name = 'Sonar' - spec.public_header_files = 'xplat/Sonar/*.h' - spec.source_files = 'xplat/Sonar/*.{h,cpp,m,mm}' - spec.libraries = "stdc++" - spec.dependency 'Folly', '~>1.1' - spec.dependency 'RSocket', '~>0.10' - spec.compiler_flags = '-DFB_SONARKIT_ENABLED=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 -Wall - -std=c++14 - -Wno-global-constructors' - spec.platforms = { :ios => "8.0" } - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } -end diff --git a/Specs/SonarKit/0.0.1/SonarKit.podspec b/Specs/SonarKit/0.0.1/SonarKit.podspec deleted file mode 100644 index 392223041..000000000 --- a/Specs/SonarKit/0.0.1/SonarKit.podspec +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.8' - -Pod::Spec.new do |spec| - spec.name = 'SonarKit' - spec.version = '0.0.1' - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :branch=> "master" } - spec.module_name = 'SonarKit' - spec.platforms = { :ios => "8.0" } - - spec.subspec "Core" do |ss| - ss.dependency 'Folly', '~>1.0' - ss.dependency 'Sonar', '~>0.0.1' - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.source_files = 'iOS/FBDefines/*.{h,cpp,m,mm}', 'iOS/SonarKit/**/*.{h,cpp,m,mm}', 'iOS/SonarKit/FBCxxUtils/*.{h, mm}' - ss.public_header_files = 'iOS/SonarKit/CppBridge/*.{h}', - 'iOS/SonarKit/SonarClient.h', - 'iOS/SonarKit/SonarDeviceData.h', - 'iOS/SonarKit/SonarPlugin.h', - 'iOS/SonarKit/SonarResponder.h', - 'iOS/SonarKit/SonarConnection.h', - 'iOS/SonarKit/SKMacros.h' - - ss.compiler_flags = '-DFB_SONARKIT_ENABLED=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' - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\" \"$(PODS_ROOT)/ComponentKit\"/**" } - end - - spec.subspec "SonarKitLayoutPlugin" do |ss| - ss.dependency 'SonarKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SonarKitLayoutPlugin.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKObjectHash.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKSwizzle.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKYogaKitHelper.h' - ss.source_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/**/*.{h,cpp,m,mm}' - end - - spec.subspec "SonarKitLayoutComponentKitSupport" do |ss| - ss.dependency 'SonarKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'SonarKit/SonarKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h' - - ss.source_files = "iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"" } - end - - spec.subspec "SonarKitNetworkPlugin" do |ss| - ss.dependency 'SonarKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKDispatchQueue.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKNetworkReporter.h' - ss.source_files = "iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.dependency 'SonarKit/Core' - ss.dependency 'SonarKit/SonarKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/SonarKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"" } - end -end diff --git a/Specs/SonarKit/0.6.12/SonarKit.podspec b/Specs/SonarKit/0.6.12/SonarKit.podspec deleted file mode 100644 index fc35f9fa7..000000000 --- a/Specs/SonarKit/0.6.12/SonarKit.podspec +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.8' - -Pod::Spec.new do |spec| - spec.name = 'SonarKit' - spec.version = '0.6.12' - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v0.6.12" } - spec.module_name = 'SonarKit' - spec.platforms = { :ios => "8.4" } - - spec.subspec "Core" do |ss| - ss.dependency 'Folly', '~>1.0' - ss.dependency 'Sonar', '~>0.6' - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.source_files = 'iOS/FBDefines/*.{h,cpp,m,mm}', 'iOS/SonarKit/**/*.{h,cpp,m,mm}', 'iOS/SonarKit/FBCxxUtils/*.{h, mm}' - ss.public_header_files = 'iOS/SonarKit/CppBridge/*.{h}', - 'iOS/SonarKit/SonarClient.h', - 'iOS/SonarKit/SonarDeviceData.h', - 'iOS/SonarKit/SonarPlugin.h', - 'iOS/SonarKit/SonarResponder.h', - 'iOS/SonarKit/SonarConnection.h', - 'iOS/SonarKit/SKMacros.h' - - ss.compiler_flags = '-DFB_SONARKIT_ENABLED=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' - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\" \"$(PODS_ROOT)/ComponentKit\"/**" } - end - - spec.subspec "SonarKitLayoutPlugin" do |ss| - ss.dependency 'SonarKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SonarKitLayoutPlugin.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKObjectHash.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKSwizzle.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKYogaKitHelper.h' - ss.source_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/**/*.{h,cpp,m,mm}' - end - - spec.subspec "SonarKitLayoutComponentKitSupport" do |ss| - ss.dependency 'SonarKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'SonarKit/SonarKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h' - - ss.source_files = "iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"" } - end - - spec.subspec "SonarKitNetworkPlugin" do |ss| - ss.dependency 'SonarKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKDispatchQueue.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKNetworkReporter.h' - ss.source_files = "iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.dependency 'SonarKit/Core' - ss.dependency 'SonarKit/SonarKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/SonarKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"" } - end -end diff --git a/Specs/SonarKit/0.6.13/SonarKit.podspec b/Specs/SonarKit/0.6.13/SonarKit.podspec deleted file mode 100644 index 5f613dc00..000000000 --- a/Specs/SonarKit/0.6.13/SonarKit.podspec +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.8' -sonarkit_version = '0.6.13' -Pod::Spec.new do |spec| - spec.name = 'SonarKit' - spec.version = sonarkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+sonarkit_version } - spec.module_name = 'SonarKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBMacros.h is imported as <FBDefines/FBMacros.h> - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import <SonarKit/FBDefines/FBMacros.h>) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/SonarKit/CppBridge/**/*.{h,mm}' - ss.public_header_files = 'iOS/SonarKit/CppBridge/**/*.h' - ss.preserve_path = 'SonarKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/SonarKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other SonarKit source files - ss.private_header_files = 'iOS/SonarKit/FBCxxUtils/**/*.h' - end - - spec.subspec "Core" do |ss| - ss.dependency 'SonarKit/FBDefines' - ss.dependency 'SonarKit/FBCxxUtils' - ss.dependency 'SonarKit/CppBridge' - ss.dependency 'Folly', '~>1.0' - ss.dependency 'Sonar', '~>'+sonarkit_version - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/SonarKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/SonarKit/CppBridge/*.{h,mm}', 'iOS/SonarKit/FBCxxUtils/*.{h,mm}', 'iOS/SonarKit/Utilities/**/*.{h,m}', 'iOS/SonarKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/SonarKit/**/{SonarClient,SonarPlugin,SonarConnection,SonarResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/SonarKit/iOS/SonarKit\" \"$(PODS_ROOT)\"/Headers/Private/SonarKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "SonarKitLayoutPlugin" do |ss| - ss.header_dir = "SonarKitLayoutPlugin" - ss.dependency 'SonarKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SonarKitLayoutPlugin.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKObjectHash.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKSwizzle.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKYogaKitHelper.h' - ss.source_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/**/*.{h,cpp,m,mm}' - end - - spec.subspec "SonarKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "SonarKitLayoutComponentKitSupport" - ss.dependency 'SonarKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'SonarKit/SonarKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'SonarKit/SonarKitLayoutPlugin' - ss.public_header_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h' - - ss.source_files = "iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/SonarKit/**" } - end - - spec.subspec "SonarKitNetworkPlugin" do |ss| - ss.header_dir = "SonarKitNetworkPlugin" - ss.dependency 'SonarKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKDispatchQueue.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKNetworkReporter.h' - ss.source_files = "iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/SonarKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'SonarKit/Core' - ss.dependency 'SonarKit/SonarKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/SonarKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/SonarKit/**" } - end -end diff --git a/Specs/SonarKit/0.6.14/SonarKit.podspec b/Specs/SonarKit/0.6.14/SonarKit.podspec deleted file mode 100644 index 57ab2c919..000000000 --- a/Specs/SonarKit/0.6.14/SonarKit.podspec +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.8' -sonarkit_version = '0.6.14' -Pod::Spec.new do |spec| - spec.name = 'SonarKit' - spec.version = sonarkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+sonarkit_version } - spec.module_name = 'SonarKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBMacros.h is imported as <FBDefines/FBMacros.h> - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import <SonarKit/FBDefines/FBMacros.h>) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/SonarKit/CppBridge/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other SonarKit source files - ss.private_header_files = 'iOS/SonarKit/CppBridge/**/*.h' - ss.preserve_path = 'SonarKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/SonarKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other SonarKit source files - ss.private_header_files = 'iOS/SonarKit/FBCxxUtils/**/*.h' - end - - spec.subspec "Core" do |ss| - ss.dependency 'SonarKit/FBDefines' - ss.dependency 'SonarKit/FBCxxUtils' - ss.dependency 'SonarKit/CppBridge' - ss.dependency 'Folly', '~>1.0' - ss.dependency 'Sonar', '~>'+sonarkit_version - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/SonarKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/SonarKit/CppBridge/*.{h,mm}', 'iOS/SonarKit/FBCxxUtils/*.{h,mm}', 'iOS/SonarKit/Utilities/**/*.{h,m}', 'iOS/SonarKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/SonarKit/**/{SonarClient,SonarPlugin,SonarConnection,SonarResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/SonarKit/iOS/SonarKit\" \"$(PODS_ROOT)\"/Headers/Private/SonarKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "SonarKitLayoutPlugin" do |ss| - ss.header_dir = "SonarKitLayoutPlugin" - ss.dependency 'SonarKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SonarKitLayoutPlugin.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKObjectHash.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKSwizzle.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKYogaKitHelper.h' - ss.source_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/**/*.{h,cpp,m,mm}' - end - - spec.subspec "SonarKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "SonarKitLayoutComponentKitSupport" - ss.dependency 'SonarKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'SonarKit/SonarKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'SonarKit/SonarKitLayoutPlugin' - ss.public_header_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h' - - ss.source_files = "iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/SonarKit/**" } - end - - spec.subspec "SonarKitNetworkPlugin" do |ss| - ss.header_dir = "SonarKitNetworkPlugin" - ss.dependency 'SonarKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKDispatchQueue.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKNetworkReporter.h' - ss.source_files = "iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/SonarKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'SonarKit/Core' - ss.dependency 'SonarKit/SonarKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/SonarKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/SonarKit/**" } - end -end diff --git a/Specs/SonarKit/0.6.15/SonarKit.podspec b/Specs/SonarKit/0.6.15/SonarKit.podspec deleted file mode 100644 index 2b00add92..000000000 --- a/Specs/SonarKit/0.6.15/SonarKit.podspec +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.8' -sonarkit_version = '0.6.15' -Pod::Spec.new do |spec| - spec.name = 'SonarKit' - spec.version = sonarkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+sonarkit_version } - spec.module_name = 'SonarKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBMacros.h is imported as <FBDefines/FBMacros.h> - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import <SonarKit/FBDefines/FBMacros.h>) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/SonarKit/CppBridge/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other SonarKit source files - ss.private_header_files = 'iOS/SonarKit/CppBridge/**/*.h' - ss.preserve_path = 'SonarKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/SonarKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other SonarKit source files - ss.private_header_files = 'iOS/SonarKit/FBCxxUtils/**/*.h' - end - - spec.subspec "Core" do |ss| - ss.dependency 'SonarKit/FBDefines' - ss.dependency 'SonarKit/FBCxxUtils' - ss.dependency 'SonarKit/CppBridge' - ss.dependency 'Folly', '~>1.0' - ss.dependency 'Sonar', '~>'+sonarkit_version - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/SonarKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/SonarKit/CppBridge/*.{h,mm}', 'iOS/SonarKit/FBCxxUtils/*.{h,mm}', 'iOS/SonarKit/Utilities/**/*.{h,m}', 'iOS/SonarKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/FBDefines/FBMacros.h', 'iOS/SonarKit/**/{SonarClient,SonarPlugin,SonarConnection,SonarResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/SonarKit/iOS/SonarKit\" \"$(PODS_ROOT)\"/Headers/Private/SonarKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "SonarKitLayoutPlugin" do |ss| - ss.header_dir = "SonarKitLayoutPlugin" - ss.dependency 'SonarKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SonarKitLayoutPlugin.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKObjectHash.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKSwizzle.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKYogaKitHelper.h' - ss.source_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/**/*.{h,cpp,m,mm}' - end - - spec.subspec "SonarKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "SonarKitLayoutComponentKitSupport" - ss.dependency 'SonarKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'SonarKit/SonarKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'SonarKit/SonarKitLayoutPlugin' - ss.public_header_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h' - - ss.source_files = "iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/SonarKit/**" } - end - - spec.subspec "SonarKitNetworkPlugin" do |ss| - ss.header_dir = "SonarKitNetworkPlugin" - ss.dependency 'SonarKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKDispatchQueue.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKNetworkReporter.h' - ss.source_files = "iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/SonarKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'SonarKit/Core' - ss.dependency 'SonarKit/SonarKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/SonarKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/SonarKit/**" } - end -end diff --git a/Specs/SonarKit/0.6.16/SonarKit.podspec b/Specs/SonarKit/0.6.16/SonarKit.podspec deleted file mode 100644 index cbc1d58fd..000000000 --- a/Specs/SonarKit/0.6.16/SonarKit.podspec +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.8' -sonarkit_version = '0.6.16' -Pod::Spec.new do |spec| - spec.name = 'SonarKit' - spec.version = sonarkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+sonarkit_version } - spec.module_name = 'SonarKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBMacros.h is imported as <FBDefines/FBMacros.h> - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import <SonarKit/FBDefines/FBMacros.h>) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/SonarKit/CppBridge/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other SonarKit source files - ss.private_header_files = 'iOS/SonarKit/CppBridge/**/*.h' - ss.preserve_path = 'SonarKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/SonarKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other SonarKit source files - ss.private_header_files = 'iOS/SonarKit/FBCxxUtils/**/*.h' - end - - spec.subspec "Core" do |ss| - ss.dependency 'SonarKit/FBDefines' - ss.dependency 'SonarKit/FBCxxUtils' - ss.dependency 'SonarKit/CppBridge' - ss.dependency 'Folly', '~>1.1' - ss.dependency 'Sonar', '~>'+sonarkit_version - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/SonarKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/SonarKit/CppBridge/*.{h,mm}', 'iOS/SonarKit/FBCxxUtils/*.{h,mm}', 'iOS/SonarKit/Utilities/**/*.{h,m}', 'iOS/SonarKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/Plugins/SonarKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin.h', - 'iOS/FBDefines/FBMacros.h', - 'iOS/SonarKit/**/{SonarClient,SonarPlugin,SonarConnection,SonarResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/SonarKit/iOS/SonarKit\" \"$(PODS_ROOT)\"/Headers/Private/SonarKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "SonarKitLayoutPlugin" do |ss| - ss.header_dir = "SonarKitLayoutPlugin" - ss.dependency 'SonarKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SonarKitLayoutPlugin.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKObjectHash.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKSwizzle.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKYogaKitHelper.h' - ss.source_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/**/*.{h,cpp,m,mm}' - end - - spec.subspec "SonarKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "SonarKitLayoutComponentKitSupport" - ss.dependency 'SonarKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'SonarKit/SonarKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'SonarKit/SonarKitLayoutPlugin' - ss.public_header_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h' - - ss.source_files = "iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/SonarKit/**" } - end - - spec.subspec "SonarKitNetworkPlugin" do |ss| - ss.header_dir = "SonarKitNetworkPlugin" - ss.dependency 'SonarKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin.h' - ss.source_files = "iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/SonarKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'SonarKit/Core' - ss.dependency 'SonarKit/SonarKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/SonarKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/SonarKit/**" } - end -end diff --git a/Specs/SonarKit/0.7.0/SonarKit.podspec b/Specs/SonarKit/0.7.0/SonarKit.podspec deleted file mode 100644 index c0b1dbb87..000000000 --- a/Specs/SonarKit/0.7.0/SonarKit.podspec +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.8' -sonarkit_version = '0.7.0' -Pod::Spec.new do |spec| - spec.name = 'SonarKit' - spec.version = sonarkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+sonarkit_version } - spec.module_name = 'SonarKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBMacros.h is imported as <FBDefines/FBMacros.h> - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import <SonarKit/FBDefines/FBMacros.h>) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/SonarKit/CppBridge/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other SonarKit source files - ss.private_header_files = 'iOS/SonarKit/CppBridge/**/*.h' - ss.preserve_path = 'SonarKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/SonarKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other SonarKit source files - ss.private_header_files = 'iOS/SonarKit/FBCxxUtils/**/*.h' - end - - spec.subspec "Core" do |ss| - ss.dependency 'SonarKit/FBDefines' - ss.dependency 'SonarKit/FBCxxUtils' - ss.dependency 'SonarKit/CppBridge' - ss.dependency 'Folly', '~>1.1' - ss.dependency 'Sonar', '~>'+sonarkit_version - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/SonarKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/SonarKit/CppBridge/*.{h,mm}', 'iOS/SonarKit/FBCxxUtils/*.{h,mm}', 'iOS/SonarKit/Utilities/**/*.{h,m}', 'iOS/SonarKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/Plugins/SonarKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin.h', - 'iOS/FBDefines/FBMacros.h', - 'iOS/SonarKit/**/{FlipperStateUpdateListener,SonarClient,SonarPlugin,SonarConnection,SonarResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/SonarKit/iOS/SonarKit\" \"$(PODS_ROOT)\"/Headers/Private/SonarKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "SonarKitLayoutPlugin" do |ss| - ss.header_dir = "SonarKitLayoutPlugin" - ss.dependency 'SonarKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SonarKitLayoutPlugin.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKObjectHash.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKSwizzle.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKYogaKitHelper.h' - ss.source_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/**/*.{h,cpp,m,mm}' - end - - spec.subspec "SonarKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "SonarKitLayoutComponentKitSupport" - ss.dependency 'SonarKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'SonarKit/SonarKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'SonarKit/SonarKitLayoutPlugin' - ss.public_header_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h' - - ss.source_files = "iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/SonarKit/**" } - end - - spec.subspec "SonarKitNetworkPlugin" do |ss| - ss.header_dir = "SonarKitNetworkPlugin" - ss.dependency 'SonarKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin.h' - ss.source_files = "iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/SonarKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'SonarKit/Core' - ss.dependency 'SonarKit/SonarKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/SonarKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/SonarKit/**" } - end -end diff --git a/Specs/SonarKit/0.7.1/SonarKit.podspec b/Specs/SonarKit/0.7.1/SonarKit.podspec deleted file mode 100644 index 15339c1bd..000000000 --- a/Specs/SonarKit/0.7.1/SonarKit.podspec +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.8' -sonarkit_version = '0.7.1' -Pod::Spec.new do |spec| - spec.name = 'SonarKit' - spec.version = sonarkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+sonarkit_version } - spec.module_name = 'SonarKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBMacros.h is imported as <FBDefines/FBMacros.h> - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import <SonarKit/FBDefines/FBMacros.h>) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/SonarKit/CppBridge/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other SonarKit source files - ss.private_header_files = 'iOS/SonarKit/CppBridge/**/*.h' - ss.preserve_path = 'SonarKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/SonarKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other SonarKit source files - ss.private_header_files = 'iOS/SonarKit/FBCxxUtils/**/*.h' - end - - spec.subspec "Core" do |ss| - ss.dependency 'SonarKit/FBDefines' - ss.dependency 'SonarKit/FBCxxUtils' - ss.dependency 'SonarKit/CppBridge' - ss.dependency 'Folly', '~>1.1' - ss.dependency 'Sonar', '~>'+sonarkit_version - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/SonarKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/SonarKit/CppBridge/*.{h,mm}', 'iOS/SonarKit/FBCxxUtils/*.{h,mm}', 'iOS/SonarKit/Utilities/**/*.{h,m}', 'iOS/SonarKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/Plugins/SonarKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin.h', - 'iOS/FBDefines/FBMacros.h', - 'iOS/SonarKit/**/{FlipperStateUpdateListener,SonarClient,SonarPlugin,SonarConnection,SonarResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/SonarKit/iOS/SonarKit\" \"$(PODS_ROOT)\"/Headers/Private/SonarKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "SonarKitLayoutPlugin" do |ss| - ss.header_dir = "SonarKitLayoutPlugin" - ss.dependency 'SonarKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SonarKitLayoutPlugin.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKObjectHash.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKSwizzle.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKYogaKitHelper.h' - ss.source_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/**/*.{h,cpp,m,mm}' - end - - spec.subspec "SonarKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "SonarKitLayoutComponentKitSupport" - ss.dependency 'SonarKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'SonarKit/SonarKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'SonarKit/SonarKitLayoutPlugin' - ss.public_header_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h' - - ss.source_files = "iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/SonarKit/**" } - end - - spec.subspec "SonarKitNetworkPlugin" do |ss| - ss.header_dir = "SonarKitNetworkPlugin" - ss.dependency 'SonarKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin.h' - ss.source_files = "iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/SonarKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'SonarKit/Core' - ss.dependency 'SonarKit/SonarKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/SonarKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/SonarKit/**" } - end -end diff --git a/Specs/SonarKit/0.7.2/SonarKit.podspec b/Specs/SonarKit/0.7.2/SonarKit.podspec deleted file mode 100644 index 24ee92b3b..000000000 --- a/Specs/SonarKit/0.7.2/SonarKit.podspec +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -folly_compiler_flags = '-DFB_SONARKIT_ENABLED=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' -yoga_version = '~> 1.9' -yogakit_version = '~>1.8' -sonarkit_version = '0.7.2' -Pod::Spec.new do |spec| - spec.name = 'SonarKit' - spec.version = sonarkit_version - spec.license = { :type => 'MIT' } - spec.homepage = 'https://github.com/facebook/Sonar' - spec.summary = 'Sonar iOS podspec' - spec.authors = 'Facebook' - spec.static_framework = true - spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+sonarkit_version } - spec.module_name = 'SonarKit' - spec.platforms = { :ios => "8.4" } - spec.default_subspecs = "Core" - - # This subspec is necessary since FBMacros.h is imported as <FBDefines/FBMacros.h> - # inside SKMacros.h, which is a public header file. Defining this directory as a - # subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't - # generally (you would need to import <SonarKit/FBDefines/FBMacros.h>) - spec.subspec 'FBDefines' do |ss| - ss.header_dir = 'FBDefines' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/FBDefines/**/*.h' - ss.public_header_files = 'iOS/FBDefines/**/*.h' - end - - spec.subspec 'CppBridge' do |ss| - ss.header_dir = 'CppBridge' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/SonarKit/CppBridge/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other SonarKit source files - ss.private_header_files = 'iOS/SonarKit/CppBridge/**/*.h' - ss.preserve_path = 'SonarKit/CppBridge/**/*.h' - end - - spec.subspec 'FBCxxUtils' do |ss| - ss.header_dir = 'FBCxxUtils' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/SonarKit/FBCxxUtils/**/*.{h,mm}' - # We set these files as private headers since they only need to be accessed - # by other SonarKit source files - ss.private_header_files = 'iOS/SonarKit/FBCxxUtils/**/*.h' - end - - spec.subspec "Core" do |ss| - ss.dependency 'SonarKit/FBDefines' - ss.dependency 'SonarKit/FBCxxUtils' - ss.dependency 'SonarKit/CppBridge' - ss.dependency 'Folly', '~>1.1' - ss.dependency 'Sonar', '~>'+sonarkit_version - ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' - ss.dependency 'OpenSSL-Static', '1.0.2.c1' - ss.compiler_flags = folly_compiler_flags - ss.source_files = 'iOS/SonarKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/SonarKit/CppBridge/*.{h,mm}', 'iOS/SonarKit/FBCxxUtils/*.{h,mm}', 'iOS/SonarKit/Utilities/**/*.{h,m}', 'iOS/SonarKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/Plugins/SonarKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin.h', - 'iOS/FBDefines/FBMacros.h', - 'iOS/SonarKit/**/{FlipperStateUpdateListener,SonarClient,SonarPlugin,SonarConnection,SonarResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/SonarKit/iOS/SonarKit\" \"$(PODS_ROOT)\"/Headers/Private/SonarKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "DEFINES_MODULE" => "YES", - "HEADER_SEARCH_PATHS" => header_search_paths } - end - - spec.subspec "SonarKitLayoutPlugin" do |ss| - ss.header_dir = "SonarKitLayoutPlugin" - ss.dependency 'SonarKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'YogaKit', yogakit_version - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SonarKitLayoutPlugin.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTouch.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKDescriptorMapper.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNodeDescriptor.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKInvalidation.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKNamed.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKTapListener.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKObject.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/SKHighlightOverlay.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/UIColor+SKSonarValueCoder.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKObjectHash.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKSwizzle.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/utils/SKYogaKitHelper.h' - ss.source_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutPlugin/**/*.{h,cpp,m,mm}' - end - - spec.subspec "SonarKitLayoutComponentKitSupport" do |ss| - ss.header_dir = "SonarKitLayoutComponentKitSupport" - ss.dependency 'SonarKit/Core' - ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit' - ss.dependency 'SonarKit/SonarKitLayoutPlugin' - ss.compiler_flags = folly_compiler_flags - ss.dependency 'SonarKit/SonarKitLayoutPlugin' - ss.public_header_files = 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h', - 'iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h' - - ss.source_files = "iOS/Plugins/SonarKitLayoutPlugin/SonarKitLayoutComponentKitSupport/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/SonarKit/**" } - end - - spec.subspec "SonarKitNetworkPlugin" do |ss| - ss.header_dir = "SonarKitNetworkPlugin" - ss.dependency 'SonarKit/Core' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKBufferingPlugin.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKNetworkReporter.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKRequestInfo.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SKResponseInfo.h', - 'iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/SonarKitNetworkPlugin.h' - ss.source_files = "iOS/Plugins/SonarKitNetworkPlugin/SonarKitNetworkPlugin/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/SonarKit/**" } - end - - spec.subspec "SKIOSNetworkPlugin" do |ss| - ss.header_dir = "SKIOSNetworkPlugin" - ss.dependency 'SonarKit/Core' - ss.dependency 'SonarKit/SonarKitNetworkPlugin' - ss.compiler_flags = folly_compiler_flags - ss.public_header_files = 'iOS/Plugins/SonarKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.h' - ss.source_files = "iOS/Plugins/SonarKitNetworkPlugin/SKIOSNetworkPlugin/**/*.{h,cpp,m,mm}" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/SonarKit/**" } - end -end From f6de499171cc511d26767c905de0dd3ed081a356 Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa <lblasa@meta.com> Date: Wed, 18 Oct 2023 12:28:06 -0700 Subject: [PATCH 19/80] Export to manifest on get Summary: Every time the token is returned, export it to the manifest. This covers the case in which the token found in the manifest has already expired. Reviewed By: antonk52 Differential Revision: D50419458 fbshipit-source-id: 8eefa0e97e234985b34f824190b208bf74e2d8ec --- .../certificate-exchange/certificate-utils.tsx | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/desktop/flipper-server-core/src/app-connectivity/certificate-exchange/certificate-utils.tsx b/desktop/flipper-server-core/src/app-connectivity/certificate-exchange/certificate-utils.tsx index ba7f9e326..044403519 100644 --- a/desktop/flipper-server-core/src/app-connectivity/certificate-exchange/certificate-utils.tsx +++ b/desktop/flipper-server-core/src/app-connectivity/certificate-exchange/certificate-utils.tsx @@ -332,6 +332,18 @@ export const generateAuthToken = async () => { return token; }; +/** + * Gets the client authentication token. If there is no existing token, + * it generates one, export it to the manifest file and returns it. + * + * Additionally, it must check the token's validity before returning it. + * If the token is invalid, it regenerates it and exports it to the manifest file. + * + * Finally, the token is also exported to the manifest, on every get as to + * ensure it is always up to date. + * + * @returns + */ export const getAuthToken = async (): Promise<string> => { if (!(await hasAuthToken())) { return generateAuthToken(); @@ -349,6 +361,12 @@ export const getAuthToken = async (): Promise<string> => { return generateAuthToken(); } + const config = getFlipperServerConfig(); + if (config.environmentInfo.isHeadlessBuild) { + console.info('Token exported to manifest'); + await exportTokenToManifest(config, token.toString()); + } + return token.toString(); }; From a0ffacb6b6c07ec16b31a7babd622fd2fdd463bb Mon Sep 17 00:00:00 2001 From: generatedunixname89002005306973 <generatedunixname89002005306973@meta.com> Date: Thu, 19 Oct 2023 03:12:05 -0700 Subject: [PATCH 20/80] Flipper Release: v0.229.0 Summary: Releasing version 0.229.0 Reviewed By: lblasa Differential Revision: D50444276 fbshipit-source-id: cb7a962db5bf891787c07626d1eb3dbe5a6c0817 --- desktop/package.json | 2 +- desktop/plugins/public/layout/docs/setup.mdx | 2 +- desktop/plugins/public/leak_canary/docs/setup.mdx | 2 +- desktop/plugins/public/network/docs/setup.mdx | 2 +- docs/getting-started/android-native.mdx | 4 ++-- docs/getting-started/react-native-ios.mdx | 2 +- docs/getting-started/react-native.mdx | 4 ++-- gradle.properties | 2 +- js/js-flipper/package.json | 2 +- react-native/react-native-flipper/package.json | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/desktop/package.json b/desktop/package.json index 486c344ea..24fe52f48 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -170,7 +170,7 @@ "npm": "use yarn instead", "yarn": "^1.16" }, - "version": "0.228.0", + "version": "0.229.0", "workspaces": { "packages": [ "scripts", diff --git a/desktop/plugins/public/layout/docs/setup.mdx b/desktop/plugins/public/layout/docs/setup.mdx index 01a4f3838..76abf1419 100644 --- a/desktop/plugins/public/layout/docs/setup.mdx +++ b/desktop/plugins/public/layout/docs/setup.mdx @@ -27,7 +27,7 @@ You also need to compile in the `litho-annotations` package, as Flipper reflects ```groovy dependencies { - debugImplementation 'com.facebook.flipper:flipper-litho-plugin:0.228.0' + debugImplementation 'com.facebook.flipper:flipper-litho-plugin:0.229.0' debugImplementation 'com.facebook.litho:litho-annotations:0.19.0' // ... } diff --git a/desktop/plugins/public/leak_canary/docs/setup.mdx b/desktop/plugins/public/leak_canary/docs/setup.mdx index 29a35a942..022526fb9 100644 --- a/desktop/plugins/public/leak_canary/docs/setup.mdx +++ b/desktop/plugins/public/leak_canary/docs/setup.mdx @@ -8,7 +8,7 @@ To setup the <Link to={useBaseUrl("/docs/features/plugins/leak-canary")}>LeakCan ```groovy dependencies { - debugImplementation 'com.facebook.flipper:flipper-leakcanary2-plugin:0.228.0' + debugImplementation 'com.facebook.flipper:flipper-leakcanary2-plugin:0.229.0' debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.8.1' } ``` diff --git a/desktop/plugins/public/network/docs/setup.mdx b/desktop/plugins/public/network/docs/setup.mdx index 77d94307a..9b6e986de 100644 --- a/desktop/plugins/public/network/docs/setup.mdx +++ b/desktop/plugins/public/network/docs/setup.mdx @@ -12,7 +12,7 @@ The network plugin is shipped as a separate Maven artifact, as follows: ```groovy dependencies { - debugImplementation 'com.facebook.flipper:flipper-network-plugin:0.228.0' + debugImplementation 'com.facebook.flipper:flipper-network-plugin:0.229.0' } ``` diff --git a/docs/getting-started/android-native.mdx b/docs/getting-started/android-native.mdx index 8069d5e28..fbf543daf 100644 --- a/docs/getting-started/android-native.mdx +++ b/docs/getting-started/android-native.mdx @@ -24,10 +24,10 @@ repositories { } dependencies { - debugImplementation 'com.facebook.flipper:flipper:0.228.0' + debugImplementation 'com.facebook.flipper:flipper:0.229.0' debugImplementation 'com.facebook.soloader:soloader:0.10.5' - releaseImplementation 'com.facebook.flipper:flipper-noop:0.228.0' + releaseImplementation 'com.facebook.flipper:flipper-noop:0.229.0' } ``` diff --git a/docs/getting-started/react-native-ios.mdx b/docs/getting-started/react-native-ios.mdx index 8b5aabf30..603b0bb5c 100644 --- a/docs/getting-started/react-native-ios.mdx +++ b/docs/getting-started/react-native-ios.mdx @@ -51,7 +51,7 @@ Add all of the code below to your `ios/Podfile`: platform :ios, '9.0' def flipper_pods() - flipperkit_version = '0.228.0' # should match the version of your Flipper client app + flipperkit_version = '0.229.0' # should match the version of your Flipper client app pod 'FlipperKit', '~>' + flipperkit_version, :configuration => 'Debug' pod 'FlipperKit/FlipperKitLayoutPlugin', '~>' + flipperkit_version, :configuration => 'Debug' pod 'FlipperKit/SKIOSNetworkPlugin', '~>' + flipperkit_version, :configuration => 'Debug' diff --git a/docs/getting-started/react-native.mdx b/docs/getting-started/react-native.mdx index 8ee16a713..caac76ff2 100644 --- a/docs/getting-started/react-native.mdx +++ b/docs/getting-started/react-native.mdx @@ -34,7 +34,7 @@ Latest version of Flipper requires react-native 0.69+! If you use react-native < Android: -1. Bump the `FLIPPER_VERSION` variable in `android/gradle.properties`, for example: `FLIPPER_VERSION=0.228.0`. +1. Bump the `FLIPPER_VERSION` variable in `android/gradle.properties`, for example: `FLIPPER_VERSION=0.229.0`. 2. Run `./gradlew clean` in the `android` directory. iOS: @@ -44,7 +44,7 @@ react-native version => 0.69.0 2. Run `pod install --repo-update` in the `ios` directory. react-native version < 0.69.0 -1. Call `use_flipper` with a specific version in `ios/Podfile`, for example: `use_flipper!({ 'Flipper' => '0.228.0' })`. +1. Call `use_flipper` with a specific version in `ios/Podfile`, for example: `use_flipper!({ 'Flipper' => '0.229.0' })`. 2. Run `pod install --repo-update` in the `ios` directory. ## Manual Setup diff --git a/gradle.properties b/gradle.properties index 12ab0fe10..e5d5b7589 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. # POM publishing constants -VERSION_NAME=0.228.1-SNAPSHOT +VERSION_NAME=0.229.0 GROUP=com.facebook.flipper SONATYPE_STAGING_PROFILE=comfacebook POM_URL=https://github.com/facebook/flipper diff --git a/js/js-flipper/package.json b/js/js-flipper/package.json index 4f95029f7..6f60d7f4b 100644 --- a/js/js-flipper/package.json +++ b/js/js-flipper/package.json @@ -1,7 +1,7 @@ { "name": "js-flipper", "title": "JS Flipper Bindings for Web-Socket based clients", - "version": "0.228.0", + "version": "0.229.0", "main": "lib/index.js", "browser": { "os": false diff --git a/react-native/react-native-flipper/package.json b/react-native/react-native-flipper/package.json index adf692315..ba146ef77 100644 --- a/react-native/react-native-flipper/package.json +++ b/react-native/react-native-flipper/package.json @@ -1,7 +1,7 @@ { "name": "react-native-flipper", "title": "React Native Flipper Bindings", - "version": "0.228.0", + "version": "0.229.0", "description": "Flipper bindings for React Native", "main": "index.js", "types": "index.d.ts", From da903b8bc5c4e13bcbaff929c3050fc57fb7e983 Mon Sep 17 00:00:00 2001 From: generatedunixname89002005306973 <generatedunixname89002005306973@meta.com> Date: Thu, 19 Oct 2023 03:12:05 -0700 Subject: [PATCH 21/80] Flipper Snapshot Bump: v0.229.1-SNAPSHOT Summary: Releasing snapshot version 0.229.1-SNAPSHOT Reviewed By: lblasa Differential Revision: D50444272 fbshipit-source-id: 5913d464a68c5c9b1bbffc9b8bd4f51c6e09d7f9 --- docs/getting-started/android-native.mdx | 4 ++-- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/getting-started/android-native.mdx b/docs/getting-started/android-native.mdx index fbf543daf..6534c63ca 100644 --- a/docs/getting-started/android-native.mdx +++ b/docs/getting-started/android-native.mdx @@ -124,10 +124,10 @@ repositories { } dependencies { - debugImplementation 'com.facebook.flipper:flipper:0.228.1-SNAPSHOT' + debugImplementation 'com.facebook.flipper:flipper:0.229.1-SNAPSHOT' debugImplementation 'com.facebook.soloader:soloader:0.10.5' - releaseImplementation 'com.facebook.flipper:flipper-noop:0.228.1-SNAPSHOT' + releaseImplementation 'com.facebook.flipper:flipper-noop:0.229.1-SNAPSHOT' } ``` diff --git a/gradle.properties b/gradle.properties index e5d5b7589..5aa843a16 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. # POM publishing constants -VERSION_NAME=0.229.0 +VERSION_NAME=0.229.1-SNAPSHOT GROUP=com.facebook.flipper SONATYPE_STAGING_PROFILE=comfacebook POM_URL=https://github.com/facebook/flipper From ee7f12ef8557cd2fbc10db965f6170e0de6dff91 Mon Sep 17 00:00:00 2001 From: Luke De Feo <lukedefeo@meta.com> Date: Thu, 19 Oct 2023 03:33:42 -0700 Subject: [PATCH 22/80] Add message when traversal has error Summary: By sending a message to the desktop we can report to log view and inform the user what happened Reviewed By: lblasa Differential Revision: D50369853 fbshipit-source-id: b4852d736232477261bfdf6f94c9395ce29cceaf --- .../plugins/uidebugger/core/UIDContext.kt | 10 ++++++-- .../plugins/uidebugger/model/Events.kt | 22 +++++++++++++---- .../uidebugger/model/FrameworkEvents.kt | 4 ++-- .../plugins/uidebugger/model/Metadata.kt | 2 +- .../flipper/plugins/uidebugger/model/Types.kt | 10 ++++---- .../observers/TreeObserverManager.kt | 15 +++++++++++- .../traversal/PartialLayoutTraversal.kt | 24 ++++++++++++------- 7 files changed, 62 insertions(+), 25 deletions(-) diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/core/UIDContext.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/core/UIDContext.kt index 83ed3f111..bd2a275d3 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/core/UIDContext.kt +++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/core/UIDContext.kt @@ -13,10 +13,12 @@ import com.facebook.flipper.plugins.uidebugger.common.BitmapPool import com.facebook.flipper.plugins.uidebugger.descriptors.DescriptorRegister import com.facebook.flipper.plugins.uidebugger.model.FrameworkEvent import com.facebook.flipper.plugins.uidebugger.model.FrameworkEventMetadata +import com.facebook.flipper.plugins.uidebugger.model.TraversalError import com.facebook.flipper.plugins.uidebugger.observers.TreeObserverFactory import com.facebook.flipper.plugins.uidebugger.observers.TreeObserverManager import com.facebook.flipper.plugins.uidebugger.scheduler.SharedThrottle import com.facebook.flipper.plugins.uidebugger.traversal.PartialLayoutTraversal +import kotlinx.serialization.json.Json interface ConnectionListener { fun onConnect() @@ -34,8 +36,7 @@ class UIDContext( private val pendingFrameworkEvents: MutableList<FrameworkEvent> ) { - val layoutTraversal: PartialLayoutTraversal = - PartialLayoutTraversal(descriptorRegister, observerFactory) + val layoutTraversal: PartialLayoutTraversal = PartialLayoutTraversal(this) val treeObserverManager = TreeObserverManager(this) val sharedThrottle: SharedThrottle = SharedThrottle() @@ -45,6 +46,11 @@ class UIDContext( synchronized(pendingFrameworkEvents) { pendingFrameworkEvents.add(frameworkEvent) } } + fun onError(traversalError: TraversalError) { + connectionRef.connection?.send( + TraversalError.name, Json.encodeToString(TraversalError.serializer(), traversalError)) + } + fun extractPendingFrameworkEvents(): List<FrameworkEvent> { synchronized(pendingFrameworkEvents) { val copy = pendingFrameworkEvents.toList() diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/model/Events.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/model/Events.kt index 69624989f..def4febe7 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/model/Events.kt +++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/model/Events.kt @@ -10,21 +10,21 @@ package com.facebook.flipper.plugins.uidebugger.model import com.facebook.flipper.plugins.uidebugger.descriptors.Id @kotlinx.serialization.Serializable -data class InitEvent(val rootId: Id, val frameworkEventMetadata: List<FrameworkEventMetadata>) { +class InitEvent(val rootId: Id, val frameworkEventMetadata: List<FrameworkEventMetadata>) { companion object { const val name = "init" } } @kotlinx.serialization.Serializable -data class MetadataUpdateEvent(val attributeMetadata: Map<MetadataId, Metadata> = emptyMap()) { +class MetadataUpdateEvent(val attributeMetadata: Map<MetadataId, Metadata> = emptyMap()) { companion object { const val name = "metadataUpdate" } } @kotlinx.serialization.Serializable -data class FrameScanEvent( +class FrameScanEvent( val frameTime: Long, val nodes: List<Node>, val snapshot: Snapshot?, @@ -35,11 +35,23 @@ data class FrameScanEvent( } } -@kotlinx.serialization.Serializable data class Snapshot(val nodeId: Id, val data: String) +@kotlinx.serialization.Serializable +class TraversalError( + val nodeName: String, + val errorType: String, + val errorMessage: String, + val stack: String +) { + companion object { + const val name = "traversalError" + } +} + +@kotlinx.serialization.Serializable class Snapshot(val nodeId: Id, val data: String) /** Separate optional performance statistics event */ @kotlinx.serialization.Serializable -data class PerfStatsEvent( +class PerfStatsEvent( val txId: Long, val observerType: String, val nodesCount: Int, diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/model/FrameworkEvents.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/model/FrameworkEvents.kt index a5cd7f77d..28751660d 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/model/FrameworkEvents.kt +++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/model/FrameworkEvents.kt @@ -10,13 +10,13 @@ package com.facebook.flipper.plugins.uidebugger.model import com.facebook.flipper.plugins.uidebugger.descriptors.Id @kotlinx.serialization.Serializable -data class FrameworkEventMetadata( +class FrameworkEventMetadata( val type: String, val documentation: String, ) @kotlinx.serialization.Serializable -data class FrameworkEvent( +class FrameworkEvent( val treeId: Id, val nodeId: Id, val type: String, diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/model/Metadata.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/model/Metadata.kt index 0ad0915b7..56a148d85 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/model/Metadata.kt +++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/model/Metadata.kt @@ -17,7 +17,7 @@ typealias MetadataId = Int * identity, attributes, layout, documentation, or a custom type. */ @kotlinx.serialization.Serializable -data class Metadata( +class Metadata( val id: MetadataId, val type: String, val namespace: String, diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/model/Types.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/model/Types.kt index 47e99e777..9cbe5585f 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/model/Types.kt +++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/model/Types.kt @@ -22,7 +22,7 @@ data class Bounds(val x: Int, val y: Int, val width: Int, val height: Int) { } @kotlinx.serialization.Serializable -data class SpaceBox(val top: Int, val right: Int, val bottom: Int, val left: Int) { +class SpaceBox(val top: Int, val right: Int, val bottom: Int, val left: Int) { companion object { fun fromRect(rect: Rect): SpaceBox { return SpaceBox(rect.top, rect.right, rect.bottom, rect.left) @@ -31,7 +31,7 @@ data class SpaceBox(val top: Int, val right: Int, val bottom: Int, val left: Int } @kotlinx.serialization.Serializable -data class Color(val r: Int, val g: Int, val b: Int, val a: Int) { +class Color(val r: Int, val g: Int, val b: Int, val a: Int) { companion object { fun fromColor(color: Int): Color { val alpha: Int = (color shr 24) and 0xFF / 255 @@ -48,20 +48,20 @@ data class Color(val r: Int, val g: Int, val b: Int, val a: Int) { } @kotlinx.serialization.Serializable -data class Coordinate( +class Coordinate( @Serializable(with = NumberSerializer::class) val x: Number, @Serializable(with = NumberSerializer::class) val y: Number ) {} @kotlinx.serialization.Serializable -data class Coordinate3D( +class Coordinate3D( @Serializable(with = NumberSerializer::class) val x: Number, @Serializable(with = NumberSerializer::class) val y: Number, @Serializable(with = NumberSerializer::class) val z: Number ) {} @kotlinx.serialization.Serializable -data class Size( +class Size( @Serializable(with = NumberSerializer::class) val width: Number, @Serializable(with = NumberSerializer::class) val height: Number ) {} diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/observers/TreeObserverManager.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/observers/TreeObserverManager.kt index 141adbb36..7abd8db7b 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/observers/TreeObserverManager.kt +++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/observers/TreeObserverManager.kt @@ -25,6 +25,7 @@ import com.facebook.flipper.plugins.uidebugger.model.MetadataUpdateEvent import com.facebook.flipper.plugins.uidebugger.model.Node import com.facebook.flipper.plugins.uidebugger.model.PerfStatsEvent import com.facebook.flipper.plugins.uidebugger.model.Snapshot +import com.facebook.flipper.plugins.uidebugger.model.TraversalError import com.facebook.flipper.plugins.uidebugger.util.MaybeDeferred import java.io.ByteArrayOutputStream import java.util.concurrent.atomic.AtomicInteger @@ -107,7 +108,19 @@ class TreeObserverManager(val context: UIDContext) { val workerThreadStartTimestamp = System.currentTimeMillis() - val nodes = batchedUpdate.updates.flatMap { it.deferredNodes.map { it.value() } } + val nodes = + try { + batchedUpdate.updates.flatMap { it.deferredNodes.map { it.value() } } + } catch (exception: Exception) { + context.onError( + TraversalError( + "DeferredProcessing", + exception.javaClass.simpleName, + exception.message ?: "", + exception.stackTraceToString())) + return + } + val frameworkEvents = context.extractPendingFrameworkEvents() val snapshotUpdate = batchedUpdate.updates.find { it.snapshot != null } val deferredComputationEndTimestamp = System.currentTimeMillis() diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/traversal/PartialLayoutTraversal.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/traversal/PartialLayoutTraversal.kt index 110019734..fd724ee57 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/traversal/PartialLayoutTraversal.kt +++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/traversal/PartialLayoutTraversal.kt @@ -9,11 +9,11 @@ package com.facebook.flipper.plugins.uidebugger.traversal import android.util.Log import com.facebook.flipper.plugins.uidebugger.LogTag -import com.facebook.flipper.plugins.uidebugger.descriptors.DescriptorRegister +import com.facebook.flipper.plugins.uidebugger.core.UIDContext import com.facebook.flipper.plugins.uidebugger.descriptors.Id import com.facebook.flipper.plugins.uidebugger.descriptors.NodeDescriptor import com.facebook.flipper.plugins.uidebugger.model.Node -import com.facebook.flipper.plugins.uidebugger.observers.TreeObserverFactory +import com.facebook.flipper.plugins.uidebugger.model.TraversalError import com.facebook.flipper.plugins.uidebugger.util.Immediate import com.facebook.flipper.plugins.uidebugger.util.MaybeDeferred @@ -24,12 +24,11 @@ import com.facebook.flipper.plugins.uidebugger.util.MaybeDeferred * - The second item are any observable roots discovered. */ class PartialLayoutTraversal( - private val descriptorRegister: DescriptorRegister, - private val treeObserverFactory: TreeObserverFactory, + private val context: UIDContext, ) { @Suppress("unchecked_cast") - internal fun NodeDescriptor<*>.asAny(): NodeDescriptor<Any> = this as NodeDescriptor<Any> + private fun NodeDescriptor<*>.asAny(): NodeDescriptor<Any> = this as NodeDescriptor<Any> fun traverse(root: Any, parentId: Id?): Pair<List<MaybeDeferred<Node>>, List<Pair<Any, Id?>>> { @@ -47,12 +46,13 @@ class PartialLayoutTraversal( try { // If we encounter a node that has it own observer, don't traverse - if (node != root && treeObserverFactory.hasObserverFor(node)) { + if (node != root && context.observerFactory.hasObserverFor(node)) { observableRoots.add((node to parentId)) continue } - val descriptor = descriptorRegister.descriptorForClassUnsafe(node::class.java).asAny() + val descriptor = + context.descriptorRegister.descriptorForClassUnsafe(node::class.java).asAny() val curId = descriptor.getId(node) if (shallow.contains(node)) { @@ -82,13 +82,13 @@ class PartialLayoutTraversal( var activeChildId: Id? = null if (activeChild != null) { val activeChildDescriptor = - descriptorRegister.descriptorForClassUnsafe(activeChild.javaClass) + context.descriptorRegister.descriptorForClassUnsafe(activeChild.javaClass) activeChildId = activeChildDescriptor.getId(activeChild) } val childrenIds = mutableListOf<Id>() children.forEach { child -> - val childDescriptor = descriptorRegister.descriptorForClassUnsafe(child.javaClass) + val childDescriptor = context.descriptorRegister.descriptorForClassUnsafe(child.javaClass) childrenIds.add(childDescriptor.getId(child)) stack.add(Pair(child, curId)) // If there is an active child then don't traverse it @@ -117,6 +117,12 @@ class PartialLayoutTraversal( }) } catch (exception: Exception) { Log.e(LogTag, "Error while processing node ${node.javaClass.name} $node", exception) + context.onError( + TraversalError( + node.javaClass.simpleName, + exception.javaClass.simpleName, + exception.message ?: "", + exception.stackTraceToString())) } } From 64d97998fd6ecc483b25a56e481a53cf7719419c Mon Sep 17 00:00:00 2001 From: Anton Kastritskiy <antonk52@meta.com> Date: Thu, 19 Oct 2023 07:25:40 -0700 Subject: [PATCH 23/80] fix prod icons Summary: Previously we had requested non existing icons. This fixes missing icons on pixel dense screens (macbook pro, 4k screens). I could add x4, x5 icons as well. Though they are no better than x3. Even x3 is pretty raterized. Ideally we should be serving icons with higher resolution and scaling them down instead of doing this. Even better use SVG icons which we do not have. Reviewed By: LukeDefeo Differential Revision: D50454271 fbshipit-source-id: cda90972abb56069e160ddefdc6de460c49d06c0 --- desktop/flipper-ui-core/src/utils/icons.tsx | 2 +- desktop/scripts/build-icons.tsx | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/desktop/flipper-ui-core/src/utils/icons.tsx b/desktop/flipper-ui-core/src/utils/icons.tsx index b79333e6e..da866bf9d 100644 --- a/desktop/flipper-ui-core/src/utils/icons.tsx +++ b/desktop/flipper-ui-core/src/utils/icons.tsx @@ -11,7 +11,7 @@ import {getRenderHostInstance} from 'flipper-frontend-core'; import {IconSize} from '../ui/components/Glyph'; const AVAILABLE_SIZES: IconSize[] = [8, 10, 12, 16, 18, 20, 24, 28, 32]; -const DENSITIES = [1, 1.5, 2, 3, 4]; +const DENSITIES = [1, 2, 3]; export type Icon = { name: string; diff --git a/desktop/scripts/build-icons.tsx b/desktop/scripts/build-icons.tsx index 152799aa7..bda85ff0d 100644 --- a/desktop/scripts/build-icons.tsx +++ b/desktop/scripts/build-icons.tsx @@ -44,6 +44,7 @@ export async function downloadIcons(buildFolder: string) { // get icons in @1x and @2x ...sizes.map((size) => ({name, variant, size, density: 1})), ...sizes.map((size) => ({name, variant, size, density: 2})), + ...sizes.map((size) => ({name, variant, size, density: 3})), ); return acc; }, From 450e6f2d7c9ce2a72a7c6e2be58c9de46a3d3a66 Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa <lblasa@meta.com> Date: Thu, 19 Oct 2023 13:57:36 -0700 Subject: [PATCH 24/80] Fixes an issue whereas server configuration is not yet set Summary: ^ Reviewed By: aigoncharov Differential Revision: D50470060 fbshipit-source-id: cc59ac7cace092addbf48dfa16219983bd129cb0 --- .../certificate-utils.tsx | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/desktop/flipper-server-core/src/app-connectivity/certificate-exchange/certificate-utils.tsx b/desktop/flipper-server-core/src/app-connectivity/certificate-exchange/certificate-utils.tsx index 044403519..d2a62c31e 100644 --- a/desktop/flipper-server-core/src/app-connectivity/certificate-exchange/certificate-utils.tsx +++ b/desktop/flipper-server-core/src/app-connectivity/certificate-exchange/certificate-utils.tsx @@ -286,10 +286,21 @@ const getManifestPath = (config: FlipperServerConfig): string => { return path.resolve(config.paths.staticPath, manifestFilename); }; -const exportTokenToManifest = async ( - config: FlipperServerConfig, - token: string, -) => { +const exportTokenToManifest = async (token: string) => { + console.info('Export token to manifest'); + let config: FlipperServerConfig | undefined; + try { + config = getFlipperServerConfig(); + } catch { + console.warn( + 'Unable to obtain server configuration whilst exporting token to manifest', + ); + } + + if (!config || !config.environmentInfo.isHeadlessBuild) { + return; + } + const manifestPath = getManifestPath(config); try { const manifestData = await fs.readFile(manifestPath, { @@ -313,8 +324,6 @@ export const generateAuthToken = async () => { await ensureServerCertExists(); - const config = getFlipperServerConfig(); - const privateKey = await fs.readFile(serverKey); const token = jwt.sign({unixname: os.userInfo().username}, privateKey, { algorithm: 'RS256', @@ -323,11 +332,7 @@ export const generateAuthToken = async () => { await fs.writeFile(serverAuthToken, token); - console.info('Token generated and saved to disk'); - if (config.environmentInfo.isHeadlessBuild) { - console.info('Token exported to manifest'); - await exportTokenToManifest(config, token); - } + await exportTokenToManifest(token); return token; }; @@ -349,25 +354,22 @@ export const getAuthToken = async (): Promise<string> => { return generateAuthToken(); } - const token = await fs.readFile(serverAuthToken); + const tokenBuffer = await fs.readFile(serverAuthToken); + const token = tokenBuffer.toString(); try { console.info('Verify authentication token'); const serverCertificate = await fs.readFile(serverCert); - jwt.verify(token.toString(), serverCertificate); + jwt.verify(token, serverCertificate); console.info('Token verification succeeded'); } catch (_) { console.warn('Either token has expired or is invalid'); return generateAuthToken(); } - const config = getFlipperServerConfig(); - if (config.environmentInfo.isHeadlessBuild) { - console.info('Token exported to manifest'); - await exportTokenToManifest(config, token.toString()); - } + await exportTokenToManifest(token); - return token.toString(); + return token; }; export const hasAuthToken = async (): Promise<boolean> => { From a8be4436702400f8e096e0dd3d8c578c3ebb1f33 Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa <lblasa@meta.com> Date: Fri, 20 Oct 2023 04:59:41 -0700 Subject: [PATCH 25/80] Fixes an issue whereas token was only obtained if one exists Summary: The token will be generated if one doesn't exist, so always call get token. Reviewed By: antonk52 Differential Revision: D50494884 fbshipit-source-id: b93ba8ab5ba0c8b48766af3b06e8de94944d08e7 --- desktop/app/src/init.tsx | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/desktop/app/src/init.tsx b/desktop/app/src/init.tsx index 80d697ad7..577c77f62 100644 --- a/desktop/app/src/init.tsx +++ b/desktop/app/src/init.tsx @@ -112,19 +112,6 @@ async function getFlipperServer( ); const keytar: KeytarModule | undefined = await getKeytarModule(staticPath); const port = 52342; - /** - * Only attempt to use the auth token if one is available. Otherwise, - * trying to get the auth token will try to generate one if it does not exist. - * At this state, it would be impossible to generate it as our certificates - * may not be available yet. - */ - let token: string | undefined; - if (await hasAuthToken()) { - token = await getAuthToken(); - } - - const searchParams = new URLSearchParams(token ? {token} : {}); - const TCPconnectionURL = new URL(`ws://localhost:${port}?${searchParams}`); async function shutdown(): Promise<boolean> { console.info('[flipper-server] Attempt to shutdown.'); @@ -173,6 +160,10 @@ async function getFlipperServer( environmentInfo, ); + const token: string = await getAuthToken(); + const searchParams = new URLSearchParams({token}); + const TCPconnectionURL = new URL(`ws://localhost:${port}?${searchParams}`); + const companionEnv = await initCompanionEnv(server); await server.connect(); await readyForIncomingConnections(server, companionEnv); From aea77cc4da4147b5ea4a027b3d624b2fcdf9fb33 Mon Sep 17 00:00:00 2001 From: Andrey Goncharov <aigoncharov@meta.com> Date: Fri, 20 Oct 2023 05:13:20 -0700 Subject: [PATCH 26/80] Hide PWA app from Spotlight Reviewed By: LukeDefeo Differential Revision: D50411182 fbshipit-source-id: 46c089c69aefb58f85a861c7898ee355f094e03c --- desktop/flipper-common/src/server-types.tsx | 1 + .../src/FlipperServerImpl.tsx | 4 + desktop/flipper-server-core/src/index.tsx | 1 + .../src/utils/findInstallation.tsx | 77 +++++++++++++++++++ .../flipper-server/src/findInstallation.tsx | 29 ------- desktop/flipper-server/src/index.tsx | 3 +- .../src/chrome/PWAppInstallationWizard.tsx | 1 + 7 files changed, 85 insertions(+), 31 deletions(-) create mode 100644 desktop/flipper-server-core/src/utils/findInstallation.tsx delete mode 100644 desktop/flipper-server/src/findInstallation.tsx diff --git a/desktop/flipper-common/src/server-types.tsx b/desktop/flipper-common/src/server-types.tsx index 1591ec715..cb285b123 100644 --- a/desktop/flipper-common/src/server-types.tsx +++ b/desktop/flipper-common/src/server-types.tsx @@ -380,6 +380,7 @@ export type FlipperServerCommands = { shutdown: () => Promise<void>; 'is-logged-in': () => Promise<boolean>; 'environment-info': () => Promise<EnvironmentInfo>; + 'move-pwa': () => Promise<void>; }; export type GraphResponse = { diff --git a/desktop/flipper-server-core/src/FlipperServerImpl.tsx b/desktop/flipper-server-core/src/FlipperServerImpl.tsx index 5f0e55f2a..c2407ff2e 100644 --- a/desktop/flipper-server-core/src/FlipperServerImpl.tsx +++ b/desktop/flipper-server-core/src/FlipperServerImpl.tsx @@ -58,6 +58,7 @@ import {flipperDataFolder, flipperSettingsFolder} from './utils/paths'; import {DebuggableDevice} from './devices/DebuggableDevice'; import {jfUpload} from './fb-stubs/jf'; import path from 'path'; +import {movePWA} from './utils/findInstallation'; const {access, copyFile, mkdir, unlink, stat, readlink, readFile, writeFile} = promises; @@ -597,6 +598,9 @@ export class FlipperServerImpl implements FlipperServer { 'environment-info': async () => { return this.config.environmentInfo; }, + 'move-pwa': async () => { + await movePWA(); + }, }; registerDevice(device: ServerDevice) { diff --git a/desktop/flipper-server-core/src/index.tsx b/desktop/flipper-server-core/src/index.tsx index 7e8099f8b..951b26a67 100644 --- a/desktop/flipper-server-core/src/index.tsx +++ b/desktop/flipper-server-core/src/index.tsx @@ -13,6 +13,7 @@ export * from './tracker'; export {loadLauncherSettings} from './utils/launcherSettings'; export {loadProcessConfig} from './utils/processConfig'; export {getEnvironmentInfo} from './utils/environmentInfo'; +export {findInstallation} from './utils/findInstallation'; export {getGatekeepers} from './gk'; export {setupPrefetcher} from './fb-stubs/Prefetcher'; export * from './server/attachSocketServer'; diff --git a/desktop/flipper-server-core/src/utils/findInstallation.tsx b/desktop/flipper-server-core/src/utils/findInstallation.tsx new file mode 100644 index 000000000..876ad1914 --- /dev/null +++ b/desktop/flipper-server-core/src/utils/findInstallation.tsx @@ -0,0 +1,77 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @format + */ + +import path from 'path'; +import fs from 'fs-extra'; +import os from 'os'; +import GK from '../fb-stubs/GK'; + +const pwaRoot = path.join( + os.homedir(), + 'Applications', + 'Chrome Apps.localized', +); +const appFolder = path.resolve(pwaRoot, '.flipper'); +const defaultAppPath = path.join(pwaRoot, 'Flipper.app'); +const movedAppPath = path.join(appFolder, 'Flipper.app'); + +export async function movePWA(): Promise<void> { + if (os.platform() !== 'darwin') { + return; + } + + if (!GK.get('flipper_move_pwa')) { + return; + } + + // Move PWA into its own folder + // Later we will make the folder hidden so Spotlight stops indexing it + // Sadly, Spotlight can stop indexing only hidden folder, not hidden files + // Therefore, we have to create this parent folder in the first place. + if (!(await fs.pathExists(appFolder))) { + await fs.mkdir(appFolder); + } + await fs.move(defaultAppPath, movedAppPath); +} + +export async function findInstallation(): Promise<string | undefined> { + if (os.platform() !== 'darwin') { + return; + } + + try { + if (GK.get('flipper_move_pwa')) { + if (await fs.pathExists(defaultAppPath)) { + await movePWA(); + } + } + } catch (e) { + console.error('Failed to move PWA', e); + } finally { + if (GK.get('flipper_move_pwa')) { + const movedAppPlistPath = path.join( + movedAppPath, + 'Contents', + 'Info.plist', + ); + if (await fs.pathExists(movedAppPlistPath)) { + return movedAppPath; + } + // We should get here only if moving PWA failed + } + const dafaultAppPlistPath = path.join( + defaultAppPath, + 'Contents', + 'Info.plist', + ); + if (await fs.pathExists(dafaultAppPlistPath)) { + return defaultAppPath; + } + } +} diff --git a/desktop/flipper-server/src/findInstallation.tsx b/desktop/flipper-server/src/findInstallation.tsx deleted file mode 100644 index 63b4469be..000000000 --- a/desktop/flipper-server/src/findInstallation.tsx +++ /dev/null @@ -1,29 +0,0 @@ -/** - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - * - * @format - */ - -import path from 'path'; -import fs from 'fs-extra'; -import os from 'os'; - -export async function findInstallation(): Promise<string | undefined> { - if (os.platform() !== 'darwin') { - return; - } - - const appPath = path.join( - os.homedir(), - 'Applications', - 'Chrome Apps.localized', - 'Flipper.app', - ); - const appPlistPath = path.join(appPath, 'Contents', 'Info.plist'); - if (await fs.pathExists(appPlistPath)) { - return appPath; - } -} diff --git a/desktop/flipper-server/src/index.tsx b/desktop/flipper-server/src/index.tsx index 36b54ef44..77ad9e066 100644 --- a/desktop/flipper-server/src/index.tsx +++ b/desktop/flipper-server/src/index.tsx @@ -31,8 +31,7 @@ import { } from 'flipper-server-core'; import {addLogTailer, isTest, LoggerFormat} from 'flipper-common'; import exitHook from 'exit-hook'; -import {getAuthToken} from 'flipper-server-core'; -import {findInstallation} from './findInstallation'; +import {getAuthToken, findInstallation} from 'flipper-server-core'; const argv = yargs .usage('yarn flipper-server [args]') diff --git a/desktop/flipper-ui-core/src/chrome/PWAppInstallationWizard.tsx b/desktop/flipper-ui-core/src/chrome/PWAppInstallationWizard.tsx index 34cb02002..84ce4f5d2 100644 --- a/desktop/flipper-ui-core/src/chrome/PWAppInstallationWizard.tsx +++ b/desktop/flipper-ui-core/src/chrome/PWAppInstallationWizard.tsx @@ -132,6 +132,7 @@ async function install(event: any) { if (choiceResult.outcome === 'accepted') { tracker.track('pwa-install-outcome', {installed: true}); console.log('PWA installation, user accepted the prompt.'); + return getRenderHostInstance().flipperServer.exec('move-pwa'); } else { tracker.track('pwa-install-outcome', {installed: false}); console.log('PWA installation, user dismissed the prompt.'); From edc69ac8eebcea79f8bd9fb82c227cbf1272be9a Mon Sep 17 00:00:00 2001 From: generatedunixname89002005306973 <generatedunixname89002005306973@meta.com> Date: Fri, 20 Oct 2023 06:53:48 -0700 Subject: [PATCH 27/80] Flipper Release: v0.230.0 Summary: Releasing version 0.230.0 Reviewed By: lblasa Differential Revision: D50495656 fbshipit-source-id: 1c60110c1fe198a317217b8f2be667fa5f77e893 --- desktop/package.json | 2 +- desktop/plugins/public/layout/docs/setup.mdx | 2 +- desktop/plugins/public/leak_canary/docs/setup.mdx | 2 +- desktop/plugins/public/network/docs/setup.mdx | 2 +- docs/getting-started/android-native.mdx | 4 ++-- docs/getting-started/react-native-ios.mdx | 2 +- docs/getting-started/react-native.mdx | 4 ++-- gradle.properties | 2 +- js/js-flipper/package.json | 2 +- react-native/react-native-flipper/package.json | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/desktop/package.json b/desktop/package.json index 24fe52f48..a1eb29c2b 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -170,7 +170,7 @@ "npm": "use yarn instead", "yarn": "^1.16" }, - "version": "0.229.0", + "version": "0.230.0", "workspaces": { "packages": [ "scripts", diff --git a/desktop/plugins/public/layout/docs/setup.mdx b/desktop/plugins/public/layout/docs/setup.mdx index 76abf1419..e098dd46f 100644 --- a/desktop/plugins/public/layout/docs/setup.mdx +++ b/desktop/plugins/public/layout/docs/setup.mdx @@ -27,7 +27,7 @@ You also need to compile in the `litho-annotations` package, as Flipper reflects ```groovy dependencies { - debugImplementation 'com.facebook.flipper:flipper-litho-plugin:0.229.0' + debugImplementation 'com.facebook.flipper:flipper-litho-plugin:0.230.0' debugImplementation 'com.facebook.litho:litho-annotations:0.19.0' // ... } diff --git a/desktop/plugins/public/leak_canary/docs/setup.mdx b/desktop/plugins/public/leak_canary/docs/setup.mdx index 022526fb9..bcea22405 100644 --- a/desktop/plugins/public/leak_canary/docs/setup.mdx +++ b/desktop/plugins/public/leak_canary/docs/setup.mdx @@ -8,7 +8,7 @@ To setup the <Link to={useBaseUrl("/docs/features/plugins/leak-canary")}>LeakCan ```groovy dependencies { - debugImplementation 'com.facebook.flipper:flipper-leakcanary2-plugin:0.229.0' + debugImplementation 'com.facebook.flipper:flipper-leakcanary2-plugin:0.230.0' debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.8.1' } ``` diff --git a/desktop/plugins/public/network/docs/setup.mdx b/desktop/plugins/public/network/docs/setup.mdx index 9b6e986de..c073a011a 100644 --- a/desktop/plugins/public/network/docs/setup.mdx +++ b/desktop/plugins/public/network/docs/setup.mdx @@ -12,7 +12,7 @@ The network plugin is shipped as a separate Maven artifact, as follows: ```groovy dependencies { - debugImplementation 'com.facebook.flipper:flipper-network-plugin:0.229.0' + debugImplementation 'com.facebook.flipper:flipper-network-plugin:0.230.0' } ``` diff --git a/docs/getting-started/android-native.mdx b/docs/getting-started/android-native.mdx index 6534c63ca..61b664e47 100644 --- a/docs/getting-started/android-native.mdx +++ b/docs/getting-started/android-native.mdx @@ -24,10 +24,10 @@ repositories { } dependencies { - debugImplementation 'com.facebook.flipper:flipper:0.229.0' + debugImplementation 'com.facebook.flipper:flipper:0.230.0' debugImplementation 'com.facebook.soloader:soloader:0.10.5' - releaseImplementation 'com.facebook.flipper:flipper-noop:0.229.0' + releaseImplementation 'com.facebook.flipper:flipper-noop:0.230.0' } ``` diff --git a/docs/getting-started/react-native-ios.mdx b/docs/getting-started/react-native-ios.mdx index 603b0bb5c..484bcdc6b 100644 --- a/docs/getting-started/react-native-ios.mdx +++ b/docs/getting-started/react-native-ios.mdx @@ -51,7 +51,7 @@ Add all of the code below to your `ios/Podfile`: platform :ios, '9.0' def flipper_pods() - flipperkit_version = '0.229.0' # should match the version of your Flipper client app + flipperkit_version = '0.230.0' # should match the version of your Flipper client app pod 'FlipperKit', '~>' + flipperkit_version, :configuration => 'Debug' pod 'FlipperKit/FlipperKitLayoutPlugin', '~>' + flipperkit_version, :configuration => 'Debug' pod 'FlipperKit/SKIOSNetworkPlugin', '~>' + flipperkit_version, :configuration => 'Debug' diff --git a/docs/getting-started/react-native.mdx b/docs/getting-started/react-native.mdx index caac76ff2..af2a12b4e 100644 --- a/docs/getting-started/react-native.mdx +++ b/docs/getting-started/react-native.mdx @@ -34,7 +34,7 @@ Latest version of Flipper requires react-native 0.69+! If you use react-native < Android: -1. Bump the `FLIPPER_VERSION` variable in `android/gradle.properties`, for example: `FLIPPER_VERSION=0.229.0`. +1. Bump the `FLIPPER_VERSION` variable in `android/gradle.properties`, for example: `FLIPPER_VERSION=0.230.0`. 2. Run `./gradlew clean` in the `android` directory. iOS: @@ -44,7 +44,7 @@ react-native version => 0.69.0 2. Run `pod install --repo-update` in the `ios` directory. react-native version < 0.69.0 -1. Call `use_flipper` with a specific version in `ios/Podfile`, for example: `use_flipper!({ 'Flipper' => '0.229.0' })`. +1. Call `use_flipper` with a specific version in `ios/Podfile`, for example: `use_flipper!({ 'Flipper' => '0.230.0' })`. 2. Run `pod install --repo-update` in the `ios` directory. ## Manual Setup diff --git a/gradle.properties b/gradle.properties index 5aa843a16..4857b218f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. # POM publishing constants -VERSION_NAME=0.229.1-SNAPSHOT +VERSION_NAME=0.230.0 GROUP=com.facebook.flipper SONATYPE_STAGING_PROFILE=comfacebook POM_URL=https://github.com/facebook/flipper diff --git a/js/js-flipper/package.json b/js/js-flipper/package.json index 6f60d7f4b..975ae8f67 100644 --- a/js/js-flipper/package.json +++ b/js/js-flipper/package.json @@ -1,7 +1,7 @@ { "name": "js-flipper", "title": "JS Flipper Bindings for Web-Socket based clients", - "version": "0.229.0", + "version": "0.230.0", "main": "lib/index.js", "browser": { "os": false diff --git a/react-native/react-native-flipper/package.json b/react-native/react-native-flipper/package.json index ba146ef77..68b14538d 100644 --- a/react-native/react-native-flipper/package.json +++ b/react-native/react-native-flipper/package.json @@ -1,7 +1,7 @@ { "name": "react-native-flipper", "title": "React Native Flipper Bindings", - "version": "0.229.0", + "version": "0.230.0", "description": "Flipper bindings for React Native", "main": "index.js", "types": "index.d.ts", From b507f7743edcc9dd2166c9add524a0988132136e Mon Sep 17 00:00:00 2001 From: generatedunixname89002005306973 <generatedunixname89002005306973@meta.com> Date: Fri, 20 Oct 2023 06:53:48 -0700 Subject: [PATCH 28/80] Flipper Snapshot Bump: v0.230.1-SNAPSHOT Summary: Releasing snapshot version 0.230.1-SNAPSHOT Reviewed By: lblasa Differential Revision: D50495655 fbshipit-source-id: 79952d387c0b1f981c2ce383c045157630f7d02f --- docs/getting-started/android-native.mdx | 4 ++-- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/getting-started/android-native.mdx b/docs/getting-started/android-native.mdx index 61b664e47..4cdac4f43 100644 --- a/docs/getting-started/android-native.mdx +++ b/docs/getting-started/android-native.mdx @@ -124,10 +124,10 @@ repositories { } dependencies { - debugImplementation 'com.facebook.flipper:flipper:0.229.1-SNAPSHOT' + debugImplementation 'com.facebook.flipper:flipper:0.230.1-SNAPSHOT' debugImplementation 'com.facebook.soloader:soloader:0.10.5' - releaseImplementation 'com.facebook.flipper:flipper-noop:0.229.1-SNAPSHOT' + releaseImplementation 'com.facebook.flipper:flipper-noop:0.230.1-SNAPSHOT' } ``` diff --git a/gradle.properties b/gradle.properties index 4857b218f..dc80fd883 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. # POM publishing constants -VERSION_NAME=0.230.0 +VERSION_NAME=0.230.1-SNAPSHOT GROUP=com.facebook.flipper SONATYPE_STAGING_PROFILE=comfacebook POM_URL=https://github.com/facebook/flipper From a978c96987f2bf957c80675137b89622796420cf Mon Sep 17 00:00:00 2001 From: Anton Kastritskiy <antonk52@meta.com> Date: Fri, 20 Oct 2023 07:23:34 -0700 Subject: [PATCH 29/80] large fb icons only, no density Summary: Currently we download a bunch of FB icons and we normally use the smallest one available. In this diff I change the download logic so we try to download from the largest to the smallest icon and use the first one available. One the client we no longer provide the icon of the same size that is requested, instead we provide the only one we have which will typically be larger than needed. This is a good thing because 1. flipper is a local application and we do not need to worry about icons take up broadband and downloading 2. People have high density displayed I also stopped using density(rest of related code removed in the next diff) for icons as it the icons themselves did not support it. Reviewed By: lblasa Differential Revision: D50495194 fbshipit-source-id: f569c2f3b8ee424a67c6d21136e7e113868b8f6a --- desktop/.gitignore | 1 + .../app/src/utils/__tests__/icons.node.tsx | 6 +- desktop/app/src/utils/icons.tsx | 7 +- .../src/initializeRenderHost.tsx | 2 +- .../src/initializeRenderHost.tsx | 2 +- .../src/ui/components/Glyph.tsx | 2 +- desktop/flipper-ui-core/src/utils/icons.tsx | 6 +- desktop/scripts/build-icons.tsx | 46 +- desktop/static/icons.json | 1057 ++++++----------- 9 files changed, 406 insertions(+), 723 deletions(-) diff --git a/desktop/.gitignore b/desktop/.gitignore index 11851aab5..a23584694 100644 --- a/desktop/.gitignore +++ b/desktop/.gitignore @@ -12,3 +12,4 @@ tsc-error.log /flipper-server/static/ /static/flipper-server-log* /static/.audit.json +/static/icons/*_d.png diff --git a/desktop/app/src/utils/__tests__/icons.node.tsx b/desktop/app/src/utils/__tests__/icons.node.tsx index 7e60a42b7..0e86020b7 100644 --- a/desktop/app/src/utils/__tests__/icons.node.tsx +++ b/desktop/app/src/utils/__tests__/icons.node.tsx @@ -21,7 +21,7 @@ test('filled icons get correct local path', () => { size: 12, density: 2, }); - expect(iconPath).toBe(path.join('icons', 'star-filled-12@2x.png')); + expect(iconPath).toBe(path.join('icons', 'star-filled_d.png')); }); test('outline icons get correct local path', () => { @@ -31,7 +31,7 @@ test('outline icons get correct local path', () => { size: 12, density: 2, }); - expect(iconPath).toBe(path.join('icons', 'star-outline-12@2x.png')); + expect(iconPath).toBe(path.join('icons', 'star-outline_d.png')); }); test('filled icons get correct URL', async () => { @@ -51,7 +51,7 @@ test('filled icons get correct URL', async () => { expect(localUrl).toBe(iconUrl); // ... let's mock a file - const iconPath = path.join(staticPath, 'icons', 'star-filled-12@2x.png'); + const iconPath = path.join(staticPath, 'icons', 'star-filled_d.png'); try { await fs.promises.writeFile( iconPath, diff --git a/desktop/app/src/utils/icons.tsx b/desktop/app/src/utils/icons.tsx index c8993a3b4..01fe1389f 100644 --- a/desktop/app/src/utils/icons.tsx +++ b/desktop/app/src/utils/icons.tsx @@ -23,7 +23,7 @@ let _icons: Icons | undefined; function getIconsSync(staticPath: string): Icons { return ( - _icons! ?? + _icons ?? (_icons = JSON.parse( fs.readFileSync(path.join(staticPath, 'icons.json'), {encoding: 'utf8'}), )) @@ -31,10 +31,7 @@ function getIconsSync(staticPath: string): Icons { } export function buildLocalIconPath(icon: Icon) { - return path.join( - 'icons', - `${icon.name}-${icon.variant}-${icon.size}@${icon.density}x.png`, - ); + return path.join('icons', `${icon.name}-${icon.variant}_d.png`); } export function getLocalIconUrl( diff --git a/desktop/flipper-server-companion/src/initializeRenderHost.tsx b/desktop/flipper-server-companion/src/initializeRenderHost.tsx index a35192397..d88936cbf 100644 --- a/desktop/flipper-server-companion/src/initializeRenderHost.tsx +++ b/desktop/flipper-server-companion/src/initializeRenderHost.tsx @@ -74,7 +74,7 @@ export function initializeRenderHost( }, getLocalIconUrl(icon, url) { if (isProduction()) { - return `icons/${icon.name}-${icon.variant}-${icon.size}@${icon.density}x.png`; + return `icons/${icon.name}-${icon.variant}_d.png`; } return url; }, diff --git a/desktop/flipper-ui-browser/src/initializeRenderHost.tsx b/desktop/flipper-ui-browser/src/initializeRenderHost.tsx index 00ab059e6..1008f9fd2 100644 --- a/desktop/flipper-ui-browser/src/initializeRenderHost.tsx +++ b/desktop/flipper-ui-browser/src/initializeRenderHost.tsx @@ -203,7 +203,7 @@ export function initializeRenderHost( }, getLocalIconUrl(icon, url) { if (isProduction()) { - return `icons/${icon.name}-${icon.variant}-${icon.size}@${icon.density}x.png`; + return `icons/${icon.name}-${icon.variant}_d.png`; } return url; }, diff --git a/desktop/flipper-ui-core/src/ui/components/Glyph.tsx b/desktop/flipper-ui-core/src/ui/components/Glyph.tsx index dd6208cd9..17eadd84f 100644 --- a/desktop/flipper-ui-core/src/ui/components/Glyph.tsx +++ b/desktop/flipper-ui-core/src/ui/components/Glyph.tsx @@ -11,7 +11,7 @@ import React from 'react'; import styled from '@emotion/styled'; import {getIconURL} from '../../utils/icons'; -export type IconSize = 8 | 10 | 12 | 16 | 18 | 20 | 24 | 28 | 32; +export type IconSize = 8 | 10 | 12 | 16 | 18 | 20 | 24 | 28 | 32 | 48; const ColoredIconBlack = styled.img<{size: number}>(({size}) => ({ height: size, diff --git a/desktop/flipper-ui-core/src/utils/icons.tsx b/desktop/flipper-ui-core/src/utils/icons.tsx index da866bf9d..8b387f9eb 100644 --- a/desktop/flipper-ui-core/src/utils/icons.tsx +++ b/desktop/flipper-ui-core/src/utils/icons.tsx @@ -10,8 +10,8 @@ import {getRenderHostInstance} from 'flipper-frontend-core'; import {IconSize} from '../ui/components/Glyph'; -const AVAILABLE_SIZES: IconSize[] = [8, 10, 12, 16, 18, 20, 24, 28, 32]; -const DENSITIES = [1, 2, 3]; +const AVAILABLE_SIZES: IconSize[] = [8, 10, 12, 16, 18, 20, 24, 28, 32, 48]; +const DENSITIES = [1, 1.5, 2, 3, 4]; export type Icon = { name: string; @@ -58,7 +58,7 @@ function normalizeIcon(icon: Icon): Icon { }; } -export function getPublicIconUrl({name, variant, size, density}: Icon) { +export function getPublicIconUrl({name, variant, size}: Icon) { return `https://facebook.com/images/assets_DO_NOT_HARDCODE/facebook_icons/${name}_${variant}_${size}.png`; } diff --git a/desktop/scripts/build-icons.tsx b/desktop/scripts/build-icons.tsx index bda85ff0d..da76bf060 100644 --- a/desktop/scripts/build-icons.tsx +++ b/desktop/scripts/build-icons.tsx @@ -13,7 +13,7 @@ import fetch from '@adobe/node-fetch-retry'; // eslint-disable-next-line node/no-extraneous-import import type {Icon} from 'flipper-ui-core'; -const AVAILABLE_SIZES: Icon['size'][] = [8, 10, 12, 16, 18, 20, 24, 28, 32]; +const AVAILABLE_SIZES: Icon['size'][] = [8, 10, 12, 16, 18, 20, 24, 28, 32, 48]; export type Icons = { [key: string]: Icon['size'][]; @@ -32,38 +32,26 @@ function getIconPartsFromName(icon: string): { } export async function downloadIcons(buildFolder: string) { - const icons: Icons = JSON.parse( + const icons: string[] = JSON.parse( await fs.promises.readFile(path.join(buildFolder, 'icons.json'), { encoding: 'utf8', }), ); - const iconURLs = Object.entries(icons).reduce<Icon[]>( - (acc, [entryName, sizes]) => { - const {trimmedName: name, variant} = getIconPartsFromName(entryName); - acc.push( - // get icons in @1x and @2x - ...sizes.map((size) => ({name, variant, size, density: 1})), - ...sizes.map((size) => ({name, variant, size, density: 2})), - ...sizes.map((size) => ({name, variant, size, density: 3})), - ); - return acc; - }, - [], - ); + const iconURLs: Pick<Icon, 'name' | 'variant'>[] = icons.map((rawName) => { + const {trimmedName: name, variant} = getIconPartsFromName(rawName); + return {name, variant}; + }); + // Download first largest instance of each icon await Promise.all( iconURLs.map(async (icon) => { - const sizeIndex = AVAILABLE_SIZES.indexOf(icon.size); - if (sizeIndex === -1) { - throw new Error('Size unavailable: ' + icon.size); - } - const sizesToTry = AVAILABLE_SIZES.slice(sizeIndex); + const sizesToTry = [...AVAILABLE_SIZES]; while (sizesToTry.length) { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - const size = sizesToTry.shift()!; + const size = sizesToTry.pop()!; - const url = getPublicIconUrl({...icon, size}); + const url = getPublicIconUrl({...(icon as Icon), size}); const res = await fetch(url); if (res.status !== 200) { // console.log( @@ -89,21 +77,21 @@ export async function downloadIcons(buildFolder: string) { console.error( `Could not download the icon ${JSON.stringify( icon, - )} from ${getPublicIconUrl(icon)}, didn't find any matching size`, + )} from ${getPublicIconUrl({ + ...icon, + size: AVAILABLE_SIZES[AVAILABLE_SIZES.length - 1], + } as Icon)}, didn't find any matching size`, ); }), ); } // should match flipper-ui-core/src/utils/icons.tsx -export function getPublicIconUrl({name, variant, size, density}: Icon) { +export function getPublicIconUrl({name, variant, size}: Icon) { return `https://facebook.com/images/assets_DO_NOT_HARDCODE/facebook_icons/${name}_${variant}_${size}.png`; } // should match app/src/utils/icons.tsx -function buildLocalIconPath(icon: Icon) { - return path.join( - 'icons', - `${icon.name}-${icon.variant}-${icon.size}@${icon.density}x.png`, - ); +function buildLocalIconPath(icon: Pick<Icon, 'name' | 'variant'>) { + return path.join('icons', `${icon.name}-${icon.variant}_d.png`); } diff --git a/desktop/static/icons.json b/desktop/static/icons.json index 9719f74e0..8f189d9e2 100644 --- a/desktop/static/icons.json +++ b/desktop/static/icons.json @@ -1,680 +1,377 @@ -{ - "accessibility": [ - 16, - 20 - ], - "app-dailies": [ - 12 - ], - "app-react": [ - 12, - 16 - ], - "apps": [ - 12, - 16 - ], - "arrow-right": [ - 12, - 16 - ], - "bell-null-outline": [ - 24 - ], - "bell-null": [ - 12 - ], - "bell": [ - 12 - ], - "bird": [ - 12, - 16 - ], - "borders": [ - 16 - ], - "box": [ - 12, - 24 - ], - "brush-paint": [ - 12, - 16 - ], - "bug": [ - 12, - 20 - ], - "building-city": [ - 12, - 16 - ], - "camcorder": [ - 12, - 16 - ], - "camera": [ - 12, - 16 - ], - "caution-octagon": [ - 12, - 16, - 20 - ], - "caution-triangle": [ - 12, - 16, - 20, - 24 - ], - "caution": [ - 16, - 24 - ], - "checkmark": [ - 16 - ], - "chevron-down-outline": [ - 10 - ], - "chevron-down": [ - 12, - 16, - 8 - ], - "chevron-left": [ - 12, - 16 - ], - "chevron-right": [ - 8, - 12, - 16 - ], - "chevron-up": [ - 12, - 16, - 8 - ], - "compose": [ - 12, - 16 - ], - "copy": [ - 12, - 16 - ], - "cross-circle": [ - 12, - 16, - 24 - ], - "cross": [ - 12, - 16 - ], - "dashboard-outline": [ - 24 - ], - "dashboard": [ - 12, - 16 - ], - "data-table": [ - 12, - 16 - ], - "desktop": [ - 12 - ], - "directions": [ - 12, - 16 - ], - "dots-3-circle-outline": [ - 16 - ], - "download": [ - 16 - ], - "face-unhappy-outline": [ - 24 - ], - "first-aid": [ - 12 - ], - "flash-default": [ - 12, - 16 - ], - "info-circle": [ - 12, - 16, - 24 - ], - "internet": [ - 12, - 16 - ], - "life-event-major": [ - 16 - ], - "magic-wand": [ - 12, - 16, - 20 - ], - "magnifying-glass": [ - 16, - 20, - 24 - ], - "messages": [ - 12, - 16 - ], - "minus-circle": [ - 12 - ], - "mobile-engagement": [ - 16 - ], - "mobile": [ - 12, - 16, - 32 - ], - "network": [ - 12, - 16 - ], - "news-feed": [ - 12, - 16 - ], - "pause": [ - 16 - ], - "posts": [ - 20 - ], - "power": [ - 16 - ], - "profile": [ - 12, - 16 - ], - "question-circle-outline": [ - 16 - ], - "question-circle": [ - 12, - 16, - 20 - ], - "question": [ - 16 - ], - "refresh-left": [ - 16 - ], - "rocket": [ - 12, - 16, - 20 - ], - "settings": [ - 12 - ], - "share-external": [ - 12, - 16 - ], - "share": [ - 16 - ], - "star-outline": [ - 12, - 16, - 24 - ], - "star-slash": [ - 16 - ], - "star": [ - 12, - 16, - 24 - ], - "stop-playback": [ - 12, - 16 - ], - "stop": [ - 16, - 24 - ], - "target": [ - 12, - 16 - ], - "thought-bubble": [ - 12, - 16 - ], - "tools": [ - 12, - 16, - 20 - ], - "translate": [ - 12, - 16 - ], - "trash-outline": [ - 16 - ], - "trash": [ - 12, - 16 - ], - "tree": [ - 12, - 16 - ], - "trending": [ - 12, - 16 - ], - "triangle-down": [ - 12, - 16, - 20 - ], - "triangle-right": [ - 12 - ], - "underline": [ - 12, - 16 - ], - "washing-machine": [ - 12, - 16 - ], - "watch-tv": [ - 12, - 16 - ], - "gears-two": [ - 16 - ], - "info-cursive": [ - 16 - ], - "on-this-day": [ - 12 - ], - "zoom-out": [ - 16 - ], - "zoom-in": [ - 16 - ], - "fast-forward": [ - 16 - ], - "draft-outline": [ - 16 - ], - "gradient": [ - 16 - ], - "crop": [ - 16 - ], - "play": [ - 16 - ], - "cross-outline": [ - 16 - ], - "messenger-code": [ - 12, - 16 - ], - "book": [ - 12 - ], - "list-arrow-up": [ - 12, - 16 - ], - "cat": [ - 12, - 16 - ], - "duplicate": [ - 12, - 16 - ], - "profile-circle-outline": [ - 16 - ], - "card-person": [ - 12, - 16 - ], - "pencil-outline": [ - 16 - ], - "code": [ - 12, - 16, - 20 - ], - "undo-outline": [ - 16 - ], - "checkmark-circle-outline": [ - 24 - ], - "target-outline": [ - 16, - 24 - ], - "internet-outline": [ - 24, - 32 - ], - "profile-outline": [ - 32 - ], - "app-react-outline": [ - 16 - ], - "send-outline": [ - 16 - ], - "paper-stack": [ - 12, - 16 - ], - "weather-cold": [ - 12, - 16 - ], - "mobile-cross": [ - 16 - ], - "database-arrow-left": [ - 12 - ], - "plus-circle-outline": [ - 16 - ], - "arrows-circle": [ - 12 - ], - "navicon": [ - 12 - ], - "paper-fold-text": [ - 16 - ], - "marketplace": [ - 12, - 16 - ], - "workflow": [ - 12 - ], - "sankey-diagram": [ - 12, - 16 - ], - "media-stack": [ - 16 - ], - "question-hexagon": [ - 16 - ], - "briefcase": [ - 16 - ], - "business-briefcase": [ - 16 - ], - "log": [ - 12, - 16 - ], - "triangle-up": [ - 16, - 20 - ], - "checkmark-circle": [ - 12, - 20 - ], - "circle": [ - 12 - ], - "comment-swish": [ - 16 - ], - "direct": [ - 16 - ], - "plus": [ - 16 - ], - "scuba": [ - 12, - 16 - ], - "line-chart": [ - 12, - 16 - ], - "caution-circle": [ - 12, - 24 - ], - "megaphone": [ - 12, - 16 - ], - "wireless": [ - 16 - ], - "cup-outline": [ - 24 - ], - "unicorn": [ - 20 - ], - "turtle": [ - 20 - ], - "sushi": [ - 12 - ], - "arrows-up-down": [ - 16 - ], - "style-effects": [ - 16 - ], - "stopwatch": [ - 16 - ], - "database": [ - 16 - ], - "bar-chart": [ - 16 - ], - "augmented-reality": [ - 16 - ], - "app-flash": [ - 16 - ], - "sample-lo": [ - 20 - ], - "point": [ - 20 - ], - "eye": [ - 16 - ], - "send": [ - 16 - ], - "refresh-right": [ - 12, - 16 - ], - "hourglass": [ - 16 - ], - "mobile-outline": [ - 16, - 24 - ], - "bookmark-outline": [ - 16 - ], - "app-facebook-f-outline": [ - 24 - ], - "app-messenger-outline": [ - 24 - ], - "app-instagram-outline": [ - 24 - ], - "app-whatsapp-outline": [ - 24 - ], - "app-workplace-outline": [ - 24 - ], - "app-work-chat-outline": [ - 24 - ], - "sample-hi": [ - 20 - ], - "dog": [ - 12, - 16 - ], - "hub": [ - 16 - ], - "upload": [ - 16 - ], - "list-gear-outline": [ - 24 - ], - "app-apple-outline": [ - 24 - ], - "app-microsoft-windows": [ - 24 - ], - "box-outline": [ - 24 - ], - "differential": [ - 16 - ], - "raincloud": [ - 16 - ], - "app-microsoft-windows-outline": [ - 24 - ], - "camcorder-live": [ - 16 - ], - "plumbing": [ - 16 - ], - "app-facebook-circle": [ - 16 - ], - "link": [ - 16 - ], - "commercial-break-usd": [ - 16 - ], - "friends-engagement": [ - 16 - ], - "app-cms": [ - 16 - ], - "caution-triangle-outline": [ - 24 - ], - "bird-flying": [ - 16 - ], - "arrows-left-right": [ - 16 - ], - "grid-9": [ - 16 - ], - "stethoscope": [ - 16 - ], - "friend-except": [ - 16 - ], - "app-instagram": [ - 16 - ], - "nav-magnifying-glass": [ - 16 - ], - "list-arrow-down": [ - 16 - ], - "photo-arrows-left-right": [ - 16 - ], - "badge": [ - 16 - ], - "square-ruler": [ - 16 - ], - "phone": [ - 16 - ], - "app-horizon-assets": [ - 16 - ], - "app-bloks": [ - 16 - ], - "settings-internal": [ - 16 - ], - "weather-thunder-outline": [ - 16 - ], - "weather-thunder": [ - 16 - ] -} +[ + "accessibility", + "app-dailies", + "app-react", + "apps", + "arrow-right", + "bell-null-outline", + "bell-null", + "bell", + "bird", + "borders", + "box", + "brush-paint", + "bug", + "building-city", + + "camcorder", + + "camera", + + "caution-octagon", + + "caution-triangle", + + "caution", + + "checkmark", + + "chevron-down-outline", + + "chevron-down", + + "chevron-left", + + "chevron-right", + + "chevron-up", + + "compose", + + "copy", + + "cross-circle", + + "cross", + + "dashboard-outline", + + "dashboard", + + "data-table", + + "desktop", + + "directions", + + "dots-3-circle-outline", + + "download", + + "face-unhappy-outline", + + "first-aid", + + "flash-default", + + "info-circle", + + "internet", + + "life-event-major", + + "magic-wand", + + "magnifying-glass", + + "messages", + + "minus-circle", + + "mobile-engagement", + + "mobile", + + "network", + + "news-feed", + + "pause", + + "posts", + + "power", + + "profile", + + "question-circle-outline", + + "question-circle", + + "question", + + "refresh-left", + + "rocket", + + "settings", + + "share-external", + + "share", + + "star-outline", + + "star-slash", + + "star", + + "stop-playback", + + "stop", + + "target", + + "thought-bubble", + + "tools", + + "translate", + + "trash-outline", + + "trash", + + "tree", + + "trending", + + "triangle-down", + + "triangle-right", + + "underline", + + "washing-machine", + + "watch-tv", + + "gears-two", + + "info-cursive", + + "on-this-day", + + "zoom-out", + + "zoom-in", + + "fast-forward", + + "draft-outline", + + "gradient", + + "crop", + + "play", + + "cross-outline", + + "messenger-code", + + "book", + + "list-arrow-up", + + "cat", + + "duplicate", + + "profile-circle-outline", + + "card-person", + + "pencil-outline", + + "code", + + "undo-outline", + + "checkmark-circle-outline", + + "target-outline", + + "internet-outline", + + "profile-outline", + + "app-react-outline", + + "send-outline", + + "paper-stack", + + "weather-cold", + + "mobile-cross", + + "database-arrow-left", + + "plus-circle-outline", + + "arrows-circle", + + "navicon", + + "paper-fold-text", + + "marketplace", + + "workflow", + + "sankey-diagram", + + "media-stack", + + "question-hexagon", + + "briefcase", + + "business-briefcase", + + "log", + + "triangle-up", + + "checkmark-circle", + + "circle", + + "comment-swish", + + "direct", + + "plus", + + "scuba", + + "line-chart", + + "caution-circle", + + "megaphone", + + "wireless", + + "cup-outline", + + "unicorn", + + "turtle", + + "sushi", + + "arrows-up-down", + + "style-effects", + + "stopwatch", + + "database", + + "bar-chart", + + "augmented-reality", + + "app-flash", + + "sample-lo", + + "point", + + "eye", + + "send", + + "refresh-right", + + "hourglass", + + "mobile-outline", + + "bookmark-outline", + + "app-facebook-f-outline", + + "app-messenger-outline", + + "app-instagram-outline", + + "app-whatsapp-outline", + + "app-workplace-outline", + + "app-work-chat-outline", + + "sample-hi", + + "dog", + + "hub", + + "upload", + + "list-gear-outline", + + "app-apple-outline", + + "app-microsoft-windows", + + "box-outline", + + "differential", + + "raincloud", + + "app-microsoft-windows-outline", + + "camcorder-live", + + "plumbing", + + "app-facebook-circle", + + "link", + + "commercial-break-usd", + + "friends-engagement", + + "app-cms", + + "caution-triangle-outline", + + "bird-flying", + + "arrows-left-right", + + "grid-9", + + "stethoscope", + + "friend-except", + + "app-instagram", + + "nav-magnifying-glass", + + "list-arrow-down", + + "photo-arrows-left-right", + + "badge", + + "square-ruler", + + "phone", + + "app-horizon-assets", + + "app-bloks", + + "settings-internal", + + "weather-thunder-outline", + "weather-thunder" +] From fd774a2d52a139b57a6689f9aa93953b638b3880 Mon Sep 17 00:00:00 2001 From: Anton Kastritskiy <antonk52@meta.com> Date: Fri, 20 Oct 2023 07:23:34 -0700 Subject: [PATCH 30/80] remove density mentions Summary: removing dead code Reviewed By: lblasa Differential Revision: D50495989 fbshipit-source-id: 769f853b50bf6ec48705dbcec03977ec6a5bffa3 --- .../app/src/utils/__tests__/icons.node.tsx | 5 +- desktop/app/src/utils/icons.tsx | 2 +- .../flipper-frontend-core/src/RenderHost.tsx | 1 - .../src/ui/components/Glyph.tsx | 47 +++++++------------ desktop/flipper-ui-core/src/utils/icons.tsx | 22 +-------- 5 files changed, 22 insertions(+), 55 deletions(-) diff --git a/desktop/app/src/utils/__tests__/icons.node.tsx b/desktop/app/src/utils/__tests__/icons.node.tsx index 0e86020b7..10c5ce27f 100644 --- a/desktop/app/src/utils/__tests__/icons.node.tsx +++ b/desktop/app/src/utils/__tests__/icons.node.tsx @@ -19,7 +19,6 @@ test('filled icons get correct local path', () => { name: 'star', variant: 'filled', size: 12, - density: 2, }); expect(iconPath).toBe(path.join('icons', 'star-filled_d.png')); }); @@ -29,7 +28,6 @@ test('outline icons get correct local path', () => { name: 'star', variant: 'outline', size: 12, - density: 2, }); expect(iconPath).toBe(path.join('icons', 'star-outline_d.png')); }); @@ -39,11 +37,10 @@ test('filled icons get correct URL', async () => { name: 'star', variant: 'filled', size: 12, - density: 2, } as const; const iconUrl = getPublicIconUrl(icon); expect(iconUrl).toBe( - 'https://facebook.com/images/assets_DO_NOT_HARDCODE/facebook_icons/star_filled_12.png', // TODO: support density? + 'https://facebook.com/images/assets_DO_NOT_HARDCODE/facebook_icons/star_filled_12.png', ); const staticPath = getRenderHostInstance().serverConfig.paths.staticPath; const localUrl = getLocalIconUrl(icon, iconUrl, staticPath, false); diff --git a/desktop/app/src/utils/icons.tsx b/desktop/app/src/utils/icons.tsx index 01fe1389f..6e83daa17 100644 --- a/desktop/app/src/utils/icons.tsx +++ b/desktop/app/src/utils/icons.tsx @@ -65,7 +65,7 @@ function tryRegisterIcon(icon: Icon, url: string, staticPath: string) { if (res.status !== 200) { throw new Error( // eslint-disable-next-line prettier/prettier - `Trying to use icon '${entryName}' with size ${size} and density ${icon.density}, however the icon doesn't seem to exists at ${url}: ${res.status}`, + `Trying to use icon '${entryName}' with size ${size}, however the icon doesn't seem to exists at ${url}: ${res.status}`, ); } if (!existing.includes(size)) { diff --git a/desktop/flipper-frontend-core/src/RenderHost.tsx b/desktop/flipper-frontend-core/src/RenderHost.tsx index 1662b40dd..3f99acc2c 100644 --- a/desktop/flipper-frontend-core/src/RenderHost.tsx +++ b/desktop/flipper-frontend-core/src/RenderHost.tsx @@ -20,7 +20,6 @@ type Icon = { name: string; variant: 'outline' | 'filled'; size: number; - density: number; }; interface NotificationAction { diff --git a/desktop/flipper-ui-core/src/ui/components/Glyph.tsx b/desktop/flipper-ui-core/src/ui/components/Glyph.tsx index 17eadd84f..5a32a3d84 100644 --- a/desktop/flipper-ui-core/src/ui/components/Glyph.tsx +++ b/desktop/flipper-ui-core/src/ui/components/Glyph.tsx @@ -94,7 +94,7 @@ function ColoredIcon( } ColoredIcon.displayName = 'Glyph:ColoredIcon'; -export default class Glyph extends React.PureComponent<{ +export default function Glyph(props: { name: string; size?: IconSize; variant?: 'filled' | 'outline'; @@ -102,33 +102,22 @@ export default class Glyph extends React.PureComponent<{ color?: string; style?: React.CSSProperties; title?: string; -}> { - render() { - const { - name, - size = 16, - variant, - color, - className, - style, - title, - } = this.props; +}) { + const {name, size = 16, variant, color, className, style, title} = props; - return ( - <ColoredIcon - name={name} - className={className} - color={color} - size={size} - title={title} - src={getIconURL({ - name, - variant: variant ?? 'filled', - size, - density: typeof window !== 'undefined' ? window.devicePixelRatio : 1, - })} - style={style} - /> - ); - } + return ( + <ColoredIcon + name={name} + className={className} + color={color} + size={size} + title={title} + src={getIconURL({ + name, + variant: variant ?? 'filled', + size, + })} + style={style} + /> + ); } diff --git a/desktop/flipper-ui-core/src/utils/icons.tsx b/desktop/flipper-ui-core/src/utils/icons.tsx index 8b387f9eb..f0b77ca4e 100644 --- a/desktop/flipper-ui-core/src/utils/icons.tsx +++ b/desktop/flipper-ui-core/src/utils/icons.tsx @@ -11,19 +11,16 @@ import {getRenderHostInstance} from 'flipper-frontend-core'; import {IconSize} from '../ui/components/Glyph'; const AVAILABLE_SIZES: IconSize[] = [8, 10, 12, 16, 18, 20, 24, 28, 32, 48]; -const DENSITIES = [1, 1.5, 2, 3, 4]; export type Icon = { name: string; variant: 'outline' | 'filled'; size: IconSize; - density: number; }; function normalizeIcon(icon: Icon): Icon { - let {size, density} = icon; - let requestedSize = size as number; - if (!AVAILABLE_SIZES.includes(size as any)) { + let requestedSize = icon.size as number; + if (!AVAILABLE_SIZES.includes(icon.size as any)) { // find the next largest size const possibleSize = AVAILABLE_SIZES.find((size) => { return size > requestedSize; @@ -37,24 +34,9 @@ function normalizeIcon(icon: Icon): Icon { } } - if (!DENSITIES.includes(density)) { - // find the next largest size - const possibleDensity = DENSITIES.find((scale) => { - return scale > density; - }); - - // set to largest size if the real size is larger than what we have - if (possibleDensity == null) { - density = Math.max(...DENSITIES); - } else { - density = possibleDensity; - } - } - return { ...icon, size: requestedSize as IconSize, - density, }; } From 4834fda6fabdde4d5dcebe47d02dae7edcfa6839 Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa <lblasa@meta.com> Date: Fri, 20 Oct 2023 07:25:52 -0700 Subject: [PATCH 31/80] Build local architecture CLI arg Summary: The current '--mac' arg builds all supported architectures. This is great when generating release builds but not so much when testing a release for the current architecture. Not modifying the existing '--mac' arg as to not update our current CI. Reviewed By: antonk52 Differential Revision: D50497211 fbshipit-source-id: 3e4d9728adc822c48788556e2ea47f4dd1c21b05 --- desktop/scripts/build-flipper-server-release.tsx | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/desktop/scripts/build-flipper-server-release.tsx b/desktop/scripts/build-flipper-server-release.tsx index e31fe87d8..7201b742e 100644 --- a/desktop/scripts/build-flipper-server-release.tsx +++ b/desktop/scripts/build-flipper-server-release.tsx @@ -132,7 +132,12 @@ const argv = yargs default: false, }, mac: { - describe: 'Build a platform-specific bundle for MacOS.', + describe: 'Build arm64 and x64 bundles for MacOS.', + type: 'boolean', + default: false, + }, + 'mac-local': { + describe: 'Build local architecture bundle for MacOS.', type: 'boolean', default: false, }, @@ -455,6 +460,15 @@ async function buildServerRelease() { platforms.push(BuildPlatform.MAC_X64); platforms.push(BuildPlatform.MAC_AARCH64); } + if (argv.macLocal) { + const architecture = os.arch(); + console.log(`⚙️ Local architecture: ${architecture}`); + if (architecture == 'arm64') { + platforms.push(BuildPlatform.MAC_AARCH64); + } else { + platforms.push(BuildPlatform.MAC_X64); + } + } if (argv.win) { platforms.push(BuildPlatform.WINDOWS); } From 663380e721f1baf644c124d205d71ca87f98f72d Mon Sep 17 00:00:00 2001 From: Anton Kastritskiy <antonk52@meta.com> Date: Fri, 20 Oct 2023 12:44:58 -0700 Subject: [PATCH 32/80] mark unused vars as errors Reviewed By: lblasa Differential Revision: D50500690 fbshipit-source-id: 6f739fe25c232ecfe842337af4399681e85f6a13 --- desktop/.eslintrc.js | 2 +- desktop/app/src/init.tsx | 1 - desktop/flipper-plugin/src/ui/Container.tsx | 2 +- desktop/flipper-plugin/src/ui/NUX.tsx | 1 - desktop/flipper-plugin/src/ui/renderSplitLayout.tsx | 10 ++-------- .../flipper-server-core/src/devices/ios/IOSBridge.tsx | 2 +- desktop/flipper-server-core/src/server/utilities.tsx | 3 --- desktop/flipper-ui-browser/src/global.tsx | 2 ++ desktop/flipper-ui-core/src/chrome/PluginActions.tsx | 2 +- .../components/sidebar/inspector/ColorInspector.tsx | 7 ------- desktop/scripts/build-flipper-server-release.tsx | 2 +- desktop/scripts/build-utils.tsx | 2 +- desktop/scripts/start-flipper-server-dev.tsx | 2 +- desktop/scripts/tsc-plugins.tsx | 1 - 14 files changed, 11 insertions(+), 28 deletions(-) diff --git a/desktop/.eslintrc.js b/desktop/.eslintrc.js index 3f6c79bf9..c66b79852 100644 --- a/desktop/.eslintrc.js +++ b/desktop/.eslintrc.js @@ -204,7 +204,7 @@ module.exports = { 'no-dupe-class-members': 0, '@typescript-eslint/no-redeclare': 1, '@typescript-eslint/no-unused-vars': [ - 1, + 2, { ignoreRestSiblings: true, varsIgnorePattern: '^_', diff --git a/desktop/app/src/init.tsx b/desktop/app/src/init.tsx index 577c77f62..697d66c49 100644 --- a/desktop/app/src/init.tsx +++ b/desktop/app/src/init.tsx @@ -22,7 +22,6 @@ import { checkPortInUse, getAuthToken, getEnvironmentInfo, - hasAuthToken, setupPrefetcher, startFlipperServer, startServer, diff --git a/desktop/flipper-plugin/src/ui/Container.tsx b/desktop/flipper-plugin/src/ui/Container.tsx index bb3e10e1f..a7afb9c1c 100644 --- a/desktop/flipper-plugin/src/ui/Container.tsx +++ b/desktop/flipper-plugin/src/ui/Container.tsx @@ -7,7 +7,7 @@ * @format */ -import React, {CSSProperties, forwardRef} from 'react'; +import React from 'react'; import styled from '@emotion/styled'; import { normalizePadding, diff --git a/desktop/flipper-plugin/src/ui/NUX.tsx b/desktop/flipper-plugin/src/ui/NUX.tsx index b01b62f7b..1f7326375 100644 --- a/desktop/flipper-plugin/src/ui/NUX.tsx +++ b/desktop/flipper-plugin/src/ui/NUX.tsx @@ -16,7 +16,6 @@ import React, { } from 'react'; import {Badge, Tooltip, Typography, Button} from 'antd'; import styled from '@emotion/styled'; -import {keyframes} from '@emotion/css'; import reactElementToJSXString from 'react-element-to-jsx-string'; import {SandyPluginContext} from '../plugin/PluginContext'; import {createState} from 'flipper-plugin-core'; diff --git a/desktop/flipper-plugin/src/ui/renderSplitLayout.tsx b/desktop/flipper-plugin/src/ui/renderSplitLayout.tsx index f74de535f..62ccfab3f 100644 --- a/desktop/flipper-plugin/src/ui/renderSplitLayout.tsx +++ b/desktop/flipper-plugin/src/ui/renderSplitLayout.tsx @@ -7,15 +7,9 @@ * @format */ -import React, {CSSProperties, forwardRef} from 'react'; +import React, {CSSProperties} from 'react'; import styled from '@emotion/styled'; -import { - normalizePadding, - normalizeSpace, - PaddingProps, - Spacing, - theme, -} from './theme'; +import {normalizeSpace, Spacing, theme} from './theme'; import type {SplitLayoutProps} from './Layout'; import {Sidebar} from './Sidebar'; diff --git a/desktop/flipper-server-core/src/devices/ios/IOSBridge.tsx b/desktop/flipper-server-core/src/devices/ios/IOSBridge.tsx index 51f5230f7..1a50a26a8 100644 --- a/desktop/flipper-server-core/src/devices/ios/IOSBridge.tsx +++ b/desktop/flipper-server-core/src/devices/ios/IOSBridge.tsx @@ -27,7 +27,7 @@ export const ERR_NO_IDB_OR_XCODE_AVAILABLE = export const ERR_PHYSICAL_DEVICE_LOGS_WITHOUT_IDB = 'Cannot provide logs from a physical device without idb.'; -// eslint-disable-next-line @typescript-eslint/naming-convention +// eslint-disable-next-line @typescript-eslint/naming-convention, @typescript-eslint/no-unused-vars type iOSSimulatorDevice = { state: 'Booted' | 'Shutdown' | 'Shutting Down'; availability?: string; diff --git a/desktop/flipper-server-core/src/server/utilities.tsx b/desktop/flipper-server-core/src/server/utilities.tsx index 5e4aaf213..46764bbd5 100644 --- a/desktop/flipper-server-core/src/server/utilities.tsx +++ b/desktop/flipper-server-core/src/server/utilities.tsx @@ -7,10 +7,7 @@ * @format */ -import os from 'os'; -import xdgBasedir from 'xdg-basedir'; import net from 'net'; -import fs from 'fs-extra'; import fetch from 'node-fetch'; import {EnvironmentInfo} from 'flipper-common'; import semver from 'semver'; diff --git a/desktop/flipper-ui-browser/src/global.tsx b/desktop/flipper-ui-browser/src/global.tsx index 39705a833..edc96f165 100644 --- a/desktop/flipper-ui-browser/src/global.tsx +++ b/desktop/flipper-ui-browser/src/global.tsx @@ -7,6 +7,8 @@ * @format */ +// otherwise there is an error with `declare global` +// eslint-disable-next-line @typescript-eslint/no-unused-vars import type {RenderHost} from 'flipper-ui-core'; declare global { diff --git a/desktop/flipper-ui-core/src/chrome/PluginActions.tsx b/desktop/flipper-ui-core/src/chrome/PluginActions.tsx index 9ec4d225a..a2001a365 100644 --- a/desktop/flipper-ui-core/src/chrome/PluginActions.tsx +++ b/desktop/flipper-ui-core/src/chrome/PluginActions.tsx @@ -19,7 +19,7 @@ import {useCallback} from 'react'; import {useDispatch, useSelector} from 'react-redux'; import {PluginDefinition} from '../plugin'; import {startPluginDownload} from '../reducers/pluginDownloads'; -import {loadPlugin, switchPlugin} from '../reducers/pluginManager'; +import {switchPlugin} from '../reducers/pluginManager'; import { getActiveClient, getPluginDownloadStatusMap, diff --git a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/ColorInspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/ColorInspector.tsx index 3eef54560..bef843794 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/ColorInspector.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/ColorInspector.tsx @@ -27,13 +27,6 @@ type Props = { color: Color; }; -const DefaultColor: Color = { - r: 255, - g: 255, - b: 255, - a: 1, -}; - const CenteredContentContainer = styled.div(AutoMarginStyle); const ObjectContainer = styled.div(ObjectContainerStyle); const NumberValue = styled.span(NumberAttributeValueStyle); diff --git a/desktop/scripts/build-flipper-server-release.tsx b/desktop/scripts/build-flipper-server-release.tsx index 7201b742e..3dddd977c 100644 --- a/desktop/scripts/build-flipper-server-release.tsx +++ b/desktop/scripts/build-flipper-server-release.tsx @@ -437,7 +437,7 @@ async function buildServerRelease() { await fs.mkdirp(path.join(dir, 'static', 'defaultPlugins')); await prepareDefaultPlugins(argv.channel === 'insiders'); - await compileServerMain(false); + await compileServerMain(); await copyStaticResources(dir, versionNumber); await linkLocalDeps(dir); await downloadIcons(path.join(dir, 'static')); diff --git a/desktop/scripts/build-utils.tsx b/desktop/scripts/build-utils.tsx index c99f843f5..cd6c4d750 100644 --- a/desktop/scripts/build-utils.tsx +++ b/desktop/scripts/build-utils.tsx @@ -279,7 +279,7 @@ export function genMercurialRevision(): Promise<string | null> { .catch(() => null); } -export async function compileServerMain(dev: boolean) { +export async function compileServerMain() { console.log('⚙️ Compiling server sources...'); await exec(`cd ${serverDir} && yarn build`); console.log('✅ Compiled server sources.'); diff --git a/desktop/scripts/start-flipper-server-dev.tsx b/desktop/scripts/start-flipper-server-dev.tsx index aae4740e5..af87be91b 100644 --- a/desktop/scripts/start-flipper-server-dev.tsx +++ b/desktop/scripts/start-flipper-server-dev.tsx @@ -102,7 +102,7 @@ async function copyStaticResources() { async function restartServer() { try { - await compileServerMain(true); + await compileServerMain(); await launchServer(true, ++startCount === 1); // only open on the first time } catch (e) { console.error( diff --git a/desktop/scripts/tsc-plugins.tsx b/desktop/scripts/tsc-plugins.tsx index 28912149b..a04ea5067 100644 --- a/desktop/scripts/tsc-plugins.tsx +++ b/desktop/scripts/tsc-plugins.tsx @@ -16,7 +16,6 @@ import {EOL} from 'os'; import pmap from 'p-map'; import {rootDir} from './paths'; import yargs from 'yargs'; -import {isPluginJson} from 'flipper-common'; const argv = yargs .usage('yarn tsc-plugins [args]') From baf9d9ab371f6a8292fd329761e6141bff53b349 Mon Sep 17 00:00:00 2001 From: Andres Suarez <asuarez@meta.com> Date: Sat, 21 Oct 2023 12:15:21 -0700 Subject: [PATCH 33/80] Replace tempdir with tempfile Summary: `tempdir` has been deprecated since 2018: https://github.com/rust-lang-deprecated/tempdir/pull/46 It's functionality was merged into `tempfile` with minor tweaks: - Methods names: `new` -> `with_prefix`, `new_in` -> `with_prefix_in`. - `with_prefix_in`'s args order is reversed. - Temp dirs no longer have a period between the prefix and the random name (before `foo.123abc`, now `foo123abc`). Reviewed By: shayne-fletcher Differential Revision: D50526255 fbshipit-source-id: bdb3b53a6b09a09c70c8e2533ad2cea46ee2842b --- packer/Cargo.lock | 104 +++++++++++++++++++++------------------------ packer/Cargo.toml | 2 +- packer/src/main.rs | 2 +- 3 files changed, 50 insertions(+), 58 deletions(-) diff --git a/packer/Cargo.lock b/packer/Cargo.lock index 7cae92865..6749dd28a 100644 --- a/packer/Cargo.lock +++ b/packer/Cargo.lock @@ -40,6 +40,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + [[package]] name = "block-buffer" version = "0.10.4" @@ -81,7 +87,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", - "bitflags", + "bitflags 1.3.2", "clap_derive", "clap_lex", "indexmap 1.9.3", @@ -233,6 +239,22 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "errno" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + [[package]] name = "filetime" version = "0.2.22" @@ -261,7 +283,7 @@ dependencies = [ "sha2", "shellexpand", "tar", - "tempdir", + "tempfile", "xz2", ] @@ -271,12 +293,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - [[package]] name = "generic-array" version = "0.14.7" @@ -415,6 +431,12 @@ version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +[[package]] +name = "linux-raw-sys" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" + [[package]] name = "log" version = "0.4.20" @@ -525,34 +547,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi", -] - -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - [[package]] name = "rayon" version = "1.8.0" @@ -573,22 +567,13 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "redox_syscall" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -597,7 +582,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -641,12 +626,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] -name = "remove_dir_all" -version = "0.5.3" +name = "rustix" +version = "0.38.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" dependencies = [ - "winapi", + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", ] [[package]] @@ -774,13 +763,16 @@ dependencies = [ ] [[package]] -name = "tempdir" -version = "0.3.7" +name = "tempfile" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ - "rand", - "remove_dir_all", + "cfg-if", + "fastrand", + "redox_syscall 0.3.5", + "rustix", + "windows-sys 0.48.0", ] [[package]] diff --git a/packer/Cargo.toml b/packer/Cargo.toml index 5798cdb9d..1d8495501 100644 --- a/packer/Cargo.toml +++ b/packer/Cargo.toml @@ -25,4 +25,4 @@ xz2 = "0.1.7" ignore = "0.4.20" [dev-dependencies] -tempdir = "0.3.7" +tempfile = "3.8.0" diff --git a/packer/src/main.rs b/packer/src/main.rs index 260874b91..cd57087c1 100644 --- a/packer/src/main.rs +++ b/packer/src/main.rs @@ -414,7 +414,7 @@ mod test { .join("src") .join("__fixtures__") .join("archive_a.tar"); - let tmp_dir = tempdir::TempDir::new("manifest_test")?; + let tmp_dir = tempfile::TempDir::with_prefix("manifest_test.")?; let archive_paths = &[(&PackType::new("core"), artifact_path)]; let path = manifest(archive_paths, &None, tmp_dir.path())?; From 0509022dd512f2d6caac7fdea112bd2a1ebaf103 Mon Sep 17 00:00:00 2001 From: generatedunixname89002005306973 <generatedunixname89002005306973@meta.com> Date: Mon, 23 Oct 2023 03:42:26 -0700 Subject: [PATCH 34/80] Flipper Release: v0.231.0 Summary: Releasing version 0.231.0 Reviewed By: aigoncharov Differential Revision: D50548698 fbshipit-source-id: 06c1e452ce9a5d3c6fc049f2fc2047d2b8bbc7e7 --- desktop/package.json | 2 +- desktop/plugins/public/layout/docs/setup.mdx | 2 +- desktop/plugins/public/leak_canary/docs/setup.mdx | 2 +- desktop/plugins/public/network/docs/setup.mdx | 2 +- docs/getting-started/android-native.mdx | 4 ++-- docs/getting-started/react-native-ios.mdx | 2 +- docs/getting-started/react-native.mdx | 4 ++-- gradle.properties | 2 +- js/js-flipper/package.json | 2 +- react-native/react-native-flipper/package.json | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/desktop/package.json b/desktop/package.json index a1eb29c2b..dd9e196b5 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -170,7 +170,7 @@ "npm": "use yarn instead", "yarn": "^1.16" }, - "version": "0.230.0", + "version": "0.231.0", "workspaces": { "packages": [ "scripts", diff --git a/desktop/plugins/public/layout/docs/setup.mdx b/desktop/plugins/public/layout/docs/setup.mdx index e098dd46f..797a63c88 100644 --- a/desktop/plugins/public/layout/docs/setup.mdx +++ b/desktop/plugins/public/layout/docs/setup.mdx @@ -27,7 +27,7 @@ You also need to compile in the `litho-annotations` package, as Flipper reflects ```groovy dependencies { - debugImplementation 'com.facebook.flipper:flipper-litho-plugin:0.230.0' + debugImplementation 'com.facebook.flipper:flipper-litho-plugin:0.231.0' debugImplementation 'com.facebook.litho:litho-annotations:0.19.0' // ... } diff --git a/desktop/plugins/public/leak_canary/docs/setup.mdx b/desktop/plugins/public/leak_canary/docs/setup.mdx index bcea22405..2f5c4460b 100644 --- a/desktop/plugins/public/leak_canary/docs/setup.mdx +++ b/desktop/plugins/public/leak_canary/docs/setup.mdx @@ -8,7 +8,7 @@ To setup the <Link to={useBaseUrl("/docs/features/plugins/leak-canary")}>LeakCan ```groovy dependencies { - debugImplementation 'com.facebook.flipper:flipper-leakcanary2-plugin:0.230.0' + debugImplementation 'com.facebook.flipper:flipper-leakcanary2-plugin:0.231.0' debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.8.1' } ``` diff --git a/desktop/plugins/public/network/docs/setup.mdx b/desktop/plugins/public/network/docs/setup.mdx index c073a011a..855bd9285 100644 --- a/desktop/plugins/public/network/docs/setup.mdx +++ b/desktop/plugins/public/network/docs/setup.mdx @@ -12,7 +12,7 @@ The network plugin is shipped as a separate Maven artifact, as follows: ```groovy dependencies { - debugImplementation 'com.facebook.flipper:flipper-network-plugin:0.230.0' + debugImplementation 'com.facebook.flipper:flipper-network-plugin:0.231.0' } ``` diff --git a/docs/getting-started/android-native.mdx b/docs/getting-started/android-native.mdx index 4cdac4f43..e075515ad 100644 --- a/docs/getting-started/android-native.mdx +++ b/docs/getting-started/android-native.mdx @@ -24,10 +24,10 @@ repositories { } dependencies { - debugImplementation 'com.facebook.flipper:flipper:0.230.0' + debugImplementation 'com.facebook.flipper:flipper:0.231.0' debugImplementation 'com.facebook.soloader:soloader:0.10.5' - releaseImplementation 'com.facebook.flipper:flipper-noop:0.230.0' + releaseImplementation 'com.facebook.flipper:flipper-noop:0.231.0' } ``` diff --git a/docs/getting-started/react-native-ios.mdx b/docs/getting-started/react-native-ios.mdx index 484bcdc6b..b4e9dc3f6 100644 --- a/docs/getting-started/react-native-ios.mdx +++ b/docs/getting-started/react-native-ios.mdx @@ -51,7 +51,7 @@ Add all of the code below to your `ios/Podfile`: platform :ios, '9.0' def flipper_pods() - flipperkit_version = '0.230.0' # should match the version of your Flipper client app + flipperkit_version = '0.231.0' # should match the version of your Flipper client app pod 'FlipperKit', '~>' + flipperkit_version, :configuration => 'Debug' pod 'FlipperKit/FlipperKitLayoutPlugin', '~>' + flipperkit_version, :configuration => 'Debug' pod 'FlipperKit/SKIOSNetworkPlugin', '~>' + flipperkit_version, :configuration => 'Debug' diff --git a/docs/getting-started/react-native.mdx b/docs/getting-started/react-native.mdx index af2a12b4e..f28765247 100644 --- a/docs/getting-started/react-native.mdx +++ b/docs/getting-started/react-native.mdx @@ -34,7 +34,7 @@ Latest version of Flipper requires react-native 0.69+! If you use react-native < Android: -1. Bump the `FLIPPER_VERSION` variable in `android/gradle.properties`, for example: `FLIPPER_VERSION=0.230.0`. +1. Bump the `FLIPPER_VERSION` variable in `android/gradle.properties`, for example: `FLIPPER_VERSION=0.231.0`. 2. Run `./gradlew clean` in the `android` directory. iOS: @@ -44,7 +44,7 @@ react-native version => 0.69.0 2. Run `pod install --repo-update` in the `ios` directory. react-native version < 0.69.0 -1. Call `use_flipper` with a specific version in `ios/Podfile`, for example: `use_flipper!({ 'Flipper' => '0.230.0' })`. +1. Call `use_flipper` with a specific version in `ios/Podfile`, for example: `use_flipper!({ 'Flipper' => '0.231.0' })`. 2. Run `pod install --repo-update` in the `ios` directory. ## Manual Setup diff --git a/gradle.properties b/gradle.properties index dc80fd883..300021ac1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. # POM publishing constants -VERSION_NAME=0.230.1-SNAPSHOT +VERSION_NAME=0.231.0 GROUP=com.facebook.flipper SONATYPE_STAGING_PROFILE=comfacebook POM_URL=https://github.com/facebook/flipper diff --git a/js/js-flipper/package.json b/js/js-flipper/package.json index 975ae8f67..397217729 100644 --- a/js/js-flipper/package.json +++ b/js/js-flipper/package.json @@ -1,7 +1,7 @@ { "name": "js-flipper", "title": "JS Flipper Bindings for Web-Socket based clients", - "version": "0.230.0", + "version": "0.231.0", "main": "lib/index.js", "browser": { "os": false diff --git a/react-native/react-native-flipper/package.json b/react-native/react-native-flipper/package.json index 68b14538d..4fd54cf70 100644 --- a/react-native/react-native-flipper/package.json +++ b/react-native/react-native-flipper/package.json @@ -1,7 +1,7 @@ { "name": "react-native-flipper", "title": "React Native Flipper Bindings", - "version": "0.230.0", + "version": "0.231.0", "description": "Flipper bindings for React Native", "main": "index.js", "types": "index.d.ts", From 12ebf5ec5137fb0a2b739de7e4356cbf80c40c7d Mon Sep 17 00:00:00 2001 From: generatedunixname89002005306973 <generatedunixname89002005306973@meta.com> Date: Mon, 23 Oct 2023 03:42:26 -0700 Subject: [PATCH 35/80] Flipper Snapshot Bump: v0.231.1-SNAPSHOT Summary: Releasing snapshot version 0.231.1-SNAPSHOT Reviewed By: aigoncharov Differential Revision: D50548697 fbshipit-source-id: 3efa68d43385d4ba529015b7491b668fdce5ab8a --- docs/getting-started/android-native.mdx | 4 ++-- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/getting-started/android-native.mdx b/docs/getting-started/android-native.mdx index e075515ad..33f0e5a54 100644 --- a/docs/getting-started/android-native.mdx +++ b/docs/getting-started/android-native.mdx @@ -124,10 +124,10 @@ repositories { } dependencies { - debugImplementation 'com.facebook.flipper:flipper:0.230.1-SNAPSHOT' + debugImplementation 'com.facebook.flipper:flipper:0.231.1-SNAPSHOT' debugImplementation 'com.facebook.soloader:soloader:0.10.5' - releaseImplementation 'com.facebook.flipper:flipper-noop:0.230.1-SNAPSHOT' + releaseImplementation 'com.facebook.flipper:flipper-noop:0.231.1-SNAPSHOT' } ``` diff --git a/gradle.properties b/gradle.properties index 300021ac1..c4b875f7f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. # POM publishing constants -VERSION_NAME=0.231.0 +VERSION_NAME=0.231.1-SNAPSHOT GROUP=com.facebook.flipper SONATYPE_STAGING_PROFILE=comfacebook POM_URL=https://github.com/facebook/flipper From efdcaee302d293dc6a56e24a0ba79cafadb136de Mon Sep 17 00:00:00 2001 From: Andrey Goncharov <aigoncharov@meta.com> Date: Mon, 23 Oct 2023 06:51:06 -0700 Subject: [PATCH 36/80] Make enum term length dynamic Reviewed By: mweststrate Differential Revision: D50551626 fbshipit-source-id: f180252782244aaa5bc8c90521664f6bcbe6b9b7 --- .../ui/PowerSearch/PowerSearchEnumTerm.tsx | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/desktop/flipper-plugin/src/ui/PowerSearch/PowerSearchEnumTerm.tsx b/desktop/flipper-plugin/src/ui/PowerSearch/PowerSearchEnumTerm.tsx index 76c621be5..7d8fb9b73 100644 --- a/desktop/flipper-plugin/src/ui/PowerSearch/PowerSearchEnumTerm.tsx +++ b/desktop/flipper-plugin/src/ui/PowerSearch/PowerSearchEnumTerm.tsx @@ -32,6 +32,37 @@ export const PowerSearchEnumTerm: React.FC<PowerSearchEnumTermProps> = ({ })); }, [enumLabels]); + const width = React.useMemo(() => { + const minWidth = 100; + const maxWidth = 250; + + let longestOptionLabelWidth = 0; + Object.values(enumLabels).forEach((label) => { + if (label.length > longestOptionLabelWidth) { + longestOptionLabelWidth = label.length; + } + }); + + // 10px is an emperically calculated multiplier. + // A proper way to do it is to actually render the longest option and measure it + // But then we will have to render top X longest options, + // because, potentially, a string with X reeeeally wide chars could be longer than X+1 narrow chars. + // Anyhow, it seems too complex for such a simple thing a detecting the width of the select and teh dropdown + // (the dropdown is the one that actually matters from the UX perspective - users use it to select the option they want) + // Feel to increase 10 to any other value if necessary (11?) + const longestOptionsLabelWidthPx = longestOptionLabelWidth * 10; + + if (longestOptionsLabelWidthPx < minWidth) { + return minWidth; + } + + if (longestOptionsLabelWidthPx > maxWidth) { + return maxWidth; + } + + return longestOptionsLabelWidthPx; + }, [enumLabels]); + const selectValueRef = React.useRef<string>(); if (defaultValue && !selectValueRef.current) { selectValueRef.current = defaultValue; @@ -41,7 +72,7 @@ export const PowerSearchEnumTerm: React.FC<PowerSearchEnumTermProps> = ({ return ( <Select autoFocus - style={{width: 100}} + style={{width}} placeholder="..." options={options} defaultOpen From 92ca5edaea0bab857caed0abaf42d8dadabeace8 Mon Sep 17 00:00:00 2001 From: Andrey Goncharov <aigoncharov@meta.com> Date: Mon, 23 Oct 2023 09:14:56 -0700 Subject: [PATCH 37/80] Track number of loaded plugins Reviewed By: lblasa Differential Revision: D50556872 fbshipit-source-id: 2d841360f7081074afa025d0bad8c41d7b2db16e --- desktop/flipper-ui-core/src/startFlipperDesktop.tsx | 6 +++++- desktop/flipper-ui-core/src/utils/UIPerfTracker.tsx | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/desktop/flipper-ui-core/src/startFlipperDesktop.tsx b/desktop/flipper-ui-core/src/startFlipperDesktop.tsx index 7be42ec0f..a8041b5d8 100644 --- a/desktop/flipper-ui-core/src/startFlipperDesktop.tsx +++ b/desktop/flipper-ui-core/src/startFlipperDesktop.tsx @@ -162,7 +162,11 @@ function init(flipperServer: FlipperServer) { // We could potentially merge ui-perf-store-rehydrated and ui-perf-everything-finally-loaded-jeeeez, // but what if at some point in the future we relalize that store rehydration is not actually the last event? // Keep it separate for the time being (evil laugh as there is nothing more permanent than temporary stuff) - uiPerfTracker.track('ui-perf-everything-finally-loaded-jeeeez'); + uiPerfTracker.track('ui-perf-everything-finally-loaded-jeeeez', { + numberOfPlugins: + store.getState().plugins.clientPlugins.size + + store.getState().plugins.devicePlugins.size, + }); }); setPersistor(persistor); diff --git a/desktop/flipper-ui-core/src/utils/UIPerfTracker.tsx b/desktop/flipper-ui-core/src/utils/UIPerfTracker.tsx index 1da3db5d3..423802e24 100644 --- a/desktop/flipper-ui-core/src/utils/UIPerfTracker.tsx +++ b/desktop/flipper-ui-core/src/utils/UIPerfTracker.tsx @@ -22,10 +22,11 @@ class UIPerfTracker { this.t0 = performance.now(); } - track(event: UIPerfEvents) { + track(event: UIPerfEvents, data?: any) { const tx = performance.now(); getLogger().track('performance', event, { time: tx - this.t0, + data, }); } } From cd4640326c644b108e6f84732a683d6bfe46ae7e Mon Sep 17 00:00:00 2001 From: Joshua Selbo <jselbo@meta.com> Date: Mon, 23 Oct 2023 11:02:31 -0700 Subject: [PATCH 38/80] Update tests on old SDK versions Summary: Preparing for next Robolectric version which drops support for SDK 16-18. `MemoryToolsFlipperPluginTest` relies on JSON serialization order which changes when running on the latest SDK (33). `InspectorFlipperPluginTest` has multiple issues when running on the latest SDK, so just bump it to 19. Reviewed By: jiawei-lyu Differential Revision: D50558702 fbshipit-source-id: 9724d8e699b703a9e0af12559c41e7053d820150 --- .../flipper/plugins/inspector/InspectorFlipperPluginTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/test/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPluginTest.java b/android/src/test/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPluginTest.java index 9d8879e77..5ab13c00e 100644 --- a/android/src/test/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPluginTest.java +++ b/android/src/test/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPluginTest.java @@ -42,7 +42,7 @@ import org.robolectric.annotation.LooperMode; @LooperMode(LEGACY) @RunWith(RobolectricTestRunner.class) -@Config(sdk = 16) +@Config(sdk = 19) public class InspectorFlipperPluginTest { private MockApplicationDescriptor mApplicationDescriptor; From 05242b4ee9da015546b63d77a9ea17c3192f7662 Mon Sep 17 00:00:00 2001 From: Luke De Feo <lukedefeo@meta.com> Date: Tue, 24 Oct 2023 04:10:29 -0700 Subject: [PATCH 39/80] Handle traversal error Summary: Log as console . error so we get a log view and inform the user Reviewed By: lblasa Differential Revision: D50450794 fbshipit-source-id: 0eb1877eec4d602d6673dd2815af2692e89b2523 --- .../public/ui-debugger/ClientTypes.tsx | 8 +++++ desktop/plugins/public/ui-debugger/index.tsx | 3 ++ .../ui-debugger/plugin/traversalError.tsx | 29 +++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 desktop/plugins/public/ui-debugger/plugin/traversalError.tsx diff --git a/desktop/plugins/public/ui-debugger/ClientTypes.tsx b/desktop/plugins/public/ui-debugger/ClientTypes.tsx index 94e2c297c..d58e71514 100644 --- a/desktop/plugins/public/ui-debugger/ClientTypes.tsx +++ b/desktop/plugins/public/ui-debugger/ClientTypes.tsx @@ -13,6 +13,7 @@ export type Events = { init: InitEvent; subtreeUpdate: SubtreeUpdateEvent; frameScan: FrameScanEvent; + traversalError: TraversalErrorEvent; perfStats: PerfStatsEvent; performanceStats: PerformanceStatsEvent; metadataUpdate: UpdateMetadataEvent; @@ -34,6 +35,13 @@ export type FrameScanEvent = { frameworkEvents?: FrameworkEvent[]; }; +export type TraversalErrorEvent = { + nodeName: String; + errorType: String; + errorMessage: String; + stack: String; +}; + /** * @deprecated This event should not be used and soon will * be removed. FrameScan should be used instead. diff --git a/desktop/plugins/public/ui-debugger/index.tsx b/desktop/plugins/public/ui-debugger/index.tsx index d21934efd..170952a40 100644 --- a/desktop/plugins/public/ui-debugger/index.tsx +++ b/desktop/plugins/public/ui-debugger/index.tsx @@ -40,6 +40,7 @@ import {checkFocusedNodeStillActive} from './plugin/ClientDataUtils'; import {uiActions} from './plugin/uiActions'; import {first} from 'lodash'; import {getNode} from './utils/map'; +import {handleTraversalError} from './plugin/traversalError'; export function plugin(client: PluginClient<Events, Methods>) { const rootId = createState<Id | undefined>(undefined); @@ -114,6 +115,8 @@ export function plugin(client: PluginClient<Events, Methods>) { }); }); + handleTraversalError(client); + client.onConnect(() => { uiState.isConnected.set(true); console.log('[ui-debugger] connected'); diff --git a/desktop/plugins/public/ui-debugger/plugin/traversalError.tsx b/desktop/plugins/public/ui-debugger/plugin/traversalError.tsx new file mode 100644 index 000000000..7fdadd170 --- /dev/null +++ b/desktop/plugins/public/ui-debugger/plugin/traversalError.tsx @@ -0,0 +1,29 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @format + */ + +import {notification} from 'antd'; +import {PluginClient} from 'flipper-plugin'; +import {Events, Methods} from '../ClientTypes'; + +export function handleTraversalError(client: PluginClient<Events, Methods>) { + client.onMessage('traversalError', (event) => { + notification.warn({ + key: 'client-traversal-error', + duration: 60, + message: 'Error fetching UI dump', + description: `There was an error UI dump, ${event.errorType} ${event.errorMessage}. We are aware of this and looking into it. Please try again later.`, + }); + console.error( + `[ui-debugger] Client error during traversal: `, + event, + client.appName, + client.device.os, + ); + }); +} From 94120d61aa0eabeae4fcc49ae40175ba4bc3d98b Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa <lblasa@meta.com> Date: Tue, 24 Oct 2023 04:18:51 -0700 Subject: [PATCH 40/80] RN-only build flag Summary: Previously I had created a RN build, locally, with a few minor differences. That had to be reverted. Instead of reverting and re-applying changes, I'm introducing a flag that can be used in the interim to produce the RN-only builds. Reviewed By: LukeDefeo Differential Revision: D50555055 fbshipit-source-id: edface9a1587fb51e54eebe73724032baf985c83 --- .../src/utils/environmentInfo.tsx | 4 + desktop/scripts/build-release.tsx | 19 +- desktop/scripts/start-dev-server.tsx | 8 + desktop/static/icons.json | 182 +----------------- 4 files changed, 31 insertions(+), 182 deletions(-) diff --git a/desktop/flipper-server-core/src/utils/environmentInfo.tsx b/desktop/flipper-server-core/src/utils/environmentInfo.tsx index f6368c783..fbf149a80 100644 --- a/desktop/flipper-server-core/src/utils/environmentInfo.tsx +++ b/desktop/flipper-server-core/src/utils/environmentInfo.tsx @@ -39,6 +39,10 @@ export async function getEnvironmentInfo( process.env.FLIPPER_FORCE_VERSION ?? (isProduction ? packageJson.version : '0.0.0'); + if (packageJson.reactNativeOnly) { + process.env.FLIPPER_REACT_NATIVE_ONLY = 'true'; + } + return { processId: process.pid, isProduction, diff --git a/desktop/scripts/build-release.tsx b/desktop/scripts/build-release.tsx index 99047dc04..0ab876033 100755 --- a/desktop/scripts/build-release.tsx +++ b/desktop/scripts/build-release.tsx @@ -73,6 +73,11 @@ const argv = yargs 'Unique build identifier to be used as the version patch part for the build', type: 'number', }, + 'react-native-only': { + description: 'React Native only build', + type: 'boolean', + default: false, + }, channel: { description: 'Release channel for the build', choices: ['stable', 'insiders'], @@ -115,6 +120,10 @@ if (argv['default-plugins-dir']) { process.env.FLIPPER_DEFAULT_PLUGINS_DIR = argv['default-plugins-dir']; } +if (argv['react-native-only']) { + process.env.FLIPPER_REACT_NATIVE_ONLY = 'true'; +} + async function generateManifest(versionNumber: string) { await fs.writeFile( path.join(distDir, 'manifest.json'), @@ -130,6 +139,7 @@ async function modifyPackageManifest( versionNumber: string, hgRevision: string | null, channel: string, + reactNativeOnly: boolean, ) { // eslint-disable-next-line no-console console.log('Creating package.json manifest'); @@ -148,6 +158,7 @@ async function modifyPackageManifest( manifest.revision = hgRevision; } manifest.releaseChannel = channel; + manifest.reactNativeOnly = reactNativeOnly; await fs.writeFile( path.join(buildFolder, 'package.json'), JSON.stringify(manifest, null, ' '), @@ -299,7 +310,13 @@ async function copyStaticFolder(buildFolder: string) { await moveSourceMaps(dir, argv['source-map-dir']); const versionNumber = getVersionNumber(argv.version); const hgRevision = await genMercurialRevision(); - await modifyPackageManifest(dir, versionNumber, hgRevision, argv.channel); + await modifyPackageManifest( + dir, + versionNumber, + hgRevision, + argv.channel, + argv['react-native-only'], + ); await fs.ensureDir(distDir); await generateManifest(versionNumber); await buildDist(dir); diff --git a/desktop/scripts/start-dev-server.tsx b/desktop/scripts/start-dev-server.tsx index 3a1edff53..6c90ced3e 100644 --- a/desktop/scripts/start-dev-server.tsx +++ b/desktop/scripts/start-dev-server.tsx @@ -70,6 +70,10 @@ const argv = yargs '[FB-internal only] Will yield `true` on any GK. Disabled by default. Setting env var FLIPPER_ENABLE_ALL_GKS is equivalent', type: 'boolean', }, + 'react-native-only': { + description: '[FB-internal only] React Native only build', + type: 'boolean', + }, channel: { describe: '[FB-internal only] Release channel. "stable" by default. Setting env var "FLIPPER_RELEASE_CHANNEL" is equivalent.', @@ -148,6 +152,10 @@ if (argv.channel !== undefined) { process.env.FLIPPER_RELEASE_CHANNEL = argv.channel; } +if (argv['react-native-only'] === true) { + process.env.FLIPPER_REACT_NATIVE_ONLY = 'true'; +} + if (argv['force-version']) { process.env.FLIPPER_FORCE_VERSION = argv['force-version']; } diff --git a/desktop/static/icons.json b/desktop/static/icons.json index 8f189d9e2..e27663153 100644 --- a/desktop/static/icons.json +++ b/desktop/static/icons.json @@ -13,365 +13,185 @@ "brush-paint", "bug", "building-city", - "camcorder", - "camera", - "caution-octagon", - "caution-triangle", - "caution", - "checkmark", - "chevron-down-outline", - "chevron-down", - "chevron-left", - "chevron-right", - "chevron-up", - "compose", - "copy", - "cross-circle", - "cross", - "dashboard-outline", - "dashboard", - "data-table", - "desktop", - "directions", - "dots-3-circle-outline", - "download", - "face-unhappy-outline", - "first-aid", - "flash-default", - "info-circle", - "internet", - "life-event-major", - "magic-wand", - "magnifying-glass", - "messages", - "minus-circle", - "mobile-engagement", - "mobile", - "network", - "news-feed", - "pause", - "posts", - "power", - "profile", - "question-circle-outline", - "question-circle", - "question", - "refresh-left", - "rocket", - "settings", - "share-external", - "share", - "star-outline", - "star-slash", - "star", - "stop-playback", - "stop", - "target", - "thought-bubble", - "tools", - "translate", - "trash-outline", - "trash", - "tree", - "trending", - "triangle-down", - "triangle-right", - "underline", - "washing-machine", - "watch-tv", - "gears-two", - "info-cursive", - "on-this-day", - "zoom-out", - "zoom-in", - "fast-forward", - "draft-outline", - "gradient", - "crop", - "play", - "cross-outline", - "messenger-code", - "book", - "list-arrow-up", - "cat", - "duplicate", - "profile-circle-outline", - "card-person", - "pencil-outline", - "code", - "undo-outline", - "checkmark-circle-outline", - "target-outline", - "internet-outline", - "profile-outline", - "app-react-outline", - "send-outline", - "paper-stack", - "weather-cold", - "mobile-cross", - "database-arrow-left", - "plus-circle-outline", - "arrows-circle", - "navicon", - "paper-fold-text", - "marketplace", - "workflow", - "sankey-diagram", - "media-stack", - "question-hexagon", - "briefcase", - "business-briefcase", - "log", - "triangle-up", - "checkmark-circle", - "circle", - "comment-swish", - "direct", - "plus", - "scuba", - "line-chart", - "caution-circle", - "megaphone", - "wireless", - "cup-outline", - "unicorn", - "turtle", - "sushi", - "arrows-up-down", - "style-effects", - "stopwatch", - "database", - "bar-chart", - "augmented-reality", - "app-flash", - "sample-lo", - "point", - "eye", - "send", - "refresh-right", - "hourglass", - "mobile-outline", - "bookmark-outline", - "app-facebook-f-outline", - "app-messenger-outline", - "app-instagram-outline", - "app-whatsapp-outline", - "app-workplace-outline", - "app-work-chat-outline", - "sample-hi", - "dog", - "hub", - "upload", - "list-gear-outline", - "app-apple-outline", - "app-microsoft-windows", - "box-outline", - "differential", - "raincloud", - "app-microsoft-windows-outline", - "camcorder-live", - "plumbing", - "app-facebook-circle", - "link", - "commercial-break-usd", - "friends-engagement", - "app-cms", - "caution-triangle-outline", - "bird-flying", - "arrows-left-right", - "grid-9", - "stethoscope", - "friend-except", - "app-instagram", - "nav-magnifying-glass", - "list-arrow-down", - "photo-arrows-left-right", - "badge", - "square-ruler", - "phone", - "app-horizon-assets", - "app-bloks", - "settings-internal", - "weather-thunder-outline", "weather-thunder" -] +] \ No newline at end of file From 280d9544d146ce36e85c78873cb761cab6577453 Mon Sep 17 00:00:00 2001 From: generatedunixname89002005306973 <generatedunixname89002005306973@meta.com> Date: Tue, 24 Oct 2023 04:51:33 -0700 Subject: [PATCH 41/80] Flipper Release: v0.232.0 Summary: Releasing version 0.232.0 Reviewed By: aigoncharov Differential Revision: D50595864 fbshipit-source-id: 73c27ff739b585adc24db7bfd2d512153bea442a --- desktop/package.json | 2 +- desktop/plugins/public/layout/docs/setup.mdx | 2 +- desktop/plugins/public/leak_canary/docs/setup.mdx | 2 +- desktop/plugins/public/network/docs/setup.mdx | 2 +- docs/getting-started/android-native.mdx | 4 ++-- docs/getting-started/react-native-ios.mdx | 2 +- docs/getting-started/react-native.mdx | 4 ++-- gradle.properties | 2 +- js/js-flipper/package.json | 2 +- react-native/react-native-flipper/package.json | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/desktop/package.json b/desktop/package.json index dd9e196b5..ca8b7da19 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -170,7 +170,7 @@ "npm": "use yarn instead", "yarn": "^1.16" }, - "version": "0.231.0", + "version": "0.232.0", "workspaces": { "packages": [ "scripts", diff --git a/desktop/plugins/public/layout/docs/setup.mdx b/desktop/plugins/public/layout/docs/setup.mdx index 797a63c88..1eab72f1a 100644 --- a/desktop/plugins/public/layout/docs/setup.mdx +++ b/desktop/plugins/public/layout/docs/setup.mdx @@ -27,7 +27,7 @@ You also need to compile in the `litho-annotations` package, as Flipper reflects ```groovy dependencies { - debugImplementation 'com.facebook.flipper:flipper-litho-plugin:0.231.0' + debugImplementation 'com.facebook.flipper:flipper-litho-plugin:0.232.0' debugImplementation 'com.facebook.litho:litho-annotations:0.19.0' // ... } diff --git a/desktop/plugins/public/leak_canary/docs/setup.mdx b/desktop/plugins/public/leak_canary/docs/setup.mdx index 2f5c4460b..44c62f823 100644 --- a/desktop/plugins/public/leak_canary/docs/setup.mdx +++ b/desktop/plugins/public/leak_canary/docs/setup.mdx @@ -8,7 +8,7 @@ To setup the <Link to={useBaseUrl("/docs/features/plugins/leak-canary")}>LeakCan ```groovy dependencies { - debugImplementation 'com.facebook.flipper:flipper-leakcanary2-plugin:0.231.0' + debugImplementation 'com.facebook.flipper:flipper-leakcanary2-plugin:0.232.0' debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.8.1' } ``` diff --git a/desktop/plugins/public/network/docs/setup.mdx b/desktop/plugins/public/network/docs/setup.mdx index 855bd9285..f217cf239 100644 --- a/desktop/plugins/public/network/docs/setup.mdx +++ b/desktop/plugins/public/network/docs/setup.mdx @@ -12,7 +12,7 @@ The network plugin is shipped as a separate Maven artifact, as follows: ```groovy dependencies { - debugImplementation 'com.facebook.flipper:flipper-network-plugin:0.231.0' + debugImplementation 'com.facebook.flipper:flipper-network-plugin:0.232.0' } ``` diff --git a/docs/getting-started/android-native.mdx b/docs/getting-started/android-native.mdx index 33f0e5a54..4a7e01025 100644 --- a/docs/getting-started/android-native.mdx +++ b/docs/getting-started/android-native.mdx @@ -24,10 +24,10 @@ repositories { } dependencies { - debugImplementation 'com.facebook.flipper:flipper:0.231.0' + debugImplementation 'com.facebook.flipper:flipper:0.232.0' debugImplementation 'com.facebook.soloader:soloader:0.10.5' - releaseImplementation 'com.facebook.flipper:flipper-noop:0.231.0' + releaseImplementation 'com.facebook.flipper:flipper-noop:0.232.0' } ``` diff --git a/docs/getting-started/react-native-ios.mdx b/docs/getting-started/react-native-ios.mdx index b4e9dc3f6..e32e57c78 100644 --- a/docs/getting-started/react-native-ios.mdx +++ b/docs/getting-started/react-native-ios.mdx @@ -51,7 +51,7 @@ Add all of the code below to your `ios/Podfile`: platform :ios, '9.0' def flipper_pods() - flipperkit_version = '0.231.0' # should match the version of your Flipper client app + flipperkit_version = '0.232.0' # should match the version of your Flipper client app pod 'FlipperKit', '~>' + flipperkit_version, :configuration => 'Debug' pod 'FlipperKit/FlipperKitLayoutPlugin', '~>' + flipperkit_version, :configuration => 'Debug' pod 'FlipperKit/SKIOSNetworkPlugin', '~>' + flipperkit_version, :configuration => 'Debug' diff --git a/docs/getting-started/react-native.mdx b/docs/getting-started/react-native.mdx index f28765247..04a8eece5 100644 --- a/docs/getting-started/react-native.mdx +++ b/docs/getting-started/react-native.mdx @@ -34,7 +34,7 @@ Latest version of Flipper requires react-native 0.69+! If you use react-native < Android: -1. Bump the `FLIPPER_VERSION` variable in `android/gradle.properties`, for example: `FLIPPER_VERSION=0.231.0`. +1. Bump the `FLIPPER_VERSION` variable in `android/gradle.properties`, for example: `FLIPPER_VERSION=0.232.0`. 2. Run `./gradlew clean` in the `android` directory. iOS: @@ -44,7 +44,7 @@ react-native version => 0.69.0 2. Run `pod install --repo-update` in the `ios` directory. react-native version < 0.69.0 -1. Call `use_flipper` with a specific version in `ios/Podfile`, for example: `use_flipper!({ 'Flipper' => '0.231.0' })`. +1. Call `use_flipper` with a specific version in `ios/Podfile`, for example: `use_flipper!({ 'Flipper' => '0.232.0' })`. 2. Run `pod install --repo-update` in the `ios` directory. ## Manual Setup diff --git a/gradle.properties b/gradle.properties index c4b875f7f..f12f79b14 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. # POM publishing constants -VERSION_NAME=0.231.1-SNAPSHOT +VERSION_NAME=0.232.0 GROUP=com.facebook.flipper SONATYPE_STAGING_PROFILE=comfacebook POM_URL=https://github.com/facebook/flipper diff --git a/js/js-flipper/package.json b/js/js-flipper/package.json index 397217729..28284558e 100644 --- a/js/js-flipper/package.json +++ b/js/js-flipper/package.json @@ -1,7 +1,7 @@ { "name": "js-flipper", "title": "JS Flipper Bindings for Web-Socket based clients", - "version": "0.231.0", + "version": "0.232.0", "main": "lib/index.js", "browser": { "os": false diff --git a/react-native/react-native-flipper/package.json b/react-native/react-native-flipper/package.json index 4fd54cf70..af931bcca 100644 --- a/react-native/react-native-flipper/package.json +++ b/react-native/react-native-flipper/package.json @@ -1,7 +1,7 @@ { "name": "react-native-flipper", "title": "React Native Flipper Bindings", - "version": "0.231.0", + "version": "0.232.0", "description": "Flipper bindings for React Native", "main": "index.js", "types": "index.d.ts", From 9c36fd53713327d02ebd53532c89c17f9bb154a3 Mon Sep 17 00:00:00 2001 From: generatedunixname89002005306973 <generatedunixname89002005306973@meta.com> Date: Tue, 24 Oct 2023 04:51:33 -0700 Subject: [PATCH 42/80] Flipper Snapshot Bump: v0.232.1-SNAPSHOT Summary: Releasing snapshot version 0.232.1-SNAPSHOT Reviewed By: aigoncharov Differential Revision: D50595863 fbshipit-source-id: 5bc01cb2f190cf542c5f228030e5cb3c81f45a06 --- docs/getting-started/android-native.mdx | 4 ++-- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/getting-started/android-native.mdx b/docs/getting-started/android-native.mdx index 4a7e01025..7413db120 100644 --- a/docs/getting-started/android-native.mdx +++ b/docs/getting-started/android-native.mdx @@ -124,10 +124,10 @@ repositories { } dependencies { - debugImplementation 'com.facebook.flipper:flipper:0.231.1-SNAPSHOT' + debugImplementation 'com.facebook.flipper:flipper:0.232.1-SNAPSHOT' debugImplementation 'com.facebook.soloader:soloader:0.10.5' - releaseImplementation 'com.facebook.flipper:flipper-noop:0.231.1-SNAPSHOT' + releaseImplementation 'com.facebook.flipper:flipper-noop:0.232.1-SNAPSHOT' } ``` diff --git a/gradle.properties b/gradle.properties index f12f79b14..23221c65e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. # POM publishing constants -VERSION_NAME=0.232.0 +VERSION_NAME=0.232.1-SNAPSHOT GROUP=com.facebook.flipper SONATYPE_STAGING_PROFILE=comfacebook POM_URL=https://github.com/facebook/flipper From 21057fba012e2a0092ccb8f9dcc3df1eed7be6d8 Mon Sep 17 00:00:00 2001 From: Luke De Feo <lukedefeo@meta.com> Date: Tue, 24 Oct 2023 05:49:56 -0700 Subject: [PATCH 43/80] Fix null pointer error Summary: Turns out this can be null in some rare circumstances and can cause a crash in the fragment tracker Reviewed By: aigoncharov Differential Revision: D50562123 fbshipit-source-id: 4dfaecfde69359a85b778fc5ff0a4a3a8165a875 --- .../plugins/uidebugger/descriptors/ViewPagerDescriptor.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/ViewPagerDescriptor.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/ViewPagerDescriptor.kt index c322c25cc..3a6e08adf 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/ViewPagerDescriptor.kt +++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/ViewPagerDescriptor.kt @@ -23,6 +23,9 @@ object ViewPagerDescriptor : ChainedDescriptor<ViewPager>() { override fun onGetActiveChild(node: ViewPager): Any? { val child = node.getChildAt(node.currentItem) + if (child == null) { + return null + } val fragment = FragmentTracker.getFragment(child) if (fragment != null) { return fragment From 4b915da47c1a7bb179e0137c55a3457b37dac3c7 Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa <lblasa@meta.com> Date: Tue, 24 Oct 2023 05:51:06 -0700 Subject: [PATCH 44/80] Electron releases do not update indicator on the Navigation Bar Summary: No need to show this for Electron releases. Also, this becomes important once we make the final Electron release. Reviewed By: aigoncharov Differential Revision: D50557052 fbshipit-source-id: 803a9c9ad21fbff39147ac06add74888b9ee4091 --- .../src/dispatcher/handleOpenPluginDeeplink.tsx | 9 +++++---- desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/desktop/flipper-ui-core/src/dispatcher/handleOpenPluginDeeplink.tsx b/desktop/flipper-ui-core/src/dispatcher/handleOpenPluginDeeplink.tsx index 48ec33258..68d56c79f 100644 --- a/desktop/flipper-ui-core/src/dispatcher/handleOpenPluginDeeplink.tsx +++ b/desktop/flipper-ui-core/src/dispatcher/handleOpenPluginDeeplink.tsx @@ -291,10 +291,11 @@ async function waitForLogin(store: Store) { async function verifyFlipperIsUpToDate(title: string) { const serverConfig = getRenderHostInstance().serverConfig; - // // If this is not a headless build, do not check for updates. - // if (!serverConfig.environmentInfo.isHeadlessBuild) { - // return; - // } + + // If this is not a headless build, do not check for updates. + if (!serverConfig.environmentInfo.isHeadlessBuild) { + return; + } const config = serverConfig.processConfig; if ( !isProduction() || diff --git a/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx b/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx index 4327b7bf9..8e4023c1c 100644 --- a/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx +++ b/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx @@ -103,7 +103,8 @@ export const Navbar = withTrackingScope(function Navbar() { <TroubleshootMenu /> <ExtrasMenu /> <RightSidebarToggleButton /> - <UpdateIndicator /> + {getRenderHostInstance().serverConfig.environmentInfo + .isHeadlessBuild && <UpdateIndicator />} </Layout.Horizontal> </Layout.Horizontal> ); From b306a5591e13a0f3198fcafb88813defecbb2e5b Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa <lblasa@meta.com> Date: Tue, 24 Oct 2023 05:51:06 -0700 Subject: [PATCH 45/80] Title should show unsupported for Electron builds Summary: ^ Reviewed By: aigoncharov Differential Revision: D50557114 fbshipit-source-id: c9235e71e64ee8f6ce35b8b5d3c00660e9d7fbbb --- desktop/flipper-ui-core/src/sandy-chrome/SandyApp.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/desktop/flipper-ui-core/src/sandy-chrome/SandyApp.tsx b/desktop/flipper-ui-core/src/sandy-chrome/SandyApp.tsx index 173913251..320488da1 100644 --- a/desktop/flipper-ui-core/src/sandy-chrome/SandyApp.tsx +++ b/desktop/flipper-ui-core/src/sandy-chrome/SandyApp.tsx @@ -48,11 +48,17 @@ export function SandyApp() { (state) => state.application.leftSidebarVisible, ); const staticView = useStore((state) => state.connections.staticView); + const serverConfig = getRenderHostInstance().serverConfig; useEffect(() => { - document.title = `Flipper (${getVersionString()}${ + let title = `Flipper (${getVersionString()}${ config.isFBBuild ? '@FB' : '' })`; + if (!serverConfig.environmentInfo.isHeadlessBuild) { + title += ' (Unsupported)'; + } + + document.title = title; registerStartupTime(logger); uiPerfTracker.track('ui-perf-sandy-container-rendered'); From 25245506c79eb6ce27a215b7e853405748291f67 Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa <lblasa@meta.com> Date: Tue, 24 Oct 2023 05:51:06 -0700 Subject: [PATCH 46/80] Only show changelog for headless builds Summary: ^ Reviewed By: LukeDefeo, aigoncharov Differential Revision: D50557155 fbshipit-source-id: 9f0990ded22ed18d01931ed3b2652498eb6b1abc --- desktop/flipper-ui-core/src/sandy-chrome/SandyApp.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/desktop/flipper-ui-core/src/sandy-chrome/SandyApp.tsx b/desktop/flipper-ui-core/src/sandy-chrome/SandyApp.tsx index 320488da1..c082546d6 100644 --- a/desktop/flipper-ui-core/src/sandy-chrome/SandyApp.tsx +++ b/desktop/flipper-ui-core/src/sandy-chrome/SandyApp.tsx @@ -79,7 +79,9 @@ export function SandyApp() { Dialog.showModal((onHide) => <PWAInstallationWizard onHide={onHide} />); } - showChangelog(true); + if (serverConfig.environmentInfo.isHeadlessBuild) { + showChangelog(true); + } // don't warn about logger, even with a new logger we don't want to re-register // eslint-disable-next-line From b3497a1642ea7c0921a5dff7760a1768efa2345b Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa <lblasa@meta.com> Date: Tue, 24 Oct 2023 05:51:06 -0700 Subject: [PATCH 47/80] Show unsupported modal for RN-only builds Summary: ^ Reviewed By: aigoncharov Differential Revision: D50557230 fbshipit-source-id: d1974771edba97ce99294b967c27e4ec76a6cf61 --- .../src/sandy-chrome/SandyApp.tsx | 58 +++++++++++++++---- 1 file changed, 48 insertions(+), 10 deletions(-) diff --git a/desktop/flipper-ui-core/src/sandy-chrome/SandyApp.tsx b/desktop/flipper-ui-core/src/sandy-chrome/SandyApp.tsx index c082546d6..156ebfe33 100644 --- a/desktop/flipper-ui-core/src/sandy-chrome/SandyApp.tsx +++ b/desktop/flipper-ui-core/src/sandy-chrome/SandyApp.tsx @@ -15,6 +15,7 @@ import { Layout, Dialog, _PortalsManager, + getFlipperLib, } from 'flipper-plugin'; import {Link, styled} from '../ui'; import {theme} from 'flipper-plugin'; @@ -37,10 +38,11 @@ import config from '../fb-stubs/config'; import {WelcomeScreenStaticView} from './WelcomeScreen'; import fbConfig from '../fb-stubs/config'; import {isFBEmployee} from '../utils/fbEmployee'; -import {notification} from 'antd'; +import {Button, Modal, notification} from 'antd'; import isProduction from '../utils/isProduction'; import {getRenderHostInstance} from 'flipper-frontend-core'; import {uiPerfTracker} from '../utils/UIPerfTracker'; +import {WarningOutlined} from '@ant-design/icons'; export function SandyApp() { const logger = useLogger(); @@ -88,10 +90,46 @@ export function SandyApp() { }, []); useEffect(() => { - if (fbConfig.warnFBEmployees && isProduction()) { - isFBEmployee() - .then((isEmployee) => { - if (isEmployee) { + isFBEmployee() + .then((isEmployee) => { + if (isEmployee) { + if (process.env.FLIPPER_REACT_NATIVE_ONLY) { + Dialog.showModal((onHide) => ( + <Modal + closable={false} + keyboard={false} + maskClosable={false} + open + centered + onCancel={() => onHide()} + width={570} + title={ + <> + <WarningOutlined /> This Version of Flipper is Unsupported + </> + } + footer={ + <> + <Button + type="primary" + onClick={() => { + getFlipperLib().openLink('munki://detail-Flipper'); + onHide(); + }}> + Open Flipper Stable instead + </Button> + <Button type="ghost" onClick={() => onHide()}> + I understand + </Button> + </> + }> + This version is only meant to be used for React Native + debugging. It is not maintained and it doesn't receive updates. + Instead, you should be using the main Flipper version from + Managed Software Center for all other purposes. + </Modal> + )); + } else if (fbConfig.warnFBEmployees && isProduction()) { notification.warning({ placement: 'bottomLeft', message: 'Please use Flipper@FB', @@ -108,11 +146,11 @@ export function SandyApp() { duration: null, }); } - }) - .catch((e) => { - console.warn('Failed to check if user is employee', e); - }); - } + } + }) + .catch((e) => { + console.warn('Failed to check if user is employee', e); + }); }, []); return ( From cdb96df06f94c4c58612ebaa503fbe67fa4d2d87 Mon Sep 17 00:00:00 2001 From: Luke De Feo <lukedefeo@meta.com> Date: Tue, 24 Oct 2023 06:22:20 -0700 Subject: [PATCH 48/80] Litho layout prop improvements Summary: A few fixes. 1. We were ignoring start and end inputs, they are now sent to desktop 2. we were computing our own version of the resolved (computed ) values for border padding and margin. We are now using the correct about from litho getLayoutX Removed some code duplication Unfortunatley getLayoutBorderWidth is not available in open source yet so will need to land that first Reviewed By: adityasharat Differential Revision: D50496369 fbshipit-source-id: 7960a5d338adb40175f48982150665e046688fe1 --- .../descriptors/props/LayoutPropExtractor.kt | 317 ++++++------------ 1 file changed, 101 insertions(+), 216 deletions(-) diff --git a/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/uidebugger/litho/descriptors/props/LayoutPropExtractor.kt b/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/uidebugger/litho/descriptors/props/LayoutPropExtractor.kt index a2f2ef651..22a9f1f6c 100644 --- a/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/uidebugger/litho/descriptors/props/LayoutPropExtractor.kt +++ b/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/uidebugger/litho/descriptors/props/LayoutPropExtractor.kt @@ -127,202 +127,70 @@ object LayoutPropExtractor { private val RotationId = MetadataRegister.register(MetadataRegister.TYPE_ATTRIBUTE, NAMESPACE, "rotation") - private val EmptyId = MetadataRegister.register(MetadataRegister.TYPE_ATTRIBUTE, NAMESPACE, "") + private val ResolvedId = + MetadataRegister.register(MetadataRegister.TYPE_ATTRIBUTE, NAMESPACE, "resolved") private val NoneId = MetadataRegister.register(MetadataRegister.TYPE_ATTRIBUTE, NAMESPACE, "none") private val SizeId = MetadataRegister.register(MetadataRegister.TYPE_ATTRIBUTE, NAMESPACE, "size") private val ViewOutputId = MetadataRegister.register(MetadataRegister.TYPE_ATTRIBUTE, NAMESPACE, "viewOutput") - fun getInspectableBox( - left: YogaValue?, - top: YogaValue?, - right: YogaValue?, - bottom: YogaValue?, - horizontal: YogaValue?, - vertical: YogaValue?, - all: YogaValue?, - start: YogaValue?, - end: YogaValue? + /** constructs an object type containing any inputs that were provided and the resolved values */ + private fun getInspectableBox( + leftInput: Inspectable?, + topInput: Inspectable?, + rightInput: Inspectable?, + bottomInput: Inspectable?, + horizontalInput: Inspectable?, + verticalInput: Inspectable?, + allInput: Inspectable?, + startInput: Inspectable?, + endInput: Inspectable?, + leftResolved: Float?, + topResolved: Float?, + rightResolved: Float?, + bottomResolved: Float?, ): InspectableObject { val props = mutableMapOf<MetadataId, Inspectable>() - var actualLeft = 0 - var actualTop = 0 - var actualRight = 0 - var actualBottom = 0 + allInput?.let { props[AllId] = it } + horizontalInput?.let { props[HorizontalId] = it } + verticalInput?.let { props[VerticalId] = it } + leftInput?.let { props[LeftId] = it } + rightInput?.let { props[RightId] = it } + topInput?.let { props[TopId] = it } + bottomInput?.let { props[BottomId] = it } + startInput?.let { props[StartId] = it } + endInput?.let { props[EndId] = it } - all?.let { yogaValue -> - if (yogaValue.unit != YogaUnit.UNDEFINED) { - if (yogaValue.unit == YogaUnit.POINT || yogaValue.unit == YogaUnit.PERCENT) { - val intValue = yogaValue.value.toInt() - actualLeft = intValue - actualTop = intValue - actualRight = intValue - actualBottom = intValue - } - - props[AllId] = InspectableValue.Text(yogaValue.toString()) - } + if (leftResolved != null && + rightResolved != null && + topResolved != null && + bottomResolved != null) { + props[ResolvedId] = + InspectableValue.SpaceBox( + SpaceBox( + left = leftResolved.toInt(), + right = rightResolved.toInt(), + bottom = bottomResolved.toInt(), + top = topResolved.toInt())) } - horizontal?.let { yogaValue -> - if (yogaValue.unit != YogaUnit.UNDEFINED) { - if (yogaValue.unit == YogaUnit.POINT || yogaValue.unit == YogaUnit.PERCENT) { - val intValue = yogaValue.value.toInt() - actualLeft = intValue - actualRight = intValue - } - - props[HorizontalId] = InspectableValue.Text(yogaValue.toString()) - } - } - - vertical?.let { yogaValue -> - if (yogaValue.unit != YogaUnit.UNDEFINED) { - if (yogaValue.unit == YogaUnit.POINT || yogaValue.unit == YogaUnit.PERCENT) { - val intValue = yogaValue.value.toInt() - actualTop = intValue - actualBottom = intValue - } - - props[VerticalId] = InspectableValue.Text(yogaValue.toString()) - } - } - - left?.let { yogaValue -> - if (yogaValue.unit != YogaUnit.UNDEFINED) { - if (yogaValue.unit == YogaUnit.POINT || yogaValue.unit == YogaUnit.PERCENT) { - val intValue = yogaValue.value.toInt() - actualLeft = intValue - } - - props[LeftId] = InspectableValue.Text(yogaValue.toString()) - } - } - - right?.let { yogaValue -> - if (yogaValue.unit != YogaUnit.UNDEFINED) { - if (yogaValue.unit == YogaUnit.POINT || yogaValue.unit == YogaUnit.PERCENT) { - val intValue = yogaValue.value.toInt() - actualRight = intValue - } - - props[RightId] = InspectableValue.Text(yogaValue.toString()) - } - } - - top?.let { yogaValue -> - if (yogaValue.unit != YogaUnit.UNDEFINED) { - if (yogaValue.unit == YogaUnit.POINT || yogaValue.unit == YogaUnit.PERCENT) { - val intValue = yogaValue.value.toInt() - actualTop = intValue - } - - props[TopId] = InspectableValue.Text(yogaValue.toString()) - } - } - - bottom?.let { yogaValue -> - if (yogaValue.unit != YogaUnit.UNDEFINED) { - if (yogaValue.unit == YogaUnit.POINT || yogaValue.unit == YogaUnit.PERCENT) { - val intValue = yogaValue.value.toInt() - actualBottom = intValue - } - - props[BottomId] = InspectableValue.Text(yogaValue.toString()) - } - } - - props[EmptyId] = - InspectableValue.SpaceBox(SpaceBox(actualTop, actualRight, actualBottom, actualLeft)) - return InspectableObject(props) } - fun getInspectableBoxRaw( - left: Float?, - top: Float?, - right: Float?, - bottom: Float?, - horizontal: Float?, - vertical: Float?, - all: Float?, - start: Float?, - end: Float? - ): InspectableObject { - val props = mutableMapOf<MetadataId, Inspectable>() - - var actualLeft = 0 - var actualTop = 0 - var actualRight = 0 - var actualBottom = 0 - - all?.let { value -> - if (!value.isNaN()) { - val intValue = value.toInt() - actualLeft = intValue - actualTop = intValue - actualRight = intValue - actualBottom = intValue - props[AllId] = InspectableValue.Number(value) + private fun toInspectable(yogaValue: YogaValue) = + if (yogaValue.unit != YogaUnit.UNDEFINED) { + InspectableValue.Text(yogaValue.toString()) + } else { + null } - } - horizontal?.let { value -> - if (!value.isNaN()) { - val intValue = value.toInt() - actualLeft = intValue - actualRight = intValue - props[HorizontalId] = InspectableValue.Number(value) + private fun toInspectable(value: Float) = + if (value.isNaN()) { + null + } else { + InspectableValue.Number(value) } - } - - vertical?.let { value -> - if (!value.isNaN()) { - val intValue = value.toInt() - actualTop = intValue - actualBottom = intValue - props[VerticalId] = InspectableValue.Number(value) - } - } - - left?.let { value -> - if (!value.isNaN()) { - val intValue = value.toInt() - actualLeft = intValue - props[LeftId] = InspectableValue.Number(value) - } - } - - right?.let { value -> - if (!value.isNaN()) { - val intValue = value.toInt() - actualRight = intValue - props[RightId] = InspectableValue.Number(value) - } - } - - top?.let { value -> - if (!value.isNaN()) { - val intValue = value.toInt() - actualTop = intValue - props[TopId] = InspectableValue.Number(value) - } - } - - bottom?.let { value -> - if (!value.isNaN()) { - val intValue = value.toInt() - actualBottom = intValue - props[BottomId] = InspectableValue.Number(value) - } - } - - props[EmptyId] = - InspectableValue.SpaceBox(SpaceBox(actualTop, actualRight, actualBottom, actualLeft)) - - return InspectableObject(props) - } fun getProps(component: DebugComponent): Map<MetadataId, Inspectable> { val props = mutableMapOf<MetadataId, Inspectable>() @@ -366,51 +234,68 @@ object LayoutPropExtractor { props[MarginId] = getInspectableBox( - layout.getMargin(YogaEdge.LEFT), - layout.getMargin(YogaEdge.TOP), - layout.getMargin(YogaEdge.RIGHT), - layout.getMargin(YogaEdge.BOTTOM), - layout.getMargin(YogaEdge.HORIZONTAL), - layout.getMargin(YogaEdge.VERTICAL), - layout.getMargin(YogaEdge.ALL), - layout.getMargin(YogaEdge.START), - layout.getMargin(YogaEdge.END)) + leftInput = toInspectable(layout.getMargin(YogaEdge.LEFT)), + topInput = toInspectable(layout.getMargin(YogaEdge.TOP)), + rightInput = toInspectable(layout.getMargin(YogaEdge.RIGHT)), + bottomInput = toInspectable(layout.getMargin(YogaEdge.BOTTOM)), + horizontalInput = toInspectable(layout.getMargin(YogaEdge.HORIZONTAL)), + verticalInput = toInspectable(layout.getMargin(YogaEdge.VERTICAL)), + allInput = toInspectable(layout.getMargin(YogaEdge.ALL)), + startInput = toInspectable(layout.getMargin(YogaEdge.START)), + endInput = toInspectable(layout.getMargin(YogaEdge.END)), + leftResolved = layout.getLayoutMargin(YogaEdge.LEFT), + rightResolved = layout.getLayoutMargin(YogaEdge.RIGHT), + topResolved = layout.getLayoutMargin(YogaEdge.TOP), + bottomResolved = layout.getLayoutMargin(YogaEdge.BOTTOM), + ) props[PaddingId] = getInspectableBox( - layout.getPadding(YogaEdge.LEFT), - layout.getPadding(YogaEdge.TOP), - layout.getPadding(YogaEdge.RIGHT), - layout.getPadding(YogaEdge.BOTTOM), - layout.getPadding(YogaEdge.HORIZONTAL), - layout.getPadding(YogaEdge.VERTICAL), - layout.getPadding(YogaEdge.ALL), - layout.getPadding(YogaEdge.START), - layout.getPadding(YogaEdge.END)) + leftInput = toInspectable(layout.getPadding(YogaEdge.LEFT)), + topInput = toInspectable(layout.getPadding(YogaEdge.TOP)), + rightInput = toInspectable(layout.getPadding(YogaEdge.RIGHT)), + bottomInput = toInspectable(layout.getPadding(YogaEdge.BOTTOM)), + horizontalInput = toInspectable(layout.getPadding(YogaEdge.HORIZONTAL)), + verticalInput = toInspectable(layout.getPadding(YogaEdge.VERTICAL)), + allInput = toInspectable(layout.getPadding(YogaEdge.ALL)), + startInput = toInspectable(layout.getPadding(YogaEdge.START)), + endInput = toInspectable(layout.getPadding(YogaEdge.END)), + leftResolved = layout.getLayoutPadding(YogaEdge.LEFT), + rightResolved = layout.getLayoutPadding(YogaEdge.RIGHT), + topResolved = layout.getLayoutPadding(YogaEdge.TOP), + bottomResolved = layout.getLayoutPadding(YogaEdge.BOTTOM)) props[BorderId] = - getInspectableBoxRaw( - layout.getBorderWidth(YogaEdge.LEFT), - layout.getBorderWidth(YogaEdge.TOP), - layout.getBorderWidth(YogaEdge.RIGHT), - layout.getBorderWidth(YogaEdge.BOTTOM), - layout.getBorderWidth(YogaEdge.HORIZONTAL), - layout.getBorderWidth(YogaEdge.VERTICAL), - layout.getBorderWidth(YogaEdge.ALL), - layout.getBorderWidth(YogaEdge.START), - layout.getBorderWidth(YogaEdge.END)) + getInspectableBox( + toInspectable(layout.getBorderWidth(YogaEdge.LEFT)), + toInspectable(layout.getBorderWidth(YogaEdge.TOP)), + toInspectable(layout.getBorderWidth(YogaEdge.RIGHT)), + toInspectable(layout.getBorderWidth(YogaEdge.BOTTOM)), + toInspectable(layout.getBorderWidth(YogaEdge.HORIZONTAL)), + toInspectable(layout.getBorderWidth(YogaEdge.VERTICAL)), + toInspectable(layout.getBorderWidth(YogaEdge.ALL)), + toInspectable(layout.getBorderWidth(YogaEdge.START)), + toInspectable(layout.getBorderWidth(YogaEdge.END)), + null, // todo expose layout border from litho + null, + null, + null) props[PositionId] = getInspectableBox( - layout.getPosition(YogaEdge.LEFT), - layout.getPosition(YogaEdge.TOP), - layout.getPosition(YogaEdge.RIGHT), - layout.getPosition(YogaEdge.BOTTOM), - layout.getPosition(YogaEdge.HORIZONTAL), - layout.getPosition(YogaEdge.VERTICAL), - layout.getPosition(YogaEdge.ALL), - layout.getPosition(YogaEdge.START), - layout.getPosition(YogaEdge.END)) + toInspectable(layout.getPosition(YogaEdge.LEFT)), + toInspectable(layout.getPosition(YogaEdge.TOP)), + toInspectable(layout.getPosition(YogaEdge.RIGHT)), + toInspectable(layout.getPosition(YogaEdge.BOTTOM)), + toInspectable(layout.getPosition(YogaEdge.HORIZONTAL)), + toInspectable(layout.getPosition(YogaEdge.VERTICAL)), + toInspectable(layout.getPosition(YogaEdge.ALL)), + toInspectable(layout.getPosition(YogaEdge.START)), + toInspectable(layout.getPosition(YogaEdge.END)), + null, + null, + null, + null) val viewOutput: MutableMap<MetadataId, Inspectable> = mutableMapOf() viewOutput[HasViewOutputId] = InspectableValue.Boolean(layout.hasViewOutput()) From 1f13a9dab5ce26a1fe19f415b821037376e49065 Mon Sep 17 00:00:00 2001 From: Pascal Hartig <realpassy@meta.com> Date: Tue, 24 Oct 2023 06:54:37 -0700 Subject: [PATCH 49/80] Fix packlist (#5242) Summary: [packer] Fix packlist Test Plan: Pull Request resolved: https://github.com/facebook/flipper/pull/5242 Imported from GitHub, without a `Test Plan:` line. Reviewed By: mweststrate Differential Revision: D50596825 Pulled By: passy fbshipit-source-id: be4f80f95be27f86aa61384f9dd46540bf4aa349 --- packer/src/packlist.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/src/packlist.yaml b/packer/src/packlist.yaml index ff8f54e23..d929b16ea 100644 --- a/packer/src/packlist.yaml +++ b/packer/src/packlist.yaml @@ -60,7 +60,7 @@ server-linux: - '!*' - flipper-runtime core: - - '!flipper-runtime + - '!flipper-runtime' - '!static' static: - '!*' From 3ed89a50bb595a1e3b925903c1bd864e6acf6c24 Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa <lblasa@meta.com> Date: Tue, 24 Oct 2023 07:18:43 -0700 Subject: [PATCH 50/80] RN-only icon Summary: ^ Reviewed By: antonk52, aigoncharov Differential Revision: D50557283 fbshipit-source-id: d869a3159c9c0b0b7e06ac04a1d51bbbe10f0970 --- .../flipper-ui-core/src/sandy-chrome/WelcomeScreen.tsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/desktop/flipper-ui-core/src/sandy-chrome/WelcomeScreen.tsx b/desktop/flipper-ui-core/src/sandy-chrome/WelcomeScreen.tsx index a4ac5a43f..5c1e1ef87 100644 --- a/desktop/flipper-ui-core/src/sandy-chrome/WelcomeScreen.tsx +++ b/desktop/flipper-ui-core/src/sandy-chrome/WelcomeScreen.tsx @@ -28,7 +28,6 @@ import {getAppVersion} from '../utils/info'; import {getFlipperLib} from 'flipper-plugin'; import {ReleaseChannel} from 'flipper-common'; import {showChangelog} from '../chrome/ChangelogSheet'; -import {getRenderHostInstance} from 'flipper-frontend-core'; const RowContainer = styled(Layout.Horizontal)({ alignItems: 'flex-start', @@ -143,8 +142,6 @@ export function WelcomeScreenStaticView() { } function WelcomeScreenContent() { - const isHeadlessBuild = - getRenderHostInstance().serverConfig.environmentInfo.isHeadlessBuild; const isInsidersChannel = config.getReleaseChannel() === ReleaseChannel.INSIDERS; @@ -160,7 +157,11 @@ function WelcomeScreenContent() { }} width={125} height={125} - src={isHeadlessBuild ? './icon.png' : './icon.png'} + src={ + process.env.FLIPPER_REACT_NATIVE_ONLY + ? './icon-rn-only.png' + : './icon.png' + } preview={false} /> <Title level={1}>Welcome to Flipper From bf49924f0c76324494ac4f4482c17e4270aa0b79 Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa Date: Tue, 24 Oct 2023 07:18:43 -0700 Subject: [PATCH 51/80] RN-only app icon Summary: ^ Reviewed By: aigoncharov Differential Revision: D50557331 fbshipit-source-id: bc6f9ed7b379b65b9f09b1471d9ec7cbb820086b --- desktop/scripts/build-release.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/desktop/scripts/build-release.tsx b/desktop/scripts/build-release.tsx index 0ab876033..8bdafe38f 100755 --- a/desktop/scripts/build-release.tsx +++ b/desktop/scripts/build-release.tsx @@ -276,6 +276,9 @@ async function buildDist(buildFolder: string) { }, mac: { bundleVersion: FIX_RELEASE_VERSION, + icon: process.env.FLIPPER_REACT_NATIVE_ONLY + ? path.resolve(buildFolder, 'icon-rn-only.icns') + : path.resolve(buildFolder, 'icon.icns'), }, win: { signAndEditExecutable: !isFB, From da7917cefe6a729da29b7b4be88e7aa8d5aca60f Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa Date: Tue, 24 Oct 2023 07:18:43 -0700 Subject: [PATCH 52/80] No not delegate launch to Flipper Launcher Summary: ^ Reviewed By: aigoncharov Differential Revision: D50557385 fbshipit-source-id: d9571dda36520eae19f2d5fda4f52807f439a4e1 --- desktop/static/main.tsx | 93 +++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 51 deletions(-) diff --git a/desktop/static/main.tsx b/desktop/static/main.tsx index 6b872f636..96d34c4ef 100644 --- a/desktop/static/main.tsx +++ b/desktop/static/main.tsx @@ -28,7 +28,6 @@ import fixPath from 'fix-path'; import {exec} from 'child_process'; import setup, {Config, configPath} from './setup'; import isFB from './fb-stubs/isFB'; -import delegateToLauncher from './launcher'; import yargs from 'yargs'; import {promisify} from 'util'; import process from 'process'; @@ -174,58 +173,50 @@ app.on('ready', async () => { const config = await setup(argv); processConfig(config); - // If we delegate to the launcher, shut down this instance of the app. - delegateToLauncher(argv) - .then(async (hasLauncherInvoked: boolean) => { - if (hasLauncherInvoked) { - app.quit(); - return; - } - appReady = true; - app.commandLine.appendSwitch('scroll-bounce'); - configureSession(); - createWindow(config); + appReady = true; - // if in development install the react devtools extension - if (process.env.NODE_ENV === 'development') { - const { - default: installExtension, - REACT_DEVELOPER_TOOLS, - } = require('electron-devtools-installer'); - // if set, try to download a newever version of the dev tools - const forceDownload = process.env.FLIPPER_UPDATE_DEV_TOOLS === 'true'; - if (forceDownload) { - console.log('Force updating DevTools'); - } - // React - // Fix for extension loading (see D27685981) - // Work around per https://github.com/electron/electron/issues/23662#issuecomment-787420799 - const reactDevToolsPath = `${os.homedir()}/Library/Application Support/Electron/extensions/${ - REACT_DEVELOPER_TOOLS.id - }`; - if (await promisify(fs.exists)(reactDevToolsPath)) { - console.log('Loading React devtools from disk ' + reactDevToolsPath); - try { - await session.defaultSession.loadExtension( - reactDevToolsPath, - // @ts-ignore only supported (and needed) in Electron 12 - {allowFileAccess: true}, - ); - } catch (e) { - console.error('Failed to load React devtools from disk: ', e); - } - } else { - try { - await installExtension(REACT_DEVELOPER_TOOLS.id, { - loadExtensionOptions: {allowFileAccess: true, forceDownload}, - }); - } catch (e) { - console.error('Failed to install React devtools extension', e); - } - } + app.commandLine.appendSwitch('scroll-bounce'); + configureSession(); + createWindow(config); + + // if in development install the react devtools extension + if (process.env.NODE_ENV === 'development') { + const { + default: installExtension, + REACT_DEVELOPER_TOOLS, + } = require('electron-devtools-installer'); + // if set, try to download a newever version of the dev tools + const forceDownload = process.env.FLIPPER_UPDATE_DEV_TOOLS === 'true'; + if (forceDownload) { + console.log('Force updating DevTools'); + } + // React + // Fix for extension loading (see D27685981) + // Work around per https://github.com/electron/electron/issues/23662#issuecomment-787420799 + const reactDevToolsPath = `${os.homedir()}/Library/Application Support/Electron/extensions/${ + REACT_DEVELOPER_TOOLS.id + }`; + if (await promisify(fs.exists)(reactDevToolsPath)) { + console.log('Loading React devtools from disk ' + reactDevToolsPath); + try { + await session.defaultSession.loadExtension( + reactDevToolsPath, + // @ts-ignore only supported (and needed) in Electron 12 + {allowFileAccess: true}, + ); + } catch (e) { + console.error('Failed to load React devtools from disk: ', e); } - }) - .catch((e: any) => console.error('Error while delegating app launch', e)); + } else { + try { + await installExtension(REACT_DEVELOPER_TOOLS.id, { + loadExtensionOptions: {allowFileAccess: true, forceDownload}, + }); + } catch (e) { + console.error('Failed to install React devtools extension', e); + } + } + } }); app.on('web-contents-created', (_event, contents) => { From 7f6d1cf55b0cd3490aa44a889997a020a21b2781 Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa Date: Wed, 25 Oct 2023 04:44:01 -0700 Subject: [PATCH 53/80] Fix nullability warnings/errors Summary: ^ Reviewed By: passy Differential Revision: D50640020 fbshipit-source-id: d42b938520203a6ce232717c1adc43da176457e3 --- iOS/Sample/NetworkViewController.m | 87 +++++++++++++++---------- iOS/Sample/UserDefaultsViewController.m | 7 +- 2 files changed, 59 insertions(+), 35 deletions(-) diff --git a/iOS/Sample/NetworkViewController.m b/iOS/Sample/NetworkViewController.m index 87f28702c..ec2aa3e56 100644 --- a/iOS/Sample/NetworkViewController.m +++ b/iOS/Sample/NetworkViewController.m @@ -19,25 +19,32 @@ } - (IBAction)tappedGithubLitho:(UIButton*)sender { - [[[NSURLSession sharedSession] - dataTaskWithURL: - [NSURL - URLWithString: - @"https://raw.githubusercontent.com/facebook/litho/main/docs/static/logo.png"] - completionHandler:^( - NSData* _Nullable data, - NSURLResponse* _Nullable response, - NSError* _Nullable error) { - if (error && !data) { - return; - } - NSLog(@"Got Image"); - }] resume]; + NSURL* url = [NSURL + URLWithString: + @"https://raw.githubusercontent.com/facebook/litho/main/docs/static/logo.png"]; + if (!url) { + return; + } + + [[[NSURLSession sharedSession] dataTaskWithURL:url + completionHandler:^( + NSData* _Nullable data, + NSURLResponse* _Nullable response, + NSError* _Nullable error) { + if (error && !data) { + return; + } + NSLog(@"Got Image"); + }] resume]; } - (IBAction)tappedPOSTAPI:(UIButton*)sender { - NSString* post = @"https://demo9512366.mockable.io/FlipperPost"; - NSURL* url = [NSURL URLWithString:post]; + NSURL* url = + [NSURL URLWithString:@"https://demo9512366.mockable.io/FlipperPost"]; + if (!url) { + return; + } + NSMutableURLRequest* urlRequest = [NSMutableURLRequest requestWithURL:url]; [urlRequest addValue:@"application/json" forHTTPHeaderField:@"Content-Type"]; [urlRequest addValue:@"application/json" forHTTPHeaderField:@"Accept"]; @@ -57,42 +64,56 @@ [[[NSURLSession sharedSession] dataTaskWithRequest:urlRequest completionHandler:^( - NSData* _Nullable data, + NSData* data, NSURLResponse* _Nullable response, NSError* _Nullable dataTaskError) { - if (dataTaskError || !data) { + if (dataTaskError) { [weakSelf showAlertWithMessage:@"Received error in POST API response"]; return; } - NSDictionary* dict = - [NSJSONSerialization JSONObjectWithData:data - options:0 - error:&dataTaskError]; - NSLog(@"MSG-POST: %@", dict[@"msg"]); + if (data == nil) { + [weakSelf + showAlertWithMessage:@"No data received in POST API response"]; + } else { + NSDictionary* dict = + [NSJSONSerialization JSONObjectWithData:data + options:0 + error:&dataTaskError]; + NSLog(@"MSG-POST: %@", dict[@"msg"]); - [weakSelf showAlertWithMessage:@"Received response from POST API"]; + [weakSelf showAlertWithMessage:@"Received response from POST API"]; + } }] resume]; } - (IBAction)tappedGetAPI:(UIButton*)sender { + NSURL* url = + [NSURL URLWithString:@"https://demo9512366.mockable.io/FlipperGet"]; + if (!url) { + return; + } __weak NetworkViewController* weakSelf = self; [[[NSURLSession sharedSession] - dataTaskWithURL: - [NSURL URLWithString:@"https://demo9512366.mockable.io/FlipperGet"] + dataTaskWithURL:url completionHandler:^( - NSData* _Nullable data, + NSData* data, NSURLResponse* _Nullable response, NSError* _Nullable error) { - if (error || !data) { + if (error) { [weakSelf showAlertWithMessage:@"Received error in GET API response"]; return; } - NSDictionary* dict = [NSJSONSerialization JSONObjectWithData:data - options:0 - error:&error]; - NSLog(@"MSG-GET: %@", dict[@"msg"]); - [weakSelf showAlertWithMessage:@"Received response from GET API"]; + if (data == nil) { + [weakSelf + showAlertWithMessage:@"No data received in GET API response"]; + } else { + NSDictionary* dict = [NSJSONSerialization JSONObjectWithData:data + options:0 + error:&error]; + NSLog(@"MSG-GET: %@", dict[@"msg"]); + [weakSelf showAlertWithMessage:@"Received response from GET API"]; + } }] resume]; } diff --git a/iOS/Sample/UserDefaultsViewController.m b/iOS/Sample/UserDefaultsViewController.m index 837452d5c..7b5b32aa1 100644 --- a/iOS/Sample/UserDefaultsViewController.m +++ b/iOS/Sample/UserDefaultsViewController.m @@ -23,8 +23,11 @@ } - (IBAction)tappedSave:(id)sender { - [self.userDefaults setObject:self.valueTextField.text - forKey:self.keyTextField.text]; + NSString* key = self.keyTextField.text; + NSString* value = self.valueTextField.text; + if (key != nil) { + [self.userDefaults setObject:value forKey:key]; + } } @end From 97f01d0057ae4cb246dcf3dd8a124653da906af1 Mon Sep 17 00:00:00 2001 From: Andrey Goncharov Date: Wed, 25 Oct 2023 04:52:00 -0700 Subject: [PATCH 54/80] Check certs are good for TLS Reviewed By: lblasa Differential Revision: D50496418 fbshipit-source-id: fb4ee3a91b50d0e02f8b1d0e4618a510cf0c3a54 --- .../certificate-utils.tsx | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/desktop/flipper-server-core/src/app-connectivity/certificate-exchange/certificate-utils.tsx b/desktop/flipper-server-core/src/app-connectivity/certificate-exchange/certificate-utils.tsx index d2a62c31e..ba5d9702a 100644 --- a/desktop/flipper-server-core/src/app-connectivity/certificate-exchange/certificate-utils.tsx +++ b/desktop/flipper-server-core/src/app-connectivity/certificate-exchange/certificate-utils.tsx @@ -22,6 +22,7 @@ import {flipperDataFolder} from '../../utils/paths'; import * as jwt from 'jsonwebtoken'; import {getFlipperServerConfig} from '../../FlipperServerConfig'; import {Mutex} from 'async-mutex'; +import {createSecureContext} from 'tls'; const tmpFile = promisify(tmp.file) as ( options?: FileOptions, @@ -157,13 +158,13 @@ const certificateSetup = async () => { const mutex = new Mutex(); const ensureServerCertExists = async (): Promise => { return mutex.runExclusive(async () => { - const allExist = await Promise.all([ - fs.pathExists(serverKey), - fs.pathExists(serverCert), - fs.pathExists(caCert), - ]).then((exist) => exist.every(Boolean)); + const certs = await Promise.all([ + fs.readFile(serverKey).catch(() => ''), + fs.readFile(serverCert).catch(() => ''), + fs.readFile(caCert).catch(() => ''), + ]); - if (!allExist) { + if (!certs.every(Boolean)) { console.info('No certificates were found, generating new ones'); await generateServerCertificate(); } else { @@ -172,6 +173,13 @@ const ensureServerCertExists = async (): Promise => { await checkCertIsValid(serverCert); console.info('Checking certificate was issued by current CA'); await verifyServerCertWasIssuedByCA(); + console.info('Checking certs can be used for TLS'); + // https://fb.workplace.com/groups/flippersupport/posts/1712654405881877/ + createSecureContext({ + key: certs[0], + cert: certs[1], + ca: certs[2], + }); console.info('Current certificates are valid'); } catch (e) { console.warn('Not all certificates are valid, generating new ones', e); From 8c5078dc08ac330935df1058e6dfef57cecac2cc Mon Sep 17 00:00:00 2001 From: Andrey Goncharov Date: Wed, 25 Oct 2023 04:52:00 -0700 Subject: [PATCH 55/80] Catch sync errors while starting HTTP server Reviewed By: lblasa Differential Revision: D50636260 fbshipit-source-id: f23fb2005c779b87122ae34bfdd9371d8bdec8b4 --- .../src/app-connectivity/ServerRSocket.tsx | 64 ++++++++-------- .../src/app-connectivity/ServerWebSocket.tsx | 74 ++++++++++--------- 2 files changed, 73 insertions(+), 65 deletions(-) diff --git a/desktop/flipper-server-core/src/app-connectivity/ServerRSocket.tsx b/desktop/flipper-server-core/src/app-connectivity/ServerRSocket.tsx index 59db23943..84515b68d 100644 --- a/desktop/flipper-server-core/src/app-connectivity/ServerRSocket.tsx +++ b/desktop/flipper-server-core/src/app-connectivity/ServerRSocket.tsx @@ -47,37 +47,41 @@ class ServerRSocket extends ServerWebSocketBase { start(port: number, sslConfig?: SecureServerConfig): Promise { const self = this; return new Promise((resolve, reject) => { - // eslint-disable-next-line prefer-const - let rawServer: RSocketServer | undefined; - const serverFactory = (onConnect: (socket: Socket) => void) => { - const transportServer = sslConfig - ? tls.createServer(sslConfig, (socket) => { - onConnect(socket); - }) - : net.createServer(onConnect); - transportServer.on('error', reject).on('listening', () => { - console.debug( - `${ - sslConfig ? 'Secure' : 'Certificate' - } server started on port ${port}`, - 'server', - ); - self.listener.onListening(port); - self.rawServer_ = rawServer; - resolve((transportServer.address() as AddressInfo).port); + try { + // eslint-disable-next-line prefer-const + let rawServer: RSocketServer | undefined; + const serverFactory = (onConnect: (socket: Socket) => void) => { + const transportServer = sslConfig + ? tls.createServer(sslConfig, (socket) => { + onConnect(socket); + }) + : net.createServer(onConnect); + transportServer.on('error', reject).on('listening', () => { + console.debug( + `${ + sslConfig ? 'Secure' : 'Certificate' + } server started on port ${port}`, + 'server', + ); + self.listener.onListening(port); + self.rawServer_ = rawServer; + resolve((transportServer.address() as AddressInfo).port); + }); + return transportServer; + }; + rawServer = new RSocketServer({ + getRequestHandler: sslConfig + ? this._trustedRequestHandler + : this._untrustedRequestHandler, + transport: new RSocketTCPServer({ + port: port, + serverFactory: serverFactory, + }), }); - return transportServer; - }; - rawServer = new RSocketServer({ - getRequestHandler: sslConfig - ? this._trustedRequestHandler - : this._untrustedRequestHandler, - transport: new RSocketTCPServer({ - port: port, - serverFactory: serverFactory, - }), - }); - rawServer.start(); + rawServer.start(); + } catch (e) { + reject(e); + } }); } diff --git a/desktop/flipper-server-core/src/app-connectivity/ServerWebSocket.tsx b/desktop/flipper-server-core/src/app-connectivity/ServerWebSocket.tsx index b380ff97a..0e882e26d 100644 --- a/desktop/flipper-server-core/src/app-connectivity/ServerWebSocket.tsx +++ b/desktop/flipper-server-core/src/app-connectivity/ServerWebSocket.tsx @@ -49,46 +49,50 @@ class ServerWebSocket extends ServerWebSocketBase { async start(port: number, sslConfig?: SecureServerConfig): Promise { const assignedPort = await new Promise((resolve, reject) => { - const server = sslConfig - ? createHttpsServer(sslConfig) - : createHttpServer(); + try { + const server = sslConfig + ? createHttpsServer(sslConfig) + : createHttpServer(); - const wsServer = new WSServer({ - server, - verifyClient: this.verifyClient(), - maxPayload: WEBSOCKET_MAX_MESSAGE_SIZE, - }); + const wsServer = new WSServer({ + server, + verifyClient: this.verifyClient(), + maxPayload: WEBSOCKET_MAX_MESSAGE_SIZE, + }); - // We do not need to listen to http server's `error` because it is propagated to WS - // https://github.com/websockets/ws/blob/a3a22e4ed39c1a3be8e727e9c630dd440edc61dd/lib/websocket-server.js#L109 - const onConnectionError = (error: Error) => { - reject( - new Error( - `Unable to start server at port ${port} due to ${JSON.stringify( - serializeError(error), - )}`, - ), - ); - }; - wsServer.once('error', onConnectionError); - server.listen(port, () => { - console.debug( - `[ws] ${ - sslConfig ? 'Secure' : 'Insecure' - } server started on port ${port}`, - 'server', - ); + // We do not need to listen to http server's `error` because it is propagated to WS + // https://github.com/websockets/ws/blob/a3a22e4ed39c1a3be8e727e9c630dd440edc61dd/lib/websocket-server.js#L109 + const onConnectionError = (error: Error) => { + reject( + new Error( + `Unable to start server at port ${port} due to ${JSON.stringify( + serializeError(error), + )}`, + ), + ); + }; + wsServer.once('error', onConnectionError); + server.listen(port, () => { + console.debug( + `[ws] ${ + sslConfig ? 'Secure' : 'Insecure' + } server started on port ${port}`, + 'server', + ); - // Unsubscribe connection error listener. - // We'll attach a permanent error listener later. - wsServer.off('error', onConnectionError); + // Unsubscribe connection error listener. + // We'll attach a permanent error listener later. + wsServer.off('error', onConnectionError); - this.listener.onListening(port); - this.wsServer = wsServer; - this.httpServer = server; + this.listener.onListening(port); + this.wsServer = wsServer; + this.httpServer = server; - resolve((server.address() as AddressInfo).port); - }); + resolve((server.address() as AddressInfo).port); + }); + } catch (e) { + reject(e); + } }); assertNotNull(this.wsServer); From 554cc8846240a3176bd2627cf729f4328c376366 Mon Sep 17 00:00:00 2001 From: generatedunixname89002005306973 Date: Wed, 25 Oct 2023 06:57:03 -0700 Subject: [PATCH 56/80] Flipper Release: v0.233.0 Summary: Releasing version 0.233.0 Reviewed By: lblasa Differential Revision: D50642810 fbshipit-source-id: 6c42fdbdf61aed5c0af11dbb781496a917c44b8c --- desktop/package.json | 2 +- desktop/plugins/public/layout/docs/setup.mdx | 2 +- desktop/plugins/public/leak_canary/docs/setup.mdx | 2 +- desktop/plugins/public/network/docs/setup.mdx | 2 +- docs/getting-started/android-native.mdx | 4 ++-- docs/getting-started/react-native-ios.mdx | 2 +- docs/getting-started/react-native.mdx | 4 ++-- gradle.properties | 2 +- js/js-flipper/package.json | 2 +- react-native/react-native-flipper/package.json | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/desktop/package.json b/desktop/package.json index ca8b7da19..5c7d49f02 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -170,7 +170,7 @@ "npm": "use yarn instead", "yarn": "^1.16" }, - "version": "0.232.0", + "version": "0.233.0", "workspaces": { "packages": [ "scripts", diff --git a/desktop/plugins/public/layout/docs/setup.mdx b/desktop/plugins/public/layout/docs/setup.mdx index 1eab72f1a..4113641eb 100644 --- a/desktop/plugins/public/layout/docs/setup.mdx +++ b/desktop/plugins/public/layout/docs/setup.mdx @@ -27,7 +27,7 @@ You also need to compile in the `litho-annotations` package, as Flipper reflects ```groovy dependencies { - debugImplementation 'com.facebook.flipper:flipper-litho-plugin:0.232.0' + debugImplementation 'com.facebook.flipper:flipper-litho-plugin:0.233.0' debugImplementation 'com.facebook.litho:litho-annotations:0.19.0' // ... } diff --git a/desktop/plugins/public/leak_canary/docs/setup.mdx b/desktop/plugins/public/leak_canary/docs/setup.mdx index 44c62f823..6cdc3ba7a 100644 --- a/desktop/plugins/public/leak_canary/docs/setup.mdx +++ b/desktop/plugins/public/leak_canary/docs/setup.mdx @@ -8,7 +8,7 @@ To setup the LeakCan ```groovy dependencies { - debugImplementation 'com.facebook.flipper:flipper-leakcanary2-plugin:0.232.0' + debugImplementation 'com.facebook.flipper:flipper-leakcanary2-plugin:0.233.0' debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.8.1' } ``` diff --git a/desktop/plugins/public/network/docs/setup.mdx b/desktop/plugins/public/network/docs/setup.mdx index f217cf239..7f81f9b11 100644 --- a/desktop/plugins/public/network/docs/setup.mdx +++ b/desktop/plugins/public/network/docs/setup.mdx @@ -12,7 +12,7 @@ The network plugin is shipped as a separate Maven artifact, as follows: ```groovy dependencies { - debugImplementation 'com.facebook.flipper:flipper-network-plugin:0.232.0' + debugImplementation 'com.facebook.flipper:flipper-network-plugin:0.233.0' } ``` diff --git a/docs/getting-started/android-native.mdx b/docs/getting-started/android-native.mdx index 7413db120..43300d7c5 100644 --- a/docs/getting-started/android-native.mdx +++ b/docs/getting-started/android-native.mdx @@ -24,10 +24,10 @@ repositories { } dependencies { - debugImplementation 'com.facebook.flipper:flipper:0.232.0' + debugImplementation 'com.facebook.flipper:flipper:0.233.0' debugImplementation 'com.facebook.soloader:soloader:0.10.5' - releaseImplementation 'com.facebook.flipper:flipper-noop:0.232.0' + releaseImplementation 'com.facebook.flipper:flipper-noop:0.233.0' } ``` diff --git a/docs/getting-started/react-native-ios.mdx b/docs/getting-started/react-native-ios.mdx index e32e57c78..83ff1232e 100644 --- a/docs/getting-started/react-native-ios.mdx +++ b/docs/getting-started/react-native-ios.mdx @@ -51,7 +51,7 @@ Add all of the code below to your `ios/Podfile`: platform :ios, '9.0' def flipper_pods() - flipperkit_version = '0.232.0' # should match the version of your Flipper client app + flipperkit_version = '0.233.0' # should match the version of your Flipper client app pod 'FlipperKit', '~>' + flipperkit_version, :configuration => 'Debug' pod 'FlipperKit/FlipperKitLayoutPlugin', '~>' + flipperkit_version, :configuration => 'Debug' pod 'FlipperKit/SKIOSNetworkPlugin', '~>' + flipperkit_version, :configuration => 'Debug' diff --git a/docs/getting-started/react-native.mdx b/docs/getting-started/react-native.mdx index 04a8eece5..79f3de193 100644 --- a/docs/getting-started/react-native.mdx +++ b/docs/getting-started/react-native.mdx @@ -34,7 +34,7 @@ Latest version of Flipper requires react-native 0.69+! If you use react-native < Android: -1. Bump the `FLIPPER_VERSION` variable in `android/gradle.properties`, for example: `FLIPPER_VERSION=0.232.0`. +1. Bump the `FLIPPER_VERSION` variable in `android/gradle.properties`, for example: `FLIPPER_VERSION=0.233.0`. 2. Run `./gradlew clean` in the `android` directory. iOS: @@ -44,7 +44,7 @@ react-native version => 0.69.0 2. Run `pod install --repo-update` in the `ios` directory. react-native version < 0.69.0 -1. Call `use_flipper` with a specific version in `ios/Podfile`, for example: `use_flipper!({ 'Flipper' => '0.232.0' })`. +1. Call `use_flipper` with a specific version in `ios/Podfile`, for example: `use_flipper!({ 'Flipper' => '0.233.0' })`. 2. Run `pod install --repo-update` in the `ios` directory. ## Manual Setup diff --git a/gradle.properties b/gradle.properties index 23221c65e..a6d6852eb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. # POM publishing constants -VERSION_NAME=0.232.1-SNAPSHOT +VERSION_NAME=0.233.0 GROUP=com.facebook.flipper SONATYPE_STAGING_PROFILE=comfacebook POM_URL=https://github.com/facebook/flipper diff --git a/js/js-flipper/package.json b/js/js-flipper/package.json index 28284558e..1c7dcf4b0 100644 --- a/js/js-flipper/package.json +++ b/js/js-flipper/package.json @@ -1,7 +1,7 @@ { "name": "js-flipper", "title": "JS Flipper Bindings for Web-Socket based clients", - "version": "0.232.0", + "version": "0.233.0", "main": "lib/index.js", "browser": { "os": false diff --git a/react-native/react-native-flipper/package.json b/react-native/react-native-flipper/package.json index af931bcca..27428c3c0 100644 --- a/react-native/react-native-flipper/package.json +++ b/react-native/react-native-flipper/package.json @@ -1,7 +1,7 @@ { "name": "react-native-flipper", "title": "React Native Flipper Bindings", - "version": "0.232.0", + "version": "0.233.0", "description": "Flipper bindings for React Native", "main": "index.js", "types": "index.d.ts", From eb5618d6439f2e353107fa1e564a15bda97ca4b1 Mon Sep 17 00:00:00 2001 From: generatedunixname89002005306973 Date: Wed, 25 Oct 2023 06:57:03 -0700 Subject: [PATCH 57/80] Flipper Snapshot Bump: v0.233.1-SNAPSHOT Summary: Releasing snapshot version 0.233.1-SNAPSHOT Reviewed By: lblasa Differential Revision: D50642811 fbshipit-source-id: f8155816d667e52f17254812b376eb84bba3f64c --- docs/getting-started/android-native.mdx | 4 ++-- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/getting-started/android-native.mdx b/docs/getting-started/android-native.mdx index 43300d7c5..64af14c22 100644 --- a/docs/getting-started/android-native.mdx +++ b/docs/getting-started/android-native.mdx @@ -124,10 +124,10 @@ repositories { } dependencies { - debugImplementation 'com.facebook.flipper:flipper:0.232.1-SNAPSHOT' + debugImplementation 'com.facebook.flipper:flipper:0.233.1-SNAPSHOT' debugImplementation 'com.facebook.soloader:soloader:0.10.5' - releaseImplementation 'com.facebook.flipper:flipper-noop:0.232.1-SNAPSHOT' + releaseImplementation 'com.facebook.flipper:flipper-noop:0.233.1-SNAPSHOT' } ``` diff --git a/gradle.properties b/gradle.properties index a6d6852eb..15ff2bb5b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. # POM publishing constants -VERSION_NAME=0.233.0 +VERSION_NAME=0.233.1-SNAPSHOT GROUP=com.facebook.flipper SONATYPE_STAGING_PROFILE=comfacebook POM_URL=https://github.com/facebook/flipper From 6970edcc69bc5541ba62ae3f4b972544b2ed3ec0 Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Wed, 25 Oct 2023 07:17:33 -0700 Subject: [PATCH 58/80] Bump AGP to 8.1.2 (#5245) Summary: [android] Bump AGP to 8.1.2 --- Stack created with [Sapling](https://sapling-scm.com). Best reviewed with [ReviewStack](https://reviewstack.dev/facebook/flipper/pull/5245). * https://github.com/facebook/flipper/issues/5247 * https://github.com/facebook/flipper/issues/5246 * __->__ https://github.com/facebook/flipper/issues/5245 Pull Request resolved: https://github.com/facebook/flipper/pull/5245 Reviewed By: lblasa Differential Revision: D50599214 Pulled By: passy fbshipit-source-id: 10ac3000fa3b884cbfb629ab8410c6e722e3111c --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3e497f533..109b8d1bf 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.1.0' + classpath 'com.android.tools.build:gradle:8.1.2' classpath 'com.vanniktech:gradle-maven-publish-plugin:0.25.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION" classpath "org.jetbrains.kotlin:kotlin-serialization:$KOTLIN_VERSION" From ecfa9451dbcb12ffb22e301957c15ba9722af327 Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Thu, 26 Oct 2023 03:05:02 -0700 Subject: [PATCH 59/80] Remove unused which dependency Summary: This seems to be (no longer) in use. Reviewed By: lblasa Differential Revision: D50645270 fbshipit-source-id: 69cf276f97d960a16ffd3e48342420b33fa646da --- desktop/flipper-server-core/package.json | 2 -- desktop/yarn.lock | 5 ----- 2 files changed, 7 deletions(-) diff --git a/desktop/flipper-server-core/package.json b/desktop/flipper-server-core/package.json index 60d6d5a71..5e7b2e3b4 100644 --- a/desktop/flipper-server-core/package.json +++ b/desktop/flipper-server-core/package.json @@ -44,7 +44,6 @@ "serialize-error": "^8.1.0", "split2": "^4.1.0", "tmp": "^0.2.1", - "which": "^2.0.2", "ws": "^8.6.0", "xdg-basedir": "^4.0.0" }, @@ -63,7 +62,6 @@ "@types/rsocket-tcp-server": "^0.0.2", "@types/split2": "^4.2.0", "@types/tmp": "^0.2.3", - "@types/which": "^2.0.1", "@types/ws": "^8.5.3", "mock-fs": "^5.2.0" }, diff --git a/desktop/yarn.lock b/desktop/yarn.lock index a9d3ac175..9068715f3 100644 --- a/desktop/yarn.lock +++ b/desktop/yarn.lock @@ -4608,11 +4608,6 @@ resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.5.tgz#2a1413aded46e67a1fe2386800e291123ed75eb1" integrity sha512-9UjMCHK5GPgQRoNbqdLIAvAy0EInuiqbW0PBMtVP6B5B2HQJlvoJHM+KodPZMEjOa5VkSc+5LH7xy+cUzQdmHw== -"@types/which@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@types/which/-/which-2.0.1.tgz#27ecd67f915b7c3d6ba552135bb1eecd66e63501" - integrity sha512-Jjakcv8Roqtio6w1gr0D7y6twbhx6gGgFGF5BLwajPpnOIOxFkakFhCq+LmyyeAz7BX6ULrjBOxdKaCDy+4+dQ== - "@types/ws@^8.5.3": version "8.5.3" resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz#7d25a1ffbecd3c4f2d35068d0b283c037003274d" From abefa2165f38f86e7e634352dff393e4192edcf4 Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Thu, 26 Oct 2023 03:05:02 -0700 Subject: [PATCH 60/80] Remove unused reconnecting-websocket dep Summary: This seems to be (no longer) in use. Reviewed By: lblasa Differential Revision: D50645304 fbshipit-source-id: 6d8e89a376f57e9dccafe899cfb2be85271329c9 --- desktop/flipper-frontend-core/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/desktop/flipper-frontend-core/package.json b/desktop/flipper-frontend-core/package.json index 6d694fc90..4bc3c6bdf 100644 --- a/desktop/flipper-frontend-core/package.json +++ b/desktop/flipper-frontend-core/package.json @@ -15,7 +15,6 @@ "immer": "^9.0.18", "js-base64": "^3.7.5", "p-map": "^4.0.0", - "reconnecting-websocket": "^4.4.0", "semver": "^7.5.4" }, "devDependencies": { From 50b06f2efdefd9f398d2ffcc0ffe1a883843226d Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Thu, 26 Oct 2023 03:05:02 -0700 Subject: [PATCH 61/80] Remove unused eventemitter 3 Summary: This seems to be (no longer) in use. Reviewed By: lblasa Differential Revision: D50659072 fbshipit-source-id: 0fde643711ee4859a5d270a878d858694337d6a5 --- desktop/flipper-plugin/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/desktop/flipper-plugin/package.json b/desktop/flipper-plugin/package.json index 2210a01a8..5cc26703e 100644 --- a/desktop/flipper-plugin/package.json +++ b/desktop/flipper-plugin/package.json @@ -17,7 +17,6 @@ "@types/react-color": "2.13.5", "@types/react-dom": "^17.0.13", "dayjs": "^1.11.10", - "eventemitter3": "^4.0.7", "flipper-common": "0.0.0", "flipper-plugin-core": "0.0.0", "immer": "^9.0.18", From b184500d943e77e0f75e8e0454f8fefc183c5b0a Mon Sep 17 00:00:00 2001 From: Luke De Feo Date: Thu, 26 Oct 2023 05:24:30 -0700 Subject: [PATCH 62/80] New sidebar design 1/n Summary: Added basic infra basic types Reviewed By: lblasa Differential Revision: D50595985 fbshipit-source-id: 48ebd74bd8ccebdd8a6d69dbda344b8d831dc04f --- .../public/ui-debugger/DesktopTypes.tsx | 2 + .../public/ui-debugger/components/main.tsx | 11 +- .../components/sidebar/Inspector.tsx | 2 +- .../inspector/FrameworkEventsInspector.tsx | 4 +- .../sidebarV2/AttributesInspector.tsx | 329 ++++++++++++++++++ .../components/sidebarV2/SidebarV2.tsx | 82 +++++ .../plugins/public/ui-debugger/package.json | 1 + 7 files changed, 423 insertions(+), 8 deletions(-) create mode 100644 desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx create mode 100644 desktop/plugins/public/ui-debugger/components/sidebarV2/SidebarV2.tsx diff --git a/desktop/plugins/public/ui-debugger/DesktopTypes.tsx b/desktop/plugins/public/ui-debugger/DesktopTypes.tsx index b79f8a228..2536de954 100644 --- a/desktop/plugins/public/ui-debugger/DesktopTypes.tsx +++ b/desktop/plugins/public/ui-debugger/DesktopTypes.tsx @@ -18,6 +18,7 @@ import { ClientNode, Metadata, SnapshotInfo, + MetadataId, } from './ClientTypes'; import TypedEmitter from 'typed-emitter'; @@ -26,6 +27,7 @@ export type LiveClientState = { nodes: Map; }; +export type MetadataMap = Map; export type Color = string; export type UIState = { diff --git a/desktop/plugins/public/ui-debugger/components/main.tsx b/desktop/plugins/public/ui-debugger/components/main.tsx index fc3ab0f22..2d13722ef 100644 --- a/desktop/plugins/public/ui-debugger/components/main.tsx +++ b/desktop/plugins/public/ui-debugger/components/main.tsx @@ -21,7 +21,6 @@ import {useHotkeys} from 'react-hotkeys-hook'; import {Id, Metadata, MetadataId, ClientNode} from '../ClientTypes'; import {PerfStats} from './PerfStats'; import {Visualization2D} from './visualizer/Visualization2D'; -import {Inspector} from './sidebar/Inspector'; import {TreeControls} from './tree/TreeControls'; import {Button, Spin, Typography} from 'antd'; import {QueryClientProvider} from 'react-query'; @@ -30,6 +29,8 @@ import {StreamInterceptorErrorView} from './StreamInterceptorErrorView'; import {queryClient} from '../utils/reactQuery'; import {FrameworkEventsTable} from './FrameworkEventsTable'; import {Centered} from './shared/Centered'; +import {SidebarV2} from './sidebarV2/SidebarV2'; +import {getNode} from '../utils/map'; export function Component() { const instance = usePlugin(plugin); @@ -38,6 +39,7 @@ export function Component() { const visualiserWidth = useValue(instance.uiState.visualiserWidth); const nodes: Map = useValue(instance.nodes); const metadata: Map = useValue(instance.metadata); + const selectedNodeId = useValue(instance.uiState.selectedNode); const [showPerfStats, setShowPerfStats] = useState(false); @@ -155,11 +157,10 @@ export function Component() { /> - diff --git a/desktop/plugins/public/ui-debugger/components/sidebar/Inspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebar/Inspector.tsx index 9a7a0c620..94c7c7dae 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebar/Inspector.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebar/Inspector.tsx @@ -126,7 +126,7 @@ export const Inspector: React.FC = ({ frameworkEventMetadata={frameworkEventMetadata} node={selectedNode} events={selectedFrameworkEvents} - showExtra={showExtra} + showBottomPanel={showExtra} /> )} diff --git a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/FrameworkEventsInspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/FrameworkEventsInspector.tsx index 36dd25a1a..f904fcfde 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/FrameworkEventsInspector.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/FrameworkEventsInspector.tsx @@ -42,7 +42,7 @@ import {tracker} from '../../../utils/tracker'; type Props = { node: ClientNode; events: readonly FrameworkEvent[]; - showExtra?: (title: string, element: ReactNode) => void; + showBottomPanel?: (title: string, element: ReactNode) => void; frameworkEventMetadata: Map; onSetViewMode: (viewMode: ViewMode) => void; }; @@ -50,7 +50,7 @@ type Props = { export const FrameworkEventsInspector: React.FC = ({ node, events, - showExtra, + showBottomPanel: showExtra, frameworkEventMetadata, onSetViewMode, }) => { diff --git a/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx new file mode 100644 index 000000000..cbde1cfa3 --- /dev/null +++ b/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx @@ -0,0 +1,329 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @format + */ + +import {Input, Typography} from 'antd'; +import {Panel, theme, Layout} from 'flipper-plugin'; +import React from 'react'; +import { + ClientNode, + Inspectable, + InspectableObject, + Metadata, +} from '../../ClientTypes'; +import {MetadataMap} from '../../DesktopTypes'; +import {NoData} from '../sidebar/inspector/NoData'; +import {css, cx} from '@emotion/css'; +import {upperFirst} from 'lodash'; + +export function AttributesInspector({ + node, + metadata, +}: { + node: ClientNode; + metadata: MetadataMap; +}) { + const keys = Object.keys(node.attributes); + const sections = keys + .map((key, _) => { + /** + * The node top-level attributes refer to the displayable panels. + * The panel name is obtained by querying the metadata. + * The inspectable contains the actual attributes belonging to each panel. + */ + const metadataId: number = Number(key); + const sectionMetadata = metadata.get(metadataId); + if (sectionMetadata == null) { + return null; + } + const sectionAttributes = node.attributes[ + metadataId + ] as InspectableObject; + + return AttributeSection( + metadata, + sectionMetadata.name, + sectionAttributes, + ); + }) + .filter((section) => section != null); + + if (sections.length === 0) { + return ; + } + return <>{sections}; +} + +function AttributeSection( + metadataMap: MetadataMap, + name: string, + inspectable: InspectableObject, +) { + const children = Object.keys(inspectable.fields) + .map((key) => { + const metadataId: number = Number(key); + const attributeMetadata = metadataMap.get(metadataId); + + if (attributeMetadata == null) { + return null; + } + const attributeValue = inspectable.fields[metadataId]; + + const attributeName = + upperFirst(attributeMetadata?.name) ?? String(metadataId); + return ( + + + {attributeName} + + + + + + + ); + }) + .filter((attr) => attr != null); + + if (children.length > 0) { + return ( + + + {...children} + + + ); + } else { + return null; + } +} + +/** + * disables hover and focsued states + */ +const readOnlyInput = css` + :hover { + border-color: ${theme.disabledColor} !important; + } + :focus { + border-color: ${theme.disabledColor} !important; + + box-shadow: none !important; + } + box-shadow: none !important; + border-color: ${theme.disabledColor} !important; + + padding: 2px 4px 2px 4px; + + min-height: 20px !important; //this is for text area +`; + +function StyledInput({ + value, + color, + mutable, + rightAddon, +}: { + value: any; + color: string; + mutable: boolean; + rightAddon?: string; +}) { + return ( + + ); +} + +function StyledTextArea({ + value, + color, + mutable, +}: { + value: any; + color: string; + mutable: boolean; + rightAddon?: string; +}) { + return ( + + ); +} + +const boolColor = '#C41D7F'; +const stringColor = '#AF5800'; +const enumColor = '#006D75'; +const numberColor = '#003EB3'; + +type NumberGroupValue = {value: number; addonText: string}; + +function NumberGroup({values}: {values: NumberGroupValue[]}) { + return ( + + {values.map(({value, addonText}, idx) => ( + + ))} + + ); +} + +function AttributeValue({ + inspectable, +}: { + attributeMetadata: Metadata; + metadataMap: MetadataMap; + name: string; + inspectable: Inspectable; + level: number; +}) { + switch (inspectable.type) { + case 'boolean': + return ( + + ); + case 'text': + return ( + + ); + case 'number': + return ( + + ); + + case 'enum': + return ( + + ); + case 'size': + return ( + + ); + + case 'coordinate': + return ( + + ); + case 'coordinate3d': + return ( + + ); + case 'space': + return ( + + + + + ); + case 'bounds': + return ( + + + + + ); + } + return null; +} diff --git a/desktop/plugins/public/ui-debugger/components/sidebarV2/SidebarV2.tsx b/desktop/plugins/public/ui-debugger/components/sidebarV2/SidebarV2.tsx new file mode 100644 index 000000000..c65877e82 --- /dev/null +++ b/desktop/plugins/public/ui-debugger/components/sidebarV2/SidebarV2.tsx @@ -0,0 +1,82 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @format + */ + +import {ClientNode, MetadataId, Metadata} from '../../ClientTypes'; +import {plugin} from '../../index'; +import React, {ReactNode} from 'react'; +import {Layout, Tab, Tabs, usePlugin, useValue} from 'flipper-plugin'; +import {NoData} from '../sidebar/inspector/NoData'; +import {Tooltip} from 'antd'; +import {AttributesInspector} from './AttributesInspector'; +import {FrameworkEventsInspector} from '../sidebar/inspector/FrameworkEventsInspector'; +import {theme} from 'flipper-plugin'; +// eslint-disable-next-line rulesdir/no-restricted-imports-clone +import {Glyph} from 'flipper'; + +type Props = { + selectedNode?: ClientNode; + metadata: Map; + showBottomPanel: (title: string, element: ReactNode) => void; +}; +export function SidebarV2({selectedNode, metadata, showBottomPanel}: Props) { + const instance = usePlugin(plugin); + + const frameworkEventMetadata = useValue(instance.frameworkEventMetadata); + + if (!selectedNode) { + return ; + } + const selectedFrameworkEvents = selectedNode.id + ? instance.frameworkEvents.getAllRecordsByIndex({nodeId: selectedNode.id}) + : []; + + return ( + + + + + + + + }> + + + {selectedFrameworkEvents?.length > 0 && ( + + + + + + }> + + + )} + + + ); +} diff --git a/desktop/plugins/public/ui-debugger/package.json b/desktop/plugins/public/ui-debugger/package.json index b6e9d8e5c..8326f56f8 100644 --- a/desktop/plugins/public/ui-debugger/package.json +++ b/desktop/plugins/public/ui-debugger/package.json @@ -33,6 +33,7 @@ "peerDependencies": { "@ant-design/icons": "*", "@emotion/styled": "*", + "@emotion/css": "*", "@types/node": "*", "@types/react": "*", "@types/react-dom": "*", From 65de40be7cf5c5324a52628115017055756fac3a Mon Sep 17 00:00:00 2001 From: Luke De Feo Date: Thu, 26 Oct 2023 05:24:30 -0700 Subject: [PATCH 63/80] Add support for Subsections Summary: in the figma design we have the concept of subsections which are single level deep objects shown inline {F1126292520} More complex nested objects are shown a a preview that you have to click on and will come later Reviewed By: lblasa Differential Revision: D50595984 fbshipit-source-id: ea831731b87ce9968516129cf177953e200cf4d5 --- .../sidebarV2/AttributesInspector.tsx | 155 ++++++++++++++---- 1 file changed, 127 insertions(+), 28 deletions(-) diff --git a/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx index cbde1cfa3..b1e843f46 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx @@ -7,7 +7,7 @@ * @format */ -import {Input, Typography} from 'antd'; +import {Divider, Input, Typography} from 'antd'; import {Panel, theme, Layout} from 'flipper-plugin'; import React from 'react'; import { @@ -19,7 +19,8 @@ import { import {MetadataMap} from '../../DesktopTypes'; import {NoData} from '../sidebar/inspector/NoData'; import {css, cx} from '@emotion/css'; -import {upperFirst} from 'lodash'; +import {upperFirst, sortBy} from 'lodash'; +import {any} from 'lodash/fp'; export function AttributesInspector({ node, @@ -64,40 +65,63 @@ function AttributeSection( name: string, inspectable: InspectableObject, ) { - const children = Object.keys(inspectable.fields) - .map((key) => { - const metadataId: number = Number(key); + const attributesOrSubSubsections = Object.entries(inspectable.fields).map( + ([fieldKey, attributeValue]) => { + const metadataId: number = Number(fieldKey); const attributeMetadata = metadataMap.get(metadataId); + const attributeName = + upperFirst(attributeMetadata?.name) ?? String(metadataId); + //subsections are complex types that are only 1 level deep + const isSubSection = + attributeValue.type === 'object' && + !any( + (inspectable) => + inspectable.type === 'array' || inspectable.type === 'object', + Object.values(attributeValue.fields), + ); + return { + attributeName, + attributeMetadata, + isSubSection, + attributeValue, + metadataId, + }; + }, + ); + //push sub sections to the end + const sortedAttributesOrSubsections = sortBy( + attributesOrSubSubsections, + [(item) => item.isSubSection], + (item) => item.attributeName, + ); + + const children = sortedAttributesOrSubsections + .map(({isSubSection, attributeValue, attributeMetadata, attributeName}) => { if (attributeMetadata == null) { return null; } - const attributeValue = inspectable.fields[metadataId]; - const attributeName = - upperFirst(attributeMetadata?.name) ?? String(metadataId); - return ( - - - {attributeName} - - - - - - + ); + } + } + + return ( + ); }) .filter((attr) => attr != null); @@ -115,6 +139,81 @@ function AttributeSection( } } +function SubSection({ + attributeName, + inspectableObject, + metadataMap, +}: { + attributeName: string; + inspectableObject: InspectableObject; + metadataMap: MetadataMap; +}) { + return ( + + + {attributeName} + {Object.entries(inspectableObject.fields).map(([key, value]) => { + const metadataId: number = Number(key); + const attributeMetadata = metadataMap.get(metadataId); + if (attributeMetadata == null) { + return null; + } + const attributeName = + upperFirst(attributeMetadata?.name) ?? String(metadataId); + + return ( + + ); + })} + + ); +} + +function NamedAttribute({ + key, + name, + value, + metadataMap, + attributeMetadata, +}: { + name: string; + value: Inspectable; + attributeMetadata: Metadata; + metadataMap: MetadataMap; + key: string; +}) { + return ( + + + {name} + + + + + + + ); +} + /** * disables hover and focsued states */ From f5d974a26c45d613af5a2614539d616cf09f4c5b Mon Sep 17 00:00:00 2001 From: Luke De Feo Date: Thu, 26 Oct 2023 05:24:30 -0700 Subject: [PATCH 64/80] Add support for color Summary: we show rbga on one line, and hex + preview on second line Reviewed By: lblasa Differential Revision: D50595979 fbshipit-source-id: 86015ceeb5e64e67fb85e3431f85916f7d175ca2 --- .../sidebarV2/AttributesInspector.tsx | 111 +++++++++++++----- 1 file changed, 82 insertions(+), 29 deletions(-) diff --git a/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx index b1e843f46..34d77f6e4 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx @@ -8,10 +8,11 @@ */ import {Divider, Input, Typography} from 'antd'; -import {Panel, theme, Layout} from 'flipper-plugin'; +import {Panel, theme, Layout, styled} from 'flipper-plugin'; import React from 'react'; import { ClientNode, + Color, Inspectable, InspectableObject, Metadata, @@ -21,6 +22,7 @@ import {NoData} from '../sidebar/inspector/NoData'; import {css, cx} from '@emotion/css'; import {upperFirst, sortBy} from 'lodash'; import {any} from 'lodash/fp'; +import {InspectableColor} from '../../ClientTypes'; export function AttributesInspector({ node, @@ -391,38 +393,89 @@ function AttributeValue({ ); case 'space': return ( - - - - + ); case 'bounds': return ( - - - - + ); + + case 'color': + return ; } return null; } + +function ColorInspector({inspectable}: {inspectable: InspectableColor}) { + return ( + + + + + + + + ); +} + +const ColorPreview = styled.div(({background}: {background: string}) => ({ + width: '28px', + height: '28px', + borderRadius: '8px', + borderColor: theme.disabledColor, + borderStyle: 'solid', + boxSizing: 'border-box', + borderWidth: '1px', + backgroundColor: background, +})); + +const RGBAtoHEX = (color: Color) => { + const hex = + (color.r | (1 << 8)).toString(16).slice(1) + + (color.g | (1 << 8)).toString(16).slice(1) + + (color.b | (1 << 8)).toString(16).slice(1); + + return '#' + hex.toUpperCase(); +}; + +type FourItemArray = [T, T, T, T]; + +function TwoByTwoNumberGroup({ + values, +}: { + values: FourItemArray; +}) { + return ( + + + + + ); +} From b4d80c3f800666c7331b158e94665c8c52add21e Mon Sep 17 00:00:00 2001 From: Luke De Feo Date: Thu, 26 Oct 2023 05:24:30 -0700 Subject: [PATCH 65/80] Add support for complex types Summary: Complex nested arrays and objects are displayed in a modal since there isnt enough space to it practically. Not many attributes in practice fall into this category Reviewed By: lblasa Differential Revision: D50595981 fbshipit-source-id: b1eda93c448de19c8803d64eb4cf105e2b6636a8 --- .../sidebarV2/AttributesInspector.tsx | 74 +++++++++++++++++-- .../ui-debugger/utils/dataTransform.tsx | 2 +- 2 files changed, 68 insertions(+), 8 deletions(-) diff --git a/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx index 34d77f6e4..c9ab582aa 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx @@ -7,9 +7,9 @@ * @format */ -import {Divider, Input, Typography} from 'antd'; -import {Panel, theme, Layout, styled} from 'flipper-plugin'; -import React from 'react'; +import {Button, Divider, Input, Modal, Typography} from 'antd'; +import {DataInspector, Panel, theme, Layout, styled} from 'flipper-plugin'; +import React, {useState} from 'react'; import { ClientNode, Color, @@ -23,6 +23,12 @@ import {css, cx} from '@emotion/css'; import {upperFirst, sortBy} from 'lodash'; import {any} from 'lodash/fp'; import {InspectableColor} from '../../ClientTypes'; +import {transformAny} from '../../utils/dataTransform'; + +type ModalData = { + data: unknown; + title: string; +}; export function AttributesInspector({ node, @@ -31,11 +37,21 @@ export function AttributesInspector({ node: ClientNode; metadata: MetadataMap; }) { + const [modalData, setModalData] = useState(null); + + const showComplexTypeModal = (modaldata: ModalData) => { + setModalData(modaldata); + }; + + const handleCancel = () => { + setModalData(null); + }; + const keys = Object.keys(node.attributes); const sections = keys .map((key, _) => { /** - * The node top-level attributes refer to the displayable panels. + * The node top-level attributes refer to the displayable panels aka sections. * The panel name is obtained by querying the metadata. * The inspectable contains the actual attributes belonging to each panel. */ @@ -52,6 +68,7 @@ export function AttributesInspector({ metadata, sectionMetadata.name, sectionAttributes, + showComplexTypeModal, ); }) .filter((section) => section != null); @@ -59,13 +76,28 @@ export function AttributesInspector({ if (sections.length === 0) { return ; } - return <>{sections}; + return ( + <> + {modalData != null && ( + + + + )} + {sections} + + ); } function AttributeSection( metadataMap: MetadataMap, name: string, inspectable: InspectableObject, + onDisplayModal: (modaldata: ModalData) => void, ) { const attributesOrSubSubsections = Object.entries(inspectable.fields).map( ([fieldKey, attributeValue]) => { @@ -108,6 +140,7 @@ function AttributeSection( if (attributeValue.type === 'object') { return ( void; }) { return ( @@ -166,6 +202,7 @@ function SubSection({ return ( void; }) { return ( @@ -205,11 +244,11 @@ function NamedAttribute({ @@ -320,13 +359,16 @@ function NumberGroup({values}: {values: NumberGroupValue[]}) { } function AttributeValue({ + metadataMap, + name, + onDisplayModal, inspectable, }: { + onDisplayModal: (modaldata: ModalData) => void; attributeMetadata: Metadata; metadataMap: MetadataMap; name: string; inspectable: Inspectable; - level: number; }) { switch (inspectable.type) { case 'boolean': @@ -416,6 +458,24 @@ function AttributeValue({ case 'color': return ; + case 'array': + case 'object': + return ( + + ); } return null; } diff --git a/desktop/plugins/public/ui-debugger/utils/dataTransform.tsx b/desktop/plugins/public/ui-debugger/utils/dataTransform.tsx index bbec29194..0adf07ca4 100644 --- a/desktop/plugins/public/ui-debugger/utils/dataTransform.tsx +++ b/desktop/plugins/public/ui-debugger/utils/dataTransform.tsx @@ -16,7 +16,7 @@ import { MetadataId, } from '../ClientTypes'; -function transformAny( +export function transformAny( metadata: Map, inspectable: Inspectable, ): any { From 184316545a2b0868a3c27c5a8c0ea411b99cf4ac Mon Sep 17 00:00:00 2001 From: Luke De Feo Date: Thu, 26 Oct 2023 05:24:30 -0700 Subject: [PATCH 66/80] Treat unknown as text Reviewed By: lblasa Differential Revision: D50595978 fbshipit-source-id: 867eb08c3ab365a808d5c7b53a7772298e9c9156 --- .../ui-debugger/components/sidebarV2/AttributesInspector.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx index c9ab582aa..d9a25ef72 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx @@ -379,6 +379,7 @@ function AttributeValue({ value={inspectable.value ? 'TRUE' : 'FALSE'} /> ); + case 'unknown': case 'text': return ( Date: Thu, 26 Oct 2023 05:24:30 -0700 Subject: [PATCH 67/80] Default to first tab if active tab not available Summary: This is only really an issue in theUIDebugger where we have a dynamic number of tabs. on some nodes you have 3 tabs, on others you have 2. if you select the 3rd tab and move to a node with 2 tabs nothing will be selected. With this fix we will fallback to the first tab Reviewed By: lblasa Differential Revision: D50595977 fbshipit-source-id: 25c36a5609f774c2d3fd650eb6520104864fbe95 --- desktop/flipper-plugin/src/ui/Tabs.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/flipper-plugin/src/ui/Tabs.tsx b/desktop/flipper-plugin/src/ui/Tabs.tsx index 46f88e880..53c77ddb8 100644 --- a/desktop/flipper-plugin/src/ui/Tabs.tsx +++ b/desktop/flipper-plugin/src/ui/Tabs.tsx @@ -59,7 +59,7 @@ export function Tabs({ return ( { setActiveTab(key); }} From fa2845d86de2fb74273d5308c065120727ce97e5 Mon Sep 17 00:00:00 2001 From: Luke De Feo Date: Thu, 26 Oct 2023 05:24:30 -0700 Subject: [PATCH 68/80] Use text for tab headings Summary: Use text for tab headings Reviewed By: lblasa Differential Revision: D50595976 fbshipit-source-id: c062bb984ef83d76761e1deb9f24ec095099bd98 --- .../components/sidebarV2/SidebarV2.tsx | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/desktop/plugins/public/ui-debugger/components/sidebarV2/SidebarV2.tsx b/desktop/plugins/public/ui-debugger/components/sidebarV2/SidebarV2.tsx index c65877e82..b978aaf0d 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebarV2/SidebarV2.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebarV2/SidebarV2.tsx @@ -15,9 +15,6 @@ import {NoData} from '../sidebar/inspector/NoData'; import {Tooltip} from 'antd'; import {AttributesInspector} from './AttributesInspector'; import {FrameworkEventsInspector} from '../sidebar/inspector/FrameworkEventsInspector'; -import {theme} from 'flipper-plugin'; -// eslint-disable-next-line rulesdir/no-restricted-imports-clone -import {Glyph} from 'flipper'; type Props = { selectedNode?: ClientNode; @@ -43,14 +40,7 @@ export function SidebarV2({selectedNode, metadata, showBottomPanel}: Props) { grow centered key={selectedNode.id}> - - - - - - }> + Attributes}> {selectedFrameworkEvents?.length > 0 && ( @@ -58,13 +48,7 @@ export function SidebarV2({selectedNode, metadata, showBottomPanel}: Props) { key={'events'} tab={ - - - + Events }> Date: Thu, 26 Oct 2023 05:24:30 -0700 Subject: [PATCH 69/80] Handle inspectable array Summary: This was not handled and arrays were not properly transformed Reviewed By: lblasa Differential Revision: D50595983 fbshipit-source-id: cae8777c653cc9fc2a1ea8cab05b3df476121855 --- .../ui-debugger/components/sidebarV2/AttributesInspector.tsx | 2 +- desktop/plugins/public/ui-debugger/utils/dataTransform.tsx | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx index d9a25ef72..53a962808 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx @@ -85,7 +85,7 @@ export function AttributesInspector({ onOk={handleCancel} onCancel={handleCancel} footer={null}> - + )} {sections} diff --git a/desktop/plugins/public/ui-debugger/utils/dataTransform.tsx b/desktop/plugins/public/ui-debugger/utils/dataTransform.tsx index 0adf07ca4..c22e2f236 100644 --- a/desktop/plugins/public/ui-debugger/utils/dataTransform.tsx +++ b/desktop/plugins/public/ui-debugger/utils/dataTransform.tsx @@ -32,6 +32,8 @@ export function transformAny( case 'enum': case 'space': return inspectable.value; + case 'array': + return inspectable.items.map((value) => transformAny(metadata, value)); case 'object': return transformObject(metadata, inspectable); default: From 457361985ce8a74ba727469f5c8154c14a442d9a Mon Sep 17 00:00:00 2001 From: Luke De Feo Date: Thu, 26 Oct 2023 05:24:30 -0700 Subject: [PATCH 70/80] Basic filtering Summary: This filtering scheme is extremely basic, we only filter based on top level fields. Other schemes I considered were somewhat confusing and this works well in most if not all cases Reviewed By: lblasa Differential Revision: D50595986 fbshipit-source-id: 90cb82f8fc482fd4c6f996ff9e857f27766df544 --- .../sidebarV2/AttributesInspector.tsx | 48 ++++++++++++++++--- 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx index 53a962808..174c6985d 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx @@ -8,7 +8,15 @@ */ import {Button, Divider, Input, Modal, Typography} from 'antd'; -import {DataInspector, Panel, theme, Layout, styled} from 'flipper-plugin'; + +import { + DataInspector, + Panel, + theme, + Layout, + styled, + useLocalStorageState, +} from 'flipper-plugin'; import React, {useState} from 'react'; import { ClientNode, @@ -24,6 +32,7 @@ import {upperFirst, sortBy} from 'lodash'; import {any} from 'lodash/fp'; import {InspectableColor} from '../../ClientTypes'; import {transformAny} from '../../utils/dataTransform'; +import {SearchOutlined} from '@ant-design/icons'; type ModalData = { data: unknown; @@ -39,6 +48,11 @@ export function AttributesInspector({ }) { const [modalData, setModalData] = useState(null); + const [attributeFilter, setAttributeFilter] = useLocalStorageState( + 'attribute-filter', + '', + ); + const showComplexTypeModal = (modaldata: ModalData) => { setModalData(modaldata); }; @@ -69,13 +83,15 @@ export function AttributesInspector({ sectionMetadata.name, sectionAttributes, showComplexTypeModal, + attributeFilter, ); }) .filter((section) => section != null); - if (sections.length === 0) { + if (sections.length === 0 && !attributeFilter) { return ; } + return ( <> {modalData != null && ( @@ -88,7 +104,20 @@ export function AttributesInspector({ )} - {sections} + + setAttributeFilter(e.target.value)} + placeholder="Filter attributes" + prefix={} + /> + + {sections.length === 0 ? ( + + ) : ( + sections + )} + ); } @@ -98,9 +127,10 @@ function AttributeSection( name: string, inspectable: InspectableObject, onDisplayModal: (modaldata: ModalData) => void, + attributeFilter: string, ) { - const attributesOrSubSubsections = Object.entries(inspectable.fields).map( - ([fieldKey, attributeValue]) => { + const attributesOrSubSubsections = Object.entries(inspectable.fields) + .map(([fieldKey, attributeValue]) => { const metadataId: number = Number(fieldKey); const attributeMetadata = metadataMap.get(metadataId); const attributeName = @@ -120,8 +150,12 @@ function AttributeSection( attributeValue, metadataId, }; - }, - ); + }) + .filter( + ({attributeName}) => + !attributeFilter || + attributeName.toLowerCase().includes(attributeFilter), + ); //push sub sections to the end const sortedAttributesOrSubsections = sortBy( From aafd7e12df16f7fad7cbac8d6d1f892812fbfc7e Mon Sep 17 00:00:00 2001 From: Luke De Feo Date: Thu, 26 Oct 2023 05:24:30 -0700 Subject: [PATCH 71/80] Add raw data panel Reviewed By: lblasa Differential Revision: D50595980 fbshipit-source-id: 3679d53cfbfe38ab466d96efe39928c0299fb4d5 --- .../components/sidebarV2/AttributesInspector.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx index 174c6985d..8e22e890e 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx @@ -28,7 +28,7 @@ import { import {MetadataMap} from '../../DesktopTypes'; import {NoData} from '../sidebar/inspector/NoData'; import {css, cx} from '@emotion/css'; -import {upperFirst, sortBy} from 'lodash'; +import {upperFirst, sortBy, omit} from 'lodash'; import {any} from 'lodash/fp'; import {InspectableColor} from '../../ClientTypes'; import {transformAny} from '../../utils/dataTransform'; @@ -115,7 +115,11 @@ export function AttributesInspector({ {sections.length === 0 ? ( ) : ( - sections + sections.concat([ + + + , + ]) )} From 8af6ca7f02bf340ff0e6b940bb131092408be0de Mon Sep 17 00:00:00 2001 From: Luke De Feo Date: Thu, 26 Oct 2023 05:24:30 -0700 Subject: [PATCH 72/80] Shrink input size (final ) Summary: Allows more content on screen. Final diff of stack Changelog: UIDebugger, new sidebar design Reviewed By: lblasa Differential Revision: D50595987 fbshipit-source-id: 436af4191dba37f7a0f41dca23ab6349856358cd --- .../sidebarV2/AttributesInspector.tsx | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx index 8e22e890e..a48b110c6 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx @@ -271,11 +271,12 @@ function NamedAttribute({ {name} @@ -297,6 +298,7 @@ function NamedAttribute({ * disables hover and focsued states */ const readOnlyInput = css` + font-size: small; :hover { border-color: ${theme.disabledColor} !important; } @@ -501,16 +503,27 @@ function AttributeValue({ case 'object': return ( @@ -519,6 +532,8 @@ function AttributeValue({ return null; } +const rowHeight = 26; + function ColorInspector({inspectable}: {inspectable: InspectableColor}) { return ( @@ -545,8 +560,8 @@ function ColorInspector({inspectable}: {inspectable: InspectableColor}) { } const ColorPreview = styled.div(({background}: {background: string}) => ({ - width: '28px', - height: '28px', + width: rowHeight, + height: rowHeight, borderRadius: '8px', borderColor: theme.disabledColor, borderStyle: 'solid', From 20a1b9d2557f90f92be66ffac3e5f840fc883f93 Mon Sep 17 00:00:00 2001 From: Luke De Feo Date: Thu, 26 Oct 2023 05:24:30 -0700 Subject: [PATCH 73/80] format numbers Reviewed By: lblasa Differential Revision: D50653525 fbshipit-source-id: 265a2821acef572ca6d9576be647ee1d07f3850e --- .../components/sidebarV2/AttributesInspector.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx index a48b110c6..61abfdde8 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx @@ -326,6 +326,11 @@ function StyledInput({ mutable: boolean; rightAddon?: string; }) { + let formatted: any = value; + if (typeof value === 'number') { + //cap the number of decimal places to 5 but dont add trailing zeros + formatted = Number.parseFloat(value.toFixed(5)); + } return ( ); From 115cb1af711e0e1d5094e8c733c6a4bdee4866a0 Mon Sep 17 00:00:00 2001 From: Luke De Feo Date: Thu, 26 Oct 2023 05:24:30 -0700 Subject: [PATCH 74/80] Dont show empty subsections Summary: changelog: UIDebugger - new sidebar design Reviewed By: lblasa Differential Revision: D50653551 fbshipit-source-id: 8a173abb033f35ba6abd2d5f417e647ca2ffe8e7 --- .../sidebarV2/AttributesInspector.tsx | 46 +++++++++++-------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx index 61abfdde8..12d246bf5 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx @@ -224,30 +224,36 @@ function SubSection({ metadataMap: MetadataMap; onDisplayModal: (modaldata: ModalData) => void; }) { + const children = Object.entries(inspectableObject.fields).map( + ([key, value]) => { + const metadataId: number = Number(key); + const attributeMetadata = metadataMap.get(metadataId); + if (attributeMetadata == null) { + return null; + } + const attributeName = + upperFirst(attributeMetadata?.name) ?? String(metadataId); + + return ( + + ); + }, + ); + if (children.length === 0) { + return null; + } return ( {attributeName} - {Object.entries(inspectableObject.fields).map(([key, value]) => { - const metadataId: number = Number(key); - const attributeMetadata = metadataMap.get(metadataId); - if (attributeMetadata == null) { - return null; - } - const attributeName = - upperFirst(attributeMetadata?.name) ?? String(metadataId); - - return ( - - ); - })} + {children} ); } From f3449a564189661bf1cba55f826945dddb3463fb Mon Sep 17 00:00:00 2001 From: Luke De Feo Date: Thu, 26 Oct 2023 05:24:30 -0700 Subject: [PATCH 75/80] Make panel adhere to Figma design Summary: css to change the header styling Reviewed By: lblasa Differential Revision: D50595982 fbshipit-source-id: 836ea7881426e95abb449c085fca39606cd8cfdd --- desktop/flipper-plugin/src/ui/Panel.tsx | 2 ++ .../sidebarV2/AttributesInspector.tsx | 19 +++++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/desktop/flipper-plugin/src/ui/Panel.tsx b/desktop/flipper-plugin/src/ui/Panel.tsx index d8a4b55f7..efd3f9127 100644 --- a/desktop/flipper-plugin/src/ui/Panel.tsx +++ b/desktop/flipper-plugin/src/ui/Panel.tsx @@ -29,6 +29,7 @@ export const Panel: React.FC<{ pad?: Spacing; gap?: Spacing; extraActions?: React.ReactElement | null; + className?: string; }> = (props) => { const [collapsed, setCollapsed] = useLocalStorageState( `panel:${props.title}:collapsed`, @@ -45,6 +46,7 @@ export const Panel: React.FC<{ return ( diff --git a/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx index 12d246bf5..9e6e2cf0d 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebarV2/AttributesInspector.tsx @@ -39,6 +39,17 @@ type ModalData = { title: string; }; +const panelCss = css` + & > .ant-collapse-item .ant-collapse-header { + background-color: ${theme.backgroundDefault}; + padding-left: 0px; + } + + & > .ant-collapse-item .ant-collapse-header .ant-collapse-expand-icon { + width: 18px; + } +`; + export function AttributesInspector({ node, metadata, @@ -116,7 +127,7 @@ export function AttributesInspector({ ) : ( sections.concat([ - + , ]) @@ -202,8 +213,8 @@ function AttributeSection( if (children.length > 0) { return ( - - + + {...children} @@ -278,7 +289,7 @@ function NamedAttribute({ Date: Thu, 26 Oct 2023 11:29:30 -0700 Subject: [PATCH 76/80] Promote k state to top level Summary: In the new sidebar design complex types are behind a preview. before states was an array under the key states. Now we create a top level attribute according to its index Reviewed By: lblasa Differential Revision: D50654698 fbshipit-source-id: 410c50c5f1ab14efc77184a5b147d9bdf70761d4 --- .../descriptors/props/ComponentDataExtractor.kt | 14 +++++++++++++- .../litho/KStateContainerExtractionTest.kt | 13 ++++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/uidebugger/litho/descriptors/props/ComponentDataExtractor.kt b/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/uidebugger/litho/descriptors/props/ComponentDataExtractor.kt index a07286d0e..cd4af8da6 100644 --- a/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/uidebugger/litho/descriptors/props/ComponentDataExtractor.kt +++ b/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/uidebugger/litho/descriptors/props/ComponentDataExtractor.kt @@ -99,7 +99,19 @@ object ComponentDataExtractor { val id = getMetadataId(componentName, field.name) val editorValue: EditorValue? = EditorRegistry.read(field.type, field, stateContainer) if (editorValue != null) { - stateFields[id] = toInspectable(field.name, editorValue) + + val inspectable = toInspectable(field.name, editorValue) + + if (inspectable is InspectableArray) { + inspectable.items.forEachIndexed { idx, item -> + val metadataId = + MetadataRegister.register( + MetadataRegister.TYPE_ATTRIBUTE, "kstate", idx.toString()) + stateFields[metadataId] = item + } + } else { + stateFields[id] = toInspectable(field.name, editorValue) + } } } } diff --git a/android/plugins/litho/src/test/java/com/facebook/flipper/plugins/uidebugger/litho/KStateContainerExtractionTest.kt b/android/plugins/litho/src/test/java/com/facebook/flipper/plugins/uidebugger/litho/KStateContainerExtractionTest.kt index b87333700..a13cbac83 100644 --- a/android/plugins/litho/src/test/java/com/facebook/flipper/plugins/uidebugger/litho/KStateContainerExtractionTest.kt +++ b/android/plugins/litho/src/test/java/com/facebook/flipper/plugins/uidebugger/litho/KStateContainerExtractionTest.kt @@ -5,6 +5,7 @@ * LICENSE file in the root directory of this source tree. */ +import com.facebook.flipper.plugins.uidebugger.descriptors.MetadataRegister import com.facebook.flipper.plugins.uidebugger.litho.descriptors.props.ComponentDataExtractor import com.facebook.flipper.plugins.uidebugger.model.InspectableArray import com.facebook.flipper.plugins.uidebugger.model.InspectableObject @@ -16,16 +17,22 @@ import org.junit.Test class KStateContainerExtractionTest { @Test @Throws(Exception::class) - fun testCanExtractKState() { + fun testCanExtractKStateIntoSeparateAttributesByIndex() { // this test ensures that our reflection based extraction doesn't break if the KState class // structure changes - val stateContainer = KStateContainer.withNewState(null, "foo") + MetadataRegister.reset() + val stateContainer = + KStateContainer.withNewState(KStateContainer.withNewState(null, "foo"), true) val result = ComponentDataExtractor.getState(stateContainer, "Comp1") + val first = MetadataRegister.get("kstate", "0")?.id ?: -1 + val second = MetadataRegister.get("kstate", "1")?.id ?: -2 assertEquals( + InspectableObject( + mapOf(first to InspectableValue.Text("foo"), second to InspectableValue.Boolean(true))), result, - InspectableObject(mapOf(1 to InspectableArray(listOf(InspectableValue.Text("foo")))))) + ) } } From 9aadcefbf9b5f6ae0ae42ea959ebfd952388c0e3 Mon Sep 17 00:00:00 2001 From: generatedunixname89002005325672 Date: Fri, 27 Oct 2023 01:34:53 -0700 Subject: [PATCH 77/80] Daily `arc lint --take KTFMT` Reviewed By: martintrojer Differential Revision: D50729003 fbshipit-source-id: b739c041af3edb9ae7f787368938b23ae8efe4d0 --- .../plugins/uidebugger/litho/KStateContainerExtractionTest.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/android/plugins/litho/src/test/java/com/facebook/flipper/plugins/uidebugger/litho/KStateContainerExtractionTest.kt b/android/plugins/litho/src/test/java/com/facebook/flipper/plugins/uidebugger/litho/KStateContainerExtractionTest.kt index a13cbac83..75bcfcbdb 100644 --- a/android/plugins/litho/src/test/java/com/facebook/flipper/plugins/uidebugger/litho/KStateContainerExtractionTest.kt +++ b/android/plugins/litho/src/test/java/com/facebook/flipper/plugins/uidebugger/litho/KStateContainerExtractionTest.kt @@ -7,7 +7,6 @@ import com.facebook.flipper.plugins.uidebugger.descriptors.MetadataRegister import com.facebook.flipper.plugins.uidebugger.litho.descriptors.props.ComponentDataExtractor -import com.facebook.flipper.plugins.uidebugger.model.InspectableArray import com.facebook.flipper.plugins.uidebugger.model.InspectableObject import com.facebook.flipper.plugins.uidebugger.model.InspectableValue import com.facebook.litho.KStateContainer From f0023ea79d2f193a109ca71cc7b8469cb1c4986b Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa Date: Fri, 27 Oct 2023 03:12:03 -0700 Subject: [PATCH 78/80] If there's an existing problem, show regardless Summary: Setup Doctor can be used to discover installation issues. I've seen numerous times when there's a setup issue but users didn't check / bother with using the tool. Instead, if there's an issue, show the screen regardless. Reviewed By: mweststrate Differential Revision: D50642080 fbshipit-source-id: 10eb7a758a61765a5b06d398f5041897fff6280e --- .../src/sandy-chrome/Navbar.tsx | 29 +++++++++++++++++-- .../src/sandy-chrome/SetupDoctorScreen.tsx | 2 +- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx b/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx index 8e4023c1c..014f9a941 100644 --- a/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx +++ b/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx @@ -38,7 +38,10 @@ import { } from '../reducers/application'; import PluginManager from '../chrome/plugin-manager/PluginManager'; import {showEmulatorLauncher} from './appinspect/LaunchEmulator'; -import SetupDoctorScreen, {checkHasNewProblem} from './SetupDoctorScreen'; +import SetupDoctorScreen, { + checkHasNewProblem, + checkHasProblem, +} from './SetupDoctorScreen'; import {isProduction} from 'flipper-common'; import FpsGraph from '../chrome/FpsGraph'; import NetworkGraph from '../chrome/NetworkGraph'; @@ -456,12 +459,32 @@ function TroubleshootMenu() { ), [store, setStatus], ); - const [isDoctorVisible, setIsDoctorVisible] = useState(false); + + const flipperErrorLogCount = useValue(errorCounterAtom); + + /** + * About Doctor. Get the healthcheck report. + * + * checkHasProblem: check if there are problems in the healthcheck report. + * checkHasNewProblem: check if there are new problems in the healthcheck + * report since the last time it was checked or acknowledged, hence the new keyword. + * + * The first time Flipper is opened, show doctor if there's any problems. + * After this, use hasNewProblems as a means to show Doctor if needed. + */ const result = useStore( (state) => state.healthchecks.healthcheckReport.result, ); + const hasProblem = useMemo(() => checkHasProblem(result), [result]); const hasNewProblem = useMemo(() => checkHasNewProblem(result), [result]); - const flipperErrorLogCount = useValue(errorCounterAtom); + + const [isDoctorVisible, setIsDoctorVisible] = useState(hasProblem); + + useEffect(() => { + if (hasNewProblem) { + setIsDoctorVisible(true); + } + }, [hasNewProblem]); const count = flipperErrorLogCount || hasNewProblem || 0; diff --git a/desktop/flipper-ui-core/src/sandy-chrome/SetupDoctorScreen.tsx b/desktop/flipper-ui-core/src/sandy-chrome/SetupDoctorScreen.tsx index ba9a3ee9a..552a7329e 100644 --- a/desktop/flipper-ui-core/src/sandy-chrome/SetupDoctorScreen.tsx +++ b/desktop/flipper-ui-core/src/sandy-chrome/SetupDoctorScreen.tsx @@ -71,7 +71,7 @@ const statusTypeAndMessage: { }, }; -function checkHasProblem(result: FlipperDoctor.HealthcheckResult) { +export function checkHasProblem(result: FlipperDoctor.HealthcheckResult) { return result.status === 'FAILED' || result.status === 'WARNING'; } From 2c1e814264341f94eb76e7107b7add72b03c6444 Mon Sep 17 00:00:00 2001 From: Andrey Goncharov Date: Fri, 27 Oct 2023 05:45:28 -0700 Subject: [PATCH 79/80] Allow power search to be controlled externally Reviewed By: LukeDefeo Differential Revision: D50732883 fbshipit-source-id: a19932b5a3f319fd1dc45572fef251369283cc61 --- .../src/ui/PowerSearch/index.tsx | 25 +++++++++++++++++-- .../data-table/DataTableWithPowerSearch.tsx | 2 +- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/desktop/flipper-plugin/src/ui/PowerSearch/index.tsx b/desktop/flipper-plugin/src/ui/PowerSearch/index.tsx index 1d7d51a61..cf6b50c1f 100644 --- a/desktop/flipper-plugin/src/ui/PowerSearch/index.tsx +++ b/desktop/flipper-plugin/src/ui/PowerSearch/index.tsx @@ -35,6 +35,12 @@ export {PowerSearchConfig, OperatorConfig, FieldConfig, SearchExpressionTerm}; type PowerSearchProps = { config: PowerSearchConfig; + // Overrides current state of the component with every update. + // It is the way to continuously force update the state of the power search externally. + // Takes prefernce over `initialSearchExpression`. + searchExpression?: SearchExpressionTerm[]; + // Component stays uncontrolled and maintains its own state. + // It is respected only on initialization and any future updates are ignored. initialSearchExpression?: SearchExpressionTerm[]; onSearchExpressionChange: (searchExpression: SearchExpressionTerm[]) => void; onConfirmUnknownOption?: ( @@ -46,13 +52,22 @@ const OPTION_KEY_DELIMITER = '::'; export const PowerSearch: React.FC = ({ config, + searchExpression: searchExpressionExternal, initialSearchExpression, onSearchExpressionChange, onConfirmUnknownOption, }) => { const [searchExpression, setSearchExpression] = React.useState< IncompleteSearchExpressionTerm[] - >(initialSearchExpression ?? []); + >(() => { + if (searchExpressionExternal) { + return searchExpressionExternal; + } + if (initialSearchExpression) { + return initialSearchExpression; + } + return []; + }); const onSearchExpressionChangeLatestRef = useLatestRef( onSearchExpressionChange, @@ -69,6 +84,12 @@ export const PowerSearch: React.FC = ({ } }, [searchExpression, onSearchExpressionChangeLatestRef]); + React.useEffect(() => { + if (searchExpressionExternal) { + setSearchExpression(searchExpressionExternal); + } + }, [searchExpressionExternal]); + const options: PowerSearchTermFinderOptionGroup[] = React.useMemo(() => { const groupedOptions: PowerSearchTermFinderOptionGroup[] = []; @@ -112,7 +133,7 @@ export const PowerSearch: React.FC = ({ {searchExpression.map((searchTerm, i) => { return ( { setSearchExpression((prevSearchExpression) => { diff --git a/desktop/flipper-plugin/src/ui/data-table/DataTableWithPowerSearch.tsx b/desktop/flipper-plugin/src/ui/data-table/DataTableWithPowerSearch.tsx index 7c2e08d9d..d7dd34108 100644 --- a/desktop/flipper-plugin/src/ui/data-table/DataTableWithPowerSearch.tsx +++ b/desktop/flipper-plugin/src/ui/data-table/DataTableWithPowerSearch.tsx @@ -673,7 +673,7 @@ export function DataTable( { tableManager.setSearchExpression(newSearchExpression); }} From 34bbd415479efa3756adfcfd05c252b4de8b49d6 Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa Date: Fri, 27 Oct 2023 10:19:33 -0700 Subject: [PATCH 80/80] If unable to load main bundle, retry after 3 seconds Summary: If we fail to load the main js bundle, retry after 3 seconds. Reviewed By: aigoncharov Differential Revision: D50732857 fbshipit-source-id: b19ea165776f8105d724e586b1bed20bf1f5178c --- desktop/static/index.web.dev.html | 14 ++++++++++++-- desktop/static/index.web.html | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/desktop/static/index.web.dev.html b/desktop/static/index.web.dev.html index d5eda16f5..0c3606a0a 100644 --- a/desktop/static/index.web.dev.html +++ b/desktop/static/index.web.dev.html @@ -201,9 +201,19 @@ function init() { const script = document.createElement('script'); script.src = window.flipperConfig.entryPoint; - script.onerror = (e) => { - showMessage('Failed to load entry point. Check Chrome Dev Tools console for more info.'); + const retry = (retries) => { + showMessage(`Failed to load entry point. Check Chrome Dev Tools console for more info. Retrying in: ${retries}`); + retries -= 1; + if (retries < 0) { + window.location.reload(); + } + else { + setTimeout(() => retry(retries), 1000); + } + } + + retry(3); }; document.body.appendChild(script); diff --git a/desktop/static/index.web.html b/desktop/static/index.web.html index c724d7041..80c2bdc17 100644 --- a/desktop/static/index.web.html +++ b/desktop/static/index.web.html @@ -106,9 +106,19 @@ function init() { const script = document.createElement('script'); script.src = window.flipperConfig.entryPoint; - script.onerror = (e) => { - showMessage('Script failure. Check Chrome Dev Tools console for more info.'); + const retry = (retries) => { + showMessage(`Failed to load entry point. Check Chrome Dev Tools console for more info. Retrying in: ${retries}`); + retries -= 1; + if (retries < 0) { + window.location.reload(); + } + else { + setTimeout(() => retry(retries), 1000); + } + } + + retry(3); }; document.body.appendChild(script);