Merge branch 'release/3.8'

bitstadium · Sep 16, 2015 · f7eeecb · f7eeecb
2 parents 0afe76a + 2a894c8
commit f7eeecb
Show file tree

Hide file tree

Showing 117 changed files with 2,931 additions and 25,374 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,5 +21,10 @@ profile
 *~.nib
 profile
 
+
+# App Code
+**/.idea/
+**/.idea/**
+
 documentation/
 Products/
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: beta-xcode6.3
+osx_image: xcode7
 
 env:
   global:
@@ -8,15 +8,15 @@ env:
     - CONFIGURATION="DEBUG"
 
   matrix:
-    - SCHEME="HockeySDK"             DESTINATION="OS=7.1,name=iPad 2"                 RUN_TESTS="YES"
-    - SCHEME="HockeySDK"             DESTINATION="OS=7.1,name=iPhone 5"                 RUN_TESTS="YES"
-    - SCHEME="HockeySDK"             DESTINATION="OS=8.1,name=iPad Air"                 RUN_TESTS="YES"
-    - SCHEME="HockeySDK"             DESTINATION="OS=8.2,name=iPhone 6"                 RUN_TESTS="YES"
-    - SCHEME="HockeySDK"             DESTINATION="OS=8.3,name=iPhone 6 Plus"            RUN_TESTS="YES"
+    - SCHEME="HockeySDK"             DESTINATION="OS=8.1,name=iPhone 5"                 RUN_TESTS="YES"
+    - SCHEME="HockeySDK"             DESTINATION="OS=8.4,name=iPhone 6"                 RUN_TESTS="YES"
+    - SCHEME="HockeySDK"             DESTINATION="OS=9.0,name=iPad Air"                 RUN_TESTS="YES"
+    - SCHEME="HockeySDK"             DESTINATION="OS=9.0,name=iPhone 6 Plus"            RUN_TESTS="YES"
     - SCHEME="HockeySDK Framework"   DESTINATION="platform=iOS Simulator,name=iPhone 6" RUN_TESTS="YES"
     - SCHEME="HockeySDK Distribution"                                                   RUN_TESTS="NO"
 
 before_install:
+  - xcrun simctl list
   - gem install cocoapods --no-rdoc --no-ri --no-document --quiet
   - gem install xcpretty --no-rdoc --no-ri --no-document --quiet
   - brew tap homebrew/versions
@@ -30,4 +30,5 @@ script:
       COMMAND+=" -destination '$DESTINATION' clean test";
     fi
   - COMMAND+=" | xcpretty -c"
-  - eval $COMMAND
+  - echo $COMMAND
+  - eval $COMMAND
diff --git a/Classes/BITActivityIndicatorButton.m b/Classes/BITActivityIndicatorButton.m
@@ -24,6 +24,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#import "HockeySDK.h"
+
+#if HOCKEYSDK_FEATURE_FEEDBACK
+
 #import "BITActivityIndicatorButton.h"
 
 @interface BITActivityIndicatorButton()
@@ -74,3 +78,5 @@ - (void)layoutSubviews {
 
 
 @end
+
+#endif
diff --git a/Classes/BITAppStoreHeader.m b/Classes/BITAppStoreHeader.m
@@ -28,6 +28,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#import "HockeySDK.h"
+
+#if HOCKEYSDK_FEATURE_UPDATES
 
 #import "BITAppStoreHeader.h"
 #import "BITHockeyHelper.h"
@@ -158,3 +161,5 @@ - (void)setIconImage:(UIImage *)anIconImage {
 }
 
 @end
+
+#endif
diff --git a/Classes/BITArrowImageAnnotation.m b/Classes/BITArrowImageAnnotation.m
@@ -26,6 +26,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#import "HockeySDK.h"
+
+#if HOCKEYSDK_FEATURE_FEEDBACK
+
 #import "BITArrowImageAnnotation.h"
 
 #define kArrowPointCount 7
@@ -202,3 +206,5 @@ - (void)layoutSubviews{
 }
 
 @end
+
+#endif
diff --git a/Classes/BITAttributedLabel.m b/Classes/BITAttributedLabel.m
@@ -20,6 +20,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#import "HockeySDK.h"
+
+#if HOCKEYSDK_FEATURE_FEEDBACK
+
 #import "BITAttributedLabel.h"
 
 #define kBITLineBreakWordWrapTextWidthScalingFactor (M_PI / M_E)
@@ -1020,3 +1024,5 @@ - (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event {
 @end
 
 #pragma clang diagnostic pop
+
+#endif
diff --git a/Classes/BITAuthenticationViewController.m b/Classes/BITAuthenticationViewController.m
@@ -26,15 +26,17 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#import "HockeySDK.h"
+
+#if HOCKEYSDK_FEATURE_AUTHENTICATOR
+
 #import "BITAuthenticationViewController.h"
 #import "BITAuthenticator_Private.h"
 #import "HockeySDKPrivate.h"
-#import "HockeySDK.h"
 #import "BITHockeyHelper.h"
 #import "BITHockeyAppClient.h"
 
 @interface BITAuthenticationViewController ()<UITextFieldDelegate> {
-  UIStatusBarStyle _statusBarStyle;
   __weak UITextField *_emailField;
 }
 
@@ -66,24 +68,11 @@ - (void)viewDidLoad {
 - (void)viewWillAppear:(BOOL)animated {
   [super viewWillAppear:animated];
 
-  _statusBarStyle = [[UIApplication sharedApplication] statusBarStyle];
-#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_6_1
-  [[UIApplication sharedApplication] setStatusBarStyle:(self.navigationController.navigationBar.barStyle == UIBarStyleDefault) ? UIStatusBarStyleDefault : UIStatusBarStyleLightContent];
-#else
-  [[UIApplication sharedApplication] setStatusBarStyle:(self.navigationController.navigationBar.barStyle == UIBarStyleDefault) ? UIStatusBarStyleDefault : UIStatusBarStyleBlackOpaque];
-#endif
-
   [self updateBarButtons];
 
   self.navigationItem.rightBarButtonItem.enabled = [self allRequiredFieldsEntered];
 }
 
-- (void)viewWillDisappear:(BOOL)animated {
-	[super viewWillDisappear:animated];
-
-  [[UIApplication sharedApplication] setStatusBarStyle:_statusBarStyle];
-}
-
 #pragma mark - Property overrides
 
 - (void) updateBarButtons {
@@ -242,7 +231,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     textField.backgroundColor = [UIColor whiteColor];
     textField.autocorrectionType = UITextAutocorrectionTypeNo;
     textField.autocapitalizationType = UITextAutocapitalizationTypeNone;
-    textField.textAlignment = kBITTextLabelAlignmentLeft;
+    textField.textAlignment = NSTextAlignmentLeft;
     textField.delegate = self;
     textField.tag = indexPath.row;
 
@@ -305,12 +294,33 @@ - (void)saveAction:(id)sender {
                                      if(succeeded) {
                                        //controller should dismiss us shortly..
                                      } else {
-                                       UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:nil
-                                                                                           message:error.localizedDescription
-                                                                                          delegate:nil
-                                                                                 cancelButtonTitle:BITHockeyLocalizedString(@"OK")
-                                                                                 otherButtonTitles:nil];
-                                       [alertView show];
+
+                                       // requires iOS 8
+                                       id uialertcontrollerClass = NSClassFromString(@"UIAlertController");
+                                       if (uialertcontrollerClass) {
+                                         UIAlertController *alertController = [UIAlertController alertControllerWithTitle:nil
+                                                                                                                  message:error.localizedDescription
+                                                                                                           preferredStyle:UIAlertControllerStyleAlert];
+
+
+                                         UIAlertAction *okAction = [UIAlertAction actionWithTitle:BITHockeyLocalizedString(@"OK")
+                                                                                                style:UIAlertActionStyleCancel
+                                                                                              handler:^(UIAlertAction * action) {}];
+
+                                         [alertController addAction:okAction];
+
+                                         [self presentViewController:alertController animated:YES completion:nil];
+                                       } else {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+                                         UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:nil
+                                                                                             message:error.localizedDescription
+                                                                                            delegate:nil
+                                                                                   cancelButtonTitle:BITHockeyLocalizedString(@"OK")
+                                                                                   otherButtonTitles:nil];
+                                         [alertView show];
+#pragma clang diagnostic pop
+                                       }
                                        typeof(self) strongSelf = weakSelf;
                                        [strongSelf setLoginUIEnabled:YES];
                                      }
@@ -323,3 +333,5 @@ - (void) setLoginUIEnabled:(BOOL) enabled {
 }
 
 @end
+
+#endif