Merge branch 'develop' of git://github.com/realestate-com-au/HockeySDK-iOS into realestate-com-au-develop

Classes/BITHockeyManager.m

@@ -38,7 +38,9 @@
 
 - (BOOL)shouldUseLiveIdentifier;
 
+#if defined(JIRA_MOBILE_CONNECT_SUPPORT_ENABLED) && JIRA_MOBILE_CONNECT_SUPPORT_ENABLED
 - (void)configureJMC;
+#endif
 
 @end
 
@@ -169,7 +171,11 @@
   }
   
   // Setup UpdateManager
-  if (![self isUpdateManagerDisabled] || [[self class] isJMCPresent]) {
+  if (![self isUpdateManagerDisabled]
+#if defined(JIRA_MOBILE_CONNECT_SUPPORT_ENABLED) && JIRA_MOBILE_CONNECT_SUPPORT_ENABLED
+      || [[self class] isJMCPresent]
+#endif
+      ) {
     BITHockeyLog(@"INFO: Start UpdateManager with small delay");
     if (_updateURL) {
       [_updateManager setUpdateURL:_updateURL];
@@ -234,6 +240,7 @@
     _updateManager = [[BITUpdateManager alloc] initWithAppIdentifier:_appIdentifier isAppStoreEnvironemt:_appStoreEnvironment];
     _updateManager.delegate = _delegate;
     
+#if defined(JIRA_MOBILE_CONNECT_SUPPORT_ENABLED) && JIRA_MOBILE_CONNECT_SUPPORT_ENABLED
     // Only if JMC is part of the project
     if ([[self class] isJMCPresent]) {
       BITHockeyLog(@"INFO: Setup JMC");
@@ -242,12 +249,14 @@
       [[self class] disableJMCCrashReporter];
       [self performSelector:@selector(configureJMC) withObject:nil afterDelay:0];
     }
+#endif
     
   } else {
     [self logInvalidIdentifier:@"app identifier"];
   }
 }
 
+#if defined(JIRA_MOBILE_CONNECT_SUPPORT_ENABLED) && JIRA_MOBILE_CONNECT_SUPPORT_ENABLED
 
 #pragma mark - JMC
 
@@ -358,5 +367,6 @@
     [self configureJMC];
   }
 }
+#endif
 
 @end

Classes/HockeySDKPrivate.h

@@ -50,6 +50,9 @@
 #define BITHOCKEYSDK_BUNDLE @"HockeySDKResources.bundle"
 #define BITHOCKEYSDK_URL @"https://sdk.hockeyapp.net/"
 
+/* Whether to compile in support for Jira Mobile Connect */
+#define JIRA_MOBILE_CONNECT_SUPPORT_ENABLED 0
+
 #define BITHockeyLog(fmt, ...) do { if([BITHockeyManager sharedHockeyManager].isDebugLogEnabled && ![BITHockeyManager sharedHockeyManager].isAppStoreEnvironment) { NSLog((@"[HockeySDK] %s/%d " fmt), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__); }} while(0)
 
 NSBundle *BITHockeyBundle(void);

HockeySDK.podspec

@@ -1,12 +1,12 @@
 Pod::Spec.new do |s|
   s.name     = 'HockeySDK'
-  s.version  = '2.5.1'
+  s.version  = '2.5.3'
   s.license  = 'MIT'
   s.platform = :ios, '4.0'
   s.summary  = 'Distribute beta apps and collect crash reports with HockeyApp.'
   s.homepage = 'http://hockeyapp.net/'
   s.author   = { 'Andreas Linde' => 'mail@andreaslinde.de', 'Thomas Dohmke' => "thomas@dohmke.de" }
-  s.source   = { :git => 'https://github.com/bitstadium/HockeySDK-iOS.git', :tag => '2.5.1' }
+  s.source   = { :git => 'https://github.com/bitstadium/HockeySDK-iOS.git', :tag => '2.5.3' }
 
   s.description = 'HockeyApp is a server to distribute beta apps and collect crash reports. '                   \
                   'It improves the testing process dramatically and can be used for both beta '                 \