fix(dependencies): update dependencies and remove macOS support

Author: anonrig

Package.resolved

@@ -5,7 +5,7 @@ import PackageDescription
 
 let rxDependencies: [Package.Dependency] = [
   .package(url: "https://github.com/rxswiftcommunity/rxflow", from: "2.7.0"),
-  .package(url: "https://github.com/sunshinejr/Moya-ModelMapper", .branch("master")),
+  .package(url: "https://github.com/sunshinejr/Moya-ModelMapper", from: "10.0.0"),
   .package(url: "https://github.com/RxSwiftCommunity/RxRealm", from: "2.0.0"),
   .package(url: "https://github.com/RxSwiftCommunity/RxDataSources", from: "4.0.1"),
   .package(url: "https://github.com/RxSwiftCommunity/RxGesture", from: "3.0.3")
@@ -14,7 +14,6 @@ let rxDependencies: [Package.Dependency] = [
 let package = Package(
   name: "Toolkit",
   platforms: [
-    .macOS(.v10_12),
     .iOS(.v12),
     .tvOS(.v10),
     .watchOS(.v3)

Package.swift

@@ -11,10 +11,12 @@ import UIKit
 import SnapKit
 
 public extension UIView {
-  public static func container(_ insertedView: UIView,
-                               centerHorizontally: Bool = false,
-                               centerVertically: Bool = false,
-                               insets: UIEdgeInsets = .init()) -> UIView {
+  
+  static func container(_ insertedView: UIView,
+                        centerHorizontally: Bool = false,
+                        centerVertically: Bool = false,
+                        insets: UIEdgeInsets = .init()) -> UIView {
+    
     let view = UIView()
     view.addSubview(insertedView)
     insertedView.snp.makeConstraints {

Sources/Extensions/UIView+Extensions.swift

@@ -35,7 +35,7 @@ public enum ReachabilityServiceError: Error {
   case failedToCreate
 }
 
-public class DefaultReachabilityService: HasReachabilityService {
+public final class DefaultReachabilityService: HasReachabilityService {
   private let _reachabilitySubject: BehaviorSubject<ReachabilityStatus>
 
   public var reachability: Observable<ReachabilityStatus> {

Sources/RxSwift/ReachabilityService.swift

@@ -7,7 +7,7 @@
 
 import UIKit
 
-public class PaddingLabel: UILabel {
+public final class PaddingLabel: UILabel {
   private struct AssociatedKeys {
     static var padding = UIEdgeInsets()
   }
@@ -23,15 +23,15 @@ public class PaddingLabel: UILabel {
     }
   }
 
-  override open func draw(_ rect: CGRect) {
+  public override func draw(_ rect: CGRect) {
     if let insets = padding {
       self.drawText(in: rect.inset(by: insets))
     } else {
       self.drawText(in: rect)
     }
   }
 
-  override open var intrinsicContentSize: CGSize {
+  public override var intrinsicContentSize: CGSize {
     guard let text = self.text else { return super.intrinsicContentSize }
 
     var contentSize = super.intrinsicContentSize
@@ -45,9 +45,11 @@ public class PaddingLabel: UILabel {
       textWidth -= insetsWidth
     }
 
+    let customFont: UIFont = font ?? .systemFont(ofSize: 16, weight: .regular)
     let newSize = text.boundingRect(with: CGSize(width: textWidth, height: CGFloat.greatestFiniteMagnitude),
                                     options: NSStringDrawingOptions.usesLineFragmentOrigin,
-                                    attributes: [NSAttributedString.Key.font: self.font ?? UIFont.systemFont(ofSize: 16, weight: .regular)], context: nil)
+                                    attributes: [.font: customFont],
+                                    context: nil)
 
     contentSize.height = ceil(newSize.size.height) + insetsHeight
     contentSize.width = ceil(newSize.size.width) + insetsWidth

Sources/Shared/PaddingLabel.swift

@@ -7,7 +7,7 @@
 
 import UIKit
 
-public class RoundImageView: UIImageView {
+public final class RoundImageView: UIImageView {
   public override func layoutSubviews() {
     super.layoutSubviews()
     self.layer.cornerRadius = self.bounds.size.width / 2.0