Update project to more modern swift

Author: WillYu91

ProfileKit/.swiftlint.yml

@@ -22,7 +22,7 @@ disabled_rules:
   #- empty_parameters
   #- empty_parentheses_with_trailing_closure
   #- fallthrough
-  #- file_length
+  - file_length
   #- for_where
   - force_cast
   #- force_try
@@ -133,7 +133,7 @@ file_header: # Correct syntax for the file headers
   required_pattern: |
                     \/\/
                     \/\/  .*?\.swift
-                    \/\/  Profiles
+                    \/\/  ProfileKit
                     \/\/
                     \/\/  Created by .[A-Za-z -]*?\.
                     \/\/  Copyright © \d{4} .[A-Za-z -]*?\. All rights reserved\.

ProfileKit/ProfileKit.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:ProfileKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

ProfileKit/ProfileKit.xcodeproj/xcshareddata/xcschemes/ProfileKit.xcscheme

@@ -1,6 +1,6 @@
 //
 //  Data.swift
-//  Profiles
+//  ProfileKit
 //
 //  Created by Erik Berglund.
 //  Copyright © 2019 Erik Berglund. All rights reserved.
@@ -11,18 +11,18 @@ import Foundation
 extension Data {
 
     // Modified version from https://stackoverflow.com/a/26503955
-    init(withHexString hexString: String) {
-        self.init()
-        var hex = hexString
-        while !hex.isEmpty {
-            let subIndex = hex.index(hex.startIndex, offsetBy: 2)
-            let c = String(hex[..<subIndex])
-            hex = String(hex[subIndex...])
-            var ch: UInt32 = 0
-            Scanner(string: c).scanHexInt32(&ch)
-            var char = UInt8(ch)
-            self.append(&char, count: 1)
+    init?(withHexString hexString: String) {
+        guard hexString.count.isMultiple(of: 2) else {
+            return nil
         }
+
+        let chars = Array(hexString)
+        let bytes = stride(from: 0, to: chars.count, by: 2)
+            .map { String(chars[$0]) + String(chars[$0 + 1]) }
+            .compactMap { UInt8($0, radix: 16) }
+
+        guard hexString.count / bytes.count == 2 else { return nil }
+        self.init(bytes)
     }
 
     func plist() throws -> [String: Any] {

ProfileKit/ProfileKit/Extensions/Data.swift

@@ -1,6 +1,6 @@
 //
 //  Dictionary.swift
-//  Profiles
+//  ProfileKit
 //
 //  Created by Erik Berglund.
 //  Copyright © 2019 Erik Berglund. All rights reserved.

ProfileKit/ProfileKit/Extensions/Dictionary.swift

@@ -2,7 +2,7 @@
 //  FileManager.swift
 //  ProfileKit
 //
-//  Created by Erik Berglund on 2019-06-17.
+//  Created by Erik Berglund.
 //  Copyright © 2019 Erik Berglund. All rights reserved.
 //
 

ProfileKit/ProfileKit/Extensions/FileManager.swift

@@ -1,6 +1,6 @@
 //
 //  KeyedDecodingContainerProtocol.swift
-//  Profiles
+//  ProfileKit
 //
 //  Created by Erik Berglund.
 //  Copyright © 2019 Erik Berglund. All rights reserved.
@@ -88,11 +88,9 @@ public extension KeyedDecodingContainerProtocol {
     func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T: Decodable {
         var map: [Self.Key: T] = [:]
 
-        for key in allKeys {
-            if !excludedKeys.contains(key) {
-                let value = try decode(T.self, forKey: key)
-                map[key] = value
-            }
+        for key in allKeys where !excludedKeys.contains(key) {
+            let value = try decode(T.self, forKey: key)
+            map[key] = value
         }
 
         return map

ProfileKit/ProfileKit/Extensions/KeyedDecodingContainerProtocol.swift

@@ -2,7 +2,7 @@
 //  KeyedEncodingContainerProtocol.swift
 //  ProfileKit
 //
-//  Created by Erik Berglund on 2019-06-12.
+//  Created by Erik Berglund.
 //  Copyright © 2019 Erik Berglund. All rights reserved.
 //
 

ProfileKit/ProfileKit/Extensions/KeyedEncodingContainerProtocol.swift

@@ -1,8 +1,8 @@
 //
-//  Manifest.Category.swift
+//  Manifest+Category.swift
 //  ProfileKit
 //
-//  Created by Erik Berglund on 2019-06-14.
+//  Created by Erik Berglund.
 //  Copyright © 2019 Erik Berglund. All rights reserved.
 //
 

ProfileKit/ProfileKit/Extensions/Manifest.Category.swift renamed to ProfileKit/ProfileKit/Extensions/Manifest+Category.swift

@@ -1,8 +1,8 @@
 //
-//  Manifest.Interaction.swift
+//  Manifest+Interaction.swift
 //  ProfileKit
 //
-//  Created by Erik Berglund on 2019-06-14.
+//  Created by Erik Berglund.
 //  Copyright © 2019 Erik Berglund. All rights reserved.
 //