Fix all Xcode 9.3 warnings (#697)

Bharat Mediratta · ps2 · commit 20d51cb050e6 · 2018-04-04T22:46:14.000-05:00
* Perform automated XCode 9.3 update

* Correct all XCode 9.3 warnings that have an automated fix (ie. flatMap -&gt; compactMap)

* Fix cross-module struct initialization warning
diff --git a/Common/Models/StatusExtensionContext.swift b/Common/Models/StatusExtensionContext.swift
@@ -257,10 +257,7 @@ extension DatedRangeContext: RawRepresentable {
             return nil
         }
 
-        self.startDate = startDate
-        self.endDate = endDate
-        self.minValue = minValue
-        self.maxValue = maxValue
+        self.init(startDate: startDate, endDate: endDate, minValue: minValue, maxValue: maxValue)
     }
 }
 
@@ -287,7 +284,7 @@ struct StatusExtensionContext: RawRepresentable {
         }
 
         if let rawValue = rawValue["glucose"] as? [GlucoseContext.RawValue] {
-            glucose = rawValue.flatMap({return GlucoseContext(rawValue: $0)})
+            glucose = rawValue.compactMap({return GlucoseContext(rawValue: $0)})
         }
 
         if let rawValue = rawValue["predictedGlucose"] as? PredictedGlucoseContext.RawValue {
@@ -311,7 +308,7 @@ struct StatusExtensionContext: RawRepresentable {
         activeInsulin = rawValue["activeInsulin"] as? Double
         
         if let rawValue = rawValue["targetRanges"] as? [DatedRangeContext.RawValue] {
-            targetRanges = rawValue.flatMap({return DatedRangeContext(rawValue: $0)})
+            targetRanges = rawValue.compactMap({return DatedRangeContext(rawValue: $0)})
         }
 
         if let rawValue = rawValue["temporaryOverride"] as? DatedRangeContext.RawValue {
diff --git a/Common/Models/WatchContext.swift b/Common/Models/WatchContext.swift
@@ -76,7 +76,7 @@ final class WatchContext: NSObject, RawRepresentable {
         }
 
         if let configuredOverrideContextsRawValues = rawValue["coc"] as? [GlucoseRangeScheduleOverrideUserInfo.Context.RawValue] {
-            configuredOverrideContexts = configuredOverrideContextsRawValues.flatMap(GlucoseRangeScheduleOverrideUserInfo.Context.init(rawValue:))
+            configuredOverrideContexts = configuredOverrideContextsRawValues.compactMap(GlucoseRangeScheduleOverrideUserInfo.Context.init(rawValue:))
         }
 
         IOB = rawValue["iob"] as? Double
diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj
@@ -1347,7 +1347,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = "LoopKit Authors";
 				TargetAttributes = {
 					43776F8B1B8022E90074EA36 = {
@@ -2036,12 +2036,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -2101,12 +2103,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0910"
+   LastUpgradeVersion = "0930"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -54,7 +54,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -84,7 +83,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/DoseMathTests.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/DoseMathTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0910"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -10,7 +10,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -31,7 +30,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/Loop Status Extension.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/Loop Status Extension.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0910"
+   LastUpgradeVersion = "0930"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction
@@ -41,7 +41,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -61,7 +60,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = ""
       selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/Loop.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/Loop.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0910"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,9 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -57,7 +56,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/LoopTests.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/LoopTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0910"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -10,7 +10,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -31,7 +30,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/Notification - WatchApp.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/Notification - WatchApp.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0910"
+   LastUpgradeVersion = "0930"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -54,7 +54,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -84,7 +83,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/WatchApp.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/WatchApp.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0910"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -54,7 +54,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -84,7 +83,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/Loop/Extensions/NSUserDefaults.swift b/Loop/Extensions/NSUserDefaults.swift
@@ -184,7 +184,7 @@ extension UserDefaults {
             guard let rawValue = array(forKey: Key.insulinCounteractionEffects.rawValue) as? [GlucoseEffectVelocity.RawValue] else {
                 return nil
             }
-            return rawValue.flatMap {
+            return rawValue.compactMap {
                 GlucoseEffectVelocity(rawValue: $0)
             }
         }
diff --git a/Loop/Managers/CGM/CGMManager.swift b/Loop/Managers/CGM/CGMManager.swift
@@ -38,7 +38,7 @@ protocol CGMManagerDelegate: class {
 
 
 protocol CGMManager: CustomDebugStringConvertible {
-    weak var delegate: CGMManagerDelegate? { get set }
+    var delegate: CGMManagerDelegate? { get set }
 
     /// Whether the device is capable of waking the app
     var providesBLEHeartbeat: Bool { get }
diff --git a/Loop/Managers/CGM/EnliteCGMManager.swift b/Loop/Managers/CGM/EnliteCGMManager.swift
@@ -40,7 +40,7 @@ final class EnliteCGMManager: CGMManager {
 
                 _ = deviceManager.remoteDataManager.nightscoutService.uploader?.processGlucoseEvents(events, source: device.device.deviceURI)
 
-                if let latestSensorEvent = events.flatMap({ $0.glucoseEvent as?  RelativeTimestampedGlucoseEvent }).last {
+                if let latestSensorEvent = events.compactMap({ $0.glucoseEvent as?  RelativeTimestampedGlucoseEvent }).last {
                     self.sensorState = EnliteSensorDisplayable(latestSensorEvent)
                 }
 
diff --git a/Loop/View Controllers/RadioSelectionTableViewController.swift b/Loop/View Controllers/RadioSelectionTableViewController.swift
@@ -78,7 +78,7 @@ extension RadioSelectionTableViewController {
         let vc = T()
 
         vc.selectedIndex = value.rawValue
-        vc.options = (0..<2).flatMap({ InsulinDataSource(rawValue: $0) }).map { String(describing: $0) }
+        vc.options = (0..<2).compactMap({ InsulinDataSource(rawValue: $0) }).map { String(describing: $0) }
         vc.contextHelp = NSLocalizedString("Insulin delivery can be determined from the pump by either interpreting the event history or comparing the reservoir volume over time. Reading event history allows for a more accurate status graph and uploading up-to-date treatment data to Nightscout, at the cost of faster pump battery drain and the possibility of a higher radio error rate compared to reading only reservoir volume. If the selected source cannot be used for any reason, the system will attempt to fall back to the other option.", comment: "Instructions on selecting an insulin data source")
 
         return vc
@@ -88,7 +88,7 @@ extension RadioSelectionTableViewController {
         let vc = T()
 
         vc.selectedIndex = value.rawValue
-        vc.options = (0..<2).flatMap({ BatteryChemistryType(rawValue: $0) }).map { String(describing: $0) }
+        vc.options = (0..<2).compactMap({ BatteryChemistryType(rawValue: $0) }).map { String(describing: $0) }
         vc.contextHelp = NSLocalizedString("Alkaline and Lithium batteries decay at differing rates. Alkaline tend to have a linear voltage drop over time whereas lithium cell batteries tend to maintain voltage until halfway through their lifespan. Under normal usage in a Non-MySentry compatible Minimed (x22/x15) insulin pump running Loop, Alkaline batteries last approximately 4 to 5 days. Lithium batteries last between 1-2 weeks. This selection will use different battery voltage decay rates for each of the battery chemistry types and alert the user when a battery is approximately 8 to 10 hours from failure.", comment: "Instructions on selecting battery chemistry type")
 
         return vc
diff --git a/LoopUI/Managers/StatusChartsManager.swift b/LoopUI/Managers/StatusChartsManager.swift
@@ -417,7 +417,7 @@ public final class StatusChartsManager {
             frame: frame,
             innerFrame: innerFrame,
             settings: chartSettings,
-            layers: layers.flatMap { $0 }
+            layers: layers.compactMap { $0 }
         )
     }
 
@@ -487,7 +487,7 @@ public final class StatusChartsManager {
             iobLine,
         ]
 
-        return Chart(frame: frame, innerFrame: innerFrame, settings: chartSettings, layers: layers.flatMap { $0 })
+        return Chart(frame: frame, innerFrame: innerFrame, settings: chartSettings, layers: layers.compactMap { $0 })
     }
 
     public func cobChartWithFrame(_ frame: CGRect) -> Chart? {
@@ -544,7 +544,7 @@ public final class StatusChartsManager {
             cobLine
         ]
 
-        return Chart(frame: frame, innerFrame: innerFrame, settings: chartSettings, layers: layers.flatMap { $0 })
+        return Chart(frame: frame, innerFrame: innerFrame, settings: chartSettings, layers: layers.compactMap { $0 })
     }
 
     public func doseChartWithFrame(_ frame: CGRect) -> Chart? {
@@ -632,7 +632,7 @@ public final class StatusChartsManager {
             bolusLayer
         ]
         
-        return Chart(frame: frame, innerFrame: innerFrame, settings: chartSettings, layers: layers.flatMap { $0 })
+        return Chart(frame: frame, innerFrame: innerFrame, settings: chartSettings, layers: layers.compactMap { $0 })
     }
 
     // MARK: - Carb Effect
@@ -765,7 +765,7 @@ public final class StatusChartsManager {
             frame: frame,
             innerFrame: innerFrame,
             settings: chartSettings,
-            layers: layers.flatMap { $0 }
+            layers: layers.compactMap { $0 }
         )
     }
 
@@ -893,7 +893,7 @@ public final class StatusChartsManager {
             frame: frame,
             innerFrame: coordsSpace.chartInnerFrame,
             settings: chartSettings,
-            layers: layers.flatMap { $0 }
+            layers: layers.compactMap { $0 }
         )
     }
 
diff --git a/LoopUI/Views/ChartPointsContextFillLayer.swift b/LoopUI/Views/ChartPointsContextFillLayer.swift
@@ -59,7 +59,7 @@ final class ChartPointsFillsLayer: ChartCoordsSpaceLayer {
     let fills: [ChartPointsFill]
 
     init?(xAxis: ChartAxis, yAxis: ChartAxis, fills: [ChartPointsFill?]) {
-        self.fills = fills.flatMap({ $0 })
+        self.fills = fills.compactMap({ $0 })
 
         guard fills.count > 0 else {
             return nil

Original file line number	Diff line number	Diff line change
`@@ -257,10 +257,7 @@ extension DatedRangeContext: RawRepresentable {`
`257`	`257`	`return nil`
`258`	`258`	`}`
`259`	`259`
`260`		`- self.startDate = startDate`
`261`		`- self.endDate = endDate`
`262`		`- self.minValue = minValue`
`263`		`- self.maxValue = maxValue`
	`260`	`+ self.init(startDate: startDate, endDate: endDate, minValue: minValue, maxValue: maxValue)`
`264`	`261`	`}`
`265`	`262`	`}`
`266`	`263`
`@@ -287,7 +284,7 @@ struct StatusExtensionContext: RawRepresentable {`
`287`	`284`	`}`
`288`	`285`
`289`	`286`	`if let rawValue = rawValue["glucose"] as? [GlucoseContext.RawValue] {`
`290`		`- glucose = rawValue.flatMap({return GlucoseContext(rawValue: $0)})`
	`287`	`+ glucose = rawValue.compactMap({return GlucoseContext(rawValue: $0)})`
`291`	`288`	`}`
`292`	`289`
`293`	`290`	`if let rawValue = rawValue["predictedGlucose"] as? PredictedGlucoseContext.RawValue {`
`@@ -311,7 +308,7 @@ struct StatusExtensionContext: RawRepresentable {`
`311`	`308`	`activeInsulin = rawValue["activeInsulin"] as? Double`
`312`	`309`
`313`	`310`	`if let rawValue = rawValue["targetRanges"] as? [DatedRangeContext.RawValue] {`
`314`		`- targetRanges = rawValue.flatMap({return DatedRangeContext(rawValue: $0)})`
	`311`	`+ targetRanges = rawValue.compactMap({return DatedRangeContext(rawValue: $0)})`
`315`	`312`	`}`
`316`	`313`
`317`	`314`	`if let rawValue = rawValue["temporaryOverride"] as? DatedRangeContext.RawValue {`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ final class WatchContext: NSObject, RawRepresentable {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`if let configuredOverrideContextsRawValues = rawValue["coc"] as? [GlucoseRangeScheduleOverrideUserInfo.Context.RawValue] {`
`79`		`- configuredOverrideContexts = configuredOverrideContextsRawValues.flatMap(GlucoseRangeScheduleOverrideUserInfo.Context.init(rawValue:))`
	`79`	`+ configuredOverrideContexts = configuredOverrideContextsRawValues.compactMap(GlucoseRangeScheduleOverrideUserInfo.Context.init(rawValue:))`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`IOB = rawValue["iob"] as? Double`