Merge branch 'dependencies'

Author: mattrubin

Authenticator/Classes/OTPTokenEntryViewController.m

@@ -26,7 +26,6 @@
 #import "OTPSegmentedControlCell.h"
 #import "OTPTextFieldCell.h"
 #import <OneTimePassword/OneTimePassword.h>
-#import <Base32/MF_Base32Additions.h>
 
 
 typedef enum : NSUInteger {
@@ -123,7 +122,7 @@ - (void)createToken
 {
     if (!self.formIsValid) return;
 
-    NSData *secret = [NSData dataWithBase32String:self.secretKeyCell.textField.text];
+    NSData *secret = [NSData secretWithString:self.secretKeyCell.textField.text];
 
     if (secret.length) {
         OTPTokenType tokenType = (self.tokenTypeCell.segmentedControl.selectedSegmentIndex == OTPTokenTypeIndexTimer) ? OTPTokenTypeTimer : OTPTokenTypeCounter;

Podfile

@@ -1,6 +1,6 @@
 platform :ios, '7.0'
 
-pod 'OneTimePassword', '~> 1.0'
+pod 'OneTimePassword', '~> 1.1'
 pod 'SVProgressHUD', '~> 1.0'
 pod 'UIColor+Categories', '~> 0.2'
 

Podfile.lock

@@ -1,18 +1,18 @@
 PODS:
   - Base32 (1.0.2)
-  - OneTimePassword (1.0.0):
+  - OneTimePassword (1.1.0):
     - Base32 (~> 1.0.2)
   - SVProgressHUD (1.0)
   - UIColor+Categories (0.2)
 
 DEPENDENCIES:
-  - OneTimePassword (~> 1.0)
+  - OneTimePassword (~> 1.1)
   - SVProgressHUD (~> 1.0)
   - UIColor+Categories (~> 0.2)
 
 SPEC CHECKSUMS:
   Base32: a0ef6e90e721130c474cc970a4d98a6cbf16ce85
-  OneTimePassword: 5948ec8303247b449532fc553f7e01defc0e72e6
+  OneTimePassword: d08289f18a0e23a238f5adcfabb3269bbf7eb1f7
   SVProgressHUD: 5034c6e22b8c2ca3e09402e48d41ed0340aa1c50
   UIColor+Categories: 9770206090196452ff5d115b3e3dbdfcdedbc2f3