From 2ff40285c663c60c07a99db9c1aaadf2045b1410 Mon Sep 17 00:00:00 2001 From: Ivan Smolin Date: Fri, 30 Mar 2018 12:39:26 +0300 Subject: [PATCH] Xcode 9.3 migration --- CHANGELOG.md | 7 ++++--- LeadKitAdditions.xcodeproj/project.pbxproj | 14 +++++--------- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ .../PassCode/View/BasePassCodeViewController.swift | 2 +- .../Services/Network/DefaultNetworkService.swift | 4 ++-- 5 files changed, 20 insertions(+), 15 deletions(-) create mode 100644 LeadKitAdditions.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/CHANGELOG.md b/CHANGELOG.md index a67fb8e..c1bb4fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,12 @@ # Changelog -## 0.2.2 +### 0.2.3 +- **Update**: Xcode 9.3 migration. +### 0.2.2 - **Add**: `PassCodeDelayedDescription` to schedule error messages -## 0.2.1 - +### 0.2.1 - **Fixed**: BasePassCodeViewController doesn't draw last dot filled ## 0.2.0 diff --git a/LeadKitAdditions.xcodeproj/project.pbxproj b/LeadKitAdditions.xcodeproj/project.pbxproj index 93c0bf5..5c30bb7 100644 --- a/LeadKitAdditions.xcodeproj/project.pbxproj +++ b/LeadKitAdditions.xcodeproj/project.pbxproj @@ -195,7 +195,6 @@ ED0C33E61F2906EC00FAE9FD /* Extensions */, ED0C33EA1F2906EC00FAE9FD /* Protocols */, ED0C33F01F2906EC00FAE9FD /* Services */, - ED0C33FF1F2906EC00FAE9FD /* Views */, EFBD55781EBB893F0062AA63 /* Info-iOS-Extensions.plist */, EFBD55791EBB893F0062AA63 /* Info-iOS.plist */, CAE698E61E968820000394B0 /* LeadKitAdditions.h */, @@ -325,13 +324,6 @@ path = ValidationService; sourceTree = ""; }; - ED0C33FF1F2906EC00FAE9FD /* Views */ = { - isa = PBXGroup; - children = ( - ); - path = Views; - sourceTree = ""; - }; F8A65FEC7C0EB4B93746E50F /* Pods */ = { isa = PBXGroup; children = ( @@ -413,7 +405,7 @@ CAE698DA1E968820000394B0 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0900; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = TouchInstinct; TargetAttributes = { CAE698E21E968820000394B0 = { @@ -652,6 +644,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -659,6 +652,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -712,6 +706,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -719,6 +714,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; diff --git a/LeadKitAdditions.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/LeadKitAdditions.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/LeadKitAdditions.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Sources/Controllers/PassCode/View/BasePassCodeViewController.swift b/Sources/Controllers/PassCode/View/BasePassCodeViewController.swift index 4cf79ab..209d080 100644 --- a/Sources/Controllers/PassCode/View/BasePassCodeViewController.swift +++ b/Sources/Controllers/PassCode/View/BasePassCodeViewController.swift @@ -124,7 +124,7 @@ open class BasePassCodeViewController: UIViewController, ConfigurableController private func resetDotsUI() { fakeTextField.text = nil dotStackView.arrangedSubviews - .flatMap { $0 as? UIImageView } + .compactMap { $0 as? UIImageView } .forEach { $0.image = self.imageFor(type: .clear) } } diff --git a/Sources/Services/Network/DefaultNetworkService.swift b/Sources/Services/Network/DefaultNetworkService.swift index 15aa69e..c135272 100644 --- a/Sources/Services/Network/DefaultNetworkService.swift +++ b/Sources/Services/Network/DefaultNetworkService.swift @@ -45,12 +45,12 @@ open class DefaultNetworkService: NetworkService { } /// The default acceptable range 200…299 - open var acceptableStatusCodes: [Int] { + open class var acceptableStatusCodes: [Int] { return Alamofire.SessionManager.defaultAcceptableStatusCodes } public init(sessionManager: SessionManager) { - super.init(sessionManager: sessionManager, acceptableStatusCodes: acceptableStatusCodes) + super.init(sessionManager: sessionManager, acceptableStatusCodes: DefaultNetworkService.acceptableStatusCodes) // Fatal error: `drive*` family of methods can be only called from `MainThread` DispatchQueue.main.async {