From 8fc14fdfbe4b9482f8fd54233d558fc822d8a7c5 Mon Sep 17 00:00:00 2001 From: Selim Mustafaev Date: Mon, 19 Oct 2020 18:00:52 +0300 Subject: [PATCH] Fix for invalid dates --- AutoCat.xcodeproj/project.pbxproj | 4 ++-- .../xcschemes/xcschememanagement.plist | 16 ++++++++-------- AutoCat/AppDelegate.swift | 4 ++-- AutoCat/Utils/Api.swift | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/AutoCat.xcodeproj/project.pbxproj b/AutoCat.xcodeproj/project.pbxproj index 341dca4..8034b12 100644 --- a/AutoCat.xcodeproj/project.pbxproj +++ b/AutoCat.xcodeproj/project.pbxproj @@ -728,7 +728,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = AutoCat/AutoCat.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 47; + CURRENT_PROJECT_VERSION = 48; 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 = 47; + CURRENT_PROJECT_VERSION = 48; DEVELOPMENT_TEAM = 46DTTB8X4S; INFOPLIST_FILE = AutoCat/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; diff --git a/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcschemes/xcschememanagement.plist b/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcschemes/xcschememanagement.plist index 73a26bf..f9e3a76 100644 --- a/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcschemes/xcschememanagement.plist @@ -14,21 +14,21 @@ isShown orderHint - 5 + 8 DifferenceKit (Playground) 2.xcscheme isShown orderHint - 6 + 9 DifferenceKit (Playground).xcscheme isShown orderHint - 1 + 7 Eureka (Playground) 1.xcscheme @@ -119,28 +119,28 @@ isShown orderHint - 9 + 6 Rx (Playground) 2.xcscheme isShown orderHint - 10 + 5 Rx (Playground).xcscheme isShown orderHint - 7 + 1 SwiftDate (Playground) 1.xcscheme isShown orderHint - 11 + 10 SwiftDate (Playground) 2.xcscheme @@ -175,7 +175,7 @@ isShown orderHint - 8 + 11 SuppressBuildableAutocreation diff --git a/AutoCat/AppDelegate.swift b/AutoCat/AppDelegate.swift index b266146..9134a7b 100644 --- a/AutoCat/AppDelegate.swift +++ b/AutoCat/AppDelegate.swift @@ -25,7 +25,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { let config = Realm.Configuration( - schemaVersion: 20, + schemaVersion: 21, migrationBlock: { migration, oldSchemaVersion in if oldSchemaVersion <= 3 { var numbers: [String] = [] @@ -66,7 +66,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { } } - if oldSchemaVersion == 19 { + if oldSchemaVersion == 19 || oldSchemaVersion == 20 { migration.enumerateObjects(ofType: "Vehicle") { old, new in guard let addedDate = old?["addedDate"] as? TimeInterval else { return } guard let updatedDate = old?["updatedDate"] as? TimeInterval else { return } diff --git a/AutoCat/Utils/Api.swift b/AutoCat/Utils/Api.swift index 1a4b824..a59987b 100644 --- a/AutoCat/Utils/Api.swift +++ b/AutoCat/Utils/Api.swift @@ -202,7 +202,7 @@ class Api { body["googleIdToken"] = token } return self.makeBodyRequest(api: "vehicles/check", body: body).map { (vehicle: Vehicle) -> Vehicle in - vehicle.addedDate = Date().timeIntervalSince1970*1000 + vehicle.addedDate = Date().timeIntervalSince1970 return vehicle } }