Skip to content

Commit c058049

Browse files
sosnovskysosnovsky
authored
issue #529 update pods, fix M1, mailcore2 over SPM, swiftformat fix (#535)
* Issue #529 Update pods and gems * Issue #529 Use SPM for mailcore2 for arm64 compatibility * Issue #529 Fix UI tests on M1 * Issue #529 Use swiftformat lib from embedded pod * Issue #529 Update ruby to 3.0.2
1 parent aa142f9 commit c058049

File tree

16 files changed

+166
-159
lines changed

16 files changed

+166
-159
lines changed

‎FlowCrypt.xcodeproj/project.pbxproj‎

Lines changed: 39 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 51;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -50,6 +50,7 @@
5050
32DCAF95A6A329C3136B1C8E /* Imap+msg.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32DCA55C094E9745AA1FD210 /* Imap+msg.swift */; };
5151
32DCAF9DA9EC47798DF8BB73 /* SignInViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32DCA9701B2D5052225A0414 /* SignInViewController.swift */; };
5252
50531BE42629B9A80039BAE9 /* AttachmentNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50531BE32629B9A80039BAE9 /* AttachmentNode.swift */; };
53+
510A260126FDFEBE00163271 /* MailCore2 in Frameworks */ = {isa = PBXBuildFile; productRef = 510A260026FDFEBE00163271 /* MailCore2 */; };
5354
5A39F42D239EC321001F4607 /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A39F42C239EC321001F4607 /* SettingsViewController.swift */; };
5455
5A39F430239EC396001F4607 /* SettingsViewDecorator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A39F42F239EC396001F4607 /* SettingsViewDecorator.swift */; };
5556
5A39F437239ECC23001F4607 /* KeySettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A39F436239ECC23001F4607 /* KeySettingsViewController.swift */; };
@@ -758,6 +759,7 @@
758759
D2CDC3E224052D54002B045F /* FlowCryptCommon.framework in Frameworks */,
759760
D2CDC3DD24052D50002B045F /* FlowCryptUI.framework in Frameworks */,
760761
A40B9DB9E27967AC623BA60B /* Pods_FlowCrypt.framework in Frameworks */,
762+
510A260126FDFEBE00163271 /* MailCore2 in Frameworks */,
761763
);
762764
runOnlyForDeploymentPostprocessing = 0;
763765
};
@@ -1993,7 +1995,6 @@
19931995
9FDF363E235A1B0100614596 /* Frameworks */,
19941996
9FDF363F235A1B0100614596 /* Resources */,
19951997
0CF02BEF6BCBCD8B43A732A5 /* [CP] Embed Pods Frameworks */,
1996-
2EA601B887F9BA327C9A5438 /* [CP] Copy Pods Resources */,
19971998
);
19981999
buildRules = (
19992000
);
@@ -2016,7 +2017,6 @@
20162017
C132B9AD1EC2DBD800763715 /* Frameworks */,
20172018
C132B9AE1EC2DBD800763715 /* Resources */,
20182019
527B6FD5C3E83A37AEA8D0A3 /* [CP] Embed Pods Frameworks */,
2019-
F5FDFD02C616C6B2DEBEEFCA /* [CP] Copy Pods Resources */,
20202020
D2CDC3E124052D50002B045F /* Embed Frameworks */,
20212021
);
20222022
buildRules = (
@@ -2026,6 +2026,9 @@
20262026
D2CDC3E024052D50002B045F /* PBXTargetDependency */,
20272027
);
20282028
name = FlowCrypt;
2029+
packageProductDependencies = (
2030+
510A260026FDFEBE00163271 /* MailCore2 */,
2031+
);
20292032
productName = FlowCrypt;
20302033
productReference = C132B9B01EC2DBD800763715 /* FlowCrypt.app */;
20312034
productType = "com.apple.product-type.application";
@@ -2093,7 +2096,7 @@
20932096
isa = PBXProject;
20942097
attributes = {
20952098
LastSwiftUpdateCheck = 1240;
2096-
LastUpgradeCheck = 1240;
2099+
LastUpgradeCheck = 1300;
20972100
ORGANIZATIONNAME = "FlowCrypt Limited";
20982101
TargetAttributes = {
20992102
9F2AC5C5267BE99E00F6149B = {
@@ -2122,7 +2125,7 @@
21222125
};
21232126
};
21242127
buildConfigurationList = C132B9AB1EC2DBD800763715 /* Build configuration list for PBXProject "FlowCrypt" */;
2125-
compatibilityVersion = "Xcode 10.0";
2128+
compatibilityVersion = "Xcode 12.0";
21262129
developmentRegion = en;
21272130
hasScannedForEncodings = 0;
21282131
knownRegions = (
@@ -2131,6 +2134,9 @@
21312134
ru,
21322135
);
21332136
mainGroup = C132B9A71EC2DBD800763715;
2137+
packageReferences = (
2138+
510A25FF26FDFEBE00163271 /* XCRemoteSwiftPackageReference "mailcore2" */,
2139+
);
21342140
productRefGroup = C132B9B11EC2DBD800763715 /* Products */;
21352141
projectDirPath = "";
21362142
projectRoot = "";
@@ -2267,23 +2273,6 @@
22672273
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FlowCryptAppTests/Pods-FlowCryptAppTests-frameworks.sh\"\n";
22682274
showEnvVarsInLog = 0;
22692275
};
2270-
2EA601B887F9BA327C9A5438 /* [CP] Copy Pods Resources */ = {
2271-
isa = PBXShellScriptBuildPhase;
2272-
buildActionMask = 2147483647;
2273-
files = (
2274-
);
2275-
inputFileListPaths = (
2276-
"${PODS_ROOT}/Target Support Files/Pods-FlowCryptUITests/Pods-FlowCryptUITests-resources-${CONFIGURATION}-input-files.xcfilelist",
2277-
);
2278-
name = "[CP] Copy Pods Resources";
2279-
outputFileListPaths = (
2280-
"${PODS_ROOT}/Target Support Files/Pods-FlowCryptUITests/Pods-FlowCryptUITests-resources-${CONFIGURATION}-output-files.xcfilelist",
2281-
);
2282-
runOnlyForDeploymentPostprocessing = 0;
2283-
shellPath = /bin/sh;
2284-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FlowCryptUITests/Pods-FlowCryptUITests-resources.sh\"\n";
2285-
showEnvVarsInLog = 0;
2286-
};
22872276
527B6FD5C3E83A37AEA8D0A3 /* [CP] Embed Pods Frameworks */ = {
22882277
isa = PBXShellScriptBuildPhase;
22892278
buildActionMask = 2147483647;
@@ -2442,23 +2431,6 @@
24422431
shellPath = /bin/sh;
24432432
shellScript = "make format\n";
24442433
};
2445-
F5FDFD02C616C6B2DEBEEFCA /* [CP] Copy Pods Resources */ = {
2446-
isa = PBXShellScriptBuildPhase;
2447-
buildActionMask = 2147483647;
2448-
files = (
2449-
);
2450-
inputFileListPaths = (
2451-
"${PODS_ROOT}/Target Support Files/Pods-FlowCrypt/Pods-FlowCrypt-resources-${CONFIGURATION}-input-files.xcfilelist",
2452-
);
2453-
name = "[CP] Copy Pods Resources";
2454-
outputFileListPaths = (
2455-
"${PODS_ROOT}/Target Support Files/Pods-FlowCrypt/Pods-FlowCrypt-resources-${CONFIGURATION}-output-files.xcfilelist",
2456-
);
2457-
runOnlyForDeploymentPostprocessing = 0;
2458-
shellPath = /bin/sh;
2459-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FlowCrypt/Pods-FlowCrypt-resources.sh\"\n";
2460-
showEnvVarsInLog = 0;
2461-
};
24622434
/* End PBXShellScriptBuildPhase section */
24632435

24642436
/* Begin PBXSourcesBuildPhase section */
@@ -2490,7 +2462,6 @@
24902462
9FC413442683C912004C0A69 /* GmailServiceTest.swift in Sources */,
24912463
9F976556267E186D0058419D /* ClientConfigurationTests.swift in Sources */,
24922464
9F7E8EC6269877E70021C07F /* KeyInfoTests.swift in Sources */,
2493-
9F976556267E186D0058419D /* ClientConfigurationTests.swift in Sources */,
24942465
9FC41171268118A7004C0A69 /* PassPhraseStorageTests.swift in Sources */,
24952466
9F6F3C7626ADFC37005BD9C6 /* KeyStorageMock.swift in Sources */,
24962467
);
@@ -2898,7 +2869,7 @@
28982869
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
28992870
GCC_WARN_UNUSED_FUNCTION = YES;
29002871
GCC_WARN_UNUSED_VARIABLE = YES;
2901-
IPHONEOS_DEPLOYMENT_TARGET = 12.2;
2872+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
29022873
MTL_ENABLE_DEBUG_INFO = YES;
29032874
ONLY_ACTIVE_ARCH = YES;
29042875
SDKROOT = iphoneos;
@@ -3118,6 +3089,7 @@
31183089
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
31193090
CODE_SIGN_STYLE = Automatic;
31203091
DEVELOPMENT_TEAM = W57XRJ27NX;
3092+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
31213093
GCC_C_LANGUAGE_STANDARD = gnu11;
31223094
INFOPLIST_FILE = FlowCryptAppTests/Info.plist;
31233095
IPHONEOS_DEPLOYMENT_TARGET = 14.4;
@@ -3202,6 +3174,7 @@
32023174
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
32033175
CODE_SIGN_STYLE = Automatic;
32043176
DEVELOPMENT_TEAM = W57XRJ27NX;
3177+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
32053178
GCC_C_LANGUAGE_STANDARD = gnu11;
32063179
INFOPLIST_FILE = FlowCryptUITests/Info.plist;
32073180
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@@ -3306,7 +3279,7 @@
33063279
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
33073280
GCC_WARN_UNUSED_FUNCTION = YES;
33083281
GCC_WARN_UNUSED_VARIABLE = YES;
3309-
IPHONEOS_DEPLOYMENT_TARGET = 12.2;
3282+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
33103283
MTL_ENABLE_DEBUG_INFO = NO;
33113284
SDKROOT = iphoneos;
33123285
SWIFT_COMPILATION_MODE = wholemodule;
@@ -3412,7 +3385,7 @@
34123385
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
34133386
GCC_WARN_UNUSED_FUNCTION = YES;
34143387
GCC_WARN_UNUSED_VARIABLE = YES;
3415-
IPHONEOS_DEPLOYMENT_TARGET = 12.2;
3388+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
34163389
MTL_ENABLE_DEBUG_INFO = YES;
34173390
ONLY_ACTIVE_ARCH = YES;
34183391
SDKROOT = iphoneos;
@@ -3468,7 +3441,7 @@
34683441
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
34693442
GCC_WARN_UNUSED_FUNCTION = YES;
34703443
GCC_WARN_UNUSED_VARIABLE = YES;
3471-
IPHONEOS_DEPLOYMENT_TARGET = 12.2;
3444+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
34723445
MTL_ENABLE_DEBUG_INFO = NO;
34733446
SDKROOT = iphoneos;
34743447
SWIFT_COMPILATION_MODE = wholemodule;
@@ -3491,6 +3464,7 @@
34913464
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
34923465
DEVELOPMENT_TEAM = W57XRJ27NX;
34933466
ENABLE_BITCODE = NO;
3467+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
34943468
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
34953469
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
34963470
HEADER_SEARCH_PATHS = (
@@ -3584,6 +3558,7 @@
35843558
DYLIB_COMPATIBILITY_VERSION = 1;
35853559
DYLIB_CURRENT_VERSION = 1;
35863560
DYLIB_INSTALL_NAME_BASE = "@rpath";
3561+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
35873562
GCC_C_LANGUAGE_STANDARD = gnu11;
35883563
INFOPLIST_FILE = FlowCryptUI/Info.plist;
35893564
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -3692,6 +3667,7 @@
36923667
DYLIB_COMPATIBILITY_VERSION = 1;
36933668
DYLIB_CURRENT_VERSION = 1;
36943669
DYLIB_INSTALL_NAME_BASE = "@rpath";
3670+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
36953671
GCC_C_LANGUAGE_STANDARD = gnu11;
36963672
INFOPLIST_FILE = FlowCryptCommon/Info.plist;
36973673
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -3939,6 +3915,25 @@
39393915
defaultConfigurationName = Release;
39403916
};
39413917
/* End XCConfigurationList section */
3918+
3919+
/* Begin XCRemoteSwiftPackageReference section */
3920+
510A25FF26FDFEBE00163271 /* XCRemoteSwiftPackageReference "mailcore2" */ = {
3921+
isa = XCRemoteSwiftPackageReference;
3922+
repositoryURL = "https://github.com/MailCore/mailcore2";
3923+
requirement = {
3924+
branch = master;
3925+
kind = branch;
3926+
};
3927+
};
3928+
/* End XCRemoteSwiftPackageReference section */
3929+
3930+
/* Begin XCSwiftPackageProductDependency section */
3931+
510A260026FDFEBE00163271 /* MailCore2 */ = {
3932+
isa = XCSwiftPackageProductDependency;
3933+
package = 510A25FF26FDFEBE00163271 /* XCRemoteSwiftPackageReference "mailcore2" */;
3934+
productName = MailCore2;
3935+
};
3936+
/* End XCSwiftPackageProductDependency section */
39423937
};
39433938
rootObject = C132B9A81EC2DBD800763715 /* Project object */;
39443939
}

‎FlowCrypt.xcodeproj/xcshareddata/xcschemes/Enterprise FlowCrypt.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1240"
3+
LastUpgradeVersion = "1300"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎FlowCrypt.xcodeproj/xcshareddata/xcschemes/FlowCrypt.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1240"
3+
LastUpgradeVersion = "1300"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎FlowCrypt.xcodeproj/xcshareddata/xcschemes/FlowCryptAppTests.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1240"
3+
LastUpgradeVersion = "1300"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎FlowCrypt.xcodeproj/xcshareddata/xcschemes/FlowCryptCommon.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1240"
3+
LastUpgradeVersion = "1300"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎FlowCrypt.xcodeproj/xcshareddata/xcschemes/FlowCryptUI.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1240"
3+
LastUpgradeVersion = "1300"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎FlowCrypt.xcodeproj/xcshareddata/xcschemes/FlowCryptUIApplication.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1240"
3+
LastUpgradeVersion = "1300"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎FlowCrypt.xcodeproj/xcshareddata/xcschemes/FlowCryptUITests.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1240"
3+
LastUpgradeVersion = "1300"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎FlowCrypt.xcodeproj/xcshareddata/xcschemes/TestFlight FlowCrypt .xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1240"
3+
LastUpgradeVersion = "1300"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎FlowCrypt.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)