From 2f42099bd0366cfdea92e0a4e79d7702b70b5375 Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Sun, 15 Nov 2020 22:01:35 +0100 Subject: [PATCH] Update project and deprecated APIs --- Passepartout-iOS/AppDelegate.swift | 4 ++-- Passepartout-iOS/Cells/ActivityTableViewCell.swift | 2 +- Passepartout-iOS/Scenes/ServiceViewController.swift | 3 +-- Passepartout.xcodeproj/project.pbxproj | 6 +++--- .../xcshareddata/xcschemes/Passepartout-Core.xcscheme | 2 +- .../xcshareddata/xcschemes/Passepartout-iOS.xcscheme | 2 +- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Passepartout-iOS/AppDelegate.swift b/Passepartout-iOS/AppDelegate.swift index 693e497f..edc94223 100644 --- a/Passepartout-iOS/AppDelegate.swift +++ b/Passepartout-iOS/AppDelegate.swift @@ -57,8 +57,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele // splitViewController.minimumPrimaryColumnWidth = 360.0 splitViewController.maximumPrimaryColumnWidth = .infinity splitViewController.delegate = self - if UI_USER_INTERFACE_IDIOM() == .pad { - splitViewController.preferredDisplayMode = .allVisible + if UIDevice.current.userInterfaceIdiom == .pad { + splitViewController.preferredDisplayMode = .oneBesideSecondary // } else { // splitViewController.preferredDisplayMode = .primaryOverlay } diff --git a/Passepartout-iOS/Cells/ActivityTableViewCell.swift b/Passepartout-iOS/Cells/ActivityTableViewCell.swift index 63f9449d..365510ff 100644 --- a/Passepartout-iOS/Cells/ActivityTableViewCell.swift +++ b/Passepartout-iOS/Cells/ActivityTableViewCell.swift @@ -30,7 +30,7 @@ extension Cells { } class ActivityTableViewCell: UITableViewCell { - private lazy var activityIndicator = UIActivityIndicatorView(style: .gray) + private lazy var activityIndicator = UIActivityIndicatorView(style: .medium) } extension ActivityTableViewCell { diff --git a/Passepartout-iOS/Scenes/ServiceViewController.swift b/Passepartout-iOS/Scenes/ServiceViewController.swift index 865e2478..6e61c6f3 100644 --- a/Passepartout-iOS/Scenes/ServiceViewController.swift +++ b/Passepartout-iOS/Scenes/ServiceViewController.swift @@ -404,8 +404,7 @@ class ServiceViewController: UIViewController, StrongTableHost { } if #available(iOS 13, *) { - let auth = CLLocationManager.authorizationStatus() - switch auth { + switch locationManager.authorizationStatus { case .authorizedAlways, .authorizedWhenInUse: break diff --git a/Passepartout.xcodeproj/project.pbxproj b/Passepartout.xcodeproj/project.pbxproj index a5d6d841..96f3e462 100644 --- a/Passepartout.xcodeproj/project.pbxproj +++ b/Passepartout.xcodeproj/project.pbxproj @@ -744,7 +744,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1010; - LastUpgradeCheck = 1150; + LastUpgradeCheck = 1220; ORGANIZATIONNAME = "Davide De Rosa"; TargetAttributes = { 0E31529A223F9EF400F61841 = { @@ -1255,7 +1255,6 @@ baseConfigurationReference = 0E23B4A12298559800304C30 /* Config.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -1279,6 +1278,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -1319,7 +1319,6 @@ baseConfigurationReference = 0E23B4A12298559800304C30 /* Config.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -1343,6 +1342,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/Passepartout.xcodeproj/xcshareddata/xcschemes/Passepartout-Core.xcscheme b/Passepartout.xcodeproj/xcshareddata/xcschemes/Passepartout-Core.xcscheme index 51a9c1c8..144c7c64 100644 --- a/Passepartout.xcodeproj/xcshareddata/xcschemes/Passepartout-Core.xcscheme +++ b/Passepartout.xcodeproj/xcshareddata/xcschemes/Passepartout-Core.xcscheme @@ -1,6 +1,6 @@