From 0d541e312ab509fa1c5549978c00dfabcbb2abc6 Mon Sep 17 00:00:00 2001 From: Tom Date: Thu, 7 Oct 2021 19:19:14 +0800 Subject: [PATCH 1/7] issue 500 626 iOS 15 / version 0.2.0 build 1 --- FlowCrypt.xcodeproj/project.pbxproj | 16 ++++++++-------- FlowCrypt/Info.plist | 1 - 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/FlowCrypt.xcodeproj/project.pbxproj b/FlowCrypt.xcodeproj/project.pbxproj index 8f5abab90..4a5965642 100644 --- a/FlowCrypt.xcodeproj/project.pbxproj +++ b/FlowCrypt.xcodeproj/project.pbxproj @@ -2972,13 +2972,13 @@ "\"$(BUILT_PRODUCTS_DIR)/../../include\"/**", ); INFOPLIST_FILE = FlowCrypt/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 0.1.9; + MARKETING_VERSION = 0.2.0; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.flowcrypt.ios.enterprise; PRODUCT_NAME = FlowCrypt; @@ -3380,13 +3380,13 @@ "\"$(BUILT_PRODUCTS_DIR)/../../include\"/**", ); INFOPLIST_FILE = FlowCrypt/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 0.1.9; + MARKETING_VERSION = 0.2.0; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.flowcrypt.ios.testflight; PRODUCT_NAME = FlowCrypt; @@ -3544,13 +3544,13 @@ "\"$(BUILT_PRODUCTS_DIR)/../../include\"/**", ); INFOPLIST_FILE = FlowCrypt/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 0.1.9; + MARKETING_VERSION = 0.2.0; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.flowcrypt.ios.debug; PRODUCT_NAME = FlowCrypt; @@ -3590,13 +3590,13 @@ "\"$(BUILT_PRODUCTS_DIR)/../../include\"/**", ); INFOPLIST_FILE = FlowCrypt/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 0.1.9; + MARKETING_VERSION = 0.2.0; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.flowcrypt.ios; PRODUCT_NAME = FlowCrypt; diff --git a/FlowCrypt/Info.plist b/FlowCrypt/Info.plist index 04af2ee37..a6a2f7f8c 100644 --- a/FlowCrypt/Info.plist +++ b/FlowCrypt/Info.plist @@ -73,7 +73,6 @@ UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight - UIInterfaceOrientationPortraitUpsideDown From 4a94bb79beb5412a9a1377554f1af3cdaa342033 Mon Sep 17 00:00:00 2001 From: Tom Date: Thu, 7 Oct 2021 19:35:59 +0800 Subject: [PATCH 2/7] project iOS 15 --- FlowCrypt.xcodeproj/project.pbxproj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/FlowCrypt.xcodeproj/project.pbxproj b/FlowCrypt.xcodeproj/project.pbxproj index 4a5965642..97be733fd 100644 --- a/FlowCrypt.xcodeproj/project.pbxproj +++ b/FlowCrypt.xcodeproj/project.pbxproj @@ -2933,9 +2933,9 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; + ONLY_ACTIVE_ARCH = NO; SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -3343,7 +3343,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; @@ -3449,7 +3449,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -3505,7 +3505,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; From fd5f1770792a4d89431c9df343efa55446c4a9d4 Mon Sep 17 00:00:00 2001 From: Tom Date: Thu, 7 Oct 2021 20:01:30 +0800 Subject: [PATCH 3/7] update enterprise team and bundle id --- FlowCrypt.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FlowCrypt.xcodeproj/project.pbxproj b/FlowCrypt.xcodeproj/project.pbxproj index 97be733fd..921df413a 100644 --- a/FlowCrypt.xcodeproj/project.pbxproj +++ b/FlowCrypt.xcodeproj/project.pbxproj @@ -2954,7 +2954,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = W57XRJ27NX; + DEVELOPMENT_TEAM = 6DZ6CC3YMY; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = NO; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; @@ -2980,7 +2980,7 @@ LIBRARY_SEARCH_PATHS = "$(inherited)"; MARKETING_VERSION = 0.2.0; ONLY_ACTIVE_ARCH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.flowcrypt.ios.enterprise; + PRODUCT_BUNDLE_IDENTIFIER = com.flowcrypt.as.ios.enterprise; PRODUCT_NAME = FlowCrypt; PROVISIONING_PROFILE_SPECIFIER = ""; STRIP_INSTALLED_PRODUCT = NO; From 759bcae58ca67e6a8dc9aa0bd9457f2db295f731 Mon Sep 17 00:00:00 2001 From: Roma Sosnovsky Date: Thu, 7 Oct 2021 18:08:39 +0300 Subject: [PATCH 4/7] Bugfix/pr 642 google spm (#643) * use SPM for Google libs * fix tests configs --- FlowCrypt.xcodeproj/project.pbxproj | 480 +++++++++++------- .../xcshareddata/swiftpm/Package.resolved | 72 +++ .../Backup Provider/Gmail+Backup.swift | 3 +- .../Mail Provider/Gmail/GmailService.swift | 2 +- .../Mail Provider/MailProvider.swift | 2 +- .../MailServiceProviderType.swift | 2 +- .../Message Gateway/GmailService+send.swift | 3 +- .../Message Provider/Gmail+Message.swift | 3 +- .../Gmail+MessageOperations.swift | 3 +- .../Gmail+MessagesList.swift | 3 +- .../MessagesList Provider/Model/Message.swift | 2 +- .../SearchMessage Provider/Gmail+Search.swift | 3 +- .../Functionality/Services/AppStartup.swift | 2 +- .../Backup Services/BackupServiceType.swift | 2 +- .../GmailService+folders.swift | 3 +- .../Mocks/BackupServiceMock.swift | 2 +- Podfile | 23 +- Podfile.lock | 59 +-- 18 files changed, 375 insertions(+), 294 deletions(-) diff --git a/FlowCrypt.xcodeproj/project.pbxproj b/FlowCrypt.xcodeproj/project.pbxproj index 921df413a..9a1ac6b8f 100644 --- a/FlowCrypt.xcodeproj/project.pbxproj +++ b/FlowCrypt.xcodeproj/project.pbxproj @@ -56,6 +56,14 @@ 51775C32270B01C200D7C944 /* PrvKeyInfoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51775C31270B01C200D7C944 /* PrvKeyInfoTests.swift */; }; 51775C39270C7D2400D7C944 /* StorageMethod.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51775C38270C7D2400D7C944 /* StorageMethod.swift */; }; 51E1673D270DAFF900D27C52 /* Localizable.stringsdict in Resources */ = {isa = PBXBuildFile; fileRef = 51E1673C270DAFF900D27C52 /* Localizable.stringsdict */; }; + 51E16746270F301F00D27C52 /* GoogleAPIClientForREST_Gmail in Frameworks */ = {isa = PBXBuildFile; productRef = 51E16745270F301F00D27C52 /* GoogleAPIClientForREST_Gmail */; }; + 51E16749270F303100D27C52 /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = 51E16748270F303100D27C52 /* GoogleSignIn */; }; + 51E1674F270F341300D27C52 /* Promises in Frameworks */ = {isa = PBXBuildFile; productRef = 51E1674E270F341300D27C52 /* Promises */; }; + 51E16755270F356500D27C52 /* GTMAppAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 51E16754270F356500D27C52 /* GTMAppAuth */; }; + 51E1675D270F36A400D27C52 /* Realm in Frameworks */ = {isa = PBXBuildFile; productRef = 51E1675C270F36A400D27C52 /* Realm */; }; + 51E1675F270F36A400D27C52 /* RealmSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 51E1675E270F36A400D27C52 /* RealmSwift */; }; + 5298EA408FEC36021F7558BD /* Pods_FlowCrypt.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4753E9A27694B4D34C980FFA /* Pods_FlowCrypt.framework */; }; + 58BD3C66FD5A3CB9DC278D10 /* Pods_FlowCryptAppTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71764B8B0579E30806506587 /* Pods_FlowCryptAppTests.framework */; }; 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 */; }; @@ -69,8 +77,7 @@ 5ADEDCBC23A4329000EC495E /* PublicKeyDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5ADEDCBB23A4329000EC495E /* PublicKeyDetailViewController.swift */; }; 5ADEDCBE23A4363700EC495E /* KeyDetailInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5ADEDCBD23A4363700EC495E /* KeyDetailInfoViewController.swift */; }; 5ADEDCC023A43B0800EC495E /* KeyDetailInfoViewDecorator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5ADEDCBF23A43B0800EC495E /* KeyDetailInfoViewDecorator.swift */; }; - 5B810312C6D099BC214DB38F /* Pods_FlowCryptUIApplication.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 567BA6739257FE0D2924D82C /* Pods_FlowCryptUIApplication.framework */; }; - 85F56205E0D5F5F897ACF391 /* Pods_FlowCryptUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D424F068875A727743993E3 /* Pods_FlowCryptUI.framework */; }; + 7F72537A0C44D3CE670F0EFD /* Pods_FlowCryptUIApplication.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3382C015A576728FA08BA310 /* Pods_FlowCryptUIApplication.framework */; }; 949ED9422303E3B400530579 /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 949ED9412303E3B400530579 /* Colors.xcassets */; }; 9F003D6125E1B4ED00EB38C0 /* TrashFolderProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F003D6025E1B4ED00EB38C0 /* TrashFolderProvider.swift */; }; 9F003D6D25EA8F3200EB38C0 /* UserAccountService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F003D6C25EA8F3200EB38C0 /* UserAccountService.swift */; }; @@ -207,14 +214,13 @@ 9FFC7E5A260C946100282FCE /* CloudContactsProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FFC7E59260C946000282FCE /* CloudContactsProvider.swift */; }; A33BAA8422EA4B4F00CC1B5C /* flowcrypt-ios-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = A33BAA8322EA4B4F00CC1B5C /* flowcrypt-ios-icon.png */; }; A3B7C31923F576BA0022D628 /* AppStartup.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3B7C31823F576BA0022D628 /* AppStartup.swift */; }; - A40B9DB9E27967AC623BA60B /* Pods_FlowCrypt.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 069059B887A8580765029BF9 /* Pods_FlowCrypt.framework */; }; C132B9B41EC2DBD800763715 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C132B9B31EC2DBD800763715 /* AppDelegate.swift */; }; C132B9BB1EC2DBD800763715 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C132B9BA1EC2DBD800763715 /* Assets.xcassets */; }; C132B9BE1EC2DBD800763715 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C132B9BC1EC2DBD800763715 /* LaunchScreen.storyboard */; }; C132B9CB1EC2DE6400763715 /* GeneralConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = C132B9CA1EC2DE6400763715 /* GeneralConstants.swift */; }; C132B9D91EC30E1D00763715 /* InboxViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C132B9D81EC30E1D00763715 /* InboxViewController.swift */; }; C192421F1EC48B6900C3D251 /* SetupBackupsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C192421E1EC48B6900C3D251 /* SetupBackupsViewController.swift */; }; - CB5986DFBB2B4FF4AD555821 /* Pods_FlowCryptUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3FA3FBD561C4CAD27852EB0B /* Pods_FlowCryptUITests.framework */; }; + CDE91E546AF2C64C9306EB69 /* Pods_FlowCryptUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F083C28BC034555B67F7F00 /* Pods_FlowCryptUI.framework */; }; D204DBA223FB35700083B9D6 /* FlowCryptUI.h in Headers */ = {isa = PBXBuildFile; fileRef = D204DBA023FB35700083B9D6 /* FlowCryptUI.h */; settings = {ATTRIBUTES = (Public, ); }; }; D20D3C672520AB1000D4AA9A /* BackupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D20D3C662520AB1000D4AA9A /* BackupViewController.swift */; }; D20D3C6E2520AB3900D4AA9A /* BackupViewDecorator.swift in Sources */ = {isa = PBXBuildFile; fileRef = D20D3C6D2520AB3900D4AA9A /* BackupViewDecorator.swift */; }; @@ -337,7 +343,6 @@ D2FF6966243115EC007182F0 /* SetupImapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2FF6965243115EC007182F0 /* SetupImapViewController.swift */; }; D2FF6968243115F9007182F0 /* SetupImapViewDecorator.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2FF6967243115F9007182F0 /* SetupImapViewDecorator.swift */; }; D952B71D1ED0CB2500E5C02B /* MessageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D952B71C1ED0CB2500E5C02B /* MessageViewController.swift */; }; - E29491346F23FA1463A07459 /* Pods_FlowCryptAppTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 990E5AB8A4A7F69E1C113365 /* Pods_FlowCryptAppTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -387,14 +392,14 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 02A9A9F6DCFB9B2E407559A8 /* Pods-FlowCrypt.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCrypt.release.xcconfig"; path = "Target Support Files/Pods-FlowCrypt/Pods-FlowCrypt.release.xcconfig"; sourceTree = ""; }; + 049C4FBB54F5709AE2F2301B /* Pods-FlowCryptUI.enterprise.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptUI.enterprise.xcconfig"; path = "Target Support Files/Pods-FlowCryptUI/Pods-FlowCryptUI.enterprise.xcconfig"; sourceTree = ""; }; 04B4728B1ECE29D200B8266F /* KeyInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyInfo.swift; sourceTree = ""; }; 04B472921ECE29F600B8266F /* MyMenuViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MyMenuViewController.swift; sourceTree = ""; }; 04B472931ECE29F600B8266F /* SideMenuNavigationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SideMenuNavigationController.swift; sourceTree = ""; }; - 0661BC078F16A307751CA7DA /* Pods-FlowCryptUIApplication.enterprise.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptUIApplication.enterprise.xcconfig"; path = "Target Support Files/Pods-FlowCryptUIApplication/Pods-FlowCryptUIApplication.enterprise.xcconfig"; sourceTree = ""; }; - 069059B887A8580765029BF9 /* Pods_FlowCrypt.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FlowCrypt.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 113F04B20ECC35FC59A81A6C /* Pods-FlowCryptTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptTests.release.xcconfig"; path = "Target Support Files/Pods-FlowCryptTests/Pods-FlowCryptTests.release.xcconfig"; sourceTree = ""; }; - 11C1375F41411882DC4C9431 /* Pods-FlowCryptUIApplication.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptUIApplication.release.xcconfig"; path = "Target Support Files/Pods-FlowCryptUIApplication/Pods-FlowCryptUIApplication.release.xcconfig"; sourceTree = ""; }; + 06B7F70EA15D806AA5D94CA9 /* Pods-FlowCrypt.testflight.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCrypt.testflight.xcconfig"; path = "Target Support Files/Pods-FlowCrypt/Pods-FlowCrypt.testflight.xcconfig"; sourceTree = ""; }; + 0B1FD1088504F12263991E77 /* Pods-FlowCrypt.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCrypt.release.xcconfig"; path = "Target Support Files/Pods-FlowCrypt/Pods-FlowCrypt.release.xcconfig"; sourceTree = ""; }; + 0E4D5480C58B6FAB4DB4632B /* Pods-FlowCryptAppTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptAppTests.release.xcconfig"; path = "Target Support Files/Pods-FlowCryptAppTests/Pods-FlowCryptAppTests.release.xcconfig"; sourceTree = ""; }; + 1F919F817E5651D30BFF9C0B /* Pods-FlowCrypt.enterprise.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCrypt.enterprise.xcconfig"; path = "Target Support Files/Pods-FlowCrypt/Pods-FlowCrypt.enterprise.xcconfig"; sourceTree = ""; }; 211392A4266511E6009202EC /* PubLookup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PubLookup.swift; sourceTree = ""; }; 2133D51526A0571F00CC686F /* ClientConfigurationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientConfigurationService.swift; sourceTree = ""; }; 2133D51726A1E45300CC686F /* DecryptedPrivateKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DecryptedPrivateKey.swift; sourceTree = ""; }; @@ -430,8 +435,6 @@ 21F836CB2652A38700B2448C /* ZBase32EncodingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZBase32EncodingTests.swift; sourceTree = ""; }; 21F836D22652A46E00B2448C /* WKDURLsConstructorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WKDURLsConstructorTests.swift; sourceTree = ""; }; 21FEE26526FDD91A00E3783F /* ComposeMessageAttachment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeMessageAttachment.swift; sourceTree = ""; }; - 27D857C43583281B45F427F8 /* Pods-FlowCryptUI.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptUI.release.xcconfig"; path = "Target Support Files/Pods-FlowCryptUI/Pods-FlowCryptUI.release.xcconfig"; sourceTree = ""; }; - 2B4C2647A021692455F9DFAD /* Pods-FlowCryptAppTests.enterprise.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptAppTests.enterprise.xcconfig"; path = "Target Support Files/Pods-FlowCryptAppTests/Pods-FlowCryptAppTests.enterprise.xcconfig"; sourceTree = ""; }; 32DCA058652FD4616FB04FB6 /* SequenceExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SequenceExtensions.swift; sourceTree = ""; }; 32DCA0C3D34A69851A238E87 /* Core.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Core.swift; sourceTree = ""; }; 32DCA0E63F2F0473D0A8EDB0 /* StringExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StringExtensions.swift; sourceTree = ""; }; @@ -451,15 +454,20 @@ 32DCACD323127CD4FEA462FC /* flowcrypt-ios-prod.js.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "flowcrypt-ios-prod.js.txt"; sourceTree = ""; }; 32DCAEFF16F5D91A35791730 /* DataExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataExtensions.swift; sourceTree = ""; }; 32DCAF8424D0185FAA9401A7 /* Imap+send.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Imap+send.swift"; sourceTree = ""; }; - 3FA3FBD561C4CAD27852EB0B /* Pods_FlowCryptUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FlowCryptUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 411CEC75050F852F172CD687 /* Pods-FlowCryptTests.testflight.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptTests.testflight.xcconfig"; path = "Target Support Files/Pods-FlowCryptTests/Pods-FlowCryptTests.testflight.xcconfig"; sourceTree = ""; }; - 44D0BF0D60EF854CEC17561C /* Pods-FlowCryptUIApplication.testflight.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptUIApplication.testflight.xcconfig"; path = "Target Support Files/Pods-FlowCryptUIApplication/Pods-FlowCryptUIApplication.testflight.xcconfig"; sourceTree = ""; }; - 4A76C3D4559C9F415D392A62 /* Pods-FlowCryptTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptTests.debug.xcconfig"; path = "Target Support Files/Pods-FlowCryptTests/Pods-FlowCryptTests.debug.xcconfig"; sourceTree = ""; }; + 3382C015A576728FA08BA310 /* Pods_FlowCryptUIApplication.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FlowCryptUIApplication.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 3675DB672850A781424D0113 /* Pods-FlowCryptUI.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptUI.debug.xcconfig"; path = "Target Support Files/Pods-FlowCryptUI/Pods-FlowCryptUI.debug.xcconfig"; sourceTree = ""; }; + 3B945B2BE6B66D5E6B43AD2E /* Pods-FlowCryptUIApplication.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptUIApplication.debug.xcconfig"; path = "Target Support Files/Pods-FlowCryptUIApplication/Pods-FlowCryptUIApplication.debug.xcconfig"; sourceTree = ""; }; + 3EF111000D0215574B9073AD /* Pods-FlowCryptAppTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptAppTests.debug.xcconfig"; path = "Target Support Files/Pods-FlowCryptAppTests/Pods-FlowCryptAppTests.debug.xcconfig"; sourceTree = ""; }; + 3F083C28BC034555B67F7F00 /* Pods_FlowCryptUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FlowCryptUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 4753E9A27694B4D34C980FFA /* Pods_FlowCrypt.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FlowCrypt.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 48777051AEB60BEA663F2755 /* Pods-FlowCryptAppTests.testflight.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptAppTests.testflight.xcconfig"; path = "Target Support Files/Pods-FlowCryptAppTests/Pods-FlowCryptAppTests.testflight.xcconfig"; sourceTree = ""; }; + 4C5032E4FC5685A224F61785 /* Pods-FlowCryptUI.testflight.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptUI.testflight.xcconfig"; path = "Target Support Files/Pods-FlowCryptUI/Pods-FlowCryptUI.testflight.xcconfig"; sourceTree = ""; }; + 4F928D493732294B4E521900 /* Pods-FlowCryptUIApplication.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptUIApplication.release.xcconfig"; path = "Target Support Files/Pods-FlowCryptUIApplication/Pods-FlowCryptUIApplication.release.xcconfig"; sourceTree = ""; }; 50531BE32629B9A80039BAE9 /* AttachmentNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttachmentNode.swift; sourceTree = ""; }; 51775C31270B01C200D7C944 /* PrvKeyInfoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrvKeyInfoTests.swift; sourceTree = ""; }; 51775C38270C7D2400D7C944 /* StorageMethod.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorageMethod.swift; sourceTree = ""; }; 51E1673C270DAFF900D27C52 /* Localizable.stringsdict */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; path = Localizable.stringsdict; sourceTree = ""; }; - 567BA6739257FE0D2924D82C /* Pods_FlowCryptUIApplication.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FlowCryptUIApplication.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 55652F68438D6EDFE71EA13C /* Pods-FlowCryptUIApplication.enterprise.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptUIApplication.enterprise.xcconfig"; path = "Target Support Files/Pods-FlowCryptUIApplication/Pods-FlowCryptUIApplication.enterprise.xcconfig"; sourceTree = ""; }; 5A39F42C239EC321001F4607 /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = ""; }; 5A39F42F239EC396001F4607 /* SettingsViewDecorator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewDecorator.swift; sourceTree = ""; }; 5A39F433239EC61C001F4607 /* SettingsCellNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsCellNode.swift; sourceTree = ""; }; @@ -477,13 +485,8 @@ 5ADEDCBD23A4363700EC495E /* KeyDetailInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyDetailInfoViewController.swift; sourceTree = ""; }; 5ADEDCBF23A43B0800EC495E /* KeyDetailInfoViewDecorator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyDetailInfoViewDecorator.swift; sourceTree = ""; }; 5ADEDCC123A43C6800EC495E /* KeyTextCellNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyTextCellNode.swift; sourceTree = ""; }; - 5C0F9ED0610EBC4EA2348E1A /* Pods-FlowCrypt.testflight.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCrypt.testflight.xcconfig"; path = "Target Support Files/Pods-FlowCrypt/Pods-FlowCrypt.testflight.xcconfig"; sourceTree = ""; }; - 665165CEB9BB3DA16B5715D4 /* Pods-FlowCryptUIApplication.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptUIApplication.debug.xcconfig"; path = "Target Support Files/Pods-FlowCryptUIApplication/Pods-FlowCryptUIApplication.debug.xcconfig"; sourceTree = ""; }; - 6D8A8C9A8EA0B31DB5F92E39 /* Pods-FlowCryptUITests.testflight.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptUITests.testflight.xcconfig"; path = "Target Support Files/Pods-FlowCryptUITests/Pods-FlowCryptUITests.testflight.xcconfig"; sourceTree = ""; }; - 727E7B2D9A5AC9919E04363A /* Pods-FlowCryptUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptUITests.release.xcconfig"; path = "Target Support Files/Pods-FlowCryptUITests/Pods-FlowCryptUITests.release.xcconfig"; sourceTree = ""; }; - 7D424F068875A727743993E3 /* Pods_FlowCryptUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FlowCryptUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 71764B8B0579E30806506587 /* Pods_FlowCryptAppTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FlowCryptAppTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 949ED9412303E3B400530579 /* Colors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Colors.xcassets; sourceTree = ""; }; - 990E5AB8A4A7F69E1C113365 /* Pods_FlowCryptAppTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FlowCryptAppTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9F003D6025E1B4ED00EB38C0 /* TrashFolderProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrashFolderProvider.swift; sourceTree = ""; }; 9F003D6C25EA8F3200EB38C0 /* UserAccountService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserAccountService.swift; sourceTree = ""; }; 9F003D9D25EA910B00EB38C0 /* LocalStorageTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalStorageTests.swift; sourceTree = ""; }; @@ -652,12 +655,7 @@ A3B7C31823F576BA0022D628 /* AppStartup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppStartup.swift; sourceTree = ""; }; A3DAD5FD22E4574B00F2C4CD /* FlowCryptCoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlowCryptCoreTests.swift; sourceTree = ""; }; A3DAD60722E4588800F2C4CD /* TestData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestData.swift; sourceTree = ""; }; - A8E25B5340E41CA59482FC34 /* Pods-FlowCryptAppTests.testflight.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptAppTests.testflight.xcconfig"; path = "Target Support Files/Pods-FlowCryptAppTests/Pods-FlowCryptAppTests.testflight.xcconfig"; sourceTree = ""; }; - B2D5E6D67A7C2E406945F9B9 /* Pods-FlowCryptAppTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptAppTests.debug.xcconfig"; path = "Target Support Files/Pods-FlowCryptAppTests/Pods-FlowCryptAppTests.debug.xcconfig"; sourceTree = ""; }; - B5FD94843B54B71375747E38 /* Pods_FlowCryptTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FlowCryptTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - B8A71CC43DE980CB3B798EAE /* Pods-FlowCryptUI.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptUI.debug.xcconfig"; path = "Target Support Files/Pods-FlowCryptUI/Pods-FlowCryptUI.debug.xcconfig"; sourceTree = ""; }; - BB4F4E0EC72273F1D5C0BECD /* Pods-FlowCryptUI.testflight.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptUI.testflight.xcconfig"; path = "Target Support Files/Pods-FlowCryptUI/Pods-FlowCryptUI.testflight.xcconfig"; sourceTree = ""; }; - C0FB753BE77A7038836861D7 /* Pods-FlowCrypt.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCrypt.debug.xcconfig"; path = "Target Support Files/Pods-FlowCrypt/Pods-FlowCrypt.debug.xcconfig"; sourceTree = ""; }; + BBFB58E712FFB19AEC513D40 /* Pods-FlowCrypt.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCrypt.debug.xcconfig"; path = "Target Support Files/Pods-FlowCrypt/Pods-FlowCrypt.debug.xcconfig"; sourceTree = ""; }; C132B9B01EC2DBD800763715 /* FlowCrypt.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FlowCrypt.app; sourceTree = BUILT_PRODUCTS_DIR; }; C132B9B31EC2DBD800763715 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; C132B9BA1EC2DBD800763715 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -667,8 +665,6 @@ C132B9D81EC30E1D00763715 /* InboxViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InboxViewController.swift; sourceTree = ""; }; C132B9DF1EC333AA00763715 /* FlowCrypt-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "FlowCrypt-Bridging-Header.h"; sourceTree = ""; }; C192421E1EC48B6900C3D251 /* SetupBackupsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SetupBackupsViewController.swift; sourceTree = ""; }; - C37B425E87C035322DD0215E /* Pods-FlowCryptAppTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptAppTests.release.xcconfig"; path = "Target Support Files/Pods-FlowCryptAppTests/Pods-FlowCryptAppTests.release.xcconfig"; sourceTree = ""; }; - D10767C30A339253DB81208D /* Pods-FlowCryptUITests.enterprise.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptUITests.enterprise.xcconfig"; path = "Target Support Files/Pods-FlowCryptUITests/Pods-FlowCryptUITests.enterprise.xcconfig"; sourceTree = ""; }; D204DB9E23FB35700083B9D6 /* FlowCryptUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FlowCryptUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D204DBA023FB35700083B9D6 /* FlowCryptUI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FlowCryptUI.h; sourceTree = ""; }; D204DBA123FB35700083B9D6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -749,10 +745,10 @@ D2FD0F682453245E00259FF0 /* Either.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Either.swift; sourceTree = ""; }; D2FF6965243115EC007182F0 /* SetupImapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetupImapViewController.swift; sourceTree = ""; }; D2FF6967243115F9007182F0 /* SetupImapViewDecorator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetupImapViewDecorator.swift; sourceTree = ""; }; + D9381A4EE6BAAD97294A7F9A /* Pods-FlowCryptUI.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptUI.release.xcconfig"; path = "Target Support Files/Pods-FlowCryptUI/Pods-FlowCryptUI.release.xcconfig"; sourceTree = ""; }; D952B71C1ED0CB2500E5C02B /* MessageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageViewController.swift; sourceTree = ""; }; - DCFF9B8BC7DEED36917C457B /* Pods-FlowCrypt.enterprise.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCrypt.enterprise.xcconfig"; path = "Target Support Files/Pods-FlowCrypt/Pods-FlowCrypt.enterprise.xcconfig"; sourceTree = ""; }; - DFA70003EC75596718303F14 /* Pods-FlowCryptUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptUITests.debug.xcconfig"; path = "Target Support Files/Pods-FlowCryptUITests/Pods-FlowCryptUITests.debug.xcconfig"; sourceTree = ""; }; - E3FED78D0C98E6C19FEACB5F /* Pods-FlowCryptUI.enterprise.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptUI.enterprise.xcconfig"; path = "Target Support Files/Pods-FlowCryptUI/Pods-FlowCryptUI.enterprise.xcconfig"; sourceTree = ""; }; + E16585B4D0D6F175370CC6AE /* Pods-FlowCryptUIApplication.testflight.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptUIApplication.testflight.xcconfig"; path = "Target Support Files/Pods-FlowCryptUIApplication/Pods-FlowCryptUIApplication.testflight.xcconfig"; sourceTree = ""; }; + E1E8DF1D4A746810CDD600E3 /* Pods-FlowCryptAppTests.enterprise.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptAppTests.enterprise.xcconfig"; path = "Target Support Files/Pods-FlowCryptAppTests/Pods-FlowCryptAppTests.enterprise.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -760,7 +756,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - E29491346F23FA1463A07459 /* Pods_FlowCryptAppTests.framework in Frameworks */, + 58BD3C66FD5A3CB9DC278D10 /* Pods_FlowCryptAppTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -768,7 +764,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - CB5986DFBB2B4FF4AD555821 /* Pods_FlowCryptUITests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -778,8 +773,14 @@ files = ( D2CDC3E224052D54002B045F /* FlowCryptCommon.framework in Frameworks */, D2CDC3DD24052D50002B045F /* FlowCryptUI.framework in Frameworks */, - A40B9DB9E27967AC623BA60B /* Pods_FlowCrypt.framework in Frameworks */, + 51E1674F270F341300D27C52 /* Promises in Frameworks */, + 51E16746270F301F00D27C52 /* GoogleAPIClientForREST_Gmail in Frameworks */, 510A260126FDFEBE00163271 /* MailCore2 in Frameworks */, + 51E16755270F356500D27C52 /* GTMAppAuth in Frameworks */, + 51E1675D270F36A400D27C52 /* Realm in Frameworks */, + 5298EA408FEC36021F7558BD /* Pods_FlowCrypt.framework in Frameworks */, + 51E1675F270F36A400D27C52 /* RealmSwift in Frameworks */, + 51E16749270F303100D27C52 /* GoogleSignIn in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -788,7 +789,7 @@ buildActionMask = 2147483647; files = ( D28655982424D1BD0066F52E /* FlowCryptCommon.framework in Frameworks */, - 85F56205E0D5F5F897ACF391 /* Pods_FlowCryptUI.framework in Frameworks */, + CDE91E546AF2C64C9306EB69 /* Pods_FlowCryptUI.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -805,7 +806,7 @@ files = ( D28655992424D1EB0066F52E /* FlowCryptCommon.framework in Frameworks */, D286559A2424D1EB0066F52E /* FlowCryptUI.framework in Frameworks */, - 5B810312C6D099BC214DB38F /* Pods_FlowCryptUIApplication.framework in Frameworks */, + 7F72537A0C44D3CE670F0EFD /* Pods_FlowCryptUIApplication.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -936,29 +937,22 @@ 2DC3601602226D74335E18F4 /* Pods */ = { isa = PBXGroup; children = ( - C0FB753BE77A7038836861D7 /* Pods-FlowCrypt.debug.xcconfig */, - 02A9A9F6DCFB9B2E407559A8 /* Pods-FlowCrypt.release.xcconfig */, - DFA70003EC75596718303F14 /* Pods-FlowCryptUITests.debug.xcconfig */, - 727E7B2D9A5AC9919E04363A /* Pods-FlowCryptUITests.release.xcconfig */, - 4A76C3D4559C9F415D392A62 /* Pods-FlowCryptTests.debug.xcconfig */, - 113F04B20ECC35FC59A81A6C /* Pods-FlowCryptTests.release.xcconfig */, - 5C0F9ED0610EBC4EA2348E1A /* Pods-FlowCrypt.testflight.xcconfig */, - 411CEC75050F852F172CD687 /* Pods-FlowCryptTests.testflight.xcconfig */, - 6D8A8C9A8EA0B31DB5F92E39 /* Pods-FlowCryptUITests.testflight.xcconfig */, - B8A71CC43DE980CB3B798EAE /* Pods-FlowCryptUI.debug.xcconfig */, - 27D857C43583281B45F427F8 /* Pods-FlowCryptUI.release.xcconfig */, - BB4F4E0EC72273F1D5C0BECD /* Pods-FlowCryptUI.testflight.xcconfig */, - 665165CEB9BB3DA16B5715D4 /* Pods-FlowCryptUIApplication.debug.xcconfig */, - 11C1375F41411882DC4C9431 /* Pods-FlowCryptUIApplication.release.xcconfig */, - 44D0BF0D60EF854CEC17561C /* Pods-FlowCryptUIApplication.testflight.xcconfig */, - B2D5E6D67A7C2E406945F9B9 /* Pods-FlowCryptAppTests.debug.xcconfig */, - C37B425E87C035322DD0215E /* Pods-FlowCryptAppTests.release.xcconfig */, - A8E25B5340E41CA59482FC34 /* Pods-FlowCryptAppTests.testflight.xcconfig */, - DCFF9B8BC7DEED36917C457B /* Pods-FlowCrypt.enterprise.xcconfig */, - 2B4C2647A021692455F9DFAD /* Pods-FlowCryptAppTests.enterprise.xcconfig */, - E3FED78D0C98E6C19FEACB5F /* Pods-FlowCryptUI.enterprise.xcconfig */, - 0661BC078F16A307751CA7DA /* Pods-FlowCryptUIApplication.enterprise.xcconfig */, - D10767C30A339253DB81208D /* Pods-FlowCryptUITests.enterprise.xcconfig */, + BBFB58E712FFB19AEC513D40 /* Pods-FlowCrypt.debug.xcconfig */, + 1F919F817E5651D30BFF9C0B /* Pods-FlowCrypt.enterprise.xcconfig */, + 0B1FD1088504F12263991E77 /* Pods-FlowCrypt.release.xcconfig */, + 06B7F70EA15D806AA5D94CA9 /* Pods-FlowCrypt.testflight.xcconfig */, + 3EF111000D0215574B9073AD /* Pods-FlowCryptAppTests.debug.xcconfig */, + E1E8DF1D4A746810CDD600E3 /* Pods-FlowCryptAppTests.enterprise.xcconfig */, + 0E4D5480C58B6FAB4DB4632B /* Pods-FlowCryptAppTests.release.xcconfig */, + 48777051AEB60BEA663F2755 /* Pods-FlowCryptAppTests.testflight.xcconfig */, + 3675DB672850A781424D0113 /* Pods-FlowCryptUI.debug.xcconfig */, + 049C4FBB54F5709AE2F2301B /* Pods-FlowCryptUI.enterprise.xcconfig */, + D9381A4EE6BAAD97294A7F9A /* Pods-FlowCryptUI.release.xcconfig */, + 4C5032E4FC5685A224F61785 /* Pods-FlowCryptUI.testflight.xcconfig */, + 3B945B2BE6B66D5E6B43AD2E /* Pods-FlowCryptUIApplication.debug.xcconfig */, + 55652F68438D6EDFE71EA13C /* Pods-FlowCryptUIApplication.enterprise.xcconfig */, + 4F928D493732294B4E521900 /* Pods-FlowCryptUIApplication.release.xcconfig */, + E16585B4D0D6F175370CC6AE /* Pods-FlowCryptUIApplication.testflight.xcconfig */, ); path = Pods; sourceTree = ""; @@ -1577,7 +1571,7 @@ D2531F2C23FEEF52007E5198 /* FlowCryptCommon */, 9F2AC5C7267BE99E00F6149B /* FlowCryptAppTests */, C132B9B11EC2DBD800763715 /* Products */, - E48A4865C8E7B2B971F5FC18 /* Frameworks */, + CE0C659EE9FC297F6DAC8F59 /* Frameworks */, ); sourceTree = ""; }; @@ -1678,6 +1672,17 @@ path = Setup; sourceTree = ""; }; + CE0C659EE9FC297F6DAC8F59 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 4753E9A27694B4D34C980FFA /* Pods_FlowCrypt.framework */, + 71764B8B0579E30806506587 /* Pods_FlowCryptAppTests.framework */, + 3F083C28BC034555B67F7F00 /* Pods_FlowCryptUI.framework */, + 3382C015A576728FA08BA310 /* Pods_FlowCryptUIApplication.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; D204DB9F23FB35700083B9D6 /* FlowCryptUI */ = { isa = PBXGroup; children = ( @@ -1985,19 +1990,6 @@ path = Msg; sourceTree = ""; }; - E48A4865C8E7B2B971F5FC18 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 069059B887A8580765029BF9 /* Pods_FlowCrypt.framework */, - B5FD94843B54B71375747E38 /* Pods_FlowCryptTests.framework */, - 3FA3FBD561C4CAD27852EB0B /* Pods_FlowCryptUITests.framework */, - 7D424F068875A727743993E3 /* Pods_FlowCryptUI.framework */, - 567BA6739257FE0D2924D82C /* Pods_FlowCryptUIApplication.framework */, - 990E5AB8A4A7F69E1C113365 /* Pods_FlowCryptAppTests.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -2024,11 +2016,11 @@ isa = PBXNativeTarget; buildConfigurationList = 9F2AC5CD267BE99E00F6149B /* Build configuration list for PBXNativeTarget "FlowCryptAppTests" */; buildPhases = ( - 83E0F8502A1A5A43690AC007 /* [CP] Check Pods Manifest.lock */, + 810207860AF607AFC6E0B585 /* [CP] Check Pods Manifest.lock */, 9F2AC5C2267BE99E00F6149B /* Sources */, 9F2AC5C3267BE99E00F6149B /* Frameworks */, 9F2AC5C4267BE99E00F6149B /* Resources */, - 1FC573E8F878314F4EB50EC3 /* [CP] Embed Pods Frameworks */, + 08181B91F4416AC9D86125DF /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -2044,11 +2036,9 @@ isa = PBXNativeTarget; buildConfigurationList = 9FDF364B235A1B0100614596 /* Build configuration list for PBXNativeTarget "FlowCryptUITests" */; buildPhases = ( - 1D3D5E98C2C4E7F4A36C6237 /* [CP] Check Pods Manifest.lock */, 9FDF363D235A1B0100614596 /* Sources */, 9FDF363E235A1B0100614596 /* Frameworks */, 9FDF363F235A1B0100614596 /* Resources */, - 0CF02BEF6BCBCD8B43A732A5 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -2064,14 +2054,14 @@ isa = PBXNativeTarget; buildConfigurationList = C132B9C21EC2DBD800763715 /* Build configuration list for PBXNativeTarget "FlowCrypt" */; buildPhases = ( - 5430C58483A407F52FD23C1B /* [CP] Check Pods Manifest.lock */, + 85C230714DC341D246864AD0 /* [CP] Check Pods Manifest.lock */, D2324CAA2471D47B00FD1C6F /* Format code */, D2324CA92471CED200FD1C6F /* SwiftLint */, C132B9AC1EC2DBD800763715 /* Sources */, C132B9AD1EC2DBD800763715 /* Frameworks */, C132B9AE1EC2DBD800763715 /* Resources */, - 527B6FD5C3E83A37AEA8D0A3 /* [CP] Embed Pods Frameworks */, D2CDC3E124052D50002B045F /* Embed Frameworks */, + E531C3B50A9C90454C72F878 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -2082,6 +2072,12 @@ name = FlowCrypt; packageProductDependencies = ( 510A260026FDFEBE00163271 /* MailCore2 */, + 51E16745270F301F00D27C52 /* GoogleAPIClientForREST_Gmail */, + 51E16748270F303100D27C52 /* GoogleSignIn */, + 51E1674E270F341300D27C52 /* Promises */, + 51E16754270F356500D27C52 /* GTMAppAuth */, + 51E1675C270F36A400D27C52 /* Realm */, + 51E1675E270F36A400D27C52 /* RealmSwift */, ); productName = FlowCrypt; productReference = C132B9B01EC2DBD800763715 /* FlowCrypt.app */; @@ -2091,7 +2087,7 @@ isa = PBXNativeTarget; buildConfigurationList = D204DBA623FB35700083B9D6 /* Build configuration list for PBXNativeTarget "FlowCryptUI" */; buildPhases = ( - B68D10E7C49E42D8072CA138 /* [CP] Check Pods Manifest.lock */, + 7448815F0409698014646718 /* [CP] Check Pods Manifest.lock */, D204DB9923FB35700083B9D6 /* Headers */, D204DB9A23FB35700083B9D6 /* Sources */, D204DB9B23FB35700083B9D6 /* Frameworks */, @@ -2128,11 +2124,11 @@ isa = PBXNativeTarget; buildConfigurationList = D2A1D3C823FD64AD00D626D6 /* Build configuration list for PBXNativeTarget "FlowCryptUIApplication" */; buildPhases = ( - 5F5CFBA7F01EBBFD1F1B1EFA /* [CP] Check Pods Manifest.lock */, + BF91BAF1F0E74BA172BDA5C0 /* [CP] Check Pods Manifest.lock */, D2A1D3B323FD64AB00D626D6 /* Sources */, D2A1D3B423FD64AB00D626D6 /* Frameworks */, D2A1D3B523FD64AB00D626D6 /* Resources */, - BC310DD2725DD2FDF5F0F86A /* [CP] Embed Pods Frameworks */, + 05B81508878EB6DE11728435 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -2190,6 +2186,11 @@ mainGroup = C132B9A71EC2DBD800763715; packageReferences = ( 510A25FF26FDFEBE00163271 /* XCRemoteSwiftPackageReference "mailcore2" */, + 51E16744270F301F00D27C52 /* XCRemoteSwiftPackageReference "google-api-objectivec-client-for-rest" */, + 51E16747270F303100D27C52 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */, + 51E1674D270F341200D27C52 /* XCRemoteSwiftPackageReference "promises" */, + 51E16753270F356500D27C52 /* XCRemoteSwiftPackageReference "GTMAppAuth" */, + 51E1675B270F36A400D27C52 /* XCRemoteSwiftPackageReference "realm-cocoa" */, ); productRefGroup = C132B9B11EC2DBD800763715 /* Products */; projectDirPath = ""; @@ -2272,46 +2273,24 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 0CF02BEF6BCBCD8B43A732A5 /* [CP] Embed Pods Frameworks */ = { + 05B81508878EB6DE11728435 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FlowCryptUITests/Pods-FlowCryptUITests-frameworks-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-FlowCryptUIApplication/Pods-FlowCryptUIApplication-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FlowCryptUITests/Pods-FlowCryptUITests-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FlowCryptUITests/Pods-FlowCryptUITests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 1D3D5E98C2C4E7F4A36C6237 /* [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-FlowCryptUITests-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-FlowCryptUIApplication/Pods-FlowCryptUIApplication-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); 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"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FlowCryptUIApplication/Pods-FlowCryptUIApplication-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 1FC573E8F878314F4EB50EC3 /* [CP] Embed Pods Frameworks */ = { + 08181B91F4416AC9D86125DF /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -2328,24 +2307,7 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FlowCryptAppTests/Pods-FlowCryptAppTests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 527B6FD5C3E83A37AEA8D0A3 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FlowCrypt/Pods-FlowCrypt-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FlowCrypt/Pods-FlowCrypt-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FlowCrypt/Pods-FlowCrypt-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 5430C58483A407F52FD23C1B /* [CP] Check Pods Manifest.lock */ = { + 7448815F0409698014646718 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -2360,14 +2322,14 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-FlowCrypt-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-FlowCryptUI-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; }; - 5F5CFBA7F01EBBFD1F1B1EFA /* [CP] Check Pods Manifest.lock */ = { + 810207860AF607AFC6E0B585 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -2382,14 +2344,14 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-FlowCryptUIApplication-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-FlowCryptAppTests-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; }; - 83E0F8502A1A5A43690AC007 /* [CP] Check Pods Manifest.lock */ = { + 85C230714DC341D246864AD0 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -2404,14 +2366,14 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-FlowCryptAppTests-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-FlowCrypt-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; }; - B68D10E7C49E42D8072CA138 /* [CP] Check Pods Manifest.lock */ = { + BF91BAF1F0E74BA172BDA5C0 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -2426,31 +2388,32 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-FlowCryptUI-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-FlowCryptUIApplication-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; }; - BC310DD2725DD2FDF5F0F86A /* [CP] Embed Pods Frameworks */ = { + D2324CA92471CED200FD1C6F /* SwiftLint */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FlowCryptUIApplication/Pods-FlowCryptUIApplication-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + ); + name = SwiftLint; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FlowCryptUIApplication/Pods-FlowCryptUIApplication-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FlowCryptUIApplication/Pods-FlowCryptUIApplication-frameworks.sh\"\n"; - showEnvVarsInLog = 0; + shellScript = "\"${PODS_ROOT}/SwiftLint/swiftlint\"\n"; }; - D2324CA92471CED200FD1C6F /* SwiftLint */ = { + D2324CAA2471D47B00FD1C6F /* Format code */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -2459,32 +2422,31 @@ ); inputPaths = ( ); - name = SwiftLint; + name = "Format code"; outputFileListPaths = ( ); outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/SwiftLint/swiftlint\"\n"; + shellScript = "make format\n"; }; - D2324CAA2471D47B00FD1C6F /* Format code */ = { + E531C3B50A9C90454C72F878 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-FlowCrypt/Pods-FlowCrypt-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - ); - name = "Format code"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-FlowCrypt/Pods-FlowCrypt-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "make format\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FlowCrypt/Pods-FlowCrypt-frameworks.sh\"\n"; + showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -2945,7 +2907,7 @@ }; 9F1C905026F1F38C0046E7D7 /* Enterprise */ = { isa = XCBuildConfiguration; - baseConfigurationReference = DCFF9B8BC7DEED36917C457B /* Pods-FlowCrypt.enterprise.xcconfig */; + baseConfigurationReference = 1F919F817E5651D30BFF9C0B /* Pods-FlowCrypt.enterprise.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; BUNDLE_LOADER = ""; @@ -2958,6 +2920,19 @@ ENABLE_BITCODE = NO; ENABLE_TESTABILITY = NO; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + "COCOAPODS=1", + "$(inherited)", + "AS_USE_ASSETS_LIBRARY=1", + "$(inherited)", + "AS_USE_MAPKIT=1", + "$(inherited)", + "AS_USE_PHOTOS=1", + "$(inherited)", + "AS_USE_VIDEO=1", + "SWIFT_PACKAGE=1", + ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = ( "$(inherited)", @@ -2994,7 +2969,6 @@ }; 9F1C905126F1F38C0046E7D7 /* Enterprise */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D10767C30A339253DB81208D /* Pods-FlowCryptUITests.enterprise.xcconfig */; buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_ENABLE_OBJC_WEAK = YES; @@ -3003,8 +2977,8 @@ DEVELOPMENT_TEAM = W57XRJ27NX; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = FlowCryptUITests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LD_RUNPATH_SEARCH_PATHS = "$(FRAMEWORK_SEARCH_PATHS)"; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited)"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.flowcrypt.FlowCryptUITests; @@ -3017,7 +2991,7 @@ }; 9F1C905226F1F38C0046E7D7 /* Enterprise */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E3FED78D0C98E6C19FEACB5F /* Pods-FlowCryptUI.enterprise.xcconfig */; + baseConfigurationReference = 049C4FBB54F5709AE2F2301B /* Pods-FlowCryptUI.enterprise.xcconfig */; buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_ENABLE_MODULES = YES; @@ -3033,7 +3007,7 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = FlowCryptUI/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3055,7 +3029,7 @@ }; 9F1C905326F1F38C0046E7D7 /* Enterprise */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 0661BC078F16A307751CA7DA /* Pods-FlowCryptUIApplication.enterprise.xcconfig */; + baseConfigurationReference = 55652F68438D6EDFE71EA13C /* Pods-FlowCryptUIApplication.enterprise.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -3065,7 +3039,7 @@ DEVELOPMENT_TEAM = W57XRJ27NX; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = FlowCryptUIApplication/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3095,7 +3069,7 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = FlowCryptCommon/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3116,7 +3090,7 @@ }; 9F1C905526F1F38C0046E7D7 /* Enterprise */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2B4C2647A021692455F9DFAD /* Pods-FlowCryptAppTests.enterprise.xcconfig */; + baseConfigurationReference = E1E8DF1D4A746810CDD600E3 /* Pods-FlowCryptAppTests.enterprise.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -3126,7 +3100,7 @@ DEVELOPMENT_TEAM = W57XRJ27NX; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = FlowCryptAppTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.4; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3145,7 +3119,7 @@ }; 9F2AC5CE267BE99E00F6149B /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B2D5E6D67A7C2E406945F9B9 /* Pods-FlowCryptAppTests.debug.xcconfig */; + baseConfigurationReference = 3EF111000D0215574B9073AD /* Pods-FlowCryptAppTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -3155,8 +3129,13 @@ DEVELOPMENT_TEAM = W57XRJ27NX; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + "COCOAPODS=1", + "SWIFT_PACKAGE=1", + ); INFOPLIST_FILE = FlowCryptAppTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.4; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3175,7 +3154,7 @@ }; 9F2AC5CF267BE99E00F6149B /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C37B425E87C035322DD0215E /* Pods-FlowCryptAppTests.release.xcconfig */; + baseConfigurationReference = 0E4D5480C58B6FAB4DB4632B /* Pods-FlowCryptAppTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -3185,7 +3164,7 @@ DEVELOPMENT_TEAM = W57XRJ27NX; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = FlowCryptAppTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.4; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3203,7 +3182,7 @@ }; 9F2AC5D0267BE99E00F6149B /* TestFlight */ = { isa = XCBuildConfiguration; - baseConfigurationReference = A8E25B5340E41CA59482FC34 /* Pods-FlowCryptAppTests.testflight.xcconfig */; + baseConfigurationReference = 48777051AEB60BEA663F2755 /* Pods-FlowCryptAppTests.testflight.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -3213,7 +3192,7 @@ DEVELOPMENT_TEAM = W57XRJ27NX; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = FlowCryptAppTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.4; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3231,7 +3210,6 @@ }; 9FDF3648235A1B0100614596 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = DFA70003EC75596718303F14 /* Pods-FlowCryptUITests.debug.xcconfig */; buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_ENABLE_OBJC_WEAK = YES; @@ -3241,8 +3219,8 @@ "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = FlowCryptUITests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LD_RUNPATH_SEARCH_PATHS = "$(FRAMEWORK_SEARCH_PATHS)"; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited)"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.flowcrypt.FlowCryptUITests; @@ -3255,7 +3233,6 @@ }; 9FDF3649235A1B0100614596 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 727E7B2D9A5AC9919E04363A /* Pods-FlowCryptUITests.release.xcconfig */; buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_ENABLE_OBJC_WEAK = YES; @@ -3264,8 +3241,8 @@ DEVELOPMENT_TEAM = W57XRJ27NX; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = FlowCryptUITests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LD_RUNPATH_SEARCH_PATHS = "$(FRAMEWORK_SEARCH_PATHS)"; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited)"; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.flowcrypt.FlowCryptUITests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -3277,7 +3254,6 @@ }; 9FDF364A235A1B0100614596 /* TestFlight */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 6D8A8C9A8EA0B31DB5F92E39 /* Pods-FlowCryptUITests.testflight.xcconfig */; buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_ENABLE_OBJC_WEAK = YES; @@ -3286,8 +3262,8 @@ DEVELOPMENT_TEAM = W57XRJ27NX; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = FlowCryptUITests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LD_RUNPATH_SEARCH_PATHS = "$(FRAMEWORK_SEARCH_PATHS)"; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited)"; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.flowcrypt.FlowCryptUITests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -3355,7 +3331,7 @@ }; A37A4605233823230085630A /* TestFlight */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 5C0F9ED0610EBC4EA2348E1A /* Pods-FlowCrypt.testflight.xcconfig */; + baseConfigurationReference = 06B7F70EA15D806AA5D94CA9 /* Pods-FlowCrypt.testflight.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; @@ -3366,6 +3342,19 @@ DEVELOPMENT_TEAM = W57XRJ27NX; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + "COCOAPODS=1", + "$(inherited)", + "AS_USE_ASSETS_LIBRARY=1", + "$(inherited)", + "AS_USE_MAPKIT=1", + "$(inherited)", + "AS_USE_PHOTOS=1", + "$(inherited)", + "AS_USE_VIDEO=1", + "SWIFT_PACKAGE=1", + ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = ( "$(inherited)", @@ -3517,7 +3506,7 @@ }; C132B9C31EC2DBD800763715 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C0FB753BE77A7038836861D7 /* Pods-FlowCrypt.debug.xcconfig */; + baseConfigurationReference = BBFB58E712FFB19AEC513D40 /* Pods-FlowCrypt.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; BUNDLE_LOADER = ""; @@ -3530,6 +3519,20 @@ ENABLE_BITCODE = NO; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + "COCOAPODS=1", + "$(inherited)", + "AS_USE_ASSETS_LIBRARY=1", + "$(inherited)", + "AS_USE_MAPKIT=1", + "$(inherited)", + "AS_USE_PHOTOS=1", + "$(inherited)", + "AS_USE_VIDEO=1", + "DEBUG=1", + "SWIFT_PACKAGE=1", + ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = ( "$(inherited)", @@ -3565,7 +3568,7 @@ }; C132B9C41EC2DBD800763715 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 02A9A9F6DCFB9B2E407559A8 /* Pods-FlowCrypt.release.xcconfig */; + baseConfigurationReference = 0B1FD1088504F12263991E77 /* Pods-FlowCrypt.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; @@ -3576,6 +3579,19 @@ DEVELOPMENT_TEAM = W57XRJ27NX; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + "COCOAPODS=1", + "$(inherited)", + "AS_USE_ASSETS_LIBRARY=1", + "$(inherited)", + "AS_USE_MAPKIT=1", + "$(inherited)", + "AS_USE_PHOTOS=1", + "$(inherited)", + "AS_USE_VIDEO=1", + "SWIFT_PACKAGE=1", + ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = ( "$(inherited)", @@ -3609,7 +3625,7 @@ }; D204DBA323FB35700083B9D6 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B8A71CC43DE980CB3B798EAE /* Pods-FlowCryptUI.debug.xcconfig */; + baseConfigurationReference = 3675DB672850A781424D0113 /* Pods-FlowCryptUI.debug.xcconfig */; buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_ENABLE_MODULES = YES; @@ -3626,7 +3642,7 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = FlowCryptUI/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3648,7 +3664,7 @@ }; D204DBA423FB35700083B9D6 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 27D857C43583281B45F427F8 /* Pods-FlowCryptUI.release.xcconfig */; + baseConfigurationReference = D9381A4EE6BAAD97294A7F9A /* Pods-FlowCryptUI.release.xcconfig */; buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_ENABLE_MODULES = YES; @@ -3664,7 +3680,7 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = FlowCryptUI/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3684,7 +3700,7 @@ }; D204DBA523FB35700083B9D6 /* TestFlight */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BB4F4E0EC72273F1D5C0BECD /* Pods-FlowCryptUI.testflight.xcconfig */; + baseConfigurationReference = 4C5032E4FC5685A224F61785 /* Pods-FlowCryptUI.testflight.xcconfig */; buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_ENABLE_MODULES = YES; @@ -3700,7 +3716,7 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = FlowCryptUI/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3735,7 +3751,7 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = FlowCryptCommon/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3770,7 +3786,7 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = FlowCryptCommon/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3804,7 +3820,7 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = FlowCryptCommon/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3824,7 +3840,7 @@ }; D2A1D3C923FD64AD00D626D6 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 665165CEB9BB3DA16B5715D4 /* Pods-FlowCryptUIApplication.debug.xcconfig */; + baseConfigurationReference = 3B945B2BE6B66D5E6B43AD2E /* Pods-FlowCryptUIApplication.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -3834,7 +3850,7 @@ DEVELOPMENT_TEAM = W57XRJ27NX; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = FlowCryptUIApplication/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3850,7 +3866,7 @@ }; D2A1D3CA23FD64AD00D626D6 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 11C1375F41411882DC4C9431 /* Pods-FlowCryptUIApplication.release.xcconfig */; + baseConfigurationReference = 4F928D493732294B4E521900 /* Pods-FlowCryptUIApplication.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -3860,7 +3876,7 @@ DEVELOPMENT_TEAM = W57XRJ27NX; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = FlowCryptUIApplication/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3875,7 +3891,7 @@ }; D2A1D3CB23FD64AD00D626D6 /* TestFlight */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 44D0BF0D60EF854CEC17561C /* Pods-FlowCryptUIApplication.testflight.xcconfig */; + baseConfigurationReference = E16585B4D0D6F175370CC6AE /* Pods-FlowCryptUIApplication.testflight.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -3885,7 +3901,7 @@ DEVELOPMENT_TEAM = W57XRJ27NX; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = FlowCryptUIApplication/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3989,6 +4005,46 @@ kind = branch; }; }; + 51E16744270F301F00D27C52 /* XCRemoteSwiftPackageReference "google-api-objectivec-client-for-rest" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/google/google-api-objectivec-client-for-rest"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 1.0.0; + }; + }; + 51E16747270F303100D27C52 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/google/GoogleSignIn-iOS"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 6.0.0; + }; + }; + 51E1674D270F341200D27C52 /* XCRemoteSwiftPackageReference "promises" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/google/promises"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 2.0.0; + }; + }; + 51E16753270F356500D27C52 /* XCRemoteSwiftPackageReference "GTMAppAuth" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/google/GTMAppAuth"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 1.0.0; + }; + }; + 51E1675B270F36A400D27C52 /* XCRemoteSwiftPackageReference "realm-cocoa" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/realm/realm-cocoa"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 10.0.0; + }; + }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ @@ -3997,6 +4053,36 @@ package = 510A25FF26FDFEBE00163271 /* XCRemoteSwiftPackageReference "mailcore2" */; productName = MailCore2; }; + 51E16745270F301F00D27C52 /* GoogleAPIClientForREST_Gmail */ = { + isa = XCSwiftPackageProductDependency; + package = 51E16744270F301F00D27C52 /* XCRemoteSwiftPackageReference "google-api-objectivec-client-for-rest" */; + productName = GoogleAPIClientForREST_Gmail; + }; + 51E16748270F303100D27C52 /* GoogleSignIn */ = { + isa = XCSwiftPackageProductDependency; + package = 51E16747270F303100D27C52 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */; + productName = GoogleSignIn; + }; + 51E1674E270F341300D27C52 /* Promises */ = { + isa = XCSwiftPackageProductDependency; + package = 51E1674D270F341200D27C52 /* XCRemoteSwiftPackageReference "promises" */; + productName = Promises; + }; + 51E16754270F356500D27C52 /* GTMAppAuth */ = { + isa = XCSwiftPackageProductDependency; + package = 51E16753270F356500D27C52 /* XCRemoteSwiftPackageReference "GTMAppAuth" */; + productName = GTMAppAuth; + }; + 51E1675C270F36A400D27C52 /* Realm */ = { + isa = XCSwiftPackageProductDependency; + package = 51E1675B270F36A400D27C52 /* XCRemoteSwiftPackageReference "realm-cocoa" */; + productName = Realm; + }; + 51E1675E270F36A400D27C52 /* RealmSwift */ = { + isa = XCSwiftPackageProductDependency; + package = 51E1675B270F36A400D27C52 /* XCRemoteSwiftPackageReference "realm-cocoa" */; + productName = RealmSwift; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = C132B9A81EC2DBD800763715 /* Project object */; diff --git a/FlowCrypt.xcworkspace/xcshareddata/swiftpm/Package.resolved b/FlowCrypt.xcworkspace/xcshareddata/swiftpm/Package.resolved index 5cc3d8629..b1a671e0a 100644 --- a/FlowCrypt.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/FlowCrypt.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,6 +1,51 @@ { "object": { "pins": [ + { + "package": "AppAuth", + "repositoryURL": "https://github.com/openid/AppAuth-iOS.git", + "state": { + "branch": null, + "revision": "01131d68346c8ae552961c768d583c715fbe1410", + "version": "1.4.0" + } + }, + { + "package": "GoogleAPIClientForREST", + "repositoryURL": "https://github.com/google/google-api-objectivec-client-for-rest", + "state": { + "branch": null, + "revision": "22e0bb02729d60db396e8b90d8189313cd86ba53", + "version": "1.6.0" + } + }, + { + "package": "GoogleSignIn", + "repositoryURL": "https://github.com/google/GoogleSignIn-iOS", + "state": { + "branch": null, + "revision": "27bc94f5e1bd1f3b12ba5abb2230dd77dd143f1e", + "version": "6.0.2" + } + }, + { + "package": "GTMSessionFetcher", + "repositoryURL": "https://github.com/google/gtm-session-fetcher.git", + "state": { + "branch": null, + "revision": "bc6a19702ac76ac4e488b68148710eb815f9bc56", + "version": "1.7.0" + } + }, + { + "package": "GTMAppAuth", + "repositoryURL": "https://github.com/google/GTMAppAuth", + "state": { + "branch": null, + "revision": "40f4103fb52109032c05599a0c39ad43edbdf80a", + "version": "1.2.2" + } + }, { "package": "MailCore2", "repositoryURL": "https://github.com/MailCore/mailcore2", @@ -9,6 +54,33 @@ "revision": "1434761709b4d9dd5acc5b7185a3b32aa4845ba8", "version": null } + }, + { + "package": "Promises", + "repositoryURL": "https://github.com/google/promises", + "state": { + "branch": null, + "revision": "611337c330350c9c1823ad6d671e7f936af5ee13", + "version": "2.0.0" + } + }, + { + "package": "Realm", + "repositoryURL": "https://github.com/realm/realm-cocoa", + "state": { + "branch": null, + "revision": "7ca0ce1dd58553d5be1ec9cc7283b068c256979d", + "version": "10.17.0" + } + }, + { + "package": "RealmDatabase", + "repositoryURL": "https://github.com/realm/realm-core", + "state": { + "branch": null, + "revision": "23f60515a00f076a9e3f2dc672fe1ae07601ee90", + "version": "11.4.1" + } } ] }, diff --git a/FlowCrypt/Functionality/Mail Provider/Backup Provider/Gmail+Backup.swift b/FlowCrypt/Functionality/Mail Provider/Backup Provider/Gmail+Backup.swift index 4e431b008..56e1c246a 100644 --- a/FlowCrypt/Functionality/Mail Provider/Backup Provider/Gmail+Backup.swift +++ b/FlowCrypt/Functionality/Mail Provider/Backup Provider/Gmail+Backup.swift @@ -6,8 +6,7 @@ // Copyright © 2017-present FlowCrypt a. s. All rights reserved. // -import GoogleAPIClientForREST -import GTMSessionFetcher +import GoogleAPIClientForREST_Gmail import Promises extension GmailService: BackupProvider { diff --git a/FlowCrypt/Functionality/Mail Provider/Gmail/GmailService.swift b/FlowCrypt/Functionality/Mail Provider/Gmail/GmailService.swift index d639cdb4d..6b59ca9f0 100644 --- a/FlowCrypt/Functionality/Mail Provider/Gmail/GmailService.swift +++ b/FlowCrypt/Functionality/Mail Provider/Gmail/GmailService.swift @@ -8,7 +8,7 @@ import FlowCryptCommon import Foundation -import GoogleAPIClientForREST +import GoogleAPIClientForREST_Gmail struct GmailService: MailServiceProvider { let mailServiceProviderType = MailServiceProviderType.gmail diff --git a/FlowCrypt/Functionality/Mail Provider/MailProvider.swift b/FlowCrypt/Functionality/Mail Provider/MailProvider.swift index 5529d5705..02ea5f0eb 100644 --- a/FlowCrypt/Functionality/Mail Provider/MailProvider.swift +++ b/FlowCrypt/Functionality/Mail Provider/MailProvider.swift @@ -7,7 +7,7 @@ // import Foundation -import GoogleAPIClientForREST +import GoogleAPIClientForREST_Gmail // TODO - Instead of get properties use some DI mechanism // to reuse already initialised services diff --git a/FlowCrypt/Functionality/Mail Provider/MailServiceProviderType.swift b/FlowCrypt/Functionality/Mail Provider/MailServiceProviderType.swift index 181ce4a69..f0b45cc9a 100644 --- a/FlowCrypt/Functionality/Mail Provider/MailServiceProviderType.swift +++ b/FlowCrypt/Functionality/Mail Provider/MailServiceProviderType.swift @@ -7,7 +7,7 @@ // import Foundation -import GoogleAPIClientForREST +import GoogleAPIClientForREST_Gmail enum MailServiceProviderType { case gmail diff --git a/FlowCrypt/Functionality/Mail Provider/Message Gateway/GmailService+send.swift b/FlowCrypt/Functionality/Mail Provider/Message Gateway/GmailService+send.swift index 57be07854..4aebe21e0 100644 --- a/FlowCrypt/Functionality/Mail Provider/Message Gateway/GmailService+send.swift +++ b/FlowCrypt/Functionality/Mail Provider/Message Gateway/GmailService+send.swift @@ -8,8 +8,7 @@ import Combine import Foundation -import GoogleAPIClientForREST -import GTMSessionFetcher +import GoogleAPIClientForREST_Gmail extension GmailService: MessageGateway { func sendMail(mime: Data) -> Future { diff --git a/FlowCrypt/Functionality/Mail Provider/Message Provider/Gmail+Message.swift b/FlowCrypt/Functionality/Mail Provider/Message Provider/Gmail+Message.swift index bfcd035f6..6cd6abab0 100644 --- a/FlowCrypt/Functionality/Mail Provider/Message Provider/Gmail+Message.swift +++ b/FlowCrypt/Functionality/Mail Provider/Message Provider/Gmail+Message.swift @@ -6,8 +6,7 @@ // Copyright © 2017-present FlowCrypt a. s. All rights reserved. // -import GoogleAPIClientForREST -import GTMSessionFetcher +import GoogleAPIClientForREST_Gmail import Promises extension GmailService: MessageProvider { diff --git a/FlowCrypt/Functionality/Mail Provider/MessageOperations Provider/Gmail+MessageOperations.swift b/FlowCrypt/Functionality/Mail Provider/MessageOperations Provider/Gmail+MessageOperations.swift index 19cd4ba53..4b138ba0b 100644 --- a/FlowCrypt/Functionality/Mail Provider/MessageOperations Provider/Gmail+MessageOperations.swift +++ b/FlowCrypt/Functionality/Mail Provider/MessageOperations Provider/Gmail+MessageOperations.swift @@ -7,8 +7,7 @@ // import Foundation -import GoogleAPIClientForREST -import GTMSessionFetcher +import GoogleAPIClientForREST_Gmail import Promises extension GmailService: MessageOperationsProvider { diff --git a/FlowCrypt/Functionality/Mail Provider/MessagesList Provider/Gmail+MessagesList.swift b/FlowCrypt/Functionality/Mail Provider/MessagesList Provider/Gmail+MessagesList.swift index 7aec1dce4..053574139 100644 --- a/FlowCrypt/Functionality/Mail Provider/MessagesList Provider/Gmail+MessagesList.swift +++ b/FlowCrypt/Functionality/Mail Provider/MessagesList Provider/Gmail+MessagesList.swift @@ -7,8 +7,7 @@ // import FlowCryptCommon -import GoogleAPIClientForREST -import GTMSessionFetcher +import GoogleAPIClientForREST_Gmail import Promises extension GmailService: MessagesListProvider { diff --git a/FlowCrypt/Functionality/Mail Provider/MessagesList Provider/Model/Message.swift b/FlowCrypt/Functionality/Mail Provider/MessagesList Provider/Model/Message.swift index 9f1768765..6247bff8f 100644 --- a/FlowCrypt/Functionality/Mail Provider/MessagesList Provider/Model/Message.swift +++ b/FlowCrypt/Functionality/Mail Provider/MessagesList Provider/Model/Message.swift @@ -8,7 +8,7 @@ import FlowCryptCommon import Foundation -import GoogleAPIClientForREST +import GoogleAPIClientForREST_Gmail struct Message: Hashable { let identifier: Identifier diff --git a/FlowCrypt/Functionality/Mail Provider/SearchMessage Provider/Gmail+Search.swift b/FlowCrypt/Functionality/Mail Provider/SearchMessage Provider/Gmail+Search.swift index f6a7a8473..ae8cac033 100644 --- a/FlowCrypt/Functionality/Mail Provider/SearchMessage Provider/Gmail+Search.swift +++ b/FlowCrypt/Functionality/Mail Provider/SearchMessage Provider/Gmail+Search.swift @@ -6,8 +6,7 @@ // Copyright © 2017-present FlowCrypt a. s. All rights reserved. // -import GoogleAPIClientForREST -import GTMSessionFetcher +import GoogleAPIClientForREST_Gmail import Promises extension GmailService: MessageSearchProvider { diff --git a/FlowCrypt/Functionality/Services/AppStartup.swift b/FlowCrypt/Functionality/Services/AppStartup.swift index 1de0c2325..9438d8f13 100644 --- a/FlowCrypt/Functionality/Services/AppStartup.swift +++ b/FlowCrypt/Functionality/Services/AppStartup.swift @@ -7,8 +7,8 @@ // import FlowCryptCommon -import Foundation import Promises +import UIKit private let logger = Logger.nested("AppStart") diff --git a/FlowCrypt/Functionality/Services/Backup Services/BackupServiceType.swift b/FlowCrypt/Functionality/Services/Backup Services/BackupServiceType.swift index 76dbcdaa0..2a307d9ec 100644 --- a/FlowCrypt/Functionality/Services/Backup Services/BackupServiceType.swift +++ b/FlowCrypt/Functionality/Services/Backup Services/BackupServiceType.swift @@ -6,8 +6,8 @@ // Copyright © 2017-present FlowCrypt a. s. All rights reserved. // -import Foundation import Promises +import UIKit protocol BackupServiceType { /// get all existed backups diff --git a/FlowCrypt/Functionality/Services/Folders Services/RemoteFoldersProviderType/GmailService+folders.swift b/FlowCrypt/Functionality/Services/Folders Services/RemoteFoldersProviderType/GmailService+folders.swift index d1b48f6c8..42e52bbdd 100644 --- a/FlowCrypt/Functionality/Services/Folders Services/RemoteFoldersProviderType/GmailService+folders.swift +++ b/FlowCrypt/Functionality/Services/Folders Services/RemoteFoldersProviderType/GmailService+folders.swift @@ -7,8 +7,7 @@ // import Foundation -import GoogleAPIClientForREST -import GTMSessionFetcher +import GoogleAPIClientForREST_Gmail import Promises extension GmailService: RemoteFoldersProviderType { diff --git a/FlowCryptAppTests/Mocks/BackupServiceMock.swift b/FlowCryptAppTests/Mocks/BackupServiceMock.swift index bbc3f7c83..d7c01a1ca 100644 --- a/FlowCryptAppTests/Mocks/BackupServiceMock.swift +++ b/FlowCryptAppTests/Mocks/BackupServiceMock.swift @@ -6,8 +6,8 @@ // Copyright © 2017-present FlowCrypt a. s. All rights reserved. // -import Foundation import Promises +import UIKit @testable import FlowCrypt final class BackupServiceMock: BackupServiceType { diff --git a/Podfile b/Podfile index 3806ab7cc..0689b3cb2 100644 --- a/Podfile +++ b/Podfile @@ -1,25 +1,20 @@ # Uncomment the next line to define a global platform for your project -platform :ios, '13.0' +platform :ios, '15.0' use_frameworks! ############################ Pods ############################ def app_pods - pod 'GoogleSignIn' - pod 'GTMAppAuth' pod 'MBProgressHUD' - pod 'SwiftLint' # todo - add linting rules pod 'Toast', '~> 4.0.0' pod 'ENSwiftSideMenu', '~> 0.1.4' pod 'Texture' - pod 'SwiftLint' + pod 'SwiftLint' # todo - add linting rules pod 'SwiftFormat/CLI' end def shared_pods - pod 'RealmSwift' - pod 'PromisesSwift' pod 'SwiftyRSA' pod 'IDZSwiftCommonCrypto' pod 'BigInt', '~> 5.2' @@ -29,15 +24,10 @@ def ui_pods pod 'Texture' end -def google_pods - pod 'GoogleAPIClientForREST/Gmail' -end - ############################ Targets ############################ target 'FlowCrypt' do shared_pods app_pods - google_pods end target 'FlowCryptUI' do @@ -48,23 +38,16 @@ target 'FlowCryptUIApplication' do ui_pods end -target 'FlowCryptUITests' do - pod 'GoogleSignIn' -end - target 'FlowCryptAppTests' do inherit! :search_paths pod 'IDZSwiftCommonCrypto' - pod 'PromisesSwift' - pod 'GTMAppAuth' - pod 'RealmSwift' end ## Set IPHONEOS_DEPLOYMENT_TARGET for all pods 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['IPHONEOS_DEPLOYMENT_TARGET'] = '15.0' config.build_settings['ONLY_ACTIVE_ARCH'] = 'NO' config.build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = 'YES' end diff --git a/Podfile.lock b/Podfile.lock index bc9dc7a8c..e89a5b1a9 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,28 +1,6 @@ PODS: - - 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.6.0): - - GTMSessionFetcher (>= 1.6.1) - - GoogleAPIClientForREST/Gmail (1.6.0): - - GoogleAPIClientForREST/Core - - GTMSessionFetcher (>= 1.6.1) - - GoogleSignIn (6.0.2): - - AppAuth (~> 1.4) - - GTMAppAuth (~> 1.0) - - GTMSessionFetcher/Core (~> 1.1) - - 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) - MBProgressHUD (1.2.0) - PINCache (3.0.3): @@ -40,15 +18,7 @@ PODS: - 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.16.0): - - Realm/Headers (= 10.16.0) - - Realm/Headers (10.16.0) - - RealmSwift (10.16.0): - - Realm (= 10.16.0) - - SwiftFormat/CLI (0.48.13) + - SwiftFormat/CLI (0.48.14) - SwiftLint (0.44.0) - SwiftyRSA (1.7.0): - SwiftyRSA/ObjC (= 1.7.0) @@ -78,13 +48,8 @@ PODS: DEPENDENCIES: - BigInt (~> 5.2) - ENSwiftSideMenu (~> 0.1.4) - - GoogleAPIClientForREST/Gmail - - GoogleSignIn - - GTMAppAuth - IDZSwiftCommonCrypto - MBProgressHUD - - PromisesSwift - - RealmSwift - SwiftFormat/CLI - SwiftLint - SwiftyRSA @@ -93,22 +58,13 @@ DEPENDENCIES: SPEC REPOS: trunk: - - AppAuth - BigInt - ENSwiftSideMenu - - GoogleAPIClientForREST - - GoogleSignIn - - GTMAppAuth - - GTMSessionFetcher - IDZSwiftCommonCrypto - MBProgressHUD - PINCache - PINOperation - PINRemoteImage - - PromisesObjC - - PromisesSwift - - Realm - - RealmSwift - SwiftFormat - SwiftLint - SwiftyRSA @@ -116,28 +72,19 @@ SPEC REPOS: - Toast SPEC CHECKSUMS: - AppAuth: 31bcec809a638d7bd2f86ea8a52bd45f6e81e7c7 BigInt: f668a80089607f521586bbe29513d708491ef2f7 ENSwiftSideMenu: 21e755dae28f09bbf453aa83b3d05f2e5f92ca39 - GoogleAPIClientForREST: 5183df28e7bcb7b7b41ebd558e16083cfed60d99 - GoogleSignIn: fd381840dbe7c1137aa6dc30849a5c3e070c034a - GTMAppAuth: ad5c2b70b9a8689e1a04033c9369c4915bfcbe89 - GTMSessionFetcher: 43748f93435c2aa068b1cbe39655aaf600652e91 IDZSwiftCommonCrypto: 00dd37cdfbd149312a7e5a582cf9909f8b129f44 MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406 PINCache: 7a8fc1a691173d21dbddbf86cd515de6efa55086 PINOperation: 00c935935f1e8cf0d1e2d6b542e75b88fc3e5e20 PINRemoteImage: f1295b29f8c5e640e25335a1b2bd9d805171bd01 - PromisesObjC: 68159ce6952d93e17b2dfe273b8c40907db5ba58 - PromisesSwift: e0b2a6433469efb0b83a2b84c62a2abab8e5e5d4 - Realm: b6027801398f3743fc222f096faa85281b506e6c - RealmSwift: b02a3d0e4947955da960b642c98ad3a461fc4e70 - SwiftFormat: 0c4b53c1acb503e2a743ecd9a18f51958d41d40a + SwiftFormat: 45eb1675b89bee034a18693dfc550bd5c98d1b2d SwiftLint: e96c0a8c770c7ebbc4d36c55baf9096bb65c4584 SwiftyRSA: 8c6dd1ea7db1b8dc4fb517a202f88bb1354bc2c6 Texture: 2e8ab2519452515f7f5a520f5a8f7e0a413abfa3 Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 -PODFILE CHECKSUM: 3b41a458b8e69e280b68c22f1b3f62e92f2189c4 +PODFILE CHECKSUM: 11e165d447c9e2236b18b3fd76d129dad2ee1096 COCOAPODS: 1.11.2 From bd9534307013f92d6991c8ee9de9715c82d3e97c Mon Sep 17 00:00:00 2001 From: Roma Sosnovsky Date: Thu, 7 Oct 2021 23:10:11 +0300 Subject: [PATCH 5/7] Update semaphore os_image --- .semaphore/semaphore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index a8b26206c..069cd2ea2 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -11,7 +11,7 @@ auto_cancel: # cancel running CI for older commits on same branch if new commits agent: machine: type: a1-standard-4 - os_image: macos-xcode12 + os_image: macos-xcode13 blocks: From 58afe10d442af2c422893d20b3031f63befd1672 Mon Sep 17 00:00:00 2001 From: Tom J <6306961+tomholub@users.noreply.github.com> Date: Fri, 8 Oct 2021 14:51:31 +0800 Subject: [PATCH 6/7] increase timeout for build --- .semaphore/semaphore.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 069cd2ea2..736374682 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -2,7 +2,7 @@ version: v1.0 name: FlowCrypt iOS App execution_time_limit: - minutes: 30 + minutes: 45 auto_cancel: # cancel running CI for older commits on same branch if new commits are added running: @@ -17,7 +17,7 @@ blocks: - name: iOS Tests execution_time_limit: - minutes: 25 + minutes: 40 task: secrets: - name: flowcrypt-ios-ci-secrets From 4e3b61b0fabb7bcd7f0d169b818a8558a6a6f2ee Mon Sep 17 00:00:00 2001 From: Roma Sosnovsky Date: Fri, 8 Oct 2021 11:24:01 +0300 Subject: [PATCH 7/7] move libs from Cocoapods to SPM --- FlowCrypt.xcodeproj/project.pbxproj | 110 +++++++++--------- .../xcshareddata/swiftpm/Package.resolved | 27 +++++ Podfile | 8 -- Podfile.lock | 14 +-- 4 files changed, 80 insertions(+), 79 deletions(-) diff --git a/FlowCrypt.xcodeproj/project.pbxproj b/FlowCrypt.xcodeproj/project.pbxproj index 9a1ac6b8f..d5cc25c4b 100644 --- a/FlowCrypt.xcodeproj/project.pbxproj +++ b/FlowCrypt.xcodeproj/project.pbxproj @@ -55,6 +55,9 @@ 510A260126FDFEBE00163271 /* MailCore2 in Frameworks */ = {isa = PBXBuildFile; productRef = 510A260026FDFEBE00163271 /* MailCore2 */; }; 51775C32270B01C200D7C944 /* PrvKeyInfoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51775C31270B01C200D7C944 /* PrvKeyInfoTests.swift */; }; 51775C39270C7D2400D7C944 /* StorageMethod.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51775C38270C7D2400D7C944 /* StorageMethod.swift */; }; + 51E13F12270F92BA00F287CA /* IDZSwiftCommonCrypto in Frameworks */ = {isa = PBXBuildFile; productRef = 51E13F11270F92BA00F287CA /* IDZSwiftCommonCrypto */; }; + 51E13F15270F92F200F287CA /* BigInt in Frameworks */ = {isa = PBXBuildFile; productRef = 51E13F14270F92F200F287CA /* BigInt */; }; + 51E13F18270F934C00F287CA /* MBProgressHUD in Frameworks */ = {isa = PBXBuildFile; productRef = 51E13F17270F934C00F287CA /* MBProgressHUD */; }; 51E1673D270DAFF900D27C52 /* Localizable.stringsdict in Resources */ = {isa = PBXBuildFile; fileRef = 51E1673C270DAFF900D27C52 /* Localizable.stringsdict */; }; 51E16746270F301F00D27C52 /* GoogleAPIClientForREST_Gmail in Frameworks */ = {isa = PBXBuildFile; productRef = 51E16745270F301F00D27C52 /* GoogleAPIClientForREST_Gmail */; }; 51E16749270F303100D27C52 /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = 51E16748270F303100D27C52 /* GoogleSignIn */; }; @@ -63,7 +66,6 @@ 51E1675D270F36A400D27C52 /* Realm in Frameworks */ = {isa = PBXBuildFile; productRef = 51E1675C270F36A400D27C52 /* Realm */; }; 51E1675F270F36A400D27C52 /* RealmSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 51E1675E270F36A400D27C52 /* RealmSwift */; }; 5298EA408FEC36021F7558BD /* Pods_FlowCrypt.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4753E9A27694B4D34C980FFA /* Pods_FlowCrypt.framework */; }; - 58BD3C66FD5A3CB9DC278D10 /* Pods_FlowCryptAppTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71764B8B0579E30806506587 /* Pods_FlowCryptAppTests.framework */; }; 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 */; }; @@ -398,7 +400,6 @@ 04B472931ECE29F600B8266F /* SideMenuNavigationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SideMenuNavigationController.swift; sourceTree = ""; }; 06B7F70EA15D806AA5D94CA9 /* Pods-FlowCrypt.testflight.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCrypt.testflight.xcconfig"; path = "Target Support Files/Pods-FlowCrypt/Pods-FlowCrypt.testflight.xcconfig"; sourceTree = ""; }; 0B1FD1088504F12263991E77 /* Pods-FlowCrypt.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCrypt.release.xcconfig"; path = "Target Support Files/Pods-FlowCrypt/Pods-FlowCrypt.release.xcconfig"; sourceTree = ""; }; - 0E4D5480C58B6FAB4DB4632B /* Pods-FlowCryptAppTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptAppTests.release.xcconfig"; path = "Target Support Files/Pods-FlowCryptAppTests/Pods-FlowCryptAppTests.release.xcconfig"; sourceTree = ""; }; 1F919F817E5651D30BFF9C0B /* Pods-FlowCrypt.enterprise.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCrypt.enterprise.xcconfig"; path = "Target Support Files/Pods-FlowCrypt/Pods-FlowCrypt.enterprise.xcconfig"; sourceTree = ""; }; 211392A4266511E6009202EC /* PubLookup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PubLookup.swift; sourceTree = ""; }; 2133D51526A0571F00CC686F /* ClientConfigurationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientConfigurationService.swift; sourceTree = ""; }; @@ -457,10 +458,8 @@ 3382C015A576728FA08BA310 /* Pods_FlowCryptUIApplication.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FlowCryptUIApplication.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3675DB672850A781424D0113 /* Pods-FlowCryptUI.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptUI.debug.xcconfig"; path = "Target Support Files/Pods-FlowCryptUI/Pods-FlowCryptUI.debug.xcconfig"; sourceTree = ""; }; 3B945B2BE6B66D5E6B43AD2E /* Pods-FlowCryptUIApplication.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptUIApplication.debug.xcconfig"; path = "Target Support Files/Pods-FlowCryptUIApplication/Pods-FlowCryptUIApplication.debug.xcconfig"; sourceTree = ""; }; - 3EF111000D0215574B9073AD /* Pods-FlowCryptAppTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptAppTests.debug.xcconfig"; path = "Target Support Files/Pods-FlowCryptAppTests/Pods-FlowCryptAppTests.debug.xcconfig"; sourceTree = ""; }; 3F083C28BC034555B67F7F00 /* Pods_FlowCryptUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FlowCryptUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4753E9A27694B4D34C980FFA /* Pods_FlowCrypt.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FlowCrypt.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 48777051AEB60BEA663F2755 /* Pods-FlowCryptAppTests.testflight.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptAppTests.testflight.xcconfig"; path = "Target Support Files/Pods-FlowCryptAppTests/Pods-FlowCryptAppTests.testflight.xcconfig"; sourceTree = ""; }; 4C5032E4FC5685A224F61785 /* Pods-FlowCryptUI.testflight.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptUI.testflight.xcconfig"; path = "Target Support Files/Pods-FlowCryptUI/Pods-FlowCryptUI.testflight.xcconfig"; sourceTree = ""; }; 4F928D493732294B4E521900 /* Pods-FlowCryptUIApplication.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptUIApplication.release.xcconfig"; path = "Target Support Files/Pods-FlowCryptUIApplication/Pods-FlowCryptUIApplication.release.xcconfig"; sourceTree = ""; }; 50531BE32629B9A80039BAE9 /* AttachmentNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttachmentNode.swift; sourceTree = ""; }; @@ -485,7 +484,6 @@ 5ADEDCBD23A4363700EC495E /* KeyDetailInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyDetailInfoViewController.swift; sourceTree = ""; }; 5ADEDCBF23A43B0800EC495E /* KeyDetailInfoViewDecorator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyDetailInfoViewDecorator.swift; sourceTree = ""; }; 5ADEDCC123A43C6800EC495E /* KeyTextCellNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyTextCellNode.swift; sourceTree = ""; }; - 71764B8B0579E30806506587 /* Pods_FlowCryptAppTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FlowCryptAppTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 949ED9412303E3B400530579 /* Colors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Colors.xcassets; sourceTree = ""; }; 9F003D6025E1B4ED00EB38C0 /* TrashFolderProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrashFolderProvider.swift; sourceTree = ""; }; 9F003D6C25EA8F3200EB38C0 /* UserAccountService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserAccountService.swift; sourceTree = ""; }; @@ -748,7 +746,6 @@ D9381A4EE6BAAD97294A7F9A /* Pods-FlowCryptUI.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptUI.release.xcconfig"; path = "Target Support Files/Pods-FlowCryptUI/Pods-FlowCryptUI.release.xcconfig"; sourceTree = ""; }; D952B71C1ED0CB2500E5C02B /* MessageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageViewController.swift; sourceTree = ""; }; E16585B4D0D6F175370CC6AE /* Pods-FlowCryptUIApplication.testflight.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptUIApplication.testflight.xcconfig"; path = "Target Support Files/Pods-FlowCryptUIApplication/Pods-FlowCryptUIApplication.testflight.xcconfig"; sourceTree = ""; }; - E1E8DF1D4A746810CDD600E3 /* Pods-FlowCryptAppTests.enterprise.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlowCryptAppTests.enterprise.xcconfig"; path = "Target Support Files/Pods-FlowCryptAppTests/Pods-FlowCryptAppTests.enterprise.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -756,7 +753,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 58BD3C66FD5A3CB9DC278D10 /* Pods_FlowCryptAppTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -774,10 +770,13 @@ D2CDC3E224052D54002B045F /* FlowCryptCommon.framework in Frameworks */, D2CDC3DD24052D50002B045F /* FlowCryptUI.framework in Frameworks */, 51E1674F270F341300D27C52 /* Promises in Frameworks */, + 51E13F15270F92F200F287CA /* BigInt in Frameworks */, 51E16746270F301F00D27C52 /* GoogleAPIClientForREST_Gmail in Frameworks */, 510A260126FDFEBE00163271 /* MailCore2 in Frameworks */, 51E16755270F356500D27C52 /* GTMAppAuth in Frameworks */, 51E1675D270F36A400D27C52 /* Realm in Frameworks */, + 51E13F12270F92BA00F287CA /* IDZSwiftCommonCrypto in Frameworks */, + 51E13F18270F934C00F287CA /* MBProgressHUD in Frameworks */, 5298EA408FEC36021F7558BD /* Pods_FlowCrypt.framework in Frameworks */, 51E1675F270F36A400D27C52 /* RealmSwift in Frameworks */, 51E16749270F303100D27C52 /* GoogleSignIn in Frameworks */, @@ -941,10 +940,6 @@ 1F919F817E5651D30BFF9C0B /* Pods-FlowCrypt.enterprise.xcconfig */, 0B1FD1088504F12263991E77 /* Pods-FlowCrypt.release.xcconfig */, 06B7F70EA15D806AA5D94CA9 /* Pods-FlowCrypt.testflight.xcconfig */, - 3EF111000D0215574B9073AD /* Pods-FlowCryptAppTests.debug.xcconfig */, - E1E8DF1D4A746810CDD600E3 /* Pods-FlowCryptAppTests.enterprise.xcconfig */, - 0E4D5480C58B6FAB4DB4632B /* Pods-FlowCryptAppTests.release.xcconfig */, - 48777051AEB60BEA663F2755 /* Pods-FlowCryptAppTests.testflight.xcconfig */, 3675DB672850A781424D0113 /* Pods-FlowCryptUI.debug.xcconfig */, 049C4FBB54F5709AE2F2301B /* Pods-FlowCryptUI.enterprise.xcconfig */, D9381A4EE6BAAD97294A7F9A /* Pods-FlowCryptUI.release.xcconfig */, @@ -1676,7 +1671,6 @@ isa = PBXGroup; children = ( 4753E9A27694B4D34C980FFA /* Pods_FlowCrypt.framework */, - 71764B8B0579E30806506587 /* Pods_FlowCryptAppTests.framework */, 3F083C28BC034555B67F7F00 /* Pods_FlowCryptUI.framework */, 3382C015A576728FA08BA310 /* Pods_FlowCryptUIApplication.framework */, ); @@ -2016,11 +2010,9 @@ isa = PBXNativeTarget; buildConfigurationList = 9F2AC5CD267BE99E00F6149B /* Build configuration list for PBXNativeTarget "FlowCryptAppTests" */; buildPhases = ( - 810207860AF607AFC6E0B585 /* [CP] Check Pods Manifest.lock */, 9F2AC5C2267BE99E00F6149B /* Sources */, 9F2AC5C3267BE99E00F6149B /* Frameworks */, 9F2AC5C4267BE99E00F6149B /* Resources */, - 08181B91F4416AC9D86125DF /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -2078,6 +2070,9 @@ 51E16754270F356500D27C52 /* GTMAppAuth */, 51E1675C270F36A400D27C52 /* Realm */, 51E1675E270F36A400D27C52 /* RealmSwift */, + 51E13F11270F92BA00F287CA /* IDZSwiftCommonCrypto */, + 51E13F14270F92F200F287CA /* BigInt */, + 51E13F17270F934C00F287CA /* MBProgressHUD */, ); productName = FlowCrypt; productReference = C132B9B01EC2DBD800763715 /* FlowCrypt.app */; @@ -2191,6 +2186,9 @@ 51E1674D270F341200D27C52 /* XCRemoteSwiftPackageReference "promises" */, 51E16753270F356500D27C52 /* XCRemoteSwiftPackageReference "GTMAppAuth" */, 51E1675B270F36A400D27C52 /* XCRemoteSwiftPackageReference "realm-cocoa" */, + 51E13F10270F92BA00F287CA /* XCRemoteSwiftPackageReference "IDZSwiftCommonCrypto" */, + 51E13F13270F92F100F287CA /* XCRemoteSwiftPackageReference "BigInt" */, + 51E13F16270F934C00F287CA /* XCRemoteSwiftPackageReference "MBProgressHUD" */, ); productRefGroup = C132B9B11EC2DBD800763715 /* Products */; projectDirPath = ""; @@ -2290,23 +2288,6 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FlowCryptUIApplication/Pods-FlowCryptUIApplication-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 08181B91F4416AC9D86125DF /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FlowCryptAppTests/Pods-FlowCryptAppTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FlowCryptAppTests/Pods-FlowCryptAppTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FlowCryptAppTests/Pods-FlowCryptAppTests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 7448815F0409698014646718 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -2329,28 +2310,6 @@ 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; }; - 810207860AF607AFC6E0B585 /* [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-FlowCryptAppTests-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; - }; 85C230714DC341D246864AD0 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -3090,7 +3049,6 @@ }; 9F1C905526F1F38C0046E7D7 /* Enterprise */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E1E8DF1D4A746810CDD600E3 /* Pods-FlowCryptAppTests.enterprise.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -3119,7 +3077,6 @@ }; 9F2AC5CE267BE99E00F6149B /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3EF111000D0215574B9073AD /* Pods-FlowCryptAppTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -3154,7 +3111,6 @@ }; 9F2AC5CF267BE99E00F6149B /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 0E4D5480C58B6FAB4DB4632B /* Pods-FlowCryptAppTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -3182,7 +3138,6 @@ }; 9F2AC5D0267BE99E00F6149B /* TestFlight */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 48777051AEB60BEA663F2755 /* Pods-FlowCryptAppTests.testflight.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -3638,7 +3593,6 @@ 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"; @@ -3677,6 +3631,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"; @@ -4005,6 +3960,30 @@ kind = branch; }; }; + 51E13F10270F92BA00F287CA /* XCRemoteSwiftPackageReference "IDZSwiftCommonCrypto" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/iosdevzone/IDZSwiftCommonCrypto"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 0.13.0; + }; + }; + 51E13F13270F92F100F287CA /* XCRemoteSwiftPackageReference "BigInt" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/attaswift/BigInt"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 5.3.0; + }; + }; + 51E13F16270F934C00F287CA /* XCRemoteSwiftPackageReference "MBProgressHUD" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/jdg/MBProgressHUD"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 1.2.0; + }; + }; 51E16744270F301F00D27C52 /* XCRemoteSwiftPackageReference "google-api-objectivec-client-for-rest" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/google/google-api-objectivec-client-for-rest"; @@ -4053,6 +4032,21 @@ package = 510A25FF26FDFEBE00163271 /* XCRemoteSwiftPackageReference "mailcore2" */; productName = MailCore2; }; + 51E13F11270F92BA00F287CA /* IDZSwiftCommonCrypto */ = { + isa = XCSwiftPackageProductDependency; + package = 51E13F10270F92BA00F287CA /* XCRemoteSwiftPackageReference "IDZSwiftCommonCrypto" */; + productName = IDZSwiftCommonCrypto; + }; + 51E13F14270F92F200F287CA /* BigInt */ = { + isa = XCSwiftPackageProductDependency; + package = 51E13F13270F92F100F287CA /* XCRemoteSwiftPackageReference "BigInt" */; + productName = BigInt; + }; + 51E13F17270F934C00F287CA /* MBProgressHUD */ = { + isa = XCSwiftPackageProductDependency; + package = 51E13F16270F934C00F287CA /* XCRemoteSwiftPackageReference "MBProgressHUD" */; + productName = MBProgressHUD; + }; 51E16745270F301F00D27C52 /* GoogleAPIClientForREST_Gmail */ = { isa = XCSwiftPackageProductDependency; package = 51E16744270F301F00D27C52 /* XCRemoteSwiftPackageReference "google-api-objectivec-client-for-rest" */; diff --git a/FlowCrypt.xcworkspace/xcshareddata/swiftpm/Package.resolved b/FlowCrypt.xcworkspace/xcshareddata/swiftpm/Package.resolved index b1a671e0a..8d66041a3 100644 --- a/FlowCrypt.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/FlowCrypt.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -10,6 +10,15 @@ "version": "1.4.0" } }, + { + "package": "BigInt", + "repositoryURL": "https://github.com/attaswift/BigInt", + "state": { + "branch": null, + "revision": "0ed110f7555c34ff468e72e1686e59721f2b0da6", + "version": "5.3.0" + } + }, { "package": "GoogleAPIClientForREST", "repositoryURL": "https://github.com/google/google-api-objectivec-client-for-rest", @@ -46,6 +55,15 @@ "version": "1.2.2" } }, + { + "package": "IDZSwiftCommonCrypto", + "repositoryURL": "https://github.com/iosdevzone/IDZSwiftCommonCrypto", + "state": { + "branch": null, + "revision": "d824371e670bd57eb456bbc41139b4997f7207b8", + "version": "0.13.1" + } + }, { "package": "MailCore2", "repositoryURL": "https://github.com/MailCore/mailcore2", @@ -55,6 +73,15 @@ "version": null } }, + { + "package": "MBProgressHUD", + "repositoryURL": "https://github.com/jdg/MBProgressHUD", + "state": { + "branch": null, + "revision": "bca42b801100b2b3a4eda0ba8dd33d858c780b0d", + "version": "1.2.0" + } + }, { "package": "Promises", "repositoryURL": "https://github.com/google/promises", diff --git a/Podfile b/Podfile index 0689b3cb2..a8e04e181 100644 --- a/Podfile +++ b/Podfile @@ -6,7 +6,6 @@ use_frameworks! ############################ Pods ############################ def app_pods - pod 'MBProgressHUD' pod 'Toast', '~> 4.0.0' pod 'ENSwiftSideMenu', '~> 0.1.4' pod 'Texture' @@ -16,8 +15,6 @@ end def shared_pods pod 'SwiftyRSA' - pod 'IDZSwiftCommonCrypto' - pod 'BigInt', '~> 5.2' end def ui_pods @@ -38,11 +35,6 @@ target 'FlowCryptUIApplication' do ui_pods end -target 'FlowCryptAppTests' do - inherit! :search_paths - pod 'IDZSwiftCommonCrypto' -end - ## Set IPHONEOS_DEPLOYMENT_TARGET for all pods post_install do |installer| installer.pods_project.targets.each do |target| diff --git a/Podfile.lock b/Podfile.lock index e89a5b1a9..d62c86b89 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,8 +1,5 @@ PODS: - - BigInt (5.2.0) - ENSwiftSideMenu (0.1.4) - - IDZSwiftCommonCrypto (0.13.0) - - MBProgressHUD (1.2.0) - PINCache (3.0.3): - PINCache/Arc-exception-safe (= 3.0.3) - PINCache/Core (= 3.0.3) @@ -46,10 +43,7 @@ PODS: - Toast (4.0.0) DEPENDENCIES: - - BigInt (~> 5.2) - ENSwiftSideMenu (~> 0.1.4) - - IDZSwiftCommonCrypto - - MBProgressHUD - SwiftFormat/CLI - SwiftLint - SwiftyRSA @@ -58,10 +52,7 @@ DEPENDENCIES: SPEC REPOS: trunk: - - BigInt - ENSwiftSideMenu - - IDZSwiftCommonCrypto - - MBProgressHUD - PINCache - PINOperation - PINRemoteImage @@ -72,10 +63,7 @@ SPEC REPOS: - Toast SPEC CHECKSUMS: - BigInt: f668a80089607f521586bbe29513d708491ef2f7 ENSwiftSideMenu: 21e755dae28f09bbf453aa83b3d05f2e5f92ca39 - IDZSwiftCommonCrypto: 00dd37cdfbd149312a7e5a582cf9909f8b129f44 - MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406 PINCache: 7a8fc1a691173d21dbddbf86cd515de6efa55086 PINOperation: 00c935935f1e8cf0d1e2d6b542e75b88fc3e5e20 PINRemoteImage: f1295b29f8c5e640e25335a1b2bd9d805171bd01 @@ -85,6 +73,6 @@ SPEC CHECKSUMS: Texture: 2e8ab2519452515f7f5a520f5a8f7e0a413abfa3 Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 -PODFILE CHECKSUM: 11e165d447c9e2236b18b3fd76d129dad2ee1096 +PODFILE CHECKSUM: d55f0a13d854a8ebb36e7be30910fdd3bddad7d2 COCOAPODS: 1.11.2