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.podspec b/LeadKitAdditions.podspec index e2f50f3..c84c52c 100644 --- a/LeadKitAdditions.podspec +++ b/LeadKitAdditions.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "LeadKitAdditions" - s.version = "0.2.2" + s.version = "0.2.3" s.summary = "iOS framework with a bunch of tools for rapid development" s.homepage = "https://github.com/TouchInstinct/LeadKitAdditions" s.license = "Apache License, Version 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/Podfile.lock b/Podfile.lock index f7607c6..c7f2047 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,27 +1,29 @@ PODS: - - Alamofire (4.7.0) + - Alamofire (4.7.1) - CocoaLumberjack/Default (3.4.1) - CocoaLumberjack/Swift (3.4.1): - CocoaLumberjack/Default - IDZSwiftCommonCrypto (0.10.0) - InputMask (3.0.0) - KeychainAccess (3.1.0) - - LeadKit (0.7.0): - - LeadKit/Core (= 0.7.0) - - LeadKit/Core (0.7.0): + - LeadKit (0.7.4): + - LeadKit/Core (= 0.7.4) + - LeadKit/Core (0.7.4): - CocoaLumberjack/Swift (~> 3.4) - ObjectMapper (~> 3.0) - RxAlamofire (~> 4.1) - RxCocoa (~> 4.1) - RxSwift (~> 4.1) + - SwiftDate (~> 4.5) - TableKit (~> 2.6) - UIScrollView-InfiniteScroll (~> 1.0.0) - - LeadKit/Core-iOS-Extension (0.7.0): + - LeadKit/Core-iOS-Extension (0.7.4): - CocoaLumberjack/Swift (~> 3.4) - ObjectMapper (~> 3.0) - RxAlamofire (~> 4.1) - RxCocoa (~> 4.1) - RxSwift (~> 4.1) + - SwiftDate (~> 4.5) - ObjectMapper (3.1.0) - RxAlamofire (4.1.0): - RxAlamofire/Core (= 4.1.0) @@ -31,6 +33,7 @@ PODS: - RxCocoa (4.1.2): - RxSwift (~> 4.0) - RxSwift (4.1.2) + - SwiftDate (4.5.1) - SwiftLint (0.25.0) - SwiftValidator (5.0.0) - TableKit (2.6.0) @@ -46,16 +49,17 @@ DEPENDENCIES: - SwiftValidator (= 5.0.0) SPEC CHECKSUMS: - Alamofire: 907e0a98eb68cdb7f9d1f541a563d6ac5dc77b25 + Alamofire: 68d7d521118d49c615a8d2214d87cdf525599d30 CocoaLumberjack: 2e258a064cacc8eb9a2aca318e24d02a0a7fd56d IDZSwiftCommonCrypto: 4eef2c46e262dfbcbc1fd76365e066336680ad7d InputMask: 37c273bde6705187d80cf0b4240cb42ea92096c3 KeychainAccess: 94c5540b32eabf7bc32bfb976a268e8ea05fd6da - LeadKit: 86250de67f264b5a9bdfd5ddb04a8f8d084acaf3 + LeadKit: 741848fb41fda9f83fca9bbc2627a290b4881ab9 ObjectMapper: 20505058f54e5c3ca69e1d6de9897d152a5369a6 RxAlamofire: 96a2bff4694a1609bb59c57b53d99ea7a0ddc64a RxCocoa: d88ba0f1f6abf040011a9eb4b539324fc426843a RxSwift: e49536837d9901277638493ea537394d4b55f570 + SwiftDate: 7b56d42a221f582047287deb256b23fc5ed49a60 SwiftLint: e14651157288e9e01d6e1a71db7014fb5744a8ea SwiftValidator: 46cdd2061962df3ee8bab3c536dea9b34191d459 TableKit: 61880e4c13ac0ba396a308fcb1ae48f6dec8b458 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 {