Fix warnings (#388)

* Fix warnings * Update travis config to use 9.3
ps2 · Apr 12, 2018 · 489575d · 489575d
1 parent 4a3437e
commit 489575d
Show file tree

Hide file tree

Showing 21 changed files with 29 additions and 37 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,6 +17,7 @@ DerivedData
 *.ipa
 *.xcuserstate
 *.xcscmblueprint
+project.xcworkspace
 .DS_Store
 *.log
 

diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,5 @@
 language: objective-c
-osx_image: xcode9.2
-xcode_sdk: iphonesimulator11.2
+osx_image: xcode9.3
 xcode_project: RileyLink.xcodeproj
 xcode_scheme: RileyLink
 script:

diff --git a/MinimedKit/Extensions/Int.swift b/MinimedKit/Extensions/Int.swift
@@ -10,7 +10,7 @@ import Foundation
 
 
 extension Int {
- init<T: Collection>(bigEndianBytes bytes: T) where T.Iterator.Element == UInt8, T.IndexDistance == Int {
+ init<T: Collection>(bigEndianBytes bytes: T) where T.Element == UInt8 {
  assert(bytes.count <= 4)
  var result: UInt = 0
 

diff --git a/MinimedKit/Messages/MySentryAckMessageBody.swift b/MinimedKit/Messages/MySentryAckMessageBody.swift
@@ -35,7 +35,7 @@ public struct MySentryAckMessageBody: MessageBody {
 
  sequence = rxData[0]
  mySentryID = rxData.subdata(in: 1..<4)
- responseMessageTypes = rxData[5..<9].flatMap({ MessageType(rawValue: $0) })
+ responseMessageTypes = rxData[5..<9].compactMap({ MessageType(rawValue: $0) })
  }
 
  public var txData: Data {

diff --git a/RileyLink.xcodeproj/project.pbxproj b/RileyLink.xcodeproj/project.pbxproj
@@ -1878,7 +1878,7 @@
  isa = PBXProject;
  attributes = {
  LastSwiftUpdateCheck = 0900;
- LastUpgradeCheck = 0910;
+ LastUpgradeCheck = 0930;
  ORGANIZATIONNAME = "Pete Schwamb";
  TargetAttributes = {
  431CE76E1F98564100255374 = {
@@ -3088,12 +3088,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;
@@ -3145,12 +3147,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/RileyLink.xcodeproj/xcshareddata/xcschemes/Crypto.xcscheme b/RileyLink.xcodeproj/xcshareddata/xcschemes/Crypto.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "0910"
+ LastUpgradeVersion = "0930"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
  buildConfiguration = "Debug"
  selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
  selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- language = ""
  shouldUseLaunchSchemeArgsEnv = "YES">
  <Testables>
  </Testables>
@@ -37,7 +36,6 @@
  buildConfiguration = "Debug"
  selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
  selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- language = ""
  launchStyle = "0"
  useCustomWorkingDirectory = "NO"
  ignoresPersistentStateOnLaunch = "NO"

diff --git a/RileyLink.xcodeproj/xcshareddata/xcschemes/MinimedKit.xcscheme b/RileyLink.xcodeproj/xcshareddata/xcschemes/MinimedKit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "0910"
+ LastUpgradeVersion = "0930"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
  buildConfiguration = "Debug"
  selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
  selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- language = ""
  shouldUseLaunchSchemeArgsEnv = "YES">
  <Testables>
  <TestableReference
@@ -56,7 +55,6 @@
  buildConfiguration = "Debug"
  selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
  selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- language = ""
  launchStyle = "0"
  useCustomWorkingDirectory = "NO"
  ignoresPersistentStateOnLaunch = "NO"

diff --git a/RileyLink.xcodeproj/xcshareddata/xcschemes/NightscoutUploadKit.xcscheme b/RileyLink.xcodeproj/xcshareddata/xcschemes/NightscoutUploadKit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "0910"
+ LastUpgradeVersion = "0930"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
  buildConfiguration = "Debug"
  selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
  selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- language = ""
  shouldUseLaunchSchemeArgsEnv = "YES">
  <Testables>
  <TestableReference
@@ -56,7 +55,6 @@
  buildConfiguration = "Debug"
  selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
  selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- language = ""
  launchStyle = "0"
  useCustomWorkingDirectory = "NO"
  ignoresPersistentStateOnLaunch = "NO"

diff --git a/RileyLink.xcodeproj/xcshareddata/xcschemes/RileyLink.xcscheme b/RileyLink.xcodeproj/xcshareddata/xcschemes/RileyLink.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "0910"
+ LastUpgradeVersion = "0930"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"
@@ -40,9 +40,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">
@@ -111,7 +110,6 @@
  buildConfiguration = "Debug"
  selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
  selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- language = ""
  launchStyle = "0"
  useCustomWorkingDirectory = "NO"
  ignoresPersistentStateOnLaunch = "NO"

diff --git a/RileyLink.xcodeproj/xcshareddata/xcschemes/RileyLinkBLEKit.xcscheme b/RileyLink.xcodeproj/xcshareddata/xcschemes/RileyLinkBLEKit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "0910"
+ LastUpgradeVersion = "0930"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
  buildConfiguration = "Debug"
  selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
  selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- language = ""
  shouldUseLaunchSchemeArgsEnv = "YES">
  <Testables>
  <TestableReference
@@ -56,7 +55,6 @@
  buildConfiguration = "Debug"
  selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
  selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- language = ""
  launchStyle = "0"
  useCustomWorkingDirectory = "NO"
  ignoresPersistentStateOnLaunch = "NO"

diff --git a/RileyLink.xcodeproj/xcshareddata/xcschemes/RileyLinkKit.xcscheme b/RileyLink.xcodeproj/xcshareddata/xcschemes/RileyLinkKit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "0910"
+ LastUpgradeVersion = "0930"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
  buildConfiguration = "Debug"
  selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
  selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- language = ""
  shouldUseLaunchSchemeArgsEnv = "YES">
  <Testables>
  <TestableReference
@@ -56,7 +55,6 @@
  buildConfiguration = "Debug"
  selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
  selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- language = ""
  launchStyle = "0"
  useCustomWorkingDirectory = "NO"
  ignoresPersistentStateOnLaunch = "NO"

diff --git a/RileyLink.xcodeproj/xcshareddata/xcschemes/RileyLinkKitUI.xcscheme b/RileyLink.xcodeproj/xcshareddata/xcschemes/RileyLinkKitUI.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "0910"
+ LastUpgradeVersion = "0930"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
  buildConfiguration = "Debug"
  selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
  selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- language = ""
  shouldUseLaunchSchemeArgsEnv = "YES">
  <Testables>
  </Testables>
@@ -37,7 +36,6 @@
  buildConfiguration = "Debug"
  selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
  selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- language = ""
  launchStyle = "0"
  useCustomWorkingDirectory = "NO"
  ignoresPersistentStateOnLaunch = "NO"

diff --git a/RileyLink/Images.xcassets/AppIcon.appiconset/Contents.json b/RileyLink/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -135,8 +135,9 @@
  "scale" : "2x"
  },
  {
- "idiom" : "ios-marketing",
  "size" : "1024x1024",
+ "idiom" : "ios-marketing",
+ "filename" : "iTunesArtwork@2x-2.png",
  "scale" : "1x"
  },
  {
@@ -189,8 +190,9 @@
  "subtype" : "42mm"
  },
  {
- "idiom" : "watch-marketing",
  "size" : "1024x1024",
+ "idiom" : "watch-marketing",
+ "filename" : "iTunesArtwork@2x-1.png",
  "scale" : "1x"
  },
  {

diff --git a/RileyLink/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x-1.png b/RileyLink/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x-1.png
diff --git a/RileyLink/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x-2.png b/RileyLink/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x-2.png
diff --git a/RileyLink/View Controllers/RadioSelectionTableViewController.swift b/RileyLink/View Controllers/RadioSelectionTableViewController.swift
@@ -79,7 +79,7 @@ extension RadioSelectionTableViewController {
  let vc = T()
 
  vc.selectedIndex = value?.rawValue
- vc.options = (0..<2).flatMap({ PumpRegion(rawValue: $0) }).map { String(describing: $0) }
+ vc.options = (0..<2).compactMap({ PumpRegion(rawValue: $0) }).map { String(describing: $0) }
  vc.contextHelp = NSLocalizedString("Pump Region is listed on the back of your pump as two of the last three characters of the model string, which reads something like this: MMT-551NAB, or MMT-515LWWS. If your model has an \"NA\" in it, then the region is NorthAmerica. If your model has an \"WW\" in it, then the region is WorldWide.", comment: "Instructions on selecting the pump region")
  return vc
  }

diff --git a/RileyLinkBLEKit/BLEFirmwareVersion.swift b/RileyLinkBLEKit/BLEFirmwareVersion.swift
@@ -21,7 +21,7 @@ public struct BLEFirmwareVersion {
  }
 
  self.versionString = versionString
- components = versionString[versionIndex...].split(separator: ".").flatMap({ Int($0) })
+ components = versionString[versionIndex...].split(separator: ".").compactMap({ Int($0) })
  }
 }
 

diff --git a/RileyLinkBLEKit/CBPeripheral.swift b/RileyLinkBLEKit/CBPeripheral.swift
@@ -11,12 +11,12 @@ import CoreBluetooth
 // MARK: - Discovery helpers.
 extension CBPeripheral {
  func servicesToDiscover(from serviceUUIDs: [CBUUID]) -> [CBUUID] {
- let knownServiceUUIDs = services?.flatMap({ $0.uuid }) ?? []
+ let knownServiceUUIDs = services?.compactMap({ $0.uuid }) ?? []
  return serviceUUIDs.filter({ !knownServiceUUIDs.contains($0) })
  }
 
  func characteristicsToDiscover(from characteristicUUIDs: [CBUUID], for service: CBService) -> [CBUUID] {
- let knownCharacteristicUUIDs = service.characteristics?.flatMap({ $0.uuid }) ?? []
+ let knownCharacteristicUUIDs = service.characteristics?.compactMap({ $0.uuid }) ?? []
  return characteristicUUIDs.filter({ !knownCharacteristicUUIDs.contains($0) })
  }
 }

diff --git a/RileyLinkBLEKit/RadioFirmwareVersion.swift b/RileyLinkBLEKit/RadioFirmwareVersion.swift
@@ -20,7 +20,7 @@ public struct RadioFirmwareVersion {
  }
 
  self.versionString = versionString
- components = versionString[versionIndex...].split(separator: ".").flatMap({ Int($0) })
+ components = versionString[versionIndex...].split(separator: ".").compactMap({ Int($0) })
  }
 
  private init(components: [Int]) {

diff --git a/RileyLinkBLEKit/ResponseBuffer.swift b/RileyLinkBLEKit/ResponseBuffer.swift
@@ -27,6 +27,6 @@ struct ResponseBuffer<R: Response> {
  return []
  }
 
- return segments.flatMap { R(legacyData: $0) }
+ return segments.compactMap { R(legacyData: $0) }
  }
 }
diff --git a/RileyLinkKit/Extensions/RileyLinkDevice.swift b/RileyLinkKit/Extensions/RileyLinkDevice.swift
@@ -9,7 +9,7 @@ import RileyLinkBLEKit
 
 extension RileyLinkDevice.Status {
  public var firmwareDescription: String {
- let versions = [radioFirmwareVersion, bleFirmwareVersion].flatMap { (version: CustomStringConvertible?) -> String? in
+ let versions = [radioFirmwareVersion, bleFirmwareVersion].compactMap { (version: CustomStringConvertible?) -> String? in
  if let version = version {
  return String(describing: version)
  } else {