Address linter issues

Author: denischilik

mParticle-Apple-SDK-Swift/Sources/Utils/MPDevice.swift

@@ -71,7 +71,7 @@ public class MPDevice: NSObject, NSCopying {
         self.userDefaults = userDefaults
         self.identity = identity
         self.logger = logger
-        
+
         super.init()
     }
 
@@ -89,9 +89,6 @@ public class MPDevice: NSObject, NSCopying {
 
     private var _advertiserId: String?
     @objc public private(set) var advertiserId: String? {
-        set {
-            _advertiserId = newValue
-        }
         get {
             if let adID = _advertiserId {
                 return adID
@@ -103,13 +100,13 @@ public class MPDevice: NSObject, NSCopying {
                 }
             }
         }
+        set {
+            _advertiserId = newValue
+        }
     }
 
     private var _architecture: String?
     @objc public private(set) var architecture: String {
-        set {
-            _architecture = newValue
-        }
         get {
             if let arch = _architecture {
                 return arch
@@ -120,6 +117,9 @@ public class MPDevice: NSObject, NSCopying {
                 return String(cString: archRaw)
             }
         }
+        set {
+            _architecture = newValue
+        }
     }
 
     @objc public var brand: String {
@@ -158,9 +158,6 @@ public class MPDevice: NSObject, NSCopying {
 
     private var _model: String?
     @objc public private(set) var model: String {
-        set {
-            _model = newValue
-        }
         get {
             if _model == nil {
                 var size = 0
@@ -176,6 +173,9 @@ public class MPDevice: NSObject, NSCopying {
                 return "Not available."
             }
         }
+        set {
+            _model = newValue
+        }
     }
 
     @objc open var name: String {
@@ -214,9 +214,6 @@ public class MPDevice: NSObject, NSCopying {
 
     private var _vendorId: String?
     @objc public private(set) var vendorId: String? {
-        set {
-            _vendorId = newValue
-        }
         get {
             if _vendorId == nil {
                 if let vendor = userDefaults[Device.kMPDeviceAppVendorIdKey] as? String,
@@ -229,6 +226,9 @@ public class MPDevice: NSObject, NSCopying {
             }
             return _vendorId
         }
+        set {
+            _vendorId = newValue
+        }
     }
 
     @objc public var buildId: String? {
@@ -241,11 +241,8 @@ public class MPDevice: NSObject, NSCopying {
 
     private var _screenSize: CGSize?
     @objc public private(set) var screenSize: CGSize {
-        set {
-            _screenSize = newValue
-        }
         get {
-            if let screenSize = _screenSize, !CGSizeEqualToSize(screenSize, CGSizeZero) {
+            if let screenSize = _screenSize, !CGSizeEqualToSize(screenSize, .zero) {
                 return screenSize
             } else {
                 let bounds = UIScreen.main.bounds
@@ -255,6 +252,9 @@ public class MPDevice: NSObject, NSCopying {
                 return screenSize
             }
         }
+        set {
+            _screenSize = newValue
+        }
     }
 
     @objc public var isDaylightSavingTime: Bool {

mParticle-Apple-SDK-Swift/Test/Utils/MPDeviceTests.swift

@@ -3,43 +3,38 @@ import XCTest
 
 class MPStateMachineMPDeviceMock: MPStateMachineMPDeviceProtocol {
     var deviceTokenType: String?
-    
     var attAuthorizationStatus: NSNumber?
-    
     var attAuthorizationTimestamp: NSNumber?
-    
 }
 
 class MPIdentityApiMPUserDefaultsMock: MPIdentityApiMPUserDefaultsProtocol {
     var map: [String: Any] = [:]
-    
+
     subscript(key: String) -> Any? {
         get {
             return map[key]
         }
         set(newValue) {
-            map[key] = newValue;
+            map[key] = newValue
         }
     }
-    
 }
 
 class MPIdentityApiMPDeviceMock: MPIdentityApiMPDeviceProtocol {
     func currentUserIdentities() -> [NSNumber: String]? {
         return nil
     }
-    
+
     func userIdentities(mpId: NSNumber) -> [NSNumber: String]? {
         return nil
     }
-    
 }
 
 final class MPDeviceTests: XCTestCase {
 
     func testDictionaryDescription() {
         let kMPDeviceTokenKey = "to"
-        let testDeviceToken = "<000000000000000000000000000000>".data(using: .utf8)!
+        let testDeviceToken = Data("<000000000000000000000000000000>".utf8)
         let userDefaults = MPIdentityApiMPUserDefaultsMock()
         userDefaults[kMPDeviceTokenKey] = testDeviceToken