Release OneTimePassword 2.1.1

.swiftlint.yml

@@ -3,13 +3,32 @@
 excluded:
   - Carthage
 opt_in_rules:
+  - attributes
+  - closure_end_indentation
+  - closure_spacing
+  - conditional_returns_on_newline
   - empty_count
+  - explicit_init
+  - first_where
   - missing_docs
+  - nimble_operator
+  - operator_usage_whitespace
+  - overridden_super_call
+  - private_outlet
+  - prohibited_super_call
+  - redundant_nil_coalescing
+  - switch_case_on_newline
   - vertical_whitespace
 disabled_rules:
+  - closure_parameter_position
+  - colon
   - comma
   - cyclomatic_complexity
   - function_body_length
   - line_length
-  - opening_brace
+  - syntactic_sugar
+  - unused_closure_parameter
   - valid_docs
+
+trailing_comma:
+  mandatory_comma: true

.travis.yml

@@ -5,48 +5,44 @@ language: objective-c
 xcode_workspace: OneTimePassword.xcworkspace
 xcode_scheme: OneTimePassword (iOS)
 
-osx_image: xcode8
-xcode_sdk: iphonesimulator10.0
+osx_image: xcode8.2
 
 env:
-  - 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
+  - RUNTIME="iOS 8.1"  DEVICE="iPad 2"
+  - RUNTIME="iOS 8.2"  DEVICE="iPhone 4s"
+  - RUNTIME="iOS 8.3"  DEVICE="iPhone 5"
+  - RUNTIME="iOS 8.4"  DEVICE="iPhone 5s"
+  - RUNTIME="iOS 9.0"  DEVICE="iPhone 6"
+  - RUNTIME="iOS 9.1"  DEVICE="iPhone 6 Plus"
+  - RUNTIME="iOS 9.2"  DEVICE="iPhone 6s"
+  - RUNTIME="iOS 9.3"  DEVICE="iPhone 6s Plus"
+  - RUNTIME="iOS 10.0" DEVICE="iPhone SE"
+  - RUNTIME="iOS 10.1" DEVICE="iPhone 7"
+  - RUNTIME="iOS 10.2" DEVICE="iPhone 7 Plus"
+
+# Include builds for watchOS
 matrix:
   include:
-    - 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"
     - xcode_scheme: OneTimePassword (watchOS)
-      xcode_sdk: watchsimulator3.0
-      script: set -o pipefail && xcodebuild -workspace $TRAVIS_XCODE_WORKSPACE -scheme "$TRAVIS_XCODE_SCHEME" -sdk $TRAVIS_XCODE_SDK build | xcpretty -c
-    - osx_image: xcode7.3
-      xcode_scheme: OneTimePassword (watchOS)
-      xcode_sdk: watchsimulator2.2
-      script: set -o pipefail && xcodebuild -workspace $TRAVIS_XCODE_WORKSPACE -scheme "$TRAVIS_XCODE_SCHEME" -sdk $TRAVIS_XCODE_SDK build | xcpretty -c
-
+      env: BUILD_ONLY="YES" RUNTIME="watchOS 3.1" DEVICE="Apple Watch Series 2 - 42mm"
+    - xcode_scheme: OneTimePassword (watchOS)
+      env: BUILD_ONLY="YES" RUNTIME="watchOS 2.0" DEVICE="Apple Watch - 38mm"
 
 # Check out nested dependencies
 before_install: git submodule update --init --recursive
 
-# A custom test script is required because xctool cannot access the iOS keychain
-# https://github.com/facebook/xctool/issues/269
-script: set -o pipefail && xcodebuild -workspace $TRAVIS_XCODE_WORKSPACE -scheme "$TRAVIS_XCODE_SCHEME" -sdk $TRAVIS_XCODE_SDK -destination "$DESTINATION" build test | xcpretty -c
+before_script:
+  - DEVICE_ID=com.apple.CoreSimulator.SimDeviceType.$(echo $DEVICE | sed -E -e "s/[ \-]+/ /g" -e "s/[^[:alnum:]]/-/g")
+  - RUNTIME_ID=com.apple.CoreSimulator.SimRuntime.$(echo $RUNTIME | sed -E -e "s/[ \-]+/ /g" -e "s/[^[:alnum:]]/-/g")
+  - DESTINATION_ID=$(xcrun simctl create Travis $DEVICE_ID $RUNTIME_ID)
+  - xcrun simctl boot $DESTINATION_ID
+  - if [[ $BUILD_ONLY == YES ]]; then ACTIONS="build"; else ACTIONS="build test"; fi
+  - echo "xcodebuild -workspace \"$TRAVIS_XCODE_WORKSPACE\" -scheme \"$TRAVIS_XCODE_SCHEME\" -destination \"id=$DESTINATION_ID\" $ACTIONS"
+
+script: set -o pipefail && xcodebuild -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "$TRAVIS_XCODE_SCHEME" -destination "id=$DESTINATION_ID" $ACTIONS | xcpretty -c
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)
+
+notifications:
+  email: false

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 <!--## [In development][master]-->
 
+## [2.1.1][] (2016-12-28)
+- Configure Travis to build and test with Xcode 8.2. ([#115](https://github.com/mattrubin/OneTimePassword/pull/115))
+- Add a test host app to enable keychain tests on iOS 10. ([#116](https://github.com/mattrubin/OneTimePassword/pull/116))
+- Update the SwiftLint configuration for SwiftLint 0.15. ([#117](https://github.com/mattrubin/OneTimePassword/pull/117))
+
+
 ## [2.1][] (2016-11-16)
 #### Enhancements
 - Add watchOS support. ([#96](https://github.com/mattrubin/OneTimePassword/pull/96), [#98](https://github.com/mattrubin/OneTimePassword/pull/98), [#107](https://github.com/mattrubin/OneTimePassword/pull/107))
@@ -93,8 +99,9 @@ Changes between prerelease versions of OneTimePassword version 2 can be found be
 
 ## [1.0.0][] (2014-07-17)
 
-[master]: https://github.com/mattrubin/OneTimePassword/compare/2.1...master
+[master]: https://github.com/mattrubin/OneTimePassword/compare/2.1.1...master
 
+[2.1.1]: https://github.com/mattrubin/OneTimePassword/compare/2.1...2.1.1
 [2.1]: https://github.com/mattrubin/OneTimePassword/compare/2.0.1...2.1
 [2.0.1]: https://github.com/mattrubin/OneTimePassword/compare/2.0.0...2.0.1
 [2.0.0]: https://github.com/mattrubin/OneTimePassword/compare/1.1.0...2.0.0

Configuration/OneTimePasswordTestApp.xcconfig

@@ -0,0 +1,5 @@
+#include "../Carthage/Checkouts/xcconfigs/iOS/iOS-Application.xcconfig"
+
+PRODUCT_NAME = OneTimePasswordTestApp
+PRODUCT_BUNDLE_IDENTIFIER = me.mattrubin.onetimepassword.test-app
+INFOPLIST_FILE = $(SRCROOT)/Tests/App/Info.plist

Configuration/OneTimePasswordTests-iOS.xcconfig

@@ -1,2 +1,5 @@
 #include "../Carthage/Checkouts/xcconfigs/iOS/iOS-Application.xcconfig"
 #include "OneTimePasswordTests.xcconfig"
+
+TEST_HOST = $(BUILT_PRODUCTS_DIR)/OneTimePasswordTestApp.app/OneTimePasswordTestApp
+BUNDLE_LOADER = $(TEST_HOST)

OneTimePassword.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "OneTimePassword"
-  s.version      = "2.1"
+  s.version      = "2.1.1"
   s.summary      = "A small library for generating TOTP and HOTP one-time passwords."
   s.homepage     = "https://github.com/mattrubin/OneTimePassword"
   s.license      = "MIT"