From 518572b7544c510be63f9119700636e0ee52c08b Mon Sep 17 00:00:00 2001 From: Roma Sosnovsky Date: Fri, 24 Sep 2021 13:59:00 +0300 Subject: [PATCH 1/6] Issue #529 Update pods and gems --- FlowCrypt.xcodeproj/project.pbxproj | 39 +----- .../xcschemes/Enterprise FlowCrypt.xcscheme | 2 +- .../xcshareddata/xcschemes/FlowCrypt.xcscheme | 2 +- .../xcschemes/FlowCryptAppTests.xcscheme | 2 +- .../xcschemes/FlowCryptCommon.xcscheme | 2 +- .../xcschemes/FlowCryptUI.xcscheme | 2 +- .../xcschemes/FlowCryptUIApplication.xcscheme | 2 +- .../xcschemes/FlowCryptUITests.xcscheme | 2 +- .../xcschemes/TestFlight FlowCrypt .xcscheme | 2 +- Gemfile.lock | 106 +++++++++-------- Podfile.lock | 112 +++++++++--------- 11 files changed, 120 insertions(+), 153 deletions(-) diff --git a/FlowCrypt.xcodeproj/project.pbxproj b/FlowCrypt.xcodeproj/project.pbxproj index d69d1bfe3..1f3d404b1 100644 --- a/FlowCrypt.xcodeproj/project.pbxproj +++ b/FlowCrypt.xcodeproj/project.pbxproj @@ -1993,7 +1993,6 @@ 9FDF363E235A1B0100614596 /* Frameworks */, 9FDF363F235A1B0100614596 /* Resources */, 0CF02BEF6BCBCD8B43A732A5 /* [CP] Embed Pods Frameworks */, - 2EA601B887F9BA327C9A5438 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -2016,7 +2015,6 @@ C132B9AD1EC2DBD800763715 /* Frameworks */, C132B9AE1EC2DBD800763715 /* Resources */, 527B6FD5C3E83A37AEA8D0A3 /* [CP] Embed Pods Frameworks */, - F5FDFD02C616C6B2DEBEEFCA /* [CP] Copy Pods Resources */, D2CDC3E124052D50002B045F /* Embed Frameworks */, ); buildRules = ( @@ -2093,7 +2091,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1240; - LastUpgradeCheck = 1240; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = "FlowCrypt Limited"; TargetAttributes = { 9F2AC5C5267BE99E00F6149B = { @@ -2267,23 +2265,6 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FlowCryptAppTests/Pods-FlowCryptAppTests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 2EA601B887F9BA327C9A5438 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FlowCryptUITests/Pods-FlowCryptUITests-resources-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FlowCryptUITests/Pods-FlowCryptUITests-resources-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FlowCryptUITests/Pods-FlowCryptUITests-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; 527B6FD5C3E83A37AEA8D0A3 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -2442,23 +2423,6 @@ shellPath = /bin/sh; shellScript = "make format\n"; }; - F5FDFD02C616C6B2DEBEEFCA /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FlowCrypt/Pods-FlowCrypt-resources-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FlowCrypt/Pods-FlowCrypt-resources-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FlowCrypt/Pods-FlowCrypt-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -2490,7 +2454,6 @@ 9FC413442683C912004C0A69 /* GmailServiceTest.swift in Sources */, 9F976556267E186D0058419D /* ClientConfigurationTests.swift in Sources */, 9F7E8EC6269877E70021C07F /* KeyInfoTests.swift in Sources */, - 9F976556267E186D0058419D /* ClientConfigurationTests.swift in Sources */, 9FC41171268118A7004C0A69 /* PassPhraseStorageTests.swift in Sources */, 9F6F3C7626ADFC37005BD9C6 /* KeyStorageMock.swift in Sources */, ); diff --git a/FlowCrypt.xcodeproj/xcshareddata/xcschemes/Enterprise FlowCrypt.xcscheme b/FlowCrypt.xcodeproj/xcshareddata/xcschemes/Enterprise FlowCrypt.xcscheme index be5ffdec8..f67b5c307 100644 --- a/FlowCrypt.xcodeproj/xcshareddata/xcschemes/Enterprise FlowCrypt.xcscheme +++ b/FlowCrypt.xcodeproj/xcshareddata/xcschemes/Enterprise FlowCrypt.xcscheme @@ -1,6 +1,6 @@ 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) algoliasearch (1.27.5) @@ -14,28 +16,28 @@ GEM json (>= 1.5.1) artifactory (3.0.15) atomos (0.1.3) - aws-eventstream (1.1.1) - aws-partitions (1.482.0) - aws-sdk-core (3.119.0) + aws-eventstream (1.2.0) + aws-partitions (1.505.0) + aws-sdk-core (3.121.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.46.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-kms (1.48.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.98.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-s3 (1.103.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.4) + aws-sigv4 (~> 1.4) + aws-sigv4 (1.4.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) claide (1.0.3) - cocoapods (1.10.2) - addressable (~> 2.6) + cocoapods (1.11.2) + addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.10.2) + cocoapods-core (= 1.11.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -46,26 +48,26 @@ GEM escape (~> 0.0.4) fourflusher (>= 2.3.0, < 3.0) gh_inspector (~> 1.0) - molinillo (~> 0.6.6) + molinillo (~> 0.8.0) nap (~> 1.0) - ruby-macho (~> 1.4) - xcodeproj (>= 1.19.0, < 2.0) - cocoapods-core (1.10.2) - activesupport (> 5.0, < 6) - addressable (~> 2.6) + ruby-macho (>= 1.0, < 3.0) + xcodeproj (>= 1.21.0, < 2.0) + cocoapods-core (1.11.2) + activesupport (>= 5.0, < 7) + addressable (~> 2.8) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) netrc (~> 0.11) - public_suffix + public_suffix (~> 4.0) typhoeus (~> 1.0) - cocoapods-deintegrate (1.0.4) - cocoapods-downloader (1.4.0) + cocoapods-deintegrate (1.0.5) + cocoapods-downloader (1.5.1) cocoapods-plugins (1.0.0) nap - cocoapods-search (1.0.0) - cocoapods-trunk (1.5.0) + cocoapods-search (1.0.1) + cocoapods-trunk (1.6.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.2.0) @@ -85,7 +87,7 @@ GEM ethon (0.14.0) ffi (>= 1.15.0) excon (0.85.0) - faraday (1.6.0) + faraday (1.8.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -109,8 +111,8 @@ GEM faraday-rack (1.0.0) faraday_middleware (1.1.0) faraday (~> 1.0) - fastimage (2.2.4) - fastlane (2.189.0) + fastimage (2.2.5) + fastlane (2.194.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -136,6 +138,7 @@ GEM mini_magick (>= 4.9.4, < 5.0.0) multipart-post (~> 2.0.0) naturally (~> 2.2) + optparse (~> 0.1.1) plist (>= 3.1.0, < 4.0.0) rubyzip (>= 2.0.0, < 3.0.0) security (= 0.1.3) @@ -149,11 +152,11 @@ GEM xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) fastlane-plugin-semaphore (0.2.0) - ffi (1.15.3) + ffi (1.15.4) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.10.0) + google-apis-androidpublisher_v3 (0.11.0) google-apis-core (>= 0.4, < 2.a) google-apis-core (0.4.1) addressable (~> 2.5, >= 2.5.1) @@ -164,18 +167,18 @@ GEM retriable (>= 2.0, < 4.a) rexml webrick - google-apis-iamcredentials_v1 (0.6.0) + google-apis-iamcredentials_v1 (0.7.0) google-apis-core (>= 0.4, < 2.a) google-apis-playcustomapp_v1 (0.5.0) google-apis-core (>= 0.4, < 2.a) - google-apis-storage_v1 (0.6.0) + google-apis-storage_v1 (0.7.0) google-apis-core (>= 0.4, < 2.a) google-cloud-core (1.6.0) google-cloud-env (~> 1.0) google-cloud-errors (~> 1.0) google-cloud-env (1.5.0) faraday (>= 0.17.3, < 2.0) - google-cloud-errors (1.1.0) + google-cloud-errors (1.2.0) google-cloud-storage (1.34.1) addressable (~> 2.5) digest-crc (~> 0.4) @@ -184,13 +187,13 @@ GEM google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (0.17.0) + googleauth (0.17.1) faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) - signet (~> 0.14) + signet (~> 0.15) highline (2.0.3) http-accept (1.7.0) http-cookie (1.0.4) @@ -204,17 +207,18 @@ GEM memoist (0.16.2) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.0704) + mime-types-data (3.2021.0901) mini_magick (4.11.0) - mini_mime (1.1.0) + mini_mime (1.1.1) minitest (5.14.4) - molinillo (0.6.6) + molinillo (0.8.0) multi_json (1.15.0) multipart-post (2.0.0) nanaimo (0.3.0) nap (1.1.0) naturally (2.2.1) netrc (0.11.0) + optparse (0.1.1) os (1.1.1) plist (3.6.0) public_suffix (4.0.6) @@ -231,12 +235,12 @@ GEM retriable (3.1.2) rexml (3.2.5) rouge (2.0.7) - ruby-macho (1.4.0) + ruby-macho (2.5.1) ruby2_keywords (0.0.5) rubyzip (2.3.2) security (0.1.3) - signet (0.15.0) - addressable (~> 2.3) + signet (0.16.0) + addressable (~> 2.8) faraday (>= 0.17.3, < 2.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) @@ -246,7 +250,6 @@ GEM terminal-notifier (2.0.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - thread_safe (0.3.6) trailblazer-option (0.1.1) tty-cursor (0.7.1) tty-screen (0.8.1) @@ -254,19 +257,19 @@ GEM tty-cursor (~> 0.7) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.9) - thread_safe (~> 0.1) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.7) - unicode-display_width (1.7.0) + unf_ext (0.0.8) + unicode-display_width (1.8.0) webrick (1.7.0) word_wrap (1.0.0) - xcode-install (2.7.0) + xcode-install (2.8.0) claide (>= 0.9.1, < 1.1.0) fastlane (>= 2.1.0, < 3.0.0) - xcodeproj (1.20.0) + xcodeproj (1.21.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -277,6 +280,7 @@ GEM rouge (~> 2.0.7) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) + zeitwerk (2.4.2) PLATFORMS x86_64-darwin-20 diff --git a/Podfile.lock b/Podfile.lock index cd937f5a1..41ed18547 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,59 +1,59 @@ PODS: - - AppAuth (1.2.0): - - AppAuth/Core (= 1.2.0) - - AppAuth/ExternalUserAgent (= 1.2.0) - - AppAuth/Core (1.2.0) - - AppAuth/ExternalUserAgent (1.2.0) + - AppAuth (1.4.0): + - AppAuth/Core (= 1.4.0) + - AppAuth/ExternalUserAgent (= 1.4.0) + - AppAuth/Core (1.4.0) + - AppAuth/ExternalUserAgent (1.4.0) - BigInt (5.2.0) - ENSwiftSideMenu (0.1.4) - - GoogleAPIClientForREST/Core (1.5.1): - - GTMSessionFetcher (>= 1.1.7) - - GoogleAPIClientForREST/Gmail (1.5.1): + - GoogleAPIClientForREST/Core (1.6.0): + - GTMSessionFetcher (>= 1.6.1) + - GoogleAPIClientForREST/Gmail (1.6.0): - GoogleAPIClientForREST/Core - - GTMSessionFetcher (>= 1.1.7) - - GoogleSignIn (5.0.1): - - AppAuth (~> 1.2) + - GTMSessionFetcher (>= 1.6.1) + - GoogleSignIn (6.0.2): + - AppAuth (~> 1.4) - GTMAppAuth (~> 1.0) - GTMSessionFetcher/Core (~> 1.1) - - GTMAppAuth (1.0.0): - - AppAuth/Core (~> 1.0) - - GTMSessionFetcher (~> 1.1) - - GTMSessionFetcher (1.3.0): - - GTMSessionFetcher/Full (= 1.3.0) - - GTMSessionFetcher/Core (1.3.0) - - GTMSessionFetcher/Full (1.3.0): - - GTMSessionFetcher/Core (= 1.3.0) + - GTMAppAuth (1.2.2): + - AppAuth/Core (~> 1.4) + - GTMSessionFetcher/Core (~> 1.5) + - GTMSessionFetcher (1.7.0): + - GTMSessionFetcher/Full (= 1.7.0) + - GTMSessionFetcher/Core (1.7.0) + - GTMSessionFetcher/Full (1.7.0): + - GTMSessionFetcher/Core (= 1.7.0) - IDZSwiftCommonCrypto (0.13.0) - mailcore2-ios (0.6.4) - - MBProgressHUD (1.1.0) - - PINCache (3.0.2): - - PINCache/Arc-exception-safe (= 3.0.2) - - PINCache/Core (= 3.0.2) - - PINCache/Arc-exception-safe (3.0.2): + - MBProgressHUD (1.2.0) + - PINCache (3.0.3): + - PINCache/Arc-exception-safe (= 3.0.3) + - PINCache/Core (= 3.0.3) + - PINCache/Arc-exception-safe (3.0.3): - PINCache/Core - - PINCache/Core (3.0.2): - - PINOperation (~> 1.2.0) - - PINOperation (1.2) - - PINRemoteImage/Core (3.0.1): + - PINCache/Core (3.0.3): + - PINOperation (~> 1.2.1) + - PINOperation (1.2.1) + - PINRemoteImage/Core (3.0.3): - PINOperation - - PINRemoteImage/iOS (3.0.1): + - PINRemoteImage/iOS (3.0.3): - PINRemoteImage/Core - - PINRemoteImage/PINCache (3.0.1): - - PINCache (~> 3.0.1) + - PINRemoteImage/PINCache (3.0.3): + - PINCache (~> 3.0.3) - PINRemoteImage/Core - PromisesObjC (2.0.0) - PromisesSwift (2.0.0): - PromisesObjC (= 2.0.0) - - Realm (10.7.4): - - Realm/Headers (= 10.7.4) - - Realm/Headers (10.7.4) - - RealmSwift (10.7.4): - - Realm (= 10.7.4) - - SwiftFormat/CLI (0.44.10) - - SwiftLint (0.36.0) - - SwiftyRSA (1.5.0): - - SwiftyRSA/ObjC (= 1.5.0) - - SwiftyRSA/ObjC (1.5.0) + - Realm (10.15.1): + - Realm/Headers (= 10.15.1) + - Realm/Headers (10.15.1) + - RealmSwift (10.15.1): + - Realm (= 10.15.1) + - SwiftFormat/CLI (0.48.11) + - SwiftLint (0.44.0) + - SwiftyRSA (1.7.0): + - SwiftyRSA/ObjC (= 1.7.0) + - SwiftyRSA/ObjC (1.7.0) - Texture (3.0.0): - Texture/AssetsLibrary (= 3.0.0) - Texture/Core (= 3.0.0) @@ -119,29 +119,29 @@ SPEC REPOS: - Toast SPEC CHECKSUMS: - AppAuth: bce82c76043657c99d91e7882e8a9e1a93650cd4 + AppAuth: 31bcec809a638d7bd2f86ea8a52bd45f6e81e7c7 BigInt: f668a80089607f521586bbe29513d708491ef2f7 ENSwiftSideMenu: 21e755dae28f09bbf453aa83b3d05f2e5f92ca39 - GoogleAPIClientForREST: 4bb409633efcc2e1b3f945afe7e35039b5a61db2 - GoogleSignIn: 3a51b9bb8e48b635fd7f4272cee06ca260345b86 - GTMAppAuth: 4deac854479704f348309e7b66189e604cf5e01e - GTMSessionFetcher: 43b8b64263023d4f32caa0b40f4c8bfa3c5f36d8 + GoogleAPIClientForREST: 5183df28e7bcb7b7b41ebd558e16083cfed60d99 + GoogleSignIn: fd381840dbe7c1137aa6dc30849a5c3e070c034a + GTMAppAuth: ad5c2b70b9a8689e1a04033c9369c4915bfcbe89 + GTMSessionFetcher: 43748f93435c2aa068b1cbe39655aaf600652e91 IDZSwiftCommonCrypto: 00dd37cdfbd149312a7e5a582cf9909f8b129f44 mailcore2-ios: 3ff0be2fa553d4da9c11d39c11d51863c768f24f - MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9 - PINCache: bea7c404c360f6fe0f6ee783c5cd14e778fa2aab - PINOperation: 3a967a927e7867e61976c6cc23e5770416449fbc - PINRemoteImage: 3b7cedb118c2d357f87e9eabc7c81ba0202cb236 + MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406 + PINCache: 7a8fc1a691173d21dbddbf86cd515de6efa55086 + PINOperation: 00c935935f1e8cf0d1e2d6b542e75b88fc3e5e20 + PINRemoteImage: f1295b29f8c5e640e25335a1b2bd9d805171bd01 PromisesObjC: 68159ce6952d93e17b2dfe273b8c40907db5ba58 PromisesSwift: e0b2a6433469efb0b83a2b84c62a2abab8e5e5d4 - Realm: f08ce1a85649a41303ecfe1cbd914c62e9e6d710 - RealmSwift: 60ec49d165f23d040ab48811d8dd177e09baf4d3 - SwiftFormat: b72e592ea0979aeee53f6052abff291181364933 - SwiftLint: fc9859e4e1752340664851f667bb1898b9c90114 - SwiftyRSA: 6e528fb1b1a87d5111c48081083b141d6d65f1cf + Realm: fbcbde2620d51623cc5b18e28f5b165c39abef52 + RealmSwift: e4bea8e42efad3d543aea23b56504069c6faaea2 + SwiftFormat: 938e5865a118c49d63c7a290ddad86335f9e585f + SwiftLint: e96c0a8c770c7ebbc4d36c55baf9096bb65c4584 + SwiftyRSA: 8c6dd1ea7db1b8dc4fb517a202f88bb1354bc2c6 Texture: 2f109e937850d94d1d07232041c9c7313ccddb81 Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 PODFILE CHECKSUM: 245efbb7c5808e9bebf508cb968810eb55eac62c -COCOAPODS: 1.10.2 +COCOAPODS: 1.11.2 From 0eb7f4c8190066c723aebe13d387a733679f1439 Mon Sep 17 00:00:00 2001 From: Roma Sosnovsky Date: Fri, 24 Sep 2021 15:56:59 +0300 Subject: [PATCH 2/6] Issue #529 Use SPM for mailcore2 for arm64 compatibility --- FlowCrypt.xcodeproj/project.pbxproj | 42 ++++++++++++++++--- .../xcshareddata/swiftpm/Package.resolved | 16 +++++++ .../SessionCredentialsProvider.swift | 12 +++--- Podfile | 5 +-- Podfile.lock | 6 +-- 5 files changed, 61 insertions(+), 20 deletions(-) create mode 100644 FlowCrypt.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/FlowCrypt.xcodeproj/project.pbxproj b/FlowCrypt.xcodeproj/project.pbxproj index 1f3d404b1..dfdfbdba7 100644 --- a/FlowCrypt.xcodeproj/project.pbxproj +++ b/FlowCrypt.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -50,6 +50,7 @@ 32DCAF95A6A329C3136B1C8E /* Imap+msg.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32DCA55C094E9745AA1FD210 /* Imap+msg.swift */; }; 32DCAF9DA9EC47798DF8BB73 /* SignInViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32DCA9701B2D5052225A0414 /* SignInViewController.swift */; }; 50531BE42629B9A80039BAE9 /* AttachmentNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50531BE32629B9A80039BAE9 /* AttachmentNode.swift */; }; + 510A260126FDFEBE00163271 /* MailCore2 in Frameworks */ = {isa = PBXBuildFile; productRef = 510A260026FDFEBE00163271 /* MailCore2 */; }; 5A39F42D239EC321001F4607 /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A39F42C239EC321001F4607 /* SettingsViewController.swift */; }; 5A39F430239EC396001F4607 /* SettingsViewDecorator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A39F42F239EC396001F4607 /* SettingsViewDecorator.swift */; }; 5A39F437239ECC23001F4607 /* KeySettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A39F436239ECC23001F4607 /* KeySettingsViewController.swift */; }; @@ -758,6 +759,7 @@ D2CDC3E224052D54002B045F /* FlowCryptCommon.framework in Frameworks */, D2CDC3DD24052D50002B045F /* FlowCryptUI.framework in Frameworks */, A40B9DB9E27967AC623BA60B /* Pods_FlowCrypt.framework in Frameworks */, + 510A260126FDFEBE00163271 /* MailCore2 in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2024,6 +2026,9 @@ D2CDC3E024052D50002B045F /* PBXTargetDependency */, ); name = FlowCrypt; + packageProductDependencies = ( + 510A260026FDFEBE00163271 /* MailCore2 */, + ); productName = FlowCrypt; productReference = C132B9B01EC2DBD800763715 /* FlowCrypt.app */; productType = "com.apple.product-type.application"; @@ -2120,7 +2125,7 @@ }; }; buildConfigurationList = C132B9AB1EC2DBD800763715 /* Build configuration list for PBXProject "FlowCrypt" */; - compatibilityVersion = "Xcode 10.0"; + compatibilityVersion = "Xcode 12.0"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( @@ -2129,6 +2134,9 @@ ru, ); mainGroup = C132B9A71EC2DBD800763715; + packageReferences = ( + 510A25FF26FDFEBE00163271 /* XCRemoteSwiftPackageReference "mailcore2" */, + ); productRefGroup = C132B9B11EC2DBD800763715 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -2861,7 +2869,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.2; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -3269,7 +3277,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.2; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; @@ -3375,7 +3383,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.2; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -3431,7 +3439,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.2; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; @@ -3454,6 +3462,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = W57XRJ27NX; ENABLE_BITCODE = NO; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = ( @@ -3547,6 +3556,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = FlowCryptUI/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -3655,6 +3665,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = FlowCryptCommon/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -3902,6 +3913,25 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 510A25FF26FDFEBE00163271 /* XCRemoteSwiftPackageReference "mailcore2" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/MailCore/mailcore2"; + requirement = { + branch = master; + kind = branch; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 510A260026FDFEBE00163271 /* MailCore2 */ = { + isa = XCSwiftPackageProductDependency; + package = 510A25FF26FDFEBE00163271 /* XCRemoteSwiftPackageReference "mailcore2" */; + productName = MailCore2; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = C132B9A81EC2DBD800763715 /* Project object */; } diff --git a/FlowCrypt.xcworkspace/xcshareddata/swiftpm/Package.resolved b/FlowCrypt.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 000000000..5cc3d8629 --- /dev/null +++ b/FlowCrypt.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,16 @@ +{ + "object": { + "pins": [ + { + "package": "MailCore2", + "repositoryURL": "https://github.com/MailCore/mailcore2", + "state": { + "branch": "master", + "revision": "1434761709b4d9dd5acc5b7185a3b32aa4845ba8", + "version": null + } + } + ] + }, + "version": 1 +} diff --git a/FlowCrypt/Functionality/Mail Provider/Mail Sessions Providers/SessionCredentialsProvider.swift b/FlowCrypt/Functionality/Mail Provider/Mail Sessions Providers/SessionCredentialsProvider.swift index 3ebc32d40..d961bdd7b 100644 --- a/FlowCrypt/Functionality/Mail Provider/Mail Sessions Providers/SessionCredentialsProvider.swift +++ b/FlowCrypt/Functionality/Mail Provider/Mail Sessions Providers/SessionCredentialsProvider.swift @@ -24,9 +24,9 @@ struct SessionCredentialsService: SessionCredentialsProvider { let manager = MCOMailProvidersManager.shared() func getImapCredentials(for email: String) -> MailSettingsCredentials? { - let providers = manager?.provider(forEmail: email) + let providers = manager.provider(forEmail: email) - guard let services = providers?.imapServices() as? [MCONetService] else { return nil } + guard let services = providers?.imapServices() else { return nil } // TODO: - check all possible services to establish the connection guard let service = services.first else { return nil } @@ -35,9 +35,9 @@ struct SessionCredentialsService: SessionCredentialsProvider { } func getSmtpCredentials(for email: String) -> MailSettingsCredentials? { - let providers = manager?.provider(forEmail: email) + let providers = manager.provider(forEmail: email) - guard let services = providers?.smtpServices() as? [MCONetService] else { return nil } + guard let services = providers?.smtpServices() else { return nil } // TODO: - check all possible services to establish the connection guard let service = services.first else { return nil } @@ -57,7 +57,7 @@ struct SessionCredentialsService: SessionCredentialsProvider { guard let email = email, - let services = manager?.provider(forEmail: email)?.imapServices() as? [MCONetService], + let services = manager.provider(forEmail: email)?.imapServices(), let credentials = services.first(where: { $0.connectionType == MCOConnectionType(connection) }) else { return error(for: connection) @@ -78,7 +78,7 @@ struct SessionCredentialsService: SessionCredentialsProvider { guard let email = email, - let services = manager?.provider(forEmail: email)?.smtpServices() as? [MCONetService], + let services = manager.provider(forEmail: email)?.smtpServices(), let credentials = services.first(where: { $0.connectionType == MCOConnectionType(connection) }) else { return error(for: connection) diff --git a/Podfile b/Podfile index deda552ff..3806ab7cc 100644 --- a/Podfile +++ b/Podfile @@ -8,7 +8,6 @@ use_frameworks! def app_pods pod 'GoogleSignIn' pod 'GTMAppAuth' - pod 'mailcore2-ios' pod 'MBProgressHUD' pod 'SwiftLint' # todo - add linting rules pod 'Toast', '~> 4.0.0' @@ -23,7 +22,6 @@ def shared_pods pod 'PromisesSwift' pod 'SwiftyRSA' pod 'IDZSwiftCommonCrypto' - pod 'mailcore2-ios' pod 'BigInt', '~> 5.2' end @@ -56,7 +54,6 @@ end target 'FlowCryptAppTests' do inherit! :search_paths - pod 'mailcore2-ios' pod 'IDZSwiftCommonCrypto' pod 'PromisesSwift' pod 'GTMAppAuth' @@ -68,6 +65,8 @@ post_install do |installer| installer.pods_project.targets.each do |target| target.build_configurations.each do |config| config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0' + config.build_settings['ONLY_ACTIVE_ARCH'] = 'NO' + config.build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = 'YES' end end end diff --git a/Podfile.lock b/Podfile.lock index 41ed18547..17365e538 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -24,7 +24,6 @@ PODS: - GTMSessionFetcher/Full (1.7.0): - GTMSessionFetcher/Core (= 1.7.0) - IDZSwiftCommonCrypto (0.13.0) - - mailcore2-ios (0.6.4) - MBProgressHUD (1.2.0) - PINCache (3.0.3): - PINCache/Arc-exception-safe (= 3.0.3) @@ -83,7 +82,6 @@ DEPENDENCIES: - GoogleSignIn - GTMAppAuth - IDZSwiftCommonCrypto - - mailcore2-ios - MBProgressHUD - PromisesSwift - RealmSwift @@ -103,7 +101,6 @@ SPEC REPOS: - GTMAppAuth - GTMSessionFetcher - IDZSwiftCommonCrypto - - mailcore2-ios - MBProgressHUD - PINCache - PINOperation @@ -127,7 +124,6 @@ SPEC CHECKSUMS: GTMAppAuth: ad5c2b70b9a8689e1a04033c9369c4915bfcbe89 GTMSessionFetcher: 43748f93435c2aa068b1cbe39655aaf600652e91 IDZSwiftCommonCrypto: 00dd37cdfbd149312a7e5a582cf9909f8b129f44 - mailcore2-ios: 3ff0be2fa553d4da9c11d39c11d51863c768f24f MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406 PINCache: 7a8fc1a691173d21dbddbf86cd515de6efa55086 PINOperation: 00c935935f1e8cf0d1e2d6b542e75b88fc3e5e20 @@ -142,6 +138,6 @@ SPEC CHECKSUMS: Texture: 2f109e937850d94d1d07232041c9c7313ccddb81 Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 -PODFILE CHECKSUM: 245efbb7c5808e9bebf508cb968810eb55eac62c +PODFILE CHECKSUM: 84e391640f5496cfa2b94c1252aeab49534fea99 COCOAPODS: 1.11.2 From 6a05bcd83af90a8be6bfd07a1916dc45987ca5a1 Mon Sep 17 00:00:00 2001 From: Roma Sosnovsky Date: Fri, 24 Sep 2021 16:28:13 +0300 Subject: [PATCH 3/6] Issue #529 Fix UI tests on M1 --- FlowCrypt.xcodeproj/project.pbxproj | 2 ++ Podfile.lock | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/FlowCrypt.xcodeproj/project.pbxproj b/FlowCrypt.xcodeproj/project.pbxproj index dfdfbdba7..a7ee8de1a 100644 --- a/FlowCrypt.xcodeproj/project.pbxproj +++ b/FlowCrypt.xcodeproj/project.pbxproj @@ -3089,6 +3089,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = W57XRJ27NX; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = FlowCryptAppTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.4; @@ -3173,6 +3174,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = W57XRJ27NX; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = FlowCryptUITests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; diff --git a/Podfile.lock b/Podfile.lock index 17365e538..3ca541b17 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -138,6 +138,6 @@ SPEC CHECKSUMS: Texture: 2f109e937850d94d1d07232041c9c7313ccddb81 Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 -PODFILE CHECKSUM: 84e391640f5496cfa2b94c1252aeab49534fea99 +PODFILE CHECKSUM: 3b41a458b8e69e280b68c22f1b3f62e92f2189c4 COCOAPODS: 1.11.2 From ecd4cecff56a76e8a679f4d5065c0bb640a347ff Mon Sep 17 00:00:00 2001 From: Roma Sosnovsky Date: Fri, 24 Sep 2021 16:28:48 +0300 Subject: [PATCH 4/6] Issue #529 Use swiftformat lib from embedded pod --- Scripts/format.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Scripts/format.sh b/Scripts/format.sh index 70d38b478..717f0c70d 100755 --- a/Scripts/format.sh +++ b/Scripts/format.sh @@ -10,10 +10,10 @@ else fi # Do not run format if swiftlint isn't installed -if which swiftformat >/dev/null; then +if [ -f "./Pods/SwiftFormat/CommandLineTool/swiftformat" ]; then echo "Start formatting" # swiftlint autocorrect --path . - swiftformat "FlowCrypt", "FlowCryptUITests" \ + ./Pods/SwiftFormat/CommandLineTool/swiftformat "FlowCrypt", "FlowCryptUITests" \ --rules trailingSpace \ --rules blankLinesAtEndOfScope \ --rules consecutiveBlankLines \ @@ -41,10 +41,8 @@ if which swiftformat >/dev/null; then --rules strongifiedSelf \ --rules trailingClosures \ --rules void - else echo "warning: SwiftFormat not installed, download from https://github.com/nicklockwood/SwiftFormat" - brew install swiftformat exit 0 fi From 7c6aa341c9ef6242aa173c6dc0fad9229e9c6f3c Mon Sep 17 00:00:00 2001 From: Roma Sosnovsky Date: Fri, 24 Sep 2021 16:59:20 +0300 Subject: [PATCH 5/6] Issue #529 Update ruby to 3.0.2 --- Gemfile | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index f6fcb39ed..a4a43beb0 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -ruby "2.5.1" +ruby "3.0.2" gem "fastlane", ">= 2.134.0" gem "xcode-install", ">= 2.6.1" gem "cocoapods", ">= 1.9.3" diff --git a/Gemfile.lock b/Gemfile.lock index a960ac4de..d1a889478 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -293,7 +293,7 @@ DEPENDENCIES xcode-install (>= 2.6.1) RUBY VERSION - ruby 2.5.1p57 + ruby 3.0.2p107 BUNDLED WITH 2.2.25 From 124ab8a7879aaf5c88c6931651a1f6f2fd7673bb Mon Sep 17 00:00:00 2001 From: Roma Sosnovsky Date: Fri, 24 Sep 2021 17:06:42 +0300 Subject: [PATCH 6/6] Issue #529 Rollback to Ruby 2.5.1 --- Gemfile | 4 ++-- Gemfile.lock | 43 +++++++++++++++++++++---------------------- Podfile.lock | 2 +- 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/Gemfile b/Gemfile index a4a43beb0..73d97a25a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,9 @@ source 'https://rubygems.org' -ruby "3.0.2" +ruby "2.5.1" gem "fastlane", ">= 2.134.0" gem "xcode-install", ">= 2.6.1" -gem "cocoapods", ">= 1.9.3" +gem "cocoapods", "1.10.2" gem "rest-client" plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') diff --git a/Gemfile.lock b/Gemfile.lock index d1a889478..311e7d18f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,12 +3,11 @@ GEM specs: CFPropertyList (3.0.4) rexml - activesupport (6.1.4.1) + activesupport (5.2.6) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 1.6, < 2) - minitest (>= 5.1) - tzinfo (~> 2.0) - zeitwerk (~> 2.3) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) algoliasearch (1.27.5) @@ -34,10 +33,10 @@ GEM aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) claide (1.0.3) - cocoapods (1.11.2) - addressable (~> 2.8) + cocoapods (1.10.2) + addressable (~> 2.6) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.11.2) + cocoapods-core (= 1.10.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -48,19 +47,19 @@ GEM escape (~> 0.0.4) fourflusher (>= 2.3.0, < 3.0) gh_inspector (~> 1.0) - molinillo (~> 0.8.0) + molinillo (~> 0.6.6) nap (~> 1.0) - ruby-macho (>= 1.0, < 3.0) - xcodeproj (>= 1.21.0, < 2.0) - cocoapods-core (1.11.2) - activesupport (>= 5.0, < 7) - addressable (~> 2.8) + ruby-macho (~> 1.4) + xcodeproj (>= 1.19.0, < 2.0) + cocoapods-core (1.10.2) + activesupport (> 5.0, < 6) + addressable (~> 2.6) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) netrc (~> 0.11) - public_suffix (~> 4.0) + public_suffix typhoeus (~> 1.0) cocoapods-deintegrate (1.0.5) cocoapods-downloader (1.5.1) @@ -211,7 +210,7 @@ GEM mini_magick (4.11.0) mini_mime (1.1.1) minitest (5.14.4) - molinillo (0.8.0) + molinillo (0.6.6) multi_json (1.15.0) multipart-post (2.0.0) nanaimo (0.3.0) @@ -235,7 +234,7 @@ GEM retriable (3.1.2) rexml (3.2.5) rouge (2.0.7) - ruby-macho (2.5.1) + ruby-macho (1.4.0) ruby2_keywords (0.0.5) rubyzip (2.3.2) security (0.1.3) @@ -250,6 +249,7 @@ GEM terminal-notifier (2.0.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) + thread_safe (0.3.6) trailblazer-option (0.1.1) tty-cursor (0.7.1) tty-screen (0.8.1) @@ -257,8 +257,8 @@ GEM tty-cursor (~> 0.7) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (2.0.4) - concurrent-ruby (~> 1.0) + tzinfo (1.2.9) + thread_safe (~> 0.1) uber (0.1.0) unf (0.1.4) unf_ext @@ -280,20 +280,19 @@ GEM rouge (~> 2.0.7) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) - zeitwerk (2.4.2) PLATFORMS x86_64-darwin-20 DEPENDENCIES - cocoapods (>= 1.9.3) + cocoapods (= 1.10.2) fastlane (>= 2.134.0) fastlane-plugin-semaphore rest-client xcode-install (>= 2.6.1) RUBY VERSION - ruby 3.0.2p107 + ruby 2.5.1p57 BUNDLED WITH 2.2.25 diff --git a/Podfile.lock b/Podfile.lock index 3ca541b17..aedfc862d 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -140,4 +140,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 3b41a458b8e69e280b68c22f1b3f62e92f2189c4 -COCOAPODS: 1.11.2 +COCOAPODS: 1.10.2