Merge pull request #61 from zenangst/fix/warnings-on-macos

Fix warnings on macOS
zenangst · Jan 15, 2019 · 9cb5302 · 9cb5302
2 parents 32f48b5 + 1cf4448
commit 9cb5302
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 23 deletions.
diff --git a/Hue.xcodeproj/project.pbxproj b/Hue.xcodeproj/project.pbxproj
@@ -383,7 +383,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 1010;
 				ORGANIZATIONNAME = "Hyper Interaktiv AS";
 				TargetAttributes = {
 					386887901C8343CF005A8868 = {
@@ -723,12 +723,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;
@@ -780,12 +782,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/Hue.xcodeproj/xcshareddata/xcschemes/Hue-iOS.xcscheme b/Hue.xcodeproj/xcshareddata/xcschemes/Hue-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1010"
    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/Hue.xcodeproj/xcshareddata/xcschemes/Hue-macOS.xcscheme b/Hue.xcodeproj/xcshareddata/xcschemes/Hue-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Hue.xcodeproj/xcshareddata/xcschemes/Hue-tvOS.xcscheme b/Hue.xcodeproj/xcshareddata/xcschemes/Hue-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1010"
    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/Source/macOS/NSColor+Hue.swift b/Source/macOS/NSColor+Hue.swift
@@ -6,26 +6,30 @@ public extension NSColor {
   /// Constructing color from hex string
   ///
   /// - Parameter hex: A hex string, can either contain # or not
-  convenience init(hex: String) {
-    var hex = hex.hasPrefix("#")
-      ? String(hex.characters.dropFirst())
-      : hex
-
-    guard hex.characters.count == 3 || hex.characters.count == 6
+  convenience init(hex string: String) {
+    var hex = string.hasPrefix("#")
+      ? String(string.dropFirst())
+      : string
+    guard hex.count == 3 || hex.count == 6
       else {
         self.init(white: 1.0, alpha: 0.0)
         return
     }
-    if hex.characters.count == 3 {
-      for (index, char) in hex.characters.enumerated() {
-        hex.insert(char, at: hex.characters.index(hex.startIndex, offsetBy: index * 2))
+    if hex.count == 3 {
+      for (index, char) in hex.enumerated() {
+        hex.insert(char, at: hex.index(hex.startIndex, offsetBy: index * 2))
       }
     }
 
+    guard let intCode = Int(hex, radix: 16) else {
+      self.init(white: 1.0, alpha: 0.0)
+      return
+    }
+
     self.init(
-      red:   CGFloat((Int(hex, radix: 16)! >> 16) & 0xFF) / 255.0,
-      green: CGFloat((Int(hex, radix: 16)! >> 8) & 0xFF) / 255.0,
-      blue:  CGFloat((Int(hex, radix: 16)!) & 0xFF) / 255.0, alpha: 1.0)
+      red:   CGFloat((intCode >> 16) & 0xFF) / 255.0,
+      green: CGFloat((intCode >> 8) & 0xFF) / 255.0,
+      blue:  CGFloat((intCode) & 0xFF) / 255.0, alpha: 1.0)
   }
 
   /// Adjust color based on saturation
@@ -97,9 +101,9 @@ public extension NSColor {
     let threshold: CGFloat = 0.25
     var result = false
 
-    if fabs(bg[0] - fg[0]) > threshold || fabs(bg[1] - fg[1]) > threshold || fabs(bg[2] - fg[2]) > threshold {
-      if fabs(bg[0] - bg[1]) < 0.03 && fabs(bg[0] - bg[2]) < 0.03 {
-        if fabs(fg[0] - fg[1]) < 0.03 && fabs(fg[0] - fg[2]) < 0.03 {
+    if abs(bg[0] - fg[0]) > threshold || abs(bg[1] - fg[1]) > threshold || abs(bg[2] - fg[2]) > threshold {
+      if abs(bg[0] - bg[1]) < 0.03 && abs(bg[0] - bg[2]) < 0.03 {
+        if abs(fg[0] - fg[1]) < 0.03 && abs(fg[0] - fg[2]) < 0.03 {
           result = false
         }
       }