Merge pull request #135 from square/dfed/xcode_9.3

Fix warnings on Xcode 9.3
square · Mar 30, 2018 · 3ac6cdb · 3ac6cdb
2 parents 88515f5 + f6a4019
commit 3ac6cdb
Show file tree

Hide file tree

Showing 13 changed files with 58 additions and 33 deletions.
diff --git a/Sources/Internal/Keychain.swift b/Sources/Internal/Keychain.swift
@@ -202,11 +202,18 @@ internal final class Keychain {
                 return SecItem.DataResult.success(Set([singleKey]))
 
             } else if let multipleMatches = collection as? [[String: AnyHashable]] {
+                #if swift(>=4.1)
+                return SecItem.DataResult.success(Set(multipleMatches.compactMap({ attributes in
+                    let key = attributes[kSecAttrAccount as String] as? String
+                    return key != canaryKey ? key : nil
+                })))
+                #else
                 return SecItem.DataResult.success(Set(multipleMatches.flatMap({ attributes in
                     let key = attributes[kSecAttrAccount as String] as? String
                     return key != canaryKey ? key : nil
                 })))
-
+                #endif
+
             } else {
                 return SecItem.DataResult.success(Set())
             }

diff --git a/Tests/SecureEnclaveTests.swift b/Tests/SecureEnclaveTests.swift
@@ -102,10 +102,17 @@ class SecureEnclaveTests: XCTestCase
         guard testEnvironmentIsSigned() else {
             return
         }
-
+
+        #if swift(>=4.1)
+        let permutations: [SecureEnclaveValet] = SecureEnclaveAccessControl.allValues().compactMap { accessControl in
+            return .valet(with: valet.identifier, accessControl: accessControl)
+        }
+        #else
         let permutations: [SecureEnclaveValet] = SecureEnclaveAccessControl.allValues().flatMap { accessControl in
             return .valet(with: valet.identifier, accessControl: accessControl)
         }
+        #endif
+
         for permutation in permutations {
             XCTAssertTrue(permutation.canAccessKeychain())
         }
@@ -126,10 +133,17 @@ class SecureEnclaveTests: XCTestCase
         #else
             XCTFail()
         #endif
-
+
+        #if swift(>=4.1)
+        let permutations: [SecureEnclaveValet] = SecureEnclaveAccessControl.allValues().compactMap { accessControl in
+            return .sharedAccessGroupValet(with: sharedAccessGroupIdentifier, accessControl: accessControl)
+        }
+        #else
         let permutations: [SecureEnclaveValet] = SecureEnclaveAccessControl.allValues().flatMap { accessControl in
             return .sharedAccessGroupValet(with: sharedAccessGroupIdentifier, accessControl: accessControl)
         }
+        #endif
+
         for permutation in permutations {
             XCTAssertTrue(permutation.canAccessKeychain())
         }

diff --git a/Tests/SinglePromptSecureEnclaveTests.swift b/Tests/SinglePromptSecureEnclaveTests.swift
@@ -128,10 +128,17 @@ class SinglePromptSecureEnclaveTests: XCTestCase
         guard testEnvironmentIsSigned() else {
             return
         }
-
+
+        #if swift(>=4.1)
+        let permutations: [SecureEnclaveValet] = SecureEnclaveAccessControl.allValues().compactMap { accessControl in
+            return .valet(with: valet.identifier, accessControl: accessControl)
+        }
+        #else
         let permutations: [SecureEnclaveValet] = SecureEnclaveAccessControl.allValues().flatMap { accessControl in
             return .valet(with: valet.identifier, accessControl: accessControl)
         }
+        #endif
+
         for permutation in permutations {
             XCTAssertTrue(permutation.canAccessKeychain())
         }
@@ -150,10 +157,17 @@ class SinglePromptSecureEnclaveTests: XCTestCase
         #else
             XCTFail()
         #endif
-
+
+        #if swift(>=4.1)
+        let permutations: [SecureEnclaveValet] = SecureEnclaveAccessControl.allValues().compactMap { accessControl in
+            return .sharedAccessGroupValet(with: sharedAccessGroupIdentifier, accessControl: accessControl)
+        }
+        #else
         let permutations: [SecureEnclaveValet] = SecureEnclaveAccessControl.allValues().flatMap { accessControl in
             return .sharedAccessGroupValet(with: sharedAccessGroupIdentifier, accessControl: accessControl)
         }
+        #endif
+
         for permutation in permutations {
             XCTAssertTrue(permutation.canAccessKeychain())
         }

diff --git a/Valet.podspec b/Valet.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'Valet'
-  s.version  = '3.1.2'
+  s.version  = '3.1.3'
   s.license  = 'Apache License, Version 2.0'
   s.summary  = 'Securely store data in the iOS, tvOS, or macOS Keychain without knowing a thing about how the Keychain works. It\'s easy. We promise.'
   s.homepage = 'https://github.com/square/Valet'

diff --git a/Valet.xcodeproj/project.pbxproj b/Valet.xcodeproj/project.pbxproj
@@ -749,7 +749,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 0920;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = "Square, Inc.";
 				TargetAttributes = {
 					165CDDC5204B26D400C96C2E = {
@@ -1569,13 +1569,15 @@
 				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_DOCUMENTATION_COMMENTS = YES;
 				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;
@@ -1626,13 +1628,15 @@
 				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_DOCUMENTATION_COMMENTS = YES;
 				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/Valet.xcodeproj/xcshareddata/xcschemes/Valet Mac.xcscheme b/Valet.xcodeproj/xcshareddata/xcschemes/Valet Mac.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0920"
+   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/Valet.xcodeproj/xcshareddata/xcschemes/Valet iOS Test Host App.xcscheme b/Valet.xcodeproj/xcshareddata/xcschemes/Valet iOS Test Host App.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0920"
+   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>
@@ -46,7 +45,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/Valet.xcodeproj/xcshareddata/xcschemes/Valet iOS.xcscheme b/Valet.xcodeproj/xcshareddata/xcschemes/Valet iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0920"
+   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/Valet.xcodeproj/xcshareddata/xcschemes/Valet macOS Test Host App.xcscheme b/Valet.xcodeproj/xcshareddata/xcschemes/Valet macOS Test Host App.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0920"
+   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>
@@ -46,7 +45,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/Valet.xcodeproj/xcshareddata/xcschemes/Valet tvOS Test Host App.xcscheme b/Valet.xcodeproj/xcshareddata/xcschemes/Valet tvOS Test Host App.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0920"
+   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>
@@ -46,7 +45,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

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

diff --git a/Valet.xcodeproj/xcshareddata/xcschemes/ValetTouchIDTest.xcscheme b/Valet.xcodeproj/xcshareddata/xcschemes/ValetTouchIDTest.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0920"
+   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>
@@ -46,7 +45,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/ValetTouchIDTest/ValetTouchIDTestViewController.swift b/ValetTouchIDTest/ValetTouchIDTestViewController.swift
@@ -92,7 +92,7 @@ final class ValetTouchIDTestViewController : UIViewController
 
     private func updateTextView(messageComponents: String...)
     {
-        if let textView = textView as UITextView! {
+        if let textView = textView {
             textView.text = textView.text.appendingFormat("\n%@", messageComponents.joined(separator: " "))
         }
     }