jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to enable universal builds of Flipper

Browse Source 
* added PortForwardingMacApp project target
* updated Podfiles
* updated electron builder to 22.14.10
* updated electron to 16.0.3
* added universal architecture to the build process
This commit is contained in:
Colin Bendell
2021-12-01 10:30:56 -05:00
committed by Lorenzo Blasa
parent 2b927b4e72
commit 6cc083b860
7 changed files with 535 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
iOS/FlipperKit.xcodeproj/project.pbxproj
View File

@@ -63,9 +63,7 @@
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 = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -84,8 +82,6 @@
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 */,
);
@@ -234,7 +230,7 @@
53D199FC20A4BA3600A371E3 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0940;
LastUpgradeCheck = 1310;
ORGANIZATIONNAME = Facebook;
TargetAttributes = {
53D19A0420A4BA3600A371E3 = {
@@ -250,6 +246,7 @@
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = 53D199FB20A4BA3600A371E3;
productRefGroup = 53D19A0620A4BA3600A371E3 /* Products */;
@@ -338,6 +335,7 @@
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;
@@ -364,7 +362,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.2;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@@ -399,6 +397,7 @@
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;
@@ -419,7 +418,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.2;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
@@ -458,12 +457,13 @@
"${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 = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.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 = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)",

2
iOS/FlipperKit.xcodeproj/xcshareddata/xcschemes/FlipperKit.xcscheme
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1150"
LastUpgradeVersion = "1310"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

9
iOS/Podfile
View File

@@ -7,6 +7,7 @@ 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
@@ -18,3 +19,11 @@ 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

8
iOS/Podfile.lock
View File

@@ -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: df18cabc37fd688da031cbaa29f0c4b5c7f310ee
COCOAPODS: 1.11.2