Merge branch 'master' into changelog

.swiftlint.yml

@@ -2,12 +2,12 @@
 
 excluded:
   - Carthage
-enabled_rules:
+opt_in_rules:
   - empty_count
   - missing_docs
+  - vertical_whitespace
 disabled_rules:
   - comma
-  - conditional_binding_cascade
   - cyclomatic_complexity
   - function_body_length
   - line_length

.travis.yml

@@ -5,24 +5,33 @@ language: objective-c
 xcode_workspace: OneTimePassword.xcworkspace
 xcode_scheme: OneTimePassword
 
-osx_image: xcode7.3
-xcode_sdk: iphonesimulator9.3
+osx_image: xcode8
+xcode_sdk: iphonesimulator10.0
 
 env:
-  - DESTINATION="OS=8.1,name=iPhone 4S"
-  - DESTINATION="OS=8.2,name=iPhone 5"
-  - DESTINATION="OS=8.3,name=iPhone 5S"
-  - DESTINATION="OS=8.4,name=iPhone 6"
-  - DESTINATION="OS=9.0,name=iPhone 6 Plus"
-  - DESTINATION="OS=9.1,name=iPhone 6S"
-  - DESTINATION="OS=9.2,name=iPhone 6S Plus"
+  - DESTINATION="OS=9.0,name=iPhone 6"
+  - DESTINATION="OS=9.1,name=iPhone 6 Plus"
+  - DESTINATION="OS=9.2,name=iPhone 6S"
   - DESTINATION="OS=9.3,name=iPhone 6S Plus"
+  - DESTINATION="OS=10.0,name=iPhone 7"
 
+# For now, continue testing with Xcode 7.3 and Swift 2.2
+# Testing on iOS 8.x currently times out on Travis with Xcode 8:
+# https://travis-ci.org/mattrubin/OneTimePassword/jobs/160929197
 matrix:
   include:
-    - osx_image: xcode8
-      xcode_sdk: iphonesimulator10.0
-      env: DESTINATION="OS=10.0,name=iPhone SE"
+    - osx_image: xcode7.3
+      xcode_sdk: iphonesimulator9.3
+      env: DESTINATION="OS=8.1,name=iPhone 4S"
+    - osx_image: xcode7.3
+      xcode_sdk: iphonesimulator9.3
+      env: DESTINATION="OS=8.2,name=iPhone 5"
+    - osx_image: xcode7.3
+      xcode_sdk: iphonesimulator9.3
+      env: DESTINATION="OS=8.3,name=iPhone 5S"
+    - osx_image: xcode7.3
+      xcode_sdk: iphonesimulator9.3
+      env: DESTINATION="OS=8.4,name=iPhone 6"
 
 # Check out nested dependencies
 before_install: git submodule update --init --recursive

Tests/KeychainTests.swift

@@ -23,11 +23,11 @@
 //  SOFTWARE.
 //
 
-// NOTE: Keychain access seems to be broken (error -34018) as of Xcode 8 beta 2.
+// NOTE: Keychain access from test bundles seems to be broken (error -34018) in iOS 10.
 // https://forums.developer.apple.com/thread/51071
-// The current workaround for this issue is to enable the keychain sharing entitlement, but since
-// entitlements appear to not affect test bundles, there isn't a fix for broken keychain tests.
-// Until a future beta fixes the issue, keychain tests are disabled for iOS 10.
+// Even basic (unshared) keychain access in iOS 10 requires the keychain sharing entitlement, but
+// since entitlements do not apply to test bundles, there isn't a fix for broken keychain tests.
+// Until a fix for the issue is found, keychain tests are disabled for iOS 10.
 
 import XCTest
 import OneTimePassword