Build fixes

This reverts commit 5109af4181.

Cartfile

@@ -1,7 +1,7 @@
-binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/SwiftDate/SwiftDate.json"
-binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/Alamofire/Alamofire.json"
-binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/RxAlamofire/RxAlamofire.json"
-binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/TableKit/TableKit.json"
-binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/RxSwift/RxSwift.json"
-binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/UIScrollView_InfiniteScroll/UIScrollView_InfiniteScroll.json"
-binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/SnapKit/SnapKit.json"
+binary "https://raw.github.com/TouchInstinct/CarthageBinaries/rebuild_with_swift_5_1_v2/SwiftDate/SwiftDate.json"
+binary "https://raw.github.com/TouchInstinct/CarthageBinaries/rebuild_with_swift_5_1_v2/Alamofire/Alamofire.json"
+binary "https://raw.github.com/TouchInstinct/CarthageBinaries/rebuild_with_swift_5_1_v2/RxAlamofire/RxAlamofire.json"
+binary "https://raw.github.com/TouchInstinct/CarthageBinaries/rebuild_with_swift_5_1_v2/TableKit/TableKit.json"
+binary "https://raw.github.com/TouchInstinct/CarthageBinaries/rebuild_with_swift_5_1_v2/RxSwift/RxSwift.json"
+binary "https://raw.github.com/TouchInstinct/CarthageBinaries/rebuild_with_swift_5_1_v2/UIScrollView_InfiniteScroll/UIScrollView_InfiniteScroll.json"
+binary "https://raw.github.com/TouchInstinct/CarthageBinaries/rebuild_with_swift_5_1_v2/SnapKit/SnapKit.json"

Cartfile.resolved

@@ -1,7 +1,7 @@
-binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/Alamofire/Alamofire.json" "4.8.1"
-binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/RxAlamofire/RxAlamofire.json" "4.3.0"
-binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/RxSwift/RxSwift.json" "4.4.2"
-binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/SnapKit/SnapKit.json" "4.2.0"
-binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/SwiftDate/SwiftDate.json" "5.1.0"
-binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/TableKit/TableKit.json" "2.10008.1"
-binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/UIScrollView_InfiniteScroll/UIScrollView_InfiniteScroll.json" "1.1.0"
+binary "https://raw.github.com/TouchInstinct/CarthageBinaries/rebuild_with_swift_5_1_v2/Alamofire/Alamofire.json" "4.8.1"
+binary "https://raw.github.com/TouchInstinct/CarthageBinaries/rebuild_with_swift_5_1_v2/RxAlamofire/RxAlamofire.json" "4.3.0"
+binary "https://raw.github.com/TouchInstinct/CarthageBinaries/rebuild_with_swift_5_1_v2/RxSwift/RxSwift.json" "4.5.0"
+binary "https://raw.github.com/TouchInstinct/CarthageBinaries/rebuild_with_swift_5_1_v2/SnapKit/SnapKit.json" "4.2.0"
+binary "https://raw.github.com/TouchInstinct/CarthageBinaries/rebuild_with_swift_5_1_v2/SwiftDate/SwiftDate.json" "6.0.3"
+binary "https://raw.github.com/TouchInstinct/CarthageBinaries/rebuild_with_swift_5_1_v2/TableKit/TableKit.json" "2.10008.1"
+binary "https://raw.github.com/TouchInstinct/CarthageBinaries/rebuild_with_swift_5_1_v2/UIScrollView_InfiniteScroll/UIScrollView_InfiniteScroll.json" "1.1.0"

Sources/Classes/DataLoading/PaginationDataLoading/PaginationDataLoadingModel.swift

@@ -24,7 +24,7 @@ import RxSwift
 
 /// Data loading model for PaginationDataLoadingState with ResettableRxDataSourceCursor as data source.
 public final class PaginationDataLoadingModel<Cursor: ResettableRxDataSourceCursor>:
-    RxDataLoadingModel<PaginationDataLoadingState<Cursor>> {
+RxDataLoadingModel<PaginationDataLoadingState<Cursor>> {
 
     private enum LoadType {
 

Sources/Classes/Search/BaseSearchViewController.swift

@@ -27,7 +27,7 @@ import UIKit
 public typealias SearchResultsController = UIViewController & SearchResultsViewController
 
 /// Class that allows to enter text for search and then displays search results in table view
-open class BaseSearchViewController<Item,
+open class BaseSearchViewController < Item,
     ItemViewModel,
     ViewModel,
     CustomView: UIView & TableViewHolder>: BaseCustomViewController<ViewModel, CustomView>

Sources/Classes/Views/CustomizableButton/CustomizableButtonView.swift

@@ -139,7 +139,7 @@ open class CustomizableButtonView: UIView, InitializableView {
 
     private func set(active: Bool) {
         button.isEnabled = buttonIsDisabledWhileLoading || !active
-        
+
         if hidesLabelWhenLoading {
             button.titleLabel?.layer.opacity = active ? 0 : 1
         }
@@ -186,6 +186,7 @@ open class CustomizableButtonView: UIView, InitializableView {
                 spinnerView.centerXAnchor.constraint(equalTo: button.centerXAnchor),
                 spinnerView.centerYAnchor.constraint(equalTo: button.centerYAnchor)
             ]
+
         case .leftToText(let offset):
             if let buttonLabel = button.titleLabel {
                 constraints = [
@@ -193,6 +194,7 @@ open class CustomizableButtonView: UIView, InitializableView {
                     spinnerView.trailingAnchor.constraint(equalTo: buttonLabel.leadingAnchor, constant: -offset)
                 ]
             }
+
         case .rightToText(let offset):
             if let buttonLabel = button.titleLabel {
                 constraints = [
@@ -248,7 +250,7 @@ private extension UIView {
             leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: offset.left),
             trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: offset.right),
             topAnchor.constraint(equalTo: view.topAnchor, constant: offset.top),
-            bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: offset.bottom),
+            bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: offset.bottom)
         ]
         NSLayoutConstraint.activate(constraints)
     }
@@ -329,7 +331,6 @@ public extension CustomizableButtonView {
 
             self.numberOfLines = numberOfLines
         }
-
     }
 
     enum SpinnerPosition {

Sources/Extensions/UIKit/UIViewController/UIViewController+PresentFullScreen.swift

@@ -1,4 +1,4 @@
-import UIkit
+import UIKit
 
 public extension UIViewController {