diff --git a/desktop/PortForwardingMacApp/Podfile b/desktop/PortForwardingMacApp/Podfile new file mode 100644 index 00000000000..cde1276500b --- /dev/null +++ b/desktop/PortForwardingMacApp/Podfile @@ -0,0 +1,13 @@ +# Uncomment the next line to define a global platform for your project +# platform :ios, '9.0' + +target 'PortForwardingMacApp' do + # Comment the next line if you don't want to use dynamic frameworks + #use_frameworks! + platform :osx, '11' + + # Pods for PortForwardingMacApp + pod 'Flipper-PeerTalk', '~>0.0' + pod 'CocoaAsyncSocket', '~>7.6' + +end diff --git a/desktop/PortForwardingMacApp/Podfile.lock b/desktop/PortForwardingMacApp/Podfile.lock new file mode 100644 index 00000000000..9b196fdfdab --- /dev/null +++ b/desktop/PortForwardingMacApp/Podfile.lock @@ -0,0 +1,20 @@ +PODS: + - CocoaAsyncSocket (7.6.5) + - Flipper-PeerTalk (0.0.4) + +DEPENDENCIES: + - CocoaAsyncSocket (~> 7.6) + - Flipper-PeerTalk (~> 0.0) + +SPEC REPOS: + trunk: + - CocoaAsyncSocket + - Flipper-PeerTalk + +SPEC CHECKSUMS: + CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 + Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 + +PODFILE CHECKSUM: 861e0c9ba6cbdc85168a923850426dcf49e444fa + +COCOAPODS: 1.11.2 diff --git a/desktop/PortForwardingMacApp/PortForwardingMacApp.xcodeproj/project.pbxproj b/desktop/PortForwardingMacApp/PortForwardingMacApp.xcodeproj/project.pbxproj new file mode 100644 index 00000000000..3f7e0894ea3 --- /dev/null +++ b/desktop/PortForwardingMacApp/PortForwardingMacApp.xcodeproj/project.pbxproj @@ -0,0 +1,417 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 55; + objects = { + +/* Begin PBXBuildFile section */ + 3B3526C92757197400D803F9 /* FKPortForwardingClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B61AC1A2756C3D30017E050 /* FKPortForwardingClient.m */; }; + 3B3526CA2757197400D803F9 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B3FD2F527565B8000D731DB /* main.m */; }; + 3B3526CF275721B500D803F9 /* FBPortForwardingMacApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B0A99AA5350C20B2CFA072E3 /* FBPortForwardingMacApp.framework */; }; + 49AE9D8F5494BB1BC5BF2B9E /* libPods-PortForwardingMacApp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BFC73B0CB918678127B57C88 /* libPods-PortForwardingMacApp.a */; }; +/* End PBXBuildFile section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 3B3526D1275721B500D803F9 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 339253FD0D50C9D90FA019FF /* Pods-PortForwardingMacApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PortForwardingMacApp.release.xcconfig"; path = "../../Pods/Target Support Files/Pods-PortForwardingMacApp/Pods-PortForwardingMacApp.release.xcconfig"; sourceTree = ""; }; + 3B3526B9275718D700D803F9 /* PortForwardingMacApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PortForwardingMacApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 3B3FD2F527565B8000D731DB /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 3B61AC192756C3D30017E050 /* FKPortForwardingClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FKPortForwardingClient.h; path = iOS/FlipperKit/FKPortForwarding/FKPortForwardingClient.h; sourceTree = SOURCE_ROOT; }; + 3B61AC1A2756C3D30017E050 /* FKPortForwardingClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FKPortForwardingClient.m; path = iOS/FlipperKit/FKPortForwarding/FKPortForwardingClient.m; sourceTree = SOURCE_ROOT; }; + 95395DC97D1F23A7B72F2FB8 /* Pods-PortForwardingMacApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PortForwardingMacApp.debug.xcconfig"; path = "Target Support Files/Pods-PortForwardingMacApp/Pods-PortForwardingMacApp.debug.xcconfig"; sourceTree = ""; }; + B0A99AA5350C20B2CFA072E3 /* FBPortForwardingMacApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FBPortForwardingMacApp.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + BFC73B0CB918678127B57C88 /* libPods-PortForwardingMacApp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-PortForwardingMacApp.a"; sourceTree = BUILT_PRODUCTS_DIR; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 3B3526B6275718D700D803F9 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 3B3526CF275721B500D803F9 /* FBPortForwardingMacApp.framework in Frameworks */, + 49AE9D8F5494BB1BC5BF2B9E /* libPods-PortForwardingMacApp.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 3B3FD2E927565B8000D731DB = { + isa = PBXGroup; + children = ( + 3B3FD2F427565B8000D731DB /* PortForwardingMacApp */, + 3B3FD2F327565B8000D731DB /* Products */, + 3BDD19D5275661C600E99F80 /* Frameworks */, + FE7B3BC513417A34A3909022 /* Pods */, + ); + sourceTree = ""; + }; + 3B3FD2F327565B8000D731DB /* Products */ = { + isa = PBXGroup; + children = ( + 3B3526B9275718D700D803F9 /* PortForwardingMacApp.app */, + ); + name = Products; + sourceTree = ""; + }; + 3B3FD2F427565B8000D731DB /* PortForwardingMacApp */ = { + isa = PBXGroup; + children = ( + 3BB802F8275852CD00A82E32 /* FKPortForwarding */, + 3B3FD2F527565B8000D731DB /* main.m */, + ); + path = PortForwardingMacApp; + sourceTree = ""; + }; + 3BB802F8275852CD00A82E32 /* FKPortForwarding */ = { + isa = PBXGroup; + children = ( + 3BB802FF2758545200A82E32 /* FKPortForwardingClient.h */, + 3BB803002758545200A82E32 /* FKPortForwardingClient.m */, + 3BB802FE2758545200A82E32 /* FKPortForwardingCommon.h */, + ); + name = FKPortForwarding; + path = ..; + sourceTree = ""; + }; + 3BDD19D5275661C600E99F80 /* Frameworks */ = { + isa = PBXGroup; + children = ( + B0A99AA5350C20B2CFA072E3 /* FBPortForwardingMacApp.framework */, + BFC73B0CB918678127B57C88 /* libPods-PortForwardingMacApp.a */, + ); + name = Frameworks; + sourceTree = ""; + }; + FE7B3BC513417A34A3909022 /* Pods */ = { + isa = PBXGroup; + children = ( + 95395DC97D1F23A7B72F2FB8 /* Pods-PortForwardingMacApp.debug.xcconfig */, + 339253FD0D50C9D90FA019FF /* Pods-PortForwardingMacApp.release.xcconfig */, + ); + name = Pods; + path = iOS/Pods; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 3B3526B8275718D700D803F9 /* PortForwardingMacApp */ = { + isa = PBXNativeTarget; + buildConfigurationList = 3B3526C6275718D800D803F9 /* Build configuration list for PBXNativeTarget "PortForwardingMacApp" */; + buildPhases = ( + B95B3E164CB7F2CE4005C454 /* [CP] Check Pods Manifest.lock */, + 3B3526B5275718D700D803F9 /* Sources */, + 3B3526B6275718D700D803F9 /* Frameworks */, + 3B3526B7275718D700D803F9 /* Resources */, + 3B3526D1275721B500D803F9 /* Embed Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = PortForwardingMacApp; + productName = PortForwardingMacApp; + productReference = 3B3526B9275718D700D803F9 /* PortForwardingMacApp.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 3B3FD2EA27565B8000D731DB /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = 1; + LastUpgradeCheck = 1310; + TargetAttributes = { + 3B3526B8275718D700D803F9 = { + CreatedOnToolsVersion = 13.1; + }; + }; + }; + buildConfigurationList = 3B3FD2ED27565B8000D731DB /* Build configuration list for PBXProject "PortForwardingMacApp" */; + compatibilityVersion = "Xcode 13.0"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 3B3FD2E927565B8000D731DB; + productRefGroup = 3B3FD2F327565B8000D731DB /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 3B3526B8275718D700D803F9 /* PortForwardingMacApp */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 3B3526B7275718D700D803F9 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + B95B3E164CB7F2CE4005C454 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-PortForwardingMacApp-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 3B3526B5275718D700D803F9 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 3B2385EB275850F100789041 /* main.m in Sources */, + 3BB803012758545200A82E32 /* FKPortForwardingClient.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 3B3526C7275718D800D803F9 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 95395DC97D1F23A7B72F2FB8 /* Pods-PortForwardingMacApp.debug.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + BUILD_LIBRARY_FOR_DISTRIBUTION = YES; + CODE_SIGN_ENTITLEMENTS = ""; + CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "\"${PODS_ROOT}/Headers/Public\"", + "\"${PODS_ROOT}/Headers/Public/CocoaAsyncSocket\"", + "\"${PODS_ROOT}/Headers/Public/Flipper-PeerTalk\"", + "${SRCROOT}/**", + ); + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools"; + INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2013-present Facebook. All rights reserved."; + INFOPLIST_KEY_NSMainNibFile = MainMenu; + INFOPLIST_KEY_NSPrincipalClass = NSApplication; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.facebook.PortForwardingMacApp; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_EMIT_LOC_STRINGS = YES; + }; + name = Debug; + }; + 3B3526C8275718D800D803F9 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 339253FD0D50C9D90FA019FF /* Pods-PortForwardingMacApp.release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + BUILD_LIBRARY_FOR_DISTRIBUTION = YES; + CODE_SIGN_ENTITLEMENTS = ""; + CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "\"${PODS_ROOT}/Headers/Public\"", + "\"${PODS_ROOT}/Headers/Public/CocoaAsyncSocket\"", + "\"${PODS_ROOT}/Headers/Public/Flipper-PeerTalk\"", + "${SRCROOT}/**", + ); + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools"; + INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2013-present Facebook. All rights reserved."; + INFOPLIST_KEY_NSMainNibFile = MainMenu; + INFOPLIST_KEY_NSPrincipalClass = NSApplication; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.facebook.PortForwardingMacApp; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_EMIT_LOC_STRINGS = YES; + }; + name = Release; + }; + 3B3FD2F727565B8000D731DB /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 12.0; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + }; + name = Debug; + }; + 3B3FD2F827565B8000D731DB /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 12.0; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SDKROOT = macosx; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 3B3526C6275718D800D803F9 /* Build configuration list for PBXNativeTarget "PortForwardingMacApp" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 3B3526C7275718D800D803F9 /* Debug */, + 3B3526C8275718D800D803F9 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 3B3FD2ED27565B8000D731DB /* Build configuration list for PBXProject "PortForwardingMacApp" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 3B3FD2F727565B8000D731DB /* Debug */, + 3B3FD2F827565B8000D731DB /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 3B3FD2EA27565B8000D731DB /* Project object */; +} diff --git a/desktop/PortForwardingMacApp/PortForwardingMacApp.xcodeproj/xcshareddata/xcschemes/PortForwardingMacApp.xcscheme b/desktop/PortForwardingMacApp/PortForwardingMacApp.xcodeproj/xcshareddata/xcschemes/PortForwardingMacApp.xcscheme new file mode 100644 index 00000000000..4dd1a69198e --- /dev/null +++ b/desktop/PortForwardingMacApp/PortForwardingMacApp.xcodeproj/xcshareddata/xcschemes/PortForwardingMacApp.xcscheme @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iOS/FlipperKit/FKPortForwarding/FKPortForwardingClient.h b/desktop/PortForwardingMacApp/PortForwardingMacApp/FKPortForwarding/FKPortForwardingClient.h similarity index 100% rename from iOS/FlipperKit/FKPortForwarding/FKPortForwardingClient.h rename to desktop/PortForwardingMacApp/PortForwardingMacApp/FKPortForwarding/FKPortForwardingClient.h diff --git a/iOS/FlipperKit/FKPortForwarding/FKPortForwardingClient.m b/desktop/PortForwardingMacApp/PortForwardingMacApp/FKPortForwarding/FKPortForwardingClient.m similarity index 100% rename from iOS/FlipperKit/FKPortForwarding/FKPortForwardingClient.m rename to desktop/PortForwardingMacApp/PortForwardingMacApp/FKPortForwarding/FKPortForwardingClient.m diff --git a/desktop/PortForwardingMacApp/PortForwardingMacApp/FKPortForwarding/FKPortForwardingCommon.h b/desktop/PortForwardingMacApp/PortForwardingMacApp/FKPortForwarding/FKPortForwardingCommon.h new file mode 100644 index 00000000000..d329cdffba5 --- /dev/null +++ b/desktop/PortForwardingMacApp/PortForwardingMacApp/FKPortForwarding/FKPortForwardingCommon.h @@ -0,0 +1,25 @@ +/* + * 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. + */ + +#import + +#define FBPFTrace(...) /*NSLog(__VA_ARGS__)*/ +#define FBPFLog(...) NSLog(__VA_ARGS__) + +enum { + FKPortForwardingFrameTypeOpenPipe = 201, + FKPortForwardingFrameTypeWriteToPipe = 202, + FKPortForwardingFrameTypeClosePipe = 203, +}; + +static dispatch_data_t NSDataToGCDData(NSData* data) { + __block NSData* retainedData = data; + return dispatch_data_create(data.bytes, data.length, nil, ^{ + retainedData = nil; + }); + (void)retainedData; +} diff --git a/PortForwardingMacApp/main.m b/desktop/PortForwardingMacApp/PortForwardingMacApp/main.m similarity index 100% rename from PortForwardingMacApp/main.m rename to desktop/PortForwardingMacApp/PortForwardingMacApp/main.m diff --git a/desktop/scripts/build-release.tsx b/desktop/scripts/build-release.tsx index 54dbdabf520..f58c5f10d1b 100755 --- a/desktop/scripts/build-release.tsx +++ b/desktop/scripts/build-release.tsx @@ -222,14 +222,14 @@ async function buildDist(buildFolder: string) { const postBuildCallbacks: (() => void)[] = []; if (argv.mac || argv['mac-dmg']) { - targetsRaw.push(Platform.MAC.createTarget(['dir'])); + targetsRaw.push(Platform.MAC.createTarget(['dir'], Arch.universal)); // You can build mac apps on Linux but can't build dmgs, so we separate those. if (argv['mac-dmg']) { - targetsRaw.push(Platform.MAC.createTarget(['dmg'])); + targetsRaw.push(Platform.MAC.createTarget(['dmg'], Arch.universal)); } postBuildCallbacks.push(() => spawn('zip', ['-qyr9', '../Flipper-mac.zip', 'Flipper.app'], { - cwd: path.join(distDir, 'mac'), + cwd: path.join(distDir, 'mac-universal'), encoding: 'utf-8', }), ); diff --git a/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/CocoaAsyncSocketMac.framework/CocoaAsyncSocketMac b/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/CocoaAsyncSocketMac.framework/CocoaAsyncSocketMac deleted file mode 100755 index 8917be44d54..00000000000 Binary files a/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/CocoaAsyncSocketMac.framework/CocoaAsyncSocketMac and /dev/null differ diff --git a/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/CocoaAsyncSocketMac.framework/Resources/Info.plist b/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/CocoaAsyncSocketMac.framework/Resources/Info.plist deleted file mode 100644 index 9e893f5493b..00000000000 --- a/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/CocoaAsyncSocketMac.framework/Resources/Info.plist +++ /dev/null @@ -1,44 +0,0 @@ - - - - - BuildMachineOSBuild - 16G29 - CFBundleDevelopmentRegion - English - CFBundleExecutable - CocoaAsyncSocketMac - CFBundleIdentifier - com.robbiehanson.CocoaAsyncSocketMac - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - CocoaAsyncSocketMac - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleSupportedPlatforms - - MacOSX - - CFBundleVersion - 1 - DTCompiler - com.apple.compilers.llvm.clang.1_0 - DTPlatformBuild - 9A235 - DTPlatformVersion - GM - DTSDKBuild - 17A360 - DTSDKName - macosx10.13 - DTXcode - 0900 - DTXcodeBuild - 9A235 - - diff --git a/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/CocoaAsyncSocketMac.framework/Versions/A/CocoaAsyncSocketMac b/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/CocoaAsyncSocketMac.framework/Versions/A/CocoaAsyncSocketMac deleted file mode 100755 index 8917be44d54..00000000000 Binary files a/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/CocoaAsyncSocketMac.framework/Versions/A/CocoaAsyncSocketMac and /dev/null differ diff --git a/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/CocoaAsyncSocketMac.framework/Versions/A/Resources/Info.plist b/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/CocoaAsyncSocketMac.framework/Versions/A/Resources/Info.plist deleted file mode 100644 index 9e893f5493b..00000000000 --- a/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/CocoaAsyncSocketMac.framework/Versions/A/Resources/Info.plist +++ /dev/null @@ -1,44 +0,0 @@ - - - - - BuildMachineOSBuild - 16G29 - CFBundleDevelopmentRegion - English - CFBundleExecutable - CocoaAsyncSocketMac - CFBundleIdentifier - com.robbiehanson.CocoaAsyncSocketMac - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - CocoaAsyncSocketMac - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleSupportedPlatforms - - MacOSX - - CFBundleVersion - 1 - DTCompiler - com.apple.compilers.llvm.clang.1_0 - DTPlatformBuild - 9A235 - DTPlatformVersion - GM - DTSDKBuild - 17A360 - DTSDKName - macosx10.13 - DTXcode - 0900 - DTXcodeBuild - 9A235 - - diff --git a/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/FBPortForwarding-Mac.framework/FBPortForwarding-Mac b/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/FBPortForwarding-Mac.framework/FBPortForwarding-Mac deleted file mode 100755 index 901b31192e7..00000000000 Binary files a/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/FBPortForwarding-Mac.framework/FBPortForwarding-Mac and /dev/null differ diff --git a/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/FBPortForwarding-Mac.framework/Resources/Info.plist b/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/FBPortForwarding-Mac.framework/Resources/Info.plist deleted file mode 100644 index a0e8d7ec978..00000000000 --- a/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/FBPortForwarding-Mac.framework/Resources/Info.plist +++ /dev/null @@ -1,46 +0,0 @@ - - - - - BuildMachineOSBuild - 16G29 - CFBundleDevelopmentRegion - en - CFBundleExecutable - FBPortForwarding-Mac - CFBundleIdentifier - com.facebook.FBPortForwarding-Mac - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - FBPortForwarding-Mac - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleSupportedPlatforms - - MacOSX - - CFBundleVersion - - DTCompiler - com.apple.compilers.llvm.clang.1_0 - DTPlatformBuild - 9A235 - DTPlatformVersion - GM - DTSDKBuild - 17A360 - DTSDKName - macosx10.13 - DTXcode - 0900 - DTXcodeBuild - 9A235 - NSHumanReadableCopyright - Copyright © 2014 Facebook. All rights reserved. - - diff --git a/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/FBPortForwarding-Mac.framework/Versions/A/FBPortForwarding-Mac b/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/FBPortForwarding-Mac.framework/Versions/A/FBPortForwarding-Mac deleted file mode 100755 index 901b31192e7..00000000000 Binary files a/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/FBPortForwarding-Mac.framework/Versions/A/FBPortForwarding-Mac and /dev/null differ diff --git a/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/FBPortForwarding-Mac.framework/Versions/A/Resources/Info.plist b/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/FBPortForwarding-Mac.framework/Versions/A/Resources/Info.plist deleted file mode 100644 index a0e8d7ec978..00000000000 --- a/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/FBPortForwarding-Mac.framework/Versions/A/Resources/Info.plist +++ /dev/null @@ -1,46 +0,0 @@ - - - - - BuildMachineOSBuild - 16G29 - CFBundleDevelopmentRegion - en - CFBundleExecutable - FBPortForwarding-Mac - CFBundleIdentifier - com.facebook.FBPortForwarding-Mac - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - FBPortForwarding-Mac - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleSupportedPlatforms - - MacOSX - - CFBundleVersion - - DTCompiler - com.apple.compilers.llvm.clang.1_0 - DTPlatformBuild - 9A235 - DTPlatformVersion - GM - DTSDKBuild - 17A360 - DTSDKName - macosx10.13 - DTXcode - 0900 - DTXcodeBuild - 9A235 - NSHumanReadableCopyright - Copyright © 2014 Facebook. All rights reserved. - - diff --git a/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/peertalkMac.framework/Resources/Info.plist b/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/peertalkMac.framework/Resources/Info.plist deleted file mode 100644 index f66988b1ea7..00000000000 --- a/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/peertalkMac.framework/Resources/Info.plist +++ /dev/null @@ -1,46 +0,0 @@ - - - - - BuildMachineOSBuild - 16G29 - CFBundleDevelopmentRegion - en - CFBundleExecutable - peertalkMac - CFBundleIdentifier - com.facebook.peertalkMac - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - peertalkMac - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleSupportedPlatforms - - MacOSX - - CFBundleVersion - - DTCompiler - com.apple.compilers.llvm.clang.1_0 - DTPlatformBuild - 9A235 - DTPlatformVersion - GM - DTSDKBuild - 17A360 - DTSDKName - macosx10.13 - DTXcode - 0900 - DTXcodeBuild - 9A235 - NSHumanReadableCopyright - Copyright © 2014 Facebook. All rights reserved. - - diff --git a/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/peertalkMac.framework/Versions/A/Resources/Info.plist b/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/peertalkMac.framework/Versions/A/Resources/Info.plist deleted file mode 100644 index f66988b1ea7..00000000000 --- a/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/peertalkMac.framework/Versions/A/Resources/Info.plist +++ /dev/null @@ -1,46 +0,0 @@ - - - - - BuildMachineOSBuild - 16G29 - CFBundleDevelopmentRegion - en - CFBundleExecutable - peertalkMac - CFBundleIdentifier - com.facebook.peertalkMac - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - peertalkMac - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleSupportedPlatforms - - MacOSX - - CFBundleVersion - - DTCompiler - com.apple.compilers.llvm.clang.1_0 - DTPlatformBuild - 9A235 - DTPlatformVersion - GM - DTSDKBuild - 17A360 - DTSDKName - macosx10.13 - DTXcode - 0900 - DTXcodeBuild - 9A235 - NSHumanReadableCopyright - Copyright © 2014 Facebook. All rights reserved. - - diff --git a/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/peertalkMac.framework/Versions/A/peertalkMac b/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/peertalkMac.framework/Versions/A/peertalkMac deleted file mode 100755 index 291ebf9aa1d..00000000000 Binary files a/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/peertalkMac.framework/Versions/A/peertalkMac and /dev/null differ diff --git a/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/peertalkMac.framework/peertalkMac b/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/peertalkMac.framework/peertalkMac deleted file mode 100755 index 291ebf9aa1d..00000000000 Binary files a/desktop/static/PortForwardingMacApp.app/Contents/Frameworks/peertalkMac.framework/peertalkMac and /dev/null differ diff --git a/desktop/static/PortForwardingMacApp.app/Contents/Info.plist b/desktop/static/PortForwardingMacApp.app/Contents/Info.plist index 5a3dc25fd11..e499da0f253 100644 --- a/desktop/static/PortForwardingMacApp.app/Contents/Info.plist +++ b/desktop/static/PortForwardingMacApp.app/Contents/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 16G29 + 21A559 CFBundleDevelopmentRegion en CFBundleExecutable @@ -16,30 +16,34 @@ PortForwardingMacApp CFBundlePackageType APPL - CFBundleSignature - ???? + CFBundleShortVersionString + 1.0 CFBundleSupportedPlatforms MacOSX CFBundleVersion - + 1 DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 9A235 + 13A1030d + DTPlatformName + macosx DTPlatformVersion - GM + 12.0 DTSDKBuild - 17A360 + 21A344 DTSDKName - macosx10.13 + macosx12.0 DTXcode - 0900 + 1310 DTXcodeBuild - 9A235 + 13A1030d + LSApplicationCategoryType + public.app-category.developer-tools LSMinimumSystemVersion - 10.10 + 12.0 NSHumanReadableCopyright Copyright © 2013-present Facebook. All rights reserved. NSMainNibFile diff --git a/desktop/static/PortForwardingMacApp.app/Contents/MacOS/PortForwardingMacApp b/desktop/static/PortForwardingMacApp.app/Contents/MacOS/PortForwardingMacApp index 8b1ee87b271..cfddb8067c4 100755 Binary files a/desktop/static/PortForwardingMacApp.app/Contents/MacOS/PortForwardingMacApp and b/desktop/static/PortForwardingMacApp.app/Contents/MacOS/PortForwardingMacApp differ diff --git a/desktop/static/PortForwardingMacApp.app/Contents/_CodeSignature/CodeResources b/desktop/static/PortForwardingMacApp.app/Contents/_CodeSignature/CodeResources new file mode 100644 index 00000000000..d5d0fd74412 --- /dev/null +++ b/desktop/static/PortForwardingMacApp.app/Contents/_CodeSignature/CodeResources @@ -0,0 +1,115 @@ + + + + + files + + files2 + + rules + + ^Resources/ + + ^Resources/.*\.lproj/ + + optional + + weight + 1000 + + ^Resources/.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^Resources/Base\.lproj/ + + weight + 1010 + + ^version.plist$ + + + rules2 + + .*\.dSYM($|/) + + weight + 11 + + ^(.*/)?\.DS_Store$ + + omit + + weight + 2000 + + ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/ + + nested + + weight + 10 + + ^.* + + ^Info\.plist$ + + omit + + weight + 20 + + ^PkgInfo$ + + omit + + weight + 20 + + ^Resources/ + + weight + 20 + + ^Resources/.*\.lproj/ + + optional + + weight + 1000 + + ^Resources/.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^Resources/Base\.lproj/ + + weight + 1010 + + ^[^/]+$ + + nested + + weight + 10 + + ^embedded\.provisionprofile$ + + weight + 20 + + ^version\.plist$ + + weight + 20 + + + + diff --git a/iOS/FlipperKit/FKPortForwarding/FKPortForwardingCommon.h b/iOS/FlipperKit/FKPortForwarding/FKPortForwardingCommon.h index d329cdffba5..fd8d131a364 100644 --- a/iOS/FlipperKit/FKPortForwarding/FKPortForwardingCommon.h +++ b/iOS/FlipperKit/FKPortForwarding/FKPortForwardingCommon.h @@ -1,5 +1,5 @@ /* - * Copyright (c) Meta Platforms, Inc. and affiliates. + * Copyright (c) Facebook, Inc. and its affiliates. * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. @@ -21,5 +21,4 @@ static dispatch_data_t NSDataToGCDData(NSData* data) { return dispatch_data_create(data.bytes, data.length, nil, ^{ retainedData = nil; }); - (void)retainedData; } diff --git a/iOS/Podfile.lock b/iOS/Podfile.lock index 88f9b5898ce..7f43cf05d82 100644 --- a/iOS/Podfile.lock +++ b/iOS/Podfile.lock @@ -1,7 +1,7 @@ PODS: - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.5) - - Flipper (0.135.0): + - Flipper (0.138.0): - Flipper-Folly (~> 2.6) - Flipper-Boost-iOSX (1.76.0.1.11) - Flipper-DoubleConversion (3.1.7) @@ -30,7 +30,7 @@ DEPENDENCIES: - SocketRocket (~> 0.6.0) SPEC REPOS: - https://github.com/CocoaPods/Specs: + https://github.com/CocoaPods/Specs.git: - CocoaAsyncSocket - DoubleConversion - Flipper-Boost-iOSX @@ -51,7 +51,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: e22e0762848812a87afd67ffda3998d9ef29170c - Flipper: 8d280c95b6a6d87a456d6b030df58e8859448267 + Flipper: a5ed0fd7212a369f0c0f8fe096a711355cbb22cf Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b @@ -63,6 +63,6 @@ SPEC CHECKSUMS: OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 -PODFILE CHECKSUM: 75371a02c3eedd0de3d666960d97e308c70edd88 +PODFILE CHECKSUM: fca1274f05facf86edf8f6963fe77c29120d949c -COCOAPODS: 1.11.2 +COCOAPODS: 1.10.2