From ee7b26d0a9415b948c6c7a61e53f69688a9422f3 Mon Sep 17 00:00:00 2001 From: Selim Mustafaev Date: Wed, 16 Mar 2022 18:56:40 +0300 Subject: [PATCH] Updated Eureka version --- AutoCat.xcodeproj/project.pbxproj | 38 ++-- .../xcshareddata/swiftpm/Package.resolved | 186 +++++++++--------- .../xcschemes/xcschememanagement.plist | 115 ++++++----- AutoCat/Cells/VehicleCell.swift | 2 +- 4 files changed, 180 insertions(+), 161 deletions(-) diff --git a/AutoCat.xcodeproj/project.pbxproj b/AutoCat.xcodeproj/project.pbxproj index 7565742..12aafb5 100644 --- a/AutoCat.xcodeproj/project.pbxproj +++ b/AutoCat.xcodeproj/project.pbxproj @@ -33,6 +33,7 @@ 7A2DE69B25869ABD00A113FC /* AdsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A2DE69A25869ABD00A113FC /* AdsController.swift */; }; 7A2DE69E2589606A00A113FC /* ImageGridRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A2DE69D2589606A00A113FC /* ImageGridRow.swift */; }; 7A33381124990DAE00D878F1 /* FiltersController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A33381024990DAE00D878F1 /* FiltersController.swift */; }; + 7A35177B27E23F8800DC538C /* Eureka in Frameworks */ = {isa = PBXBuildFile; productRef = 7A35177A27E23F8800DC538C /* Eureka */; }; 7A3F07AB24360DC800E59687 /* Dated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A3F07AA24360DC800E59687 /* Dated.swift */; }; 7A3F07AD2436350B00E59687 /* SearchController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A3F07AC2436350B00E59687 /* SearchController.swift */; }; 7A530B7A24001D3300CBFE6E /* CheckController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A530B7924001D3300CBFE6E /* CheckController.swift */; }; @@ -78,7 +79,6 @@ 7AA7BC3325A5DFB80053A5D5 /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = 7AF58D332402A91C00CE01A0 /* Kingfisher */; }; 7AA7BC3525A5DFB80053A5D5 /* ExceptionCatcher in Frameworks */ = {isa = PBXBuildFile; productRef = 7A813DC02508C4D900CC93B9 /* ExceptionCatcher */; }; 7AA7BC3625A5DFB80053A5D5 /* PKHUD in Frameworks */ = {isa = PBXBuildFile; productRef = 7AABDE1C2532F3EB0041AFC6 /* PKHUD */; }; - 7AA7BC3825A5DFB80053A5D5 /* Eureka in Frameworks */ = {isa = PBXBuildFile; productRef = 7AEF47A3253DC4D2001D6238 /* Eureka */; }; 7AABB1F0267E9CAA00D7AB32 /* DifferenceKit in Frameworks */ = {isa = PBXBuildFile; productRef = 7AABB1EF267E9CAA00D7AB32 /* DifferenceKit */; settings = {ATTRIBUTES = (Required, ); }; }; 7AABB1F2267E9CC800D7AB32 /* SwiftDate in Frameworks */ = {isa = PBXBuildFile; productRef = 7AABB1F1267E9CC800D7AB32 /* SwiftDate */; }; 7AABDE26253350C30041AFC6 /* RxSectionedDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AABDE25253350C30041AFC6 /* RxSectionedDataSource.swift */; }; @@ -282,11 +282,11 @@ buildActionMask = 2147483647; files = ( 7AA7BC3525A5DFB80053A5D5 /* ExceptionCatcher in Frameworks */, - 7AA7BC3825A5DFB80053A5D5 /* Eureka in Frameworks */, 7AA7BC3325A5DFB80053A5D5 /* Kingfisher in Frameworks */, 7A813DBE2506A57100CC93B9 /* AuthenticationServices.framework in Frameworks */, 7AA7BC3625A5DFB80053A5D5 /* PKHUD in Frameworks */, 7AF6D2042677C03B0086EA64 /* AutoCatCore.framework in Frameworks */, + 7A35177B27E23F8800DC538C /* Eureka in Frameworks */, 7A96AE2F246B2BCD00297C33 /* WebKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -641,7 +641,7 @@ 7AF58D332402A91C00CE01A0 /* Kingfisher */, 7A813DC02508C4D900CC93B9 /* ExceptionCatcher */, 7AABDE1C2532F3EB0041AFC6 /* PKHUD */, - 7AEF47A3253DC4D2001D6238 /* Eureka */, + 7A35177A27E23F8800DC538C /* Eureka */, ); productName = AutoCat; productReference = 7A1146FD23FDE7E500B424AF /* AutoCat.app */; @@ -733,7 +733,7 @@ 7A813DBF2508C4D900CC93B9 /* XCRemoteSwiftPackageReference "ExceptionCatcher" */, 7AABDE1B2532F3EB0041AFC6 /* XCRemoteSwiftPackageReference "PKHUD" */, 7AABDE21253327F10041AFC6 /* XCRemoteSwiftPackageReference "DifferenceKit" */, - 7AEF47A2253DC4D2001D6238 /* XCRemoteSwiftPackageReference "Eureka" */, + 7A35177927E23F8800DC538C /* XCRemoteSwiftPackageReference "Eureka" */, ); productRefGroup = 7A1146FE23FDE7E500B424AF /* Products */; projectDirPath = ""; @@ -1080,7 +1080,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = AutoCat/AutoCat.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 88; + CURRENT_PROJECT_VERSION = 89; DEVELOPMENT_TEAM = 46DTTB8X4S; INFOPLIST_FILE = AutoCat/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; @@ -1105,7 +1105,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = AutoCat/AutoCat.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 88; + CURRENT_PROJECT_VERSION = 89; DEVELOPMENT_TEAM = 46DTTB8X4S; INFOPLIST_FILE = AutoCat/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; @@ -1289,6 +1289,14 @@ minimumVersion = 5.0.0; }; }; + 7A35177927E23F8800DC538C /* XCRemoteSwiftPackageReference "Eureka" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/xmartlabs/Eureka"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 5.0.0; + }; + }; 7A530B89240181F500CBFE6E /* XCRemoteSwiftPackageReference "RxRealm" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/RxSwiftCommunity/RxRealm"; @@ -1321,14 +1329,6 @@ 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; - }; - }; 7AF58D322402A91C00CE01A0 /* XCRemoteSwiftPackageReference "Kingfisher" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/onevcat/Kingfisher"; @@ -1340,6 +1340,11 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ + 7A35177A27E23F8800DC538C /* Eureka */ = { + isa = XCSwiftPackageProductDependency; + package = 7A35177927E23F8800DC538C /* XCRemoteSwiftPackageReference "Eureka" */; + productName = Eureka; + }; 7A813DC02508C4D900CC93B9 /* ExceptionCatcher */ = { isa = XCSwiftPackageProductDependency; package = 7A813DBF2508C4D900CC93B9 /* XCRemoteSwiftPackageReference "ExceptionCatcher" */; @@ -1375,11 +1380,6 @@ package = 7AABDE1B2532F3EB0041AFC6 /* XCRemoteSwiftPackageReference "PKHUD" */; productName = PKHUD; }; - 7AEF47A3253DC4D2001D6238 /* Eureka */ = { - isa = XCSwiftPackageProductDependency; - package = 7AEF47A2253DC4D2001D6238 /* XCRemoteSwiftPackageReference "Eureka" */; - productName = Eureka; - }; 7AF58D332402A91C00CE01A0 /* Kingfisher */ = { isa = XCSwiftPackageProductDependency; package = 7AF58D322402A91C00CE01A0 /* XCRemoteSwiftPackageReference "Kingfisher" */; diff --git a/AutoCat.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/AutoCat.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 58b4350..d5a8149 100644 --- a/AutoCat.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/AutoCat.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,97 +1,95 @@ { - "object": { - "pins": [ - { - "package": "DifferenceKit", - "repositoryURL": "https://github.com/ra1028/DifferenceKit.git", - "state": { - "branch": null, - "revision": "14c66681e12a38b81045f44c6c29724a0d4b0e72", - "version": "1.1.5" - } - }, - { - "package": "Eureka", - "repositoryURL": "https://github.com/selim-mustafaev/Eureka", - "state": { - "branch": "catalyst-collapse-row-crash-fix", - "revision": "c6d0b49b894c77bd72ae07d2bbea1f2fac0efd9c", - "version": null - } - }, - { - "package": "ExceptionCatcher", - "repositoryURL": "https://github.com/sindresorhus/ExceptionCatcher", - "state": { - "branch": null, - "revision": "3787f25119e1406b4c5e47fc654626a9d5d7e111", - "version": "1.1.0" - } - }, - { - "package": "Kingfisher", - "repositoryURL": "https://github.com/onevcat/Kingfisher", - "state": { - "branch": null, - "revision": "1a0c2df04b31ed7aa318354f3583faea24f006fc", - "version": "5.15.8" - } - }, - { - "package": "PKHUD", - "repositoryURL": "https://github.com/pkluz/PKHUD.git", - "state": { - "branch": null, - "revision": "8fd26f23057c6bebd6695524b1c3e05e93aba571", - "version": "5.4.0" - } - }, - { - "package": "Realm", - "repositoryURL": "https://github.com/realm/realm-cocoa", - "state": { - "branch": null, - "revision": "7ec5df0a700ef76ad930dcedb9c63c1b354979e1", - "version": "5.5.1" - } - }, - { - "package": "RealmCore", - "repositoryURL": "https://github.com/realm/realm-core", - "state": { - "branch": null, - "revision": "66d79b3c5213fb14d491c1b22193077b488d49a6", - "version": "6.2.4" - } - }, - { - "package": "RxRealm", - "repositoryURL": "https://github.com/RxSwiftCommunity/RxRealm", - "state": { - "branch": null, - "revision": "4dcae40562b5a086dd4711fa8a596be0436dc474", - "version": "3.1.0" - } - }, - { - "package": "RxSwift", - "repositoryURL": "https://github.com/ReactiveX/RxSwift.git", - "state": { - "branch": null, - "revision": "254617dd7fae0c45319ba5fbea435bf4d0e15b5d", - "version": "5.1.2" - } - }, - { - "package": "SwiftDate", - "repositoryURL": "https://github.com/malcommac/SwiftDate.git", - "state": { - "branch": null, - "revision": "6190d0cefff3013e77ed567e6b074f324e5c5bf5", - "version": "6.3.1" - } + "pins" : [ + { + "identity" : "differencekit", + "kind" : "remoteSourceControl", + "location" : "https://github.com/ra1028/DifferenceKit.git", + "state" : { + "revision" : "14c66681e12a38b81045f44c6c29724a0d4b0e72", + "version" : "1.1.5" } - ] - }, - "version": 1 + }, + { + "identity" : "eureka", + "kind" : "remoteSourceControl", + "location" : "https://github.com/xmartlabs/Eureka", + "state" : { + "revision" : "310bee0431ea2dcf43bb3154a8f1e0f44749aa12", + "version" : "5.3.5" + } + }, + { + "identity" : "exceptioncatcher", + "kind" : "remoteSourceControl", + "location" : "https://github.com/sindresorhus/ExceptionCatcher", + "state" : { + "revision" : "3787f25119e1406b4c5e47fc654626a9d5d7e111", + "version" : "1.1.0" + } + }, + { + "identity" : "kingfisher", + "kind" : "remoteSourceControl", + "location" : "https://github.com/onevcat/Kingfisher", + "state" : { + "revision" : "1a0c2df04b31ed7aa318354f3583faea24f006fc", + "version" : "5.15.8" + } + }, + { + "identity" : "pkhud", + "kind" : "remoteSourceControl", + "location" : "https://github.com/pkluz/PKHUD.git", + "state" : { + "revision" : "8fd26f23057c6bebd6695524b1c3e05e93aba571", + "version" : "5.4.0" + } + }, + { + "identity" : "realm-cocoa", + "kind" : "remoteSourceControl", + "location" : "https://github.com/realm/realm-cocoa", + "state" : { + "revision" : "7ec5df0a700ef76ad930dcedb9c63c1b354979e1", + "version" : "5.5.1" + } + }, + { + "identity" : "realm-core", + "kind" : "remoteSourceControl", + "location" : "https://github.com/realm/realm-core", + "state" : { + "revision" : "66d79b3c5213fb14d491c1b22193077b488d49a6", + "version" : "6.2.4" + } + }, + { + "identity" : "rxrealm", + "kind" : "remoteSourceControl", + "location" : "https://github.com/RxSwiftCommunity/RxRealm", + "state" : { + "revision" : "4dcae40562b5a086dd4711fa8a596be0436dc474", + "version" : "3.1.0" + } + }, + { + "identity" : "rxswift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/ReactiveX/RxSwift.git", + "state" : { + "revision" : "254617dd7fae0c45319ba5fbea435bf4d0e15b5d", + "version" : "5.1.2" + } + }, + { + "identity" : "swiftdate", + "kind" : "remoteSourceControl", + "location" : "https://github.com/malcommac/SwiftDate.git", + "state" : { + "revision" : "6190d0cefff3013e77ed567e6b074f324e5c5bf5", + "version" : "6.3.1" + } + } + ], + "version" : 2 } diff --git a/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcschemes/xcschememanagement.plist b/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcschemes/xcschememanagement.plist index 0e5ff6f..bfdc81d 100644 --- a/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcschemes/xcschememanagement.plist @@ -12,196 +12,217 @@ AutoCatCore.xcscheme_^#shared#^_ orderHint - 1 + 2 DifferenceKit (Playground) 1.xcscheme isShown - + orderHint - 7 + 9 DifferenceKit (Playground) 2.xcscheme isShown - + orderHint - 8 + 10 DifferenceKit (Playground).xcscheme isShown - + orderHint - 2 + 8 Eureka (Playground) 1.xcscheme isShown - + orderHint - 10 + 3 Eureka (Playground) 2.xcscheme isShown - + orderHint - 11 + 4 Eureka (Playground) 3.xcscheme isShown - + orderHint - 23 + 17 Eureka (Playground) 4.xcscheme isShown - + orderHint - 25 + 18 Eureka (Playground) 5.xcscheme isShown - + orderHint - 27 + 19 + + Eureka (Playground) 6.xcscheme + + isShown + + orderHint + 20 + + Eureka (Playground) 7.xcscheme + + isShown + + orderHint + 21 + + Eureka (Playground) 8.xcscheme + + isShown + + orderHint + 22 Eureka (Playground).xcscheme isShown - + orderHint - 9 + 1 GettingStarted (Playground) 1.xcscheme isShown - + orderHint - 16 + 15 GettingStarted (Playground) 2.xcscheme isShown - + orderHint - 17 + 16 GettingStarted (Playground) 3.xcscheme isShown - + orderHint 14 GettingStarted (Playground) 4.xcscheme isShown - + orderHint 18 GettingStarted (Playground) 5.xcscheme isShown - + orderHint 21 GettingStarted (Playground).xcscheme isShown - + orderHint - 15 + 12 Rx (Playground) 1.xcscheme isShown - + orderHint - 4 + 6 Rx (Playground) 2.xcscheme isShown - + orderHint - 5 + 7 Rx (Playground) 3.xcscheme isShown - + orderHint 19 Rx (Playground) 4.xcscheme isShown - + orderHint 20 Rx (Playground) 5.xcscheme isShown - + orderHint 22 Rx (Playground).xcscheme isShown - + orderHint - 3 + 5 SwiftDate (Playground) 1.xcscheme isShown - + orderHint - 12 + 13 SwiftDate (Playground) 2.xcscheme isShown - + orderHint - 13 + 14 SwiftDate (Playground) 3.xcscheme isShown - + orderHint 24 SwiftDate (Playground) 4.xcscheme isShown - + orderHint 26 SwiftDate (Playground) 5.xcscheme isShown - + orderHint 28 SwiftDate (Playground).xcscheme isShown - + orderHint - 6 + 11 SuppressBuildableAutocreation @@ -209,7 +230,7 @@ 7A1146FC23FDE7E500B424AF primary - + diff --git a/AutoCat/Cells/VehicleCell.swift b/AutoCat/Cells/VehicleCell.swift index fa2770a..446eaaa 100644 --- a/AutoCat/Cells/VehicleCell.swift +++ b/AutoCat/Cells/VehicleCell.swift @@ -40,7 +40,7 @@ class VehicleCell: UITableViewCell, ConfigurableCell { self.updatedDate.text = formatter.string(from: Date(timeIntervalSince1970: vehicle.updatedDate)) } - self.syncImage.isHidden = vehicle.synchronized + self.syncImage.isHidden = vehicle.synchronized || vehicle.unrecognized self.bubbleImage.isHidden = vehicle.notes.isEmpty self.notesCount.isHidden = vehicle.notes.isEmpty