diff --git a/desktop/PortForwardingMacApp/Podfile b/desktop/PortForwardingMacApp/Podfile new file mode 100644 index 000000000..cde127650 --- /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 000000000..9b196fdfd --- /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/PortForwardingMacApp.xcodeproj/project.pbxproj b/desktop/PortForwardingMacApp/PortForwardingMacApp.xcodeproj/project.pbxproj similarity index 95% rename from PortForwardingMacApp.xcodeproj/project.pbxproj rename to desktop/PortForwardingMacApp/PortForwardingMacApp.xcodeproj/project.pbxproj index ad6dec082..3f7e0894e 100644 --- a/PortForwardingMacApp.xcodeproj/project.pbxproj +++ b/desktop/PortForwardingMacApp/PortForwardingMacApp.xcodeproj/project.pbxproj @@ -27,7 +27,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 339253FD0D50C9D90FA019FF /* Pods-PortForwardingMacApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PortForwardingMacApp.release.xcconfig"; path = "Target Support Files/Pods-PortForwardingMacApp/Pods-PortForwardingMacApp.release.xcconfig"; sourceTree = ""; }; + 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; }; @@ -71,19 +71,21 @@ 3B3FD2F427565B8000D731DB /* PortForwardingMacApp */ = { isa = PBXGroup; children = ( - 3B61AC182756C3AF0017E050 /* PortForwarding */, + 3BB802F8275852CD00A82E32 /* FKPortForwarding */, 3B3FD2F527565B8000D731DB /* main.m */, ); path = PortForwardingMacApp; sourceTree = ""; }; - 3B61AC182756C3AF0017E050 /* PortForwarding */ = { + 3BB802F8275852CD00A82E32 /* FKPortForwarding */ = { isa = PBXGroup; children = ( - 3B61AC192756C3D30017E050 /* FKPortForwardingClient.h */, - 3B61AC1A2756C3D30017E050 /* FKPortForwardingClient.m */, + 3BB802FF2758545200A82E32 /* FKPortForwardingClient.h */, + 3BB803002758545200A82E32 /* FKPortForwardingClient.m */, + 3BB802FE2758545200A82E32 /* FKPortForwardingCommon.h */, ); - path = PortForwarding; + name = FKPortForwarding; + path = ..; sourceTree = ""; }; 3BDD19D5275661C600E99F80 /* Frameworks */ = { @@ -199,8 +201,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 3B3526C92757197400D803F9 /* FKPortForwardingClient.m in Sources */, - 3B3526CA2757197400D803F9 /* main.m in Sources */, + 3B2385EB275850F100789041 /* main.m in Sources */, + 3BB803012758545200A82E32 /* FKPortForwardingClient.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -211,9 +213,11 @@ 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; @@ -223,7 +227,7 @@ "\"${PODS_ROOT}/Headers/Public\"", "\"${PODS_ROOT}/Headers/Public/CocoaAsyncSocket\"", "\"${PODS_ROOT}/Headers/Public/Flipper-PeerTalk\"", - "${SRCROOT}/iOS/FlipperKit/**", + "${SRCROOT}/**", ); INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools"; INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2013-present Facebook. All rights reserved."; @@ -244,9 +248,11 @@ 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; @@ -256,7 +262,7 @@ "\"${PODS_ROOT}/Headers/Public\"", "\"${PODS_ROOT}/Headers/Public/CocoaAsyncSocket\"", "\"${PODS_ROOT}/Headers/Public/Flipper-PeerTalk\"", - "${SRCROOT}/iOS/FlipperKit/**", + "${SRCROOT}/**", ); INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools"; INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2013-present Facebook. All rights reserved."; diff --git a/PortForwardingMacApp.xcodeproj/xcshareddata/xcschemes/PortForwardingMacApp.xcscheme b/desktop/PortForwardingMacApp/PortForwardingMacApp.xcodeproj/xcshareddata/xcschemes/PortForwardingMacApp.xcscheme similarity index 100% rename from PortForwardingMacApp.xcodeproj/xcshareddata/xcschemes/PortForwardingMacApp.xcscheme rename to desktop/PortForwardingMacApp/PortForwardingMacApp.xcodeproj/xcshareddata/xcschemes/PortForwardingMacApp.xcscheme 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/iOS/FlipperKit/FKPortForwarding/FKPortForwardingCommon.h b/desktop/PortForwardingMacApp/PortForwardingMacApp/FKPortForwarding/FKPortForwardingCommon.h similarity index 100% rename from iOS/FlipperKit/FKPortForwarding/FKPortForwardingCommon.h rename to desktop/PortForwardingMacApp/PortForwardingMacApp/FKPortForwarding/FKPortForwardingCommon.h 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/iOS/FlipperKit.xcodeproj/project.pbxproj b/iOS/FlipperKit.xcodeproj/project.pbxproj index 8f023cbd1..0be0462eb 100644 --- a/iOS/FlipperKit.xcodeproj/project.pbxproj +++ b/iOS/FlipperKit.xcodeproj/project.pbxproj @@ -63,7 +63,9 @@ 53915CC92152E31C0090EEA6 /* Plugins */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Plugins; sourceTree = SOURCE_ROOT; }; 53D19A0520A4BA3600A371E3 /* FlipperKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FlipperKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 53D4C51120A5B89900613A96 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; + 5B3C0104984F1A2F624E5394 /* Pods-SonarKit.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SonarKit.release.xcconfig"; path = "Pods/Target Support Files/Pods-SonarKit/Pods-SonarKit.release.xcconfig"; sourceTree = ""; }; AF8587A796104EAC5B080F7D /* Pods-FlipperKit.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlipperKit.release.xcconfig"; path = "Pods/Target Support Files/Pods-FlipperKit/Pods-FlipperKit.release.xcconfig"; sourceTree = ""; }; + C6253FA5661121EDD200B8A9 /* Pods-SonarKit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SonarKit.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SonarKit/Pods-SonarKit.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -82,6 +84,8 @@ 256B672257477FB71D3FAD20 /* Pods */ = { isa = PBXGroup; children = ( + C6253FA5661121EDD200B8A9 /* Pods-SonarKit.debug.xcconfig */, + 5B3C0104984F1A2F624E5394 /* Pods-SonarKit.release.xcconfig */, 22B8670D786EA50E30082023 /* Pods-FlipperKit.debug.xcconfig */, AF8587A796104EAC5B080F7D /* Pods-FlipperKit.release.xcconfig */, ); @@ -230,7 +234,7 @@ 53D199FC20A4BA3600A371E3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1310; + LastUpgradeCheck = 0940; ORGANIZATIONNAME = Facebook; TargetAttributes = { 53D19A0420A4BA3600A371E3 = { @@ -246,7 +250,6 @@ hasScannedForEncodings = 0; knownRegions = ( en, - Base, ); mainGroup = 53D199FB20A4BA3600A371E3; productRefGroup = 53D19A0620A4BA3600A371E3 /* Products */; @@ -335,7 +338,6 @@ 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; @@ -362,7 +364,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.2; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -397,7 +399,6 @@ 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; @@ -418,7 +419,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.2; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; @@ -457,13 +458,12 @@ "${PODS_ROOT}/Headers/Public/glog", "${PODS_ROOT}/Headers/Public/CocoaAsyncSocket", /usr/local/Cellar/openssl/1.0.2o_1/include, - /opt/homebrew/Cellar/boost/1.76.0/include, "${SRCROOT}", "${SRCROOT}/Plugins/**", ); INFOPLIST_FILE = "$(SRCROOT)/FlipperKit/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", @@ -540,7 +540,7 @@ ); INFOPLIST_FILE = "$(SRCROOT)/FlipperKit/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", diff --git a/iOS/Podfile b/iOS/Podfile index 55789320c..336debf32 100644 --- a/iOS/Podfile +++ b/iOS/Podfile @@ -7,7 +7,6 @@ target 'FlipperKit' do # Uncomment the next line if you're using Swift or would like to use dynamic frameworks # use_frameworks! - workspace 'FlipperKit.xcworkspace' project 'FlipperKit.xcodeproj' pod 'Flipper', :path => '../Flipper.podspec' # Pods for SonarKit @@ -19,11 +18,3 @@ target 'FlipperKit' do pod 'SocketRocket', '~> 0.6.0' end -target 'PortForwardingMacApp' do - #use_frameworks! - platform :osx, '11' - workspace 'FlipperKit.xcworkspace' - project '../PortForwardingMacApp.xcodeproj' - pod 'Flipper-PeerTalk', '~>0.0' - pod 'CocoaAsyncSocket', '~>7.6' -end diff --git a/iOS/Podfile.lock b/iOS/Podfile.lock index b8184130f..7f43cf05d 100644 --- a/iOS/Podfile.lock +++ b/iOS/Podfile.lock @@ -65,4 +65,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: fca1274f05facf86edf8f6963fe77c29120d949c -COCOAPODS: 1.11.2 +COCOAPODS: 1.10.2