Update for Swift 3

.codecov.yml

@@ -0,0 +1,6 @@
+# Configuration for Codecov (https://codecov.io)
+
+coverage:
+  ignore:
+    - "Tests"
+    - "OneTimePasswordLegacyTests"

.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

@@ -9,15 +9,21 @@ osx_image: xcode8
 xcode_sdk: iphonesimulator10.0
 
 env:
-  - DESTINATION="OS=10.0,name=iPhone 5"
-  - DESTINATION="OS=10.0,name=iPhone 6S Plus"
-  - DESTINATION="OS=10.0,name=iPhone SE"
-  - DESTINATION="OS=10.0,name=iPad Retina"
-  - DESTINATION="OS=10.0,name=iPad Pro (12.9 inch)"
+# iOS 8 builds time out with Xcode 8
+#  - 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"
+  - 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"
 
 # 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
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)

CHANGELOG.md

@@ -1,7 +1,24 @@
-# Changelog
+# OneTimePassword Changelog
 
 <!--## [In development][master]-->
 
+## [2.0.1][] (2016-09-20)
+#### Enhancements
+- Update the project to support Xcode 8 and Swift 2.3. ([#73](https://github.com/mattrubin/OneTimePassword/pull/73), [#75](https://github.com/mattrubin/OneTimePassword/pull/75), [#84](https://github.com/mattrubin/OneTimePassword/pull/84))
+
+#### Fixes
+- Disable broken keychain tests on iOS 10. ([#77](https://github.com/mattrubin/OneTimePassword/pull/77), [#88](https://github.com/mattrubin/OneTimePassword/pull/88))
+
+#### Other Changes
+- Update badge images and links in the README. ([#69](https://github.com/mattrubin/OneTimePassword/pull/69))
+- Reorganize source and test files following the conventions the Swift Package Manager. ([#70](https://github.com/mattrubin/OneTimePassword/pull/70))
+- Isolate the CommonCrypto dependency inside a custom wrapper function. ([#71](https://github.com/mattrubin/OneTimePassword/pull/71))
+- Clean up whitespace. ([#79](https://github.com/mattrubin/OneTimePassword/pull/79))
+- Integrate with codecov.io for automated code coverage reporting. ([#82](https://github.com/mattrubin/OneTimePassword/pull/82))
+- Update SwiftLint configuration. ([#87](https://github.com/mattrubin/OneTimePassword/pull/87))
+- Update Travis configuration to use Xcode 8. ([#89](https://github.com/mattrubin/OneTimePassword/pull/89))
+
+
 ## [2.0.0][] (2016-02-07)
 
 Version 2 of the OneTimePassword library has been completely redesigned and rewritten with a modern Swift API. The new library source differs too greatly from its predecessor for the changes to be representable in a changelog. The README has a usage guide for the new API.
@@ -63,8 +80,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.0.0...master
+[master]: https://github.com/mattrubin/OneTimePassword/compare/2.0.1...master
 
+[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
 [2.0.0-rc]: https://github.com/mattrubin/OneTimePassword/compare/2.0.0-beta.5...2.0.0
 [2.0.0-beta.5]: https://github.com/mattrubin/OneTimePassword/compare/2.0.0-beta.4...2.0.0-beta.5
@@ -75,4 +93,4 @@ Changes between prerelease versions of OneTimePassword version 2 can be found be
 [2.0.0-beta]: https://github.com/mattrubin/OneTimePassword/compare/1.1.1...2.0.0-beta
 [1.1.1]: https://github.com/mattrubin/OneTimePassword/compare/1.1.0...1.1.1
 [1.1.0]: https://github.com/mattrubin/OneTimePassword/compare/1.0.0...1.1.0
-[1.0.0]: https://github.com/mattrubin/OneTimePassword/tree/1.0.0
+[1.0.0]: https://github.com/mattrubin/OneTimePassword/tree/1.0.0

OneTimePassword.podspec

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

OneTimePassword.xcodeproj/project.pbxproj

@@ -62,6 +62,7 @@
 		C94B9BCA1BD7271E0073D7C5 /* AUTHORS.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = AUTHORS.txt; sourceTree = "<group>"; };
 		C95B10CB196D22B9000840AA /* GeneratorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratorTests.swift; sourceTree = "<group>"; };
 		C95F9FB81C03D6BC00CEA286 /* PersistentToken.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PersistentToken.swift; sourceTree = "<group>"; };
+		C9619C5C1D73FB3500757587 /* .codecov.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .codecov.yml; sourceTree = "<group>"; };
 		C97C82381946E51D00FD9F4C /* OneTimePassword.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OneTimePassword.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		C97C823C1946E51D00FD9F4C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		C97C82431946E51D00FD9F4C /* OneTimePasswordTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OneTimePasswordTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -297,6 +298,7 @@
 				C9B84D1F1C015EC8002EE631 /* Cartfile */,
 				C94765061C64587800C7527E /* Cartfile.private */,
 				C947650A1C66ADEC00C7527E /* OneTimePassword.podspec */,
+				C9619C5C1D73FB3500757587 /* .codecov.yml */,
 				C9B84D1C1C015EC0002EE631 /* .hound.yml */,
 				C9B84D1D1C015EC0002EE631 /* .swiftlint.yml */,
 				C9B84D1E1C015EC0002EE631 /* .travis.yml */,
@@ -390,7 +392,7 @@
 			attributes = {
 				LastSwiftMigration = 0700;
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0710;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = "Matt Rubin";
 				TargetAttributes = {
 					C97C82371946E51D00FD9F4C = {
@@ -526,6 +528,8 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = C996EC2C1A74D5830076B105 /* Debug.xcconfig */;
 			buildSettings = {
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -540,6 +544,8 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = C996EC2E1A74D5830076B105 /* Release.xcconfig */;
 			buildSettings = {
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				SDKROOT = iphoneos;

OneTimePasswordLegacyTests/OTPToken.swift

@@ -68,7 +68,7 @@ public final class OTPToken: NSObject {
         }
     }
 
-    private convenience init(token: Token) {
+    fileprivate convenience init(token: Token) {
         self.init()
         updateWithToken(token)
     }

README.md

@@ -2,6 +2,7 @@
 ### TOTP and HOTP one-time passwords for iOS
 
 [![Build Status](https://travis-ci.org/mattrubin/OneTimePassword.svg?branch=master)](https://travis-ci.org/mattrubin/OneTimePassword)
+[![Codecov](https://codecov.io/gh/mattrubin/OneTimePassword/branch/master/graph/badge.svg)](https://codecov.io/gh/mattrubin/OneTimePassword)
 [![CocoaPods](https://img.shields.io/cocoapods/v/OneTimePassword.svg)](https://cocoapods.org/pods/OneTimePassword)
 [![Carthage Compatible](https://img.shields.io/badge/carthage-%E2%9C%93-5BA7E9.svg)](https://github.com/Carthage/Carthage/)
 [![MIT License](https://img.shields.io/badge/license-mit-989898.svg)](https://github.com/mattrubin/OneTimePassword/blob/master/LICENSE.md)

Sources/Crypto.swift

@@ -29,17 +29,17 @@ import CommonCrypto
 func HMAC(_ algorithm: Generator.Algorithm, key: Data, data: Data) -> Data {
     let (hashFunction, hashLength) = algorithm.hashInfo
 
-    let macOut = UnsafeMutablePointer<UInt8>(allocatingCapacity: hashLength)
-    defer { macOut.deallocateCapacity(hashLength) }
+    let macOut = UnsafeMutablePointer<UInt8>.allocate(capacity: hashLength)
+    defer { macOut.deallocate(capacity: hashLength) }
 
     CCHmac(hashFunction, (key as NSData).bytes, key.count, (data as NSData).bytes, data.count, macOut)
 
     return Data(bytes: macOut, count: hashLength)
 }
 
-extension Generator.Algorithm {
+private extension Generator.Algorithm {
     /// The corresponding CommonCrypto hash function and hash length.
-    private var hashInfo: (hashFunction: CCHmacAlgorithm, hashLength: Int) {
+    var hashInfo: (hashFunction: CCHmacAlgorithm, hashLength: Int) {
         switch self {
         case .SHA1:
             return (CCHmacAlgorithm(kCCHmacAlgSHA1), Int(CC_SHA1_DIGEST_LENGTH))

Sources/Generator.swift

@@ -27,7 +27,6 @@ import Foundation
 
 /// A `Generator` contains all of the parameters needed to generate a one-time password.
 public struct Generator: Equatable {
-
     /// The moving factor, either timer- or counter-based.
     public let factor: Factor
 
@@ -78,8 +77,8 @@ public struct Generator: Equatable {
         var bigCounter = counter.bigEndian
 
         // Generate an HMAC value from the key and counter
-        let counterData = withUnsafePointer(&bigCounter) {
-            Data(bytes: UnsafePointer<UInt8>($0), count: sizeof(UInt64.self))
+        let counterData = withUnsafePointer(to: &bigCounter) {
+            Data(bytes: $0, count: MemoryLayout<UInt64>.size)
         }
         let hash = HMAC(algorithm, key: secret, data: counterData)
 
@@ -89,7 +88,9 @@ public struct Generator: Equatable {
 
             // Take 4 bytes from the hash, starting at the given byte offset
             let truncatedHashPtr = ptr + Int(offset)
-            let truncatedHash = UnsafePointer<UInt32>(truncatedHashPtr).pointee
+            let truncatedHash = truncatedHashPtr.withMemoryRebound(to: UInt32.self, capacity: 1) {
+                $0.pointee
+            }
             return truncatedHash
         }
 
@@ -151,7 +152,7 @@ public struct Generator: Equatable {
         ///
         /// - throws: A `Generator.Error` if a valid counter cannot be calculated.
         /// - returns: The counter value needed to generate the password for the target time.
-        private func counterAtTime(_ time: TimeInterval) throws -> UInt64 {
+        fileprivate func counterAtTime(_ time: TimeInterval) throws -> UInt64 {
             switch self {
             case .counter(let counter):
                 return counter
@@ -180,7 +181,7 @@ public struct Generator: Equatable {
 
     /// An error type enum representing the various errors a `Generator` can throw when computing a
     /// password.
-    public enum Error: ErrorProtocol {
+    public enum Error: Swift.Error {
         /// The requested time is before the epoch date.
         case invalidTime
         /// The timer period is not a positive number of seconds
@@ -215,14 +216,14 @@ public func == (lhs: Generator.Factor, rhs: Generator.Factor) -> Bool {
 private extension Generator {
     // MARK: Validation
 
-    private static func validateDigits(_ digits: Int) -> Bool {
+    static func validateDigits(_ digits: Int) -> Bool {
         // https://tools.ietf.org/html/rfc4226#section-5.3 states "Implementations MUST extract a
         // 6-digit code at a minimum and possibly 7 and 8-digit codes."
         let acceptableDigits = 6...8
         return acceptableDigits.contains(digits)
     }
 
-    private static func validateFactor(_ factor: Factor) -> Bool {
+    static func validateFactor(_ factor: Factor) -> Bool {
         switch factor {
         case .counter:
             return true
@@ -231,12 +232,12 @@ private extension Generator {
         }
     }
 
-    private static func validatePeriod(_ period: TimeInterval) -> Bool {
+    static func validatePeriod(_ period: TimeInterval) -> Bool {
         // The period must be positive and non-zero to produce a valid counter value.
         return (period > 0)
     }
 
-    private static func validateTime(_ time: TimeInterval) -> Bool {
+    static func validateTime(_ time: TimeInterval) -> Bool {
         // The time must be positive to produce a valid counter value.
         return (time >= 0)
     }
@@ -248,7 +249,7 @@ private extension String {
         let paddingCount = length - characters.count
         guard paddingCount > 0 else { return self }
 
-        let padding = String(repeating: character, count: paddingCount)
+        let padding = String(repeating: String(character), count: paddingCount)
         return padding + self
     }
 }

Sources/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0</string>
+	<string>2.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.0.0</string>
+	<string>2.0.1</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>