Update code for newer Swift 5

abelsanchezali · Sep 30, 2021 · 55ca397 · 55ca397
1 parent e9ecaba
commit 55ca397
Show file tree

Hide file tree

Showing 139 changed files with 1,120 additions and 994 deletions.
diff --git a/Source/Document/Addin/Childs/DocumentChildsProcessor.swift b/Source/Document/Addin/Childs/DocumentChildsProcessor.swift
@@ -8,6 +8,7 @@
 
 import Foundation
 
+@objc
 public protocol DocumentChildsProcessor {
     func processDocument(childs: DocumentChildVisitor)
 }
diff --git a/Source/Document/Addin/Childs/ObjectTransformable.swift b/Source/Document/Addin/Childs/ObjectTransformable.swift
@@ -8,6 +8,6 @@
 
 import Foundation
 
-public protocol ObjectTransformable: class {
+public protocol ObjectTransformable: AnyObject {
     func transformToObjects() -> [Any]?
 }
diff --git a/Source/Document/Addin/Childs/ValueProviderProtocol.swift b/Source/Document/Addin/Childs/ValueProviderProtocol.swift
@@ -10,4 +10,4 @@ import Foundation
 
 public protocol ValueProviderProtocol {
     func getPresentedValue() -> Any?
-}
+}
diff --git a/Source/Document/Addin/Properties/NSValueConvertible.swift b/Source/Document/Addin/Properties/NSValueConvertible.swift
@@ -10,4 +10,4 @@ import Foundation
 
 public protocol NSValueConvertible {
     func convertToNSValue() -> NSValue?
-}
+}
diff --git a/Source/Document/Addin/Properties/Numeric.swift b/Source/Document/Addin/Properties/Numeric.swift
@@ -12,39 +12,69 @@ import CoreGraphics
 // MARK: IntMaxConvertible Protocol
 
 protocol IntMaxConvertible {
-    func toIntMax() -> IntMax
+    func toIntMax() -> Int64
 }
 
 // MARK: IntMaxConvertible for Integer Types
 
 extension Int: IntMaxConvertible {
+  func toIntMax() -> Int64 {
+      return Int64(self)
+  }
 }
 
 extension UInt: IntMaxConvertible {
+  func toIntMax() -> Int64 {
+      return Int64(self)
+  }
 }
 
 extension Int8: IntMaxConvertible {
+  func toIntMax() -> Int64 {
+      return Int64(self)
+  }
 }
 
 extension Int16: IntMaxConvertible {
+  func toIntMax() -> Int64 {
+      return Int64(self)
+  }
 }
 
 extension Int32: IntMaxConvertible {
+  func toIntMax() -> Int64 {
+      return Int64(self)
+  }
 }
 
 extension Int64: IntMaxConvertible {
+  func toIntMax() -> Int64 {
+      return Int64(self)
+  }
 }
 
 extension UInt8: IntMaxConvertible {
+  func toIntMax() -> Int64 {
+      return Int64(self)
+  }
 }
 
 extension UInt16: IntMaxConvertible {
+  func toIntMax() -> Int64 {
+      return Int64(self)
+  }
 }
 
 extension UInt32: IntMaxConvertible {
+  func toIntMax() -> Int64 {
+      return Int64(self)
+  }
 }
 
 extension UInt64: IntMaxConvertible {
+  func toIntMax() -> Int64 {
+      return Int64(self)
+  }
 }
 
 // MARK: Int

diff --git a/Source/Document/Addin/Properties/PropertyHelper.swift b/Source/Document/Addin/Properties/PropertyHelper.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 class PropertyHelper {
-
+    
     @discardableResult public static func setProperty(_ instance: Any, name: String, value: Any?, hasPath: Bool = false) -> Bool {
         if let accesible = instance as? KeyValueAccesible {
             return hasPath ?

diff --git a/Source/Document/Cache/DocumentCacheProtocol.swift b/Source/Document/Cache/DocumentCacheProtocol.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-public protocol DocumentCacheProtocol: class {
+public protocol DocumentCacheProtocol: AnyObject {
     func getDocumentWithKey(_ key: AnyObject) -> DataDocument?
     func saveDocumentWithKey(_ key: AnyObject, document: DataDocument) -> Bool
     func removeDocumentWithKey(_ key: AnyObject) -> Bool

diff --git a/Source/Document/Core/DefaultConstructor.swift b/Source/Document/Core/DefaultConstructor.swift
@@ -8,6 +8,6 @@
 
 import Foundation
 
-public protocol DefaultConstructor: class {
+public protocol DefaultConstructor: AnyObject {
     init()
 }
diff --git a/Source/Document/Core/DefaultTextDeserializerService.swift b/Source/Document/Core/DefaultTextDeserializerService.swift
@@ -105,7 +105,7 @@ open class DefaultTextDeserializerService: TextDeserializerServiceProtocol {
     open func getValueAndMutability(_ text: String) -> (Any?, Bool) {
         var value: Any? = nil
         if text.hasPrefix("@") {
-            let key = text.substring(from: text.characters.index(text.startIndex, offsetBy: 1))
+            let key = text.substring(from: text.index(text.startIndex, offsetBy: 1))
             value = resolveValueForKey(key)
             if let value = value {
                 return (value, false)

diff --git a/Source/Document/Core/DocumentBuilder+Build.swift b/Source/Document/Core/DocumentBuilder+Build.swift
@@ -17,7 +17,7 @@ extension DocumentBuilder {
 
      - Parameter path:     Path to Document.
      - Parameter options:  Options to be used during build process.
-
+     
      - Returns: An instance of type T described in document.
     */
     public func load<T>(_ path: String, options: BuildOptions? = nil) -> T? {

diff --git a/Source/Document/Core/DocumentFactory+Build.swift b/Source/Document/Core/DocumentFactory+Build.swift
@@ -12,12 +12,12 @@ import UIKit
 
 public extension DocumentFactory {
 
-    public func buildObject(_ options: InstantiationOptions? = nil) -> Any? {
+    func buildObject(_ options: InstantiationOptions? = nil) -> Any? {
         let options = options ?? InstantiationOptions()
         return buildNode(document.baseNode, instance: options.baseInstance)
     }
 
-    public func build<T>(_ options: InstantiationOptions? = nil) -> T? {
+    func build<T>(_ options: InstantiationOptions? = nil) -> T? {
         let options = options ?? InstantiationOptions()
         guard let _ = document.baseNode.referenceType as? T.Type else {
             if options.verbose {
@@ -28,15 +28,15 @@ public extension DocumentFactory {
         return buildNode(document.baseNode, instance: options.baseInstance) as? T
     }
 
-    public func buildResources(_ options: InstantiationOptions? = nil) -> Resources? {
+    func buildResources(_ options: InstantiationOptions? = nil) -> Resources? {
         return build(options)
     }
 }
 
 // MARK: UIKit
 
 public extension DocumentFactory {
-    public func buildView(_ options: InstantiationOptions? = nil) -> UIView? {
+    func buildView(_ options: InstantiationOptions? = nil) -> UIView? {
         return build(options)
     }
 }
diff --git a/Source/Document/Core/DocumentFactory.swift b/Source/Document/Core/DocumentFactory.swift
@@ -11,7 +11,7 @@ import Foundation
 public class DocumentFactory: NSObject {
 
     static let DomainsValuesPrefix = "domains."
-    static let DomainsValuesPrefixLength = DocumentFactory.DomainsValuesPrefix.characters.count
+    static let DomainsValuesPrefixLength = DocumentFactory.DomainsValuesPrefix.count
 
     public let document: DataDocument
     public let builder: DocumentBuilder
@@ -166,7 +166,7 @@ public class DocumentFactory: NSObject {
 
         func valueForKey(_ key: String) -> Any? {
             if key.hasPrefix(DocumentFactory.DomainsValuesPrefix) {
-                return domainForPrefix(key.substring(from: key.characters.index(key.startIndex, offsetBy: DocumentFactory.DomainsValuesPrefixLength)))
+                return domainForPrefix(key.substring(from: key.index(key.startIndex, offsetBy: DocumentFactory.DomainsValuesPrefixLength)))
             }
             if let resourceValue = document.resources[key] {
                 return resourceValue

diff --git a/Source/Document/Core/KeyValueResolverProtocol.swift b/Source/Document/Core/KeyValueResolverProtocol.swift
@@ -8,6 +8,6 @@
 
 import Foundation
 
-public protocol KeyValueResolverProtocol: class {
+public protocol KeyValueResolverProtocol: AnyObject {
     func resolveValue(for key: String) -> Any?
 }
diff --git a/Source/Document/Core/PropertyCollection.swift b/Source/Document/Core/PropertyCollection.swift
@@ -46,7 +46,7 @@ open class PropertyCollection: Sequence {
         propertiesByName[property.name] = property
     }
 
-    open func makeIterator() -> LazyMapIterator<DictionaryIterator<String, Property>, Property> {
-        return propertiesByName.values.makeIterator()
+  open func makeIterator() -> Dictionary<String, Property>.Values.Iterator {
+    return propertiesByName.values.makeIterator();
     }
 }
diff --git a/Source/Document/Core/TextDeserializer.swift b/Source/Document/Core/TextDeserializer.swift
@@ -14,13 +14,13 @@ public protocol TextDeserializer {
 }
 
 public extension TextDeserializer {
-    public static func isDeserializedInstanceMutable() -> Bool {
+    static func isDeserializedInstanceMutable() -> Bool {
         return false
     }
 }
 
 public extension TextDeserializer {
-    public static func deserialize(text: String?) -> Any? {
+    static func deserialize(text: String?) -> Any? {
         return deserialize(text: text, service: DefaultTextDeserializerService.shared)
     }
 }

diff --git a/Source/Document/Core/TextDeserializerServiceProtocol.swift b/Source/Document/Core/TextDeserializerServiceProtocol.swift
@@ -12,8 +12,8 @@ public protocol TextDeserializerServiceProtocolDelegate: KeyValueResolverProtoco
     func resolveDomain(for prefix: String) -> String?
 }
 
-public protocol TextDeserializerServiceProtocol: class {
-    weak var delegate: TextDeserializerServiceProtocolDelegate? { get set }
+public protocol TextDeserializerServiceProtocol: AnyObject {
+    var delegate: TextDeserializerServiceProtocolDelegate? { get set }
 
     func parseValidWordsArray(from text: String) -> [String]?
     func parseValidDoubleArray(from text: String) -> [Double]?

diff --git a/Source/Document/Deserializer/DataDeserializerProtocol.swift b/Source/Document/Deserializer/DataDeserializerProtocol.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-public protocol DataDeserializerProtocol: class, DefaultConstructor {
+public protocol DataDeserializerProtocol: DefaultConstructor {
     static var identifier: String { get }
     func loadData(from path: String, options: DocumentOptions) -> DataNode?
 }
diff --git a/Source/Document/Deserializer/XMLDataDeserializer.swift b/Source/Document/Deserializer/XMLDataDeserializer.swift
@@ -47,12 +47,12 @@ class XMLDataDeserializerNSXMLParserDelegate: NSObject, XMLParserDelegate {
         }
 
         if namespace.hasPrefix("@") {
-            let key = namespace.substring(from: namespace.characters.index(namespace.startIndex, offsetBy: 1))
+            let key = namespace.substring(from: namespace.index(namespace.startIndex, offsetBy: 1))
             // Resolve namespaces with module name
             if let match = Constants.moduleWithNameExpresion?.firstMatch(in: key,
                                                                          options: NSRegularExpression.MatchingOptions(rawValue: 0),
-                                                                         range: NSMakeRange(0, key.characters.count)),
-                let nameParameter = key.substring(match.rangeAt(1)) {
+                                                                         range: NSMakeRange(0, key.count)),
+               let nameParameter = key.substring(match.range(at:1)) {
                 return options.resolveNamespaceWithName(nameParameter)
             }
             // Fallback to defined namespaces

diff --git a/Source/Document/Helpers/ReflectionHelper.swift b/Source/Document/Helpers/ReflectionHelper.swift
@@ -25,7 +25,7 @@ open class ReflectionHelper {
             }
             let bundlePath = b.bundlePath
             if path.hasPrefix(bundlePath) {
-                let bundlePathLength = bundlePath.characters.count
+                let bundlePathLength = bundlePath.count
                 if  bundlePathLength > best {
                     best = bundlePathLength
                     bundle = b
@@ -137,8 +137,10 @@ open class ReflectionHelper {
     }
 
     public class func swizzleMethod(_ originalType: AnyClass, originalSelector: Selector, _ swizzledType: AnyClass, swizzledSelector: Selector) {
-        let originalMethod = class_getInstanceMethod(originalType, originalSelector)
-        let swizzledMethod = class_getInstanceMethod(swizzledType, swizzledSelector)
+        guard let originalMethod = class_getInstanceMethod(originalType, originalSelector),
+              let swizzledMethod = class_getInstanceMethod(swizzledType, swizzledSelector) else {
+          return;
+        }
 
         let didAddMethod = class_addMethod(originalType, originalSelector, method_getImplementation(swizzledMethod), method_getTypeEncoding(swizzledMethod))