diff --git a/LeadKit.podspec b/LeadKit.podspec index 9261bbce..98ca3fa5 100644 --- a/LeadKit.podspec +++ b/LeadKit.podspec @@ -77,13 +77,13 @@ Pod::Spec.new do |s| "Sources/Structures/DataLoading/PaginationDataLoading/*" ] - ss.dependency "RxSwift", '~> 4.1' - ss.dependency "RxCocoa", '~> 4.1' - ss.dependency "RxAlamofire", '~> 4.1' - ss.dependency "SwiftDate", '~> 4.5' + ss.dependency "RxSwift", '~> 4.2' + ss.dependency "RxCocoa", '~> 4.2' + ss.dependency "RxAlamofire", '~> 4.2' + ss.dependency "SwiftDate", '~> 5.0' - ss.ios.dependency "TableKit", '~> 2.6' - ss.ios.dependency "UIScrollView-InfiniteScroll", '~> 1.0.0' + ss.ios.dependency "TableKit", '~> 2.7' + ss.ios.dependency "UIScrollView-InfiniteScroll", '~> 1.1.0' end s.subspec 'Core-iOS-Extension' do |ss| @@ -101,12 +101,12 @@ Pod::Spec.new do |s| "Sources/Extensions/Array/Array+SeparatorRowBoxExtensions.swift" ] - ss.dependency "RxSwift", '~> 4.1' - ss.dependency "RxCocoa", '~> 4.1' - ss.dependency "RxAlamofire", '~> 4.1' - ss.dependency "SwiftDate", '~> 4.5' + ss.dependency "RxSwift", '~> 4.2' + ss.dependency "RxCocoa", '~> 4.2' + ss.dependency "RxAlamofire", '~> 4.2' + ss.dependency "SwiftDate", '~> 5.0' - ss.ios.dependency "TableKit", '~> 2.6' + ss.ios.dependency "TableKit", '~> 2.7' end diff --git a/Podfile b/Podfile index 798cce53..c029f452 100644 --- a/Podfile +++ b/Podfile @@ -1,9 +1,9 @@ abstract_target 'LeadKit' do - pod "RxSwift", '~> 4.1' - pod "RxCocoa", '~> 4.1' - pod "RxAlamofire", '~> 4.1' - pod "SwiftLint", '~> 0.25' - pod "SwiftDate", '~> 4.5' + pod "RxSwift" + pod "RxCocoa" + pod "RxAlamofire" + pod "SwiftLint" + pod "SwiftDate" inhibit_all_warnings! @@ -12,8 +12,8 @@ abstract_target 'LeadKit' do use_frameworks! - pod "TableKit", '~> 2.6' - pod "UIScrollView-InfiniteScroll", '~> 1.0.0' + pod "TableKit" + pod "UIScrollView-InfiniteScroll" target 'LeadKit iOSTests' do inherit! :search_paths @@ -27,7 +27,7 @@ abstract_target 'LeadKit' do use_frameworks! - pod "TableKit", '~> 2.6' + pod "TableKit" target 'LeadKit iOS ExtensionsTests' do inherit! :search_paths diff --git a/Podfile.lock b/Podfile.lock index 93222dd0..e261cd4f 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -8,19 +8,19 @@ PODS: - RxCocoa (4.2.0): - RxSwift (~> 4.0) - RxSwift (4.2.0) - - SwiftDate (4.5.1) + - SwiftDate (5.0.4) - SwiftLint (0.26.0) - TableKit (2.7.0) - - UIScrollView-InfiniteScroll (1.0.2) + - UIScrollView-InfiniteScroll (1.1.0) DEPENDENCIES: - - RxAlamofire (~> 4.1) - - RxCocoa (~> 4.1) - - RxSwift (~> 4.1) - - SwiftDate (~> 4.5) - - SwiftLint (~> 0.25) - - TableKit (~> 2.6) - - UIScrollView-InfiniteScroll (~> 1.0.0) + - RxAlamofire + - RxCocoa + - RxSwift + - SwiftDate + - SwiftLint + - TableKit + - UIScrollView-InfiniteScroll SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -38,11 +38,11 @@ SPEC CHECKSUMS: RxAlamofire: 87a9c588541210cc3e4a1f843ccc3ecf3eb98b31 RxCocoa: 0b54909c902e1e581212a03e690bbd94032d8baa RxSwift: 99e10317ddfcc7fbe01356aafd118fde4a0be104 - SwiftDate: 7b56d42a221f582047287deb256b23fc5ed49a60 + SwiftDate: d9827f0e7edfeb8be52882beb67e75c773b634c3 SwiftLint: f6b83e8d95ee1e91e11932d843af4fdcbf3fc764 TableKit: 506650573ed96ec007649b655559ecd43f9fd505 - UIScrollView-InfiniteScroll: c132d6d5851daff229ab4a1060ccf70a05a051c9 + UIScrollView-InfiniteScroll: 3ef456bcbe759c19f510a383cff96e6647c98c98 -PODFILE CHECKSUM: e85a040b216674a8e086e29735584c3ac51816c6 +PODFILE CHECKSUM: 36f32b7ded88042eb5e271ce161ca7cef17fea62 COCOAPODS: 1.5.3 diff --git a/Sources/Extensions/DateFormattingService/DateFormattingService+DefaultImplementation.swift b/Sources/Extensions/DateFormattingService/DateFormattingService+DefaultImplementation.swift index a87a0734..68b7499b 100644 --- a/Sources/Extensions/DateFormattingService/DateFormattingService+DefaultImplementation.swift +++ b/Sources/Extensions/DateFormattingService/DateFormattingService+DefaultImplementation.swift @@ -25,20 +25,20 @@ import SwiftDate public extension DateFormattingService { func date(from string: String, - format: DateFormatType, - defaultDate: DateInRegion = Date().inRegion()) -> DateInRegion { + format: String, + defaultDate: DateInRegion = Date().inDefaultRegion()) -> DateInRegion { return date(from: string, format: format) ?? defaultDate } - func date(from string: String, format: DateFormatType) -> DateInRegion? { - return DateInRegion(string: string, format: format.swiftDateFormat, fromRegion: currentRegion) + func date(from string: String, format: String) -> DateInRegion? { + return DateInRegion(string, format: format, region: currentRegion) } func string(from date: DateInRegion, format: DateFormatType) -> String { - let dateInFormatterRegion = date.toRegion(currentRegion) + let dateInFormatterRegion = date.convertTo(region: currentRegion) - return dateInFormatterRegion.string(format: format.swiftDateFormat) + return dateInFormatterRegion.toString(format.swiftDateFormat) } } @@ -54,8 +54,8 @@ public extension DateFormattingService where Self: Singleton { /// - defaultDate: Default date if formatting will fail. /// - Returns: Date parsed from given string or default date if parsing did fail. static func date(from string: String, - format: DateFormatType, - defaultDate: DateInRegion = Date().inRegion()) -> DateInRegion { + format: String, + defaultDate: DateInRegion = Date().inDefaultRegion()) -> DateInRegion { return shared.date(from: string, format: format, defaultDate: defaultDate) } @@ -66,7 +66,7 @@ public extension DateFormattingService where Self: Singleton { /// - string: String to use for date parsing. /// - format: Format that should be used for date parsing. /// - Returns: Date parsed from given string or default date if parsing did fail. - static func date(from string: String, format: DateFormatType) -> DateInRegion? { + static func date(from string: String, format: String) -> DateInRegion? { return shared.date(from: string, format: format) } diff --git a/Sources/Protocols/DateFormatingService/DateFormat.swift b/Sources/Protocols/DateFormatingService/DateFormat.swift index 01a7768a..d6de9f53 100644 --- a/Sources/Protocols/DateFormatingService/DateFormat.swift +++ b/Sources/Protocols/DateFormatingService/DateFormat.swift @@ -26,6 +26,6 @@ import SwiftDate public protocol DateFormat { /// SwiftDate.DateFormat for current format. - var swiftDateFormat: SwiftDate.DateFormat { get } + var swiftDateFormat: DateToStringStyles { get } }