updated to Swift 5; added tests for some "items"; removed some obsolete types; version bump

Author: doofyus

AutoAPI.xcodeproj/AutoAPI_Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>10.0.1</string>
+	<string>10.0.2</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>

AutoAPI.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

AutoAPI.xcodeproj/xcshareddata/xcschemes/AutoAPI iOS Universal.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

AutoAPI.xcodeproj/xcshareddata/xcschemes/AutoAPI.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

AutoAPI.xcodeproj/xcshareddata/xcschemes/AutoAPICLT.xcscheme

@@ -98,8 +98,6 @@ public struct AAAutoAPI {
     // MARK: Type Methods
 
     public static func parseBinary<C>(_ binary: C) -> AACapability? where C: Collection, C.Element == UInt8 {
-        let capabilities = AAAutoAPI.capabilities.compactMap { $0 as? AACapabilityClass.Type }
-
-        return capabilities.compactMap { $0.init(bytes: binary.bytes) as? AACapability }.first
+        return AAAutoAPI.capabilities.compactMap { $0.init(bytes: binary.bytes) }.first
     }
 }

Sources/AutoAPI/AAAutoAPI.swift

@@ -136,7 +136,7 @@ extension AACapability {
         var string = string
         var subString: String?
 
-        string.removeFirst(firstParenthesis.encodedOffset + 1)
+        string.removeFirst(firstParenthesis.utf16Offset(in: string) + 1)
         string.removeLast()
 
         // "Clean" the label

Sources/AutoAPI/AACapability.swift

@@ -40,17 +40,13 @@ public class AAHistorical: AACapabilityClass, AACapability {
 
 
     required init(properties: AAProperties) {
-        let capabilities = AAAutoAPI.capabilities.compactMap { $0 as? AACapabilityClass.Type }
-
         /* Level 8 */
         states = properties.filter {
             $0.identifier == 0x01
         }.compactMap {
             $0.valueBytes
-        }.compactMap { bytes in
-            capabilities.compactMap {
-                $0.init(bytes: bytes) as? AACapability
-            }.first
+        }.compactMap {
+            AAAutoAPI.parseBinary($0)
         }
 
         super.init(properties: properties)

Sources/AutoAPI/Capabilities/AAHistorical.swift

@@ -41,17 +41,13 @@ public class AAMultiCommand: AACapabilityClass, AACapability {
 
 
     required init(properties: AAProperties) {
-        let capabilities = AAAutoAPI.capabilities.compactMap { $0 as? AACapabilityClass.Type }
-
         /* Level 9 */
         states = properties.filter {
             $0.identifier == 0x01
         }.compactMap {
             $0.valueBytes
-        }.compactMap { bytes in
-            capabilities.compactMap {
-                $0.init(bytes: bytes) as? AACapability
-            }.first
+        }.compactMap {
+            AAAutoAPI.parseBinary($0)
         }
 
         super.init(properties: properties)

Sources/AutoAPI/Capabilities/AAMultiCommand.swift

@@ -58,8 +58,6 @@ public class AAVehicleStatus: AACapabilityClass, AACapability {
 
 
     required init(properties: AAProperties) {
-        let capabilities = AAAutoAPI.capabilities.compactMap { $0 as? AACapabilityClass.Type }
-
         // Ordered by the ID
         vin = properties.property(forIdentifier: 0x01)
         powerTrain = properties.property(forIdentifier: 0x02)
@@ -87,10 +85,8 @@ public class AAVehicleStatus: AACapabilityClass, AACapability {
             $0.identifier == 0x99
         }.compactMap {
             $0.valueBytes
-        }.compactMap { bytes in
-            capabilities.compactMap {
-                $0.init(bytes: bytes) as? AACapability
-            }.first
+        }.compactMap {
+            AAAutoAPI.parseBinary($0)
         }
 
         super.init(properties: properties)