diff --git a/Cartfile b/Cartfile index ff4698d3..caf22909 100644 --- a/Cartfile +++ b/Cartfile @@ -3,5 +3,5 @@ github "Alamofire/Alamofire" github "RxSwiftCommunity/RxAlamofire" ~> 6.1 github "TouchInstinct/TableKit" github "ReactiveX/RxSwift" ~> 6.2 -github "pronebird/UIScrollView-InfiniteScroll" +github "pronebird/UIScrollView-InfiniteScroll" "1.1.0" github "SnapKit/SnapKit" ~> 5.0 \ No newline at end of file diff --git a/Cartfile.resolved b/Cartfile.resolved index 2df82d97..7bbac131 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -4,4 +4,4 @@ github "RxSwiftCommunity/RxAlamofire" "v6.1.2" github "SnapKit/SnapKit" "5.0.1" github "TouchInstinct/TableKit" "2.10008.1" github "malcommac/SwiftDate" "6.3.1" -github "pronebird/UIScrollView-InfiniteScroll" "1.2.0" +github "pronebird/UIScrollView-InfiniteScroll" "1.1.0" diff --git a/LeadKit.podspec b/LeadKit.podspec index 66f074ca..526e2d80 100644 --- a/LeadKit.podspec +++ b/LeadKit.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "LeadKit" - s.version = "1.5.0" + s.version = "1.5.1" s.summary = "iOS framework with a bunch of tools for rapid development" s.homepage = "https://github.com/TouchInstinct/LeadKit" s.license = "Apache License, Version 2.0" @@ -107,9 +107,9 @@ Pod::Spec.new do |s| "Sources/Classes/Controllers/BaseOrientationController.swift" ] - ss.dependency "RxSwift", '~> 6.0.0' - ss.dependency "RxCocoa", '~> 6.0.0' - ss.dependency "RxAlamofire", '~> 6.1.1' + ss.dependency "RxSwift", '~> 6.2' + ss.dependency "RxCocoa", '~> 6.2' + ss.dependency "RxAlamofire", '~> 6.1' ss.dependency "SwiftDate", '~> 6' ss.ios.dependency "TableKit", '~> 2.11' diff --git a/Sources/Protocols/BaseViewModel.swift b/Sources/Protocols/BaseViewModel.swift index 948097fe..280ef174 100644 --- a/Sources/Protocols/BaseViewModel.swift +++ b/Sources/Protocols/BaseViewModel.swift @@ -22,6 +22,6 @@ import Foundation -public protocol BaseViewModel: class { +public protocol BaseViewModel: AnyObject { // Nothing } diff --git a/Sources/Protocols/DataLoading/GeneralDataLoading/GeneralDataLoadingController.swift b/Sources/Protocols/DataLoading/GeneralDataLoading/GeneralDataLoadingController.swift index e2a2ee99..a1022c83 100644 --- a/Sources/Protocols/DataLoading/GeneralDataLoading/GeneralDataLoadingController.swift +++ b/Sources/Protocols/DataLoading/GeneralDataLoading/GeneralDataLoadingController.swift @@ -20,7 +20,7 @@ // THE SOFTWARE. // -public protocol GeneralDataLoadingController: class, ConfigurableController, GeneralDataLoadingHandler +public protocol GeneralDataLoadingController: AnyObject, ConfigurableController, GeneralDataLoadingHandler where ViewModelT: GeneralDataLoadingViewModel { /// The loading view is shown when the `onLoadingState` method gets called diff --git a/Sources/Protocols/DataLoading/PaginationDataLoading/TotalCountCursorConfiguration.swift b/Sources/Protocols/DataLoading/PaginationDataLoading/TotalCountCursorConfiguration.swift index dbca27c0..2dcaf037 100644 --- a/Sources/Protocols/DataLoading/PaginationDataLoading/TotalCountCursorConfiguration.swift +++ b/Sources/Protocols/DataLoading/PaginationDataLoading/TotalCountCursorConfiguration.swift @@ -24,6 +24,6 @@ import RxSwift /// Protocol that requests class to conform RxDataSource and ResettableType /// with constraint ResultType to TotalCountCursorListingResult. -public protocol TotalCountCursorConfiguration: class, RxDataSource, ResettableType +public protocol TotalCountCursorConfiguration: AnyObject, RxDataSource, ResettableType where ResultType: TotalCountCursorListingResult { } diff --git a/Sources/Protocols/LoadingIndicator.swift b/Sources/Protocols/LoadingIndicator.swift index c4b6ccf4..724962e4 100644 --- a/Sources/Protocols/LoadingIndicator.swift +++ b/Sources/Protocols/LoadingIndicator.swift @@ -23,7 +23,7 @@ import UIKit /// Protocol that describes placeholder view, containing loading indicator. -public protocol LoadingIndicatorHolder: class { +public protocol LoadingIndicatorHolder: AnyObject { var loadingIndicator: Animatable { get } var indicatorOwner: UIView { get } } diff --git a/Sources/Protocols/Views/ViewTextConfigurable/ViewTextConfigurable.swift b/Sources/Protocols/Views/ViewTextConfigurable/ViewTextConfigurable.swift index 45b577f8..49ef2577 100644 --- a/Sources/Protocols/Views/ViewTextConfigurable/ViewTextConfigurable.swift +++ b/Sources/Protocols/Views/ViewTextConfigurable/ViewTextConfigurable.swift @@ -24,7 +24,7 @@ import UIKit.UIFont import UIKit.UIColor /// Protocol that represents text object with appearance attributes. -public protocol ViewTextConfigurable: class { +public protocol ViewTextConfigurable: AnyObject { /// Font of text object. var textFont: UIFont? { get set } diff --git a/Sources/Structures/DataLoading/PaginationDataLoading/PaginationWrapperDelegate.swift b/Sources/Structures/DataLoading/PaginationDataLoading/PaginationWrapperDelegate.swift index c33bde08..88039c8d 100644 --- a/Sources/Structures/DataLoading/PaginationDataLoading/PaginationWrapperDelegate.swift +++ b/Sources/Structures/DataLoading/PaginationDataLoading/PaginationWrapperDelegate.swift @@ -21,7 +21,7 @@ // /// PaginationWrapper delegate used for pagination results handling -public protocol PaginationWrapperDelegate: class { +public protocol PaginationWrapperDelegate: AnyObject { associatedtype DataSourceType: DataSource diff --git a/Sources/Structures/DataLoading/PaginationDataLoading/PaginationWrapperUIDelegate.swift b/Sources/Structures/DataLoading/PaginationDataLoading/PaginationWrapperUIDelegate.swift index 2d004320..3bad0367 100644 --- a/Sources/Structures/DataLoading/PaginationDataLoading/PaginationWrapperUIDelegate.swift +++ b/Sources/Structures/DataLoading/PaginationDataLoading/PaginationWrapperUIDelegate.swift @@ -22,7 +22,7 @@ /// PaginationWrapper UI delegate used for customization /// of bound states (loading, empty, error, etc.). -public protocol PaginationWrapperUIDelegate: class { +public protocol PaginationWrapperUIDelegate: AnyObject { /// Returns placeholder view for empty state. /// diff --git a/TIFoundationUtils/TIFoundationUtils.podspec b/TIFoundationUtils/TIFoundationUtils.podspec index f19a4b82..90ecabc9 100644 --- a/TIFoundationUtils/TIFoundationUtils.podspec +++ b/TIFoundationUtils/TIFoundationUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIFoundationUtils' - s.version = '1.5.0' + s.version = '1.5.1' s.summary = 'Set of helpers for Foundation framework classes.' s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIKeychainUtils/TIKeychainUtils.podspec b/TIKeychainUtils/TIKeychainUtils.podspec index b646f968..567c34eb 100644 --- a/TIKeychainUtils/TIKeychainUtils.podspec +++ b/TIKeychainUtils/TIKeychainUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIKeychainUtils' - s.version = '1.5.0' + s.version = '1.5.1' s.summary = 'Set of helpers for Keychain classes.' s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIPagination/Sources/Protocols/InfiniteScrollDelegate.swift b/TIPagination/Sources/Protocols/InfiniteScrollDelegate.swift index 07fb6838..08c1ebd2 100644 --- a/TIPagination/Sources/Protocols/InfiniteScrollDelegate.swift +++ b/TIPagination/Sources/Protocols/InfiniteScrollDelegate.swift @@ -23,7 +23,7 @@ import UIKit import TISwiftUtils -public protocol InfiniteScrollDelegate: class { +public protocol InfiniteScrollDelegate: AnyObject { func beginInfiniteScroll(_ forceScroll: Bool) func addInfiniteScroll(handler: @escaping ParameterClosure) diff --git a/TIPagination/Sources/Protocols/PaginatorDelegate.swift b/TIPagination/Sources/Protocols/PaginatorDelegate.swift index 1c21d41a..0427c9de 100644 --- a/TIPagination/Sources/Protocols/PaginatorDelegate.swift +++ b/TIPagination/Sources/Protocols/PaginatorDelegate.swift @@ -21,7 +21,7 @@ // /// PaginationWrapper delegate used for pagination results handling -public protocol PaginatorDelegate: class { +public protocol PaginatorDelegate: AnyObject { associatedtype Page diff --git a/TIPagination/Sources/Protocols/PaginatorUIDelegate.swift b/TIPagination/Sources/Protocols/PaginatorUIDelegate.swift index d5ae6811..385ccff3 100644 --- a/TIPagination/Sources/Protocols/PaginatorUIDelegate.swift +++ b/TIPagination/Sources/Protocols/PaginatorUIDelegate.swift @@ -20,7 +20,7 @@ // THE SOFTWARE. // -public protocol PaginatorUIDelegate: class { +public protocol PaginatorUIDelegate: AnyObject { associatedtype ErrorType diff --git a/TISwiftUtils/TISwiftUtils.podspec b/TISwiftUtils/TISwiftUtils.podspec index 011ad03f..7e7e8493 100644 --- a/TISwiftUtils/TISwiftUtils.podspec +++ b/TISwiftUtils/TISwiftUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TISwiftUtils' - s.version = '1.5.0' + s.version = '1.5.1' s.summary = 'Bunch of useful helpers for Swift development.' s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TITableKitUtils/TITableKitUtils.podspec b/TITableKitUtils/TITableKitUtils.podspec index 370efe05..cdcfa5e8 100644 --- a/TITableKitUtils/TITableKitUtils.podspec +++ b/TITableKitUtils/TITableKitUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TITableKitUtils' - s.version = '1.5.0' + s.version = '1.5.1' s.summary = 'Set of helpers for TableKit classes.' s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TITransitions/TITransitions.podspec b/TITransitions/TITransitions.podspec index b23f382f..561c6a75 100644 --- a/TITransitions/TITransitions.podspec +++ b/TITransitions/TITransitions.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TITransitions' - s.version = '1.5.0' + s.version = '1.5.1' s.summary = 'Set of custom transitions to present controller. ' s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIUIElements/TIUIElements.podspec b/TIUIElements/TIUIElements.podspec index 806f2f67..26a60423 100644 --- a/TIUIElements/TIUIElements.podspec +++ b/TIUIElements/TIUIElements.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIUIElements' - s.version = '1.5.0' + s.version = '1.5.1' s.summary = 'Bunch of useful protocols and views.' s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIUIKitCore/Sources/Protocols/ActivityIndicator/ActivityIndicatorHolder.swift b/TIUIKitCore/Sources/Protocols/ActivityIndicator/ActivityIndicatorHolder.swift index dffd4b32..8865d21a 100644 --- a/TIUIKitCore/Sources/Protocols/ActivityIndicator/ActivityIndicatorHolder.swift +++ b/TIUIKitCore/Sources/Protocols/ActivityIndicator/ActivityIndicatorHolder.swift @@ -23,7 +23,7 @@ import UIKit /// Protocol that describes placeholder view, containing activity indicator. -public protocol ActivityIndicatorHolder: class { +public protocol ActivityIndicatorHolder: AnyObject { var activityIndicator: Animatable { get } var indicatorOwner: UIView { get } } diff --git a/TIUIKitCore/TIUIKitCore.podspec b/TIUIKitCore/TIUIKitCore.podspec index 526a1dc6..9498c4a0 100644 --- a/TIUIKitCore/TIUIKitCore.podspec +++ b/TIUIKitCore/TIUIKitCore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIUIKitCore' - s.version = '1.5.0' + s.version = '1.5.1' s.summary = 'Core UI elements: protocols, views and helpers.' s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' }