From b42ac23483635fccbd7d83bed4ea7c5ae65a40e3 Mon Sep 17 00:00:00 2001 From: Selim Mustafaev Date: Mon, 19 Oct 2020 16:22:03 +0300 Subject: [PATCH] Fix for date filters (was crashing on mac) --- AutoCat.xcodeproj/project.pbxproj | 38 ++++++++-------- .../xcshareddata/swiftpm/Package.resolved | 8 ++-- .../xcschemes/xcschememanagement.plist | 45 ++++++++++++++----- 3 files changed, 56 insertions(+), 35 deletions(-) diff --git a/AutoCat.xcodeproj/project.pbxproj b/AutoCat.xcodeproj/project.pbxproj index e75ddc0..341dca4 100644 --- a/AutoCat.xcodeproj/project.pbxproj +++ b/AutoCat.xcodeproj/project.pbxproj @@ -71,7 +71,6 @@ 7A813DCB250B5DC900CC93B9 /* LocationPickerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A813DCA250B5DC900CC93B9 /* LocationPickerController.swift */; }; 7A8A2209248D10EC0073DFD9 /* ResizeImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A8A2208248D10EC0073DFD9 /* ResizeImage.swift */; }; 7A8A220B248D67B60073DFD9 /* VehicleReportImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A8A220A248D67B60073DFD9 /* VehicleReportImage.swift */; }; - 7A96AE2A246AFD6200297C33 /* Eureka in Frameworks */ = {isa = PBXBuildFile; productRef = 7A96AE29246AFD6200297C33 /* Eureka */; }; 7A96AE2D246B2B7400297C33 /* GoogleSignInController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A96AE2C246B2B7400297C33 /* GoogleSignInController.swift */; }; 7A96AE2F246B2BCD00297C33 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7A96AE2E246B2BCD00297C33 /* WebKit.framework */; }; 7A96AE31246B2FE400297C33 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A96AE30246B2FE400297C33 /* Constants.swift */; }; @@ -94,6 +93,7 @@ 7AE24C5F251F1B4E00758E39 /* Buttons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AE24C5E251F1B4E00758E39 /* Buttons.swift */; }; 7AE26A3324EEF9EC00625033 /* UIViewControllerExt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AE26A3224EEF9EC00625033 /* UIViewControllerExt.swift */; }; 7AE26A3524F31B0700625033 /* EventsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AE26A3424F31B0700625033 /* EventsController.swift */; }; + 7AEF47A4253DC4D2001D6238 /* Eureka in Frameworks */ = {isa = PBXBuildFile; productRef = 7AEF47A3253DC4D2001D6238 /* Eureka */; }; 7AEFC3BE2529D3CC00BADFB2 /* ConfigurableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AEFC3BD2529D3CC00BADFB2 /* ConfigurableCell.swift */; }; 7AEFE728240455E200910EB7 /* SettingsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AEFE727240455E200910EB7 /* SettingsController.swift */; }; 7AF58D2F24029C5200CE01A0 /* MagazineLayout in Frameworks */ = {isa = PBXBuildFile; productRef = 7AF58D2E24029C5200CE01A0 /* MagazineLayout */; }; @@ -197,10 +197,10 @@ 7A813DBE2506A57100CC93B9 /* AuthenticationServices.framework in Frameworks */, 7AF58D342402A91C00CE01A0 /* Kingfisher in Frameworks */, 7A813DC12508C4D900CC93B9 /* ExceptionCatcher in Frameworks */, + 7AEF47A4253DC4D2001D6238 /* Eureka in Frameworks */, 7A96AE2F246B2BCD00297C33 /* WebKit.framework in Frameworks */, 7A11472823FEA1F400B424AF /* RealmSwift in Frameworks */, 7A11472123FEA18700B424AF /* RxCocoa in Frameworks */, - 7A96AE2A246AFD6200297C33 /* Eureka in Frameworks */, 7A051611241412CA00FC55AC /* SwiftDate in Frameworks */, 7A11472323FEA18700B424AF /* RxBlocking in Frameworks */, 7AABDE1D2532F3EB0041AFC6 /* PKHUD in Frameworks */, @@ -437,10 +437,10 @@ 7AF58D2E24029C5200CE01A0 /* MagazineLayout */, 7AF58D332402A91C00CE01A0 /* Kingfisher */, 7A051610241412CA00FC55AC /* SwiftDate */, - 7A96AE29246AFD6200297C33 /* Eureka */, 7A813DC02508C4D900CC93B9 /* ExceptionCatcher */, 7AABDE1C2532F3EB0041AFC6 /* PKHUD */, 7AABDE22253327F10041AFC6 /* DifferenceKit */, + 7AEF47A3253DC4D2001D6238 /* Eureka */, ); productName = AutoCat; productReference = 7A1146FD23FDE7E500B424AF /* AutoCat.app */; @@ -477,10 +477,10 @@ 7AF58D2D24029C5200CE01A0 /* XCRemoteSwiftPackageReference "MagazineLayout" */, 7AF58D322402A91C00CE01A0 /* XCRemoteSwiftPackageReference "Kingfisher" */, 7A05160F241412CA00FC55AC /* XCRemoteSwiftPackageReference "SwiftDate" */, - 7A96AE28246AFD6200297C33 /* XCRemoteSwiftPackageReference "Eureka" */, 7A813DBF2508C4D900CC93B9 /* XCRemoteSwiftPackageReference "ExceptionCatcher" */, 7AABDE1B2532F3EB0041AFC6 /* XCRemoteSwiftPackageReference "PKHUD" */, 7AABDE21253327F10041AFC6 /* XCRemoteSwiftPackageReference "DifferenceKit" */, + 7AEF47A2253DC4D2001D6238 /* XCRemoteSwiftPackageReference "Eureka" */, ); productRefGroup = 7A1146FE23FDE7E500B424AF /* Products */; projectDirPath = ""; @@ -728,7 +728,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = AutoCat/AutoCat.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 46; + CURRENT_PROJECT_VERSION = 47; DEVELOPMENT_TEAM = 46DTTB8X4S; INFOPLIST_FILE = AutoCat/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; @@ -750,7 +750,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = AutoCat/AutoCat.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 46; + CURRENT_PROJECT_VERSION = 47; DEVELOPMENT_TEAM = 46DTTB8X4S; INFOPLIST_FILE = AutoCat/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; @@ -830,14 +830,6 @@ minimumVersion = 1.1.0; }; }; - 7A96AE28246AFD6200297C33 /* XCRemoteSwiftPackageReference "Eureka" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/xmartlabs/Eureka"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 5.2.1; - }; - }; 7AABDE1B2532F3EB0041AFC6 /* XCRemoteSwiftPackageReference "PKHUD" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/pkluz/PKHUD.git"; @@ -854,6 +846,14 @@ minimumVersion = 1.1.5; }; }; + 7AEF47A2253DC4D2001D6238 /* XCRemoteSwiftPackageReference "Eureka" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/selim-mustafaev/Eureka"; + requirement = { + branch = "catalyst-collapse-row-crash-fix"; + kind = branch; + }; + }; 7AF58D2D24029C5200CE01A0 /* XCRemoteSwiftPackageReference "MagazineLayout" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/airbnb/MagazineLayout"; @@ -918,11 +918,6 @@ package = 7A813DBF2508C4D900CC93B9 /* XCRemoteSwiftPackageReference "ExceptionCatcher" */; productName = ExceptionCatcher; }; - 7A96AE29246AFD6200297C33 /* Eureka */ = { - isa = XCSwiftPackageProductDependency; - package = 7A96AE28246AFD6200297C33 /* XCRemoteSwiftPackageReference "Eureka" */; - productName = Eureka; - }; 7AABDE1C2532F3EB0041AFC6 /* PKHUD */ = { isa = XCSwiftPackageProductDependency; package = 7AABDE1B2532F3EB0041AFC6 /* XCRemoteSwiftPackageReference "PKHUD" */; @@ -933,6 +928,11 @@ package = 7AABDE21253327F10041AFC6 /* XCRemoteSwiftPackageReference "DifferenceKit" */; productName = DifferenceKit; }; + 7AEF47A3253DC4D2001D6238 /* Eureka */ = { + isa = XCSwiftPackageProductDependency; + package = 7AEF47A2253DC4D2001D6238 /* XCRemoteSwiftPackageReference "Eureka" */; + productName = Eureka; + }; 7AF58D2E24029C5200CE01A0 /* MagazineLayout */ = { isa = XCSwiftPackageProductDependency; package = 7AF58D2D24029C5200CE01A0 /* XCRemoteSwiftPackageReference "MagazineLayout" */; diff --git a/AutoCat.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/AutoCat.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index a5409b2..ce72e2d 100644 --- a/AutoCat.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/AutoCat.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -12,11 +12,11 @@ }, { "package": "Eureka", - "repositoryURL": "https://github.com/xmartlabs/Eureka", + "repositoryURL": "https://github.com/selim-mustafaev/Eureka", "state": { - "branch": null, - "revision": "ae025915335f02e7277ed5446b4de002bab05866", - "version": "5.3.1" + "branch": "catalyst-collapse-row-crash-fix", + "revision": "c6d0b49b894c77bd72ae07d2bbea1f2fac0efd9c", + "version": null } }, { diff --git a/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcschemes/xcschememanagement.plist b/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcschemes/xcschememanagement.plist index 547fcf4..73a26bf 100644 --- a/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcschemes/xcschememanagement.plist @@ -14,42 +14,63 @@ isShown orderHint - 12 + 5 DifferenceKit (Playground) 2.xcscheme isShown orderHint - 13 + 6 DifferenceKit (Playground).xcscheme isShown orderHint - 11 + 1 Eureka (Playground) 1.xcscheme isShown orderHint - 2 + 3 Eureka (Playground) 2.xcscheme isShown orderHint - 3 + 4 + + Eureka (Playground) 3.xcscheme + + isShown + + orderHint + 16 + + Eureka (Playground) 4.xcscheme + + isShown + + orderHint + 17 + + Eureka (Playground) 5.xcscheme + + isShown + + orderHint + 18 Eureka (Playground).xcscheme isShown orderHint - 1 + 2 GettingStarted (Playground) 1.xcscheme @@ -91,42 +112,42 @@ isShown orderHint - 7 + 13 Rx (Playground) 1.xcscheme isShown orderHint - 5 + 9 Rx (Playground) 2.xcscheme isShown orderHint - 6 + 10 Rx (Playground).xcscheme isShown orderHint - 4 + 7 SwiftDate (Playground) 1.xcscheme isShown orderHint - 9 + 11 SwiftDate (Playground) 2.xcscheme isShown orderHint - 10 + 12 SwiftDate (Playground) 3.xcscheme