Merge branch 'release/3.8.5'

Classes/BITCrashReportTextFormatter.m

@@ -348,7 +348,7 @@ + (NSString *)stringValueForCrashReport:(BITPLCrashReport *)report crashReporter
         processPath = report.processInfo.processPath;
 
         /* Remove username from the path */
-#if TARGET_IPHONE_SIMULATOR
+#if TARGET_OS_SIMULATOR
         if ([processPath length] > 0)
           processPath = [processPath stringByAbbreviatingWithTildeInPath];
         if ([processPath length] > 0 && [[processPath substringToIndex:1] isEqualToString:@"~"])
@@ -438,7 +438,7 @@ + (NSString *)stringValueForCrashReport:(BITPLCrashReport *)report crashReporter
     NSString *foundSelector = nil;
 
     // search the registers value for the current arch
-#if TARGET_IPHONE_SIMULATOR
+#if TARGET_OS_SIMULATOR
     if (lp64) {
       foundSelector = [[self class] selectorForRegisterWithName:@"rsi" ofThread:crashed_thread report:report];
       if (foundSelector == NULL)
@@ -577,13 +577,13 @@ + (NSString *)stringValueForCrashReport:(BITPLCrashReport *)report crashReporter
     /* Remove username from the image path */
     NSString *imageName = @"";
     if (imageInfo.imageName && [imageInfo.imageName length] > 0) {
-#if TARGET_IPHONE_SIMULATOR
+#if TARGET_OS_SIMULATOR
       imageName = [imageInfo.imageName stringByAbbreviatingWithTildeInPath];
 #else
       imageName = imageInfo.imageName;
 #endif
     }
-#if TARGET_IPHONE_SIMULATOR
+#if TARGET_OS_SIMULATOR
     if ([imageName length] > 0 && [[imageName substringToIndex:1] isEqualToString:@"~"])
       imageName = [NSString stringWithFormat:@"/Users/USER%@", [imageName substringFromIndex:1]];
 #endif

Classes/BITFeedbackManagerDelegate.h

@@ -27,9 +27,9 @@
  */
 
 #import <Foundation/Foundation.h>
+#import "BITFeedbackComposeViewControllerDelegate.h"
 
 @class BITFeedbackManager;
-@protocol BITFeedbackComposeViewControllerDelegate;
 
 /**
  *	Delegate protocol which is notified about changes in the feedbackManager

Classes/BITHockeyHelper.h

@@ -28,6 +28,7 @@
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
+#import "HockeySDKEnums.h"
 
 /* NSString helpers */
 NSString *bit_URLEncodedString(NSString *inputString);
@@ -49,8 +50,7 @@ BOOL bit_isPreiOS7Environment(void);
 BOOL bit_isPreiOS8Environment(void);
 BOOL bit_isAppStoreReceiptSandbox(void);
 BOOL bit_hasEmbeddedMobileProvision(void);
-BOOL bit_isRunningInTestFlightEnvironment(void);
-BOOL bit_isRunningInAppStoreEnvironment(void);
+BITEnvironment bit_currentAppEnvironment(void);
 BOOL bit_isRunningInAppExtension(void);
 
 #if !defined (HOCKEYSDK_CONFIGURATION_ReleaseCrashOnly) && !defined (HOCKEYSDK_CONFIGURATION_ReleaseCrashOnlyExtensions)

Classes/BITHockeyHelper.m

@@ -272,9 +272,12 @@ BOOL bit_isPreiOS8Environment(void) {
 }
 
 BOOL bit_isAppStoreReceiptSandbox(void) {
-#if TARGET_IPHONE_SIMULATOR
+#if TARGET_OS_SIMULATOR
   return NO;
 #else
+  if (![NSBundle.mainBundle respondsToSelector:@selector(appStoreReceiptURL)]) {
+    return NO;
+  }
   NSURL *appStoreReceiptURL = NSBundle.mainBundle.appStoreReceiptURL;
   NSString *appStoreReceiptLastComponent = appStoreReceiptURL.lastPathComponent;
 
@@ -288,25 +291,26 @@ BOOL bit_hasEmbeddedMobileProvision(void) {
   return hasEmbeddedMobileProvision;
 }
 
-BOOL bit_isRunningInTestFlightEnvironment(void) {
-#if TARGET_IPHONE_SIMULATOR
-  return NO;
+BITEnvironment bit_currentAppEnvironment(void) {
+#if TARGET_OS_SIMULATOR
+  return BITEnvironmentOther;
 #else
-  if (bit_isAppStoreReceiptSandbox() && !bit_hasEmbeddedMobileProvision()) {
-    return YES;
+
+  // MobilePovision profiles are a clear indicator for Ad-Hoc distribution
+  if (bit_hasEmbeddedMobileProvision()) {
+    return BITEnvironmentOther;
   }
-  return NO;
-#endif
-}
-
-BOOL bit_isRunningInAppStoreEnvironment(void) {
-#if TARGET_IPHONE_SIMULATOR
-  return NO;
-#else
-  if (bit_isAppStoreReceiptSandbox() || bit_hasEmbeddedMobileProvision()) {
-    return NO;
+
+  // TestFlight is only supported from iOS 8 onwards, so at this point we have to be in the AppStore
+  if (floor(NSFoundationVersionNumber) <= NSFoundationVersionNumber_iOS_6_1) {
+    return BITEnvironmentAppStore;
   }
-  return YES;
+
+  if (bit_isAppStoreReceiptSandbox()) {
+    return BITEnvironmentTestFlight;
+  }
+
+  return BITEnvironmentAppStore;
 #endif
 }
 

Classes/BITHockeyManager.h

@@ -388,7 +388,7 @@
  TestFlight and Other. Other summarizes several different distribution methods
  and we might define additional specifc values for other environments in the future.
  
- @see `BITEnvironment`
+ @see BITEnvironment
  */
 @property (nonatomic, readonly) BITEnvironment appEnvironment;
 
@@ -399,8 +399,10 @@
  
  Returns _YES_ if the app is installed and running from the App Store
  Returns _NO_ if the app is installed via debug, ad-hoc or enterprise distribution
+ 
+ @deprecated Please use `appEnvironment` instead!
  */
-@property (nonatomic, readonly, getter=isAppStoreEnvironment) BOOL appStoreEnvironment DEPRECATED_MSG_ATTRIBUTE("Use appEnvironment instead!");
+@property (nonatomic, readonly, getter=isAppStoreEnvironment) BOOL appStoreEnvironment DEPRECATED_ATTRIBUTE;
 
 
 /**

Classes/BITHockeyManager.m

@@ -155,27 +155,20 @@ - (id)init {
 #if HOCKEYSDK_FEATURE_STORE_UPDATES
     _enableStoreUpdateManager = NO;
 #endif
-    _appEnvironment = BITEnvironmentOther;
-    _appStoreEnvironment = NO;
     _startManagerIsInvoked = NO;
     _startUpdateManagerIsInvoked = NO;
 
     _liveIdentifier = nil;
     _installString = bit_appAnonID(NO);
     _disableInstallTracking = NO;
 
-#if !TARGET_IPHONE_SIMULATOR
+    _appStoreEnvironment = NO;
     // check if we are really in an app store environment
-    if (bit_isRunningInAppStoreEnvironment()) {
-      _appEnvironment = BITEnvironmentAppStore;
+      _appEnvironment = bit_currentAppEnvironment();
+    if (_appEnvironment == BITEnvironmentAppStore) {
       _appStoreEnvironment = YES;
-    } else if (bit_isRunningInTestFlightEnvironment()) {
-      _appEnvironment = BITEnvironmentTestFlight;
-    } else {
-      _appEnvironment = BITEnvironmentOther;
     }
-#endif
-
+
     [self performSelector:@selector(validateStartManagerIsInvoked) withObject:nil afterDelay:0.0f];
   }
   return self;

Classes/BITUpdateManager.m

@@ -924,7 +924,7 @@ - (BOOL)initiateAppDownload {
     return NO;
   }
 
-#if TARGET_IPHONE_SIMULATOR
+#if TARGET_OS_SIMULATOR
   /* We won't use this for now until we have a more robust solution for displaying UIAlertController
   // requires iOS 8
   id uialertcontrollerClass = NSClassFromString(@"UIAlertController");
@@ -980,7 +980,7 @@ - (BOOL)initiateAppDownload {
 
   return success;
 
-#endif /* TARGET_IPHONE_SIMULATOR */
+#endif /* TARGET_OS_SIMULATOR */
 }
 
 

Classes/HockeySDKPrivate.h

@@ -79,6 +79,19 @@ NSString *BITHockeyMD5(NSString *str);
 #define __IPHONE_8_0     80000
 #endif
 
+#ifndef TARGET_OS_SIMULATOR
+
+  #ifdef TARGET_IPHONE_SIMULATOR
+
+    #define TARGET_OS_SIMULATOR TARGET_IPHONE_SIMULATOR
+
+  #else
+
+    #define TARGET_OS_SIMULATOR 0
+
+  #endif /* TARGET_IPHONE_SIMULATOR */
+
+#endif /* TARGET_OS_SIMULATOR */
 
 #if __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_1
 

HockeySDK-Source.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name              = 'HockeySDK-Source'
-  s.version           = '3.8.4'
+  s.version           = '3.8.5'
 
   s.summary           = 'Collect live crash reports, get feedback from your users, distribute your betas, and analyze your test coverage with HockeyApp.'
   s.description       = <<-DESC
@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
   s.documentation_url = "http://hockeyapp.net/help/sdk/ios/#{s.version}/"
 
   s.license           = 'MIT'
-  s.author            = { 'Andreas Linde' => '[email protected]', 'Thomas Dohmke' => "[email protected]" }
+  s.author            = { 'Microsoft' => '[email protected]' }
   s.source            = { :git => 'https://github.com/bitstadium/HockeySDK-iOS.git', :tag => s.version.to_s }
 
   s.platform          = :ios, '7.0'
@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.frameworks              = 'AssetsLibrary', 'CoreText', 'CoreGraphics', 'MobileCoreServices', 'QuartzCore', 'QuickLook', 'Security', 'SystemConfiguration', 'UIKit'
   s.libraries = 'c++'
   s.ios.vendored_frameworks = 'Vendor/CrashReporter.framework'
-  s.xcconfig                = {'GCC_PREPROCESSOR_DEFINITIONS' => %{$(inherited) BITHOCKEY_VERSION="@\\"#{s.version}\\"" BITHOCKEY_C_VERSION="\\"#{s.version}\\"" BITHOCKEY_BUILD="@\\"56\\"" BITHOCKEY_C_BUILD="\\"56\\""} }
+  s.xcconfig                = {'GCC_PREPROCESSOR_DEFINITIONS' => %{$(inherited) BITHOCKEY_VERSION="@\\"#{s.version}\\"" BITHOCKEY_C_VERSION="\\"#{s.version}\\"" BITHOCKEY_BUILD="@\\"57\\"" BITHOCKEY_C_BUILD="\\"57\\""} }
   s.resource_bundle         = { 'HockeySDKResources' => ['Resources/*.png', 'Resources/*.lproj'] }
   s.preserve_paths          = 'Resources', 'Support'
   s.private_header_files  = 'Classes/*Private.h'

HockeySDK.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name              = 'HockeySDK'
-  s.version           = '3.8.4'
+  s.version           = '3.8.5'
 
   s.summary           = 'Collect live crash reports, get feedback from your users, distribute your betas, and analyze your test coverage with HockeyApp.'
   s.description       = <<-DESC
@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
   s.documentation_url = "http://hockeyapp.net/help/sdk/ios/#{s.version}/"
 
   s.license           = { :type => 'MIT', :file => 'HockeySDK-iOS/LICENSE' }
-  s.author            = { 'Andreas Linde' => '[email protected]', 'Thomas Dohmke' => "[email protected]" }
+  s.author            = { 'Microsoft' => '[email protected]' }
 
   s.platform          = :ios, '7.0'
   s.ios.deployment_target = '6.0'

README.md

@@ -1,8 +1,8 @@
 [![Build Status](https://travis-ci.org/bitstadium/HockeySDK-iOS.svg?branch=develop)](https://travis-ci.org/bitstadium/HockeySDK-iOS)
 
-## Version 3.8.4
+## Version 3.8.5
 
-- [Changelog](http://www.hockeyapp.net/help/sdk/ios/3.8.4/docs/docs/Changelog.html)
+- [Changelog](http://www.hockeyapp.net/help/sdk/ios/3.8.5/docs/docs/Changelog.html)
 
 ## Introduction
 
@@ -455,7 +455,7 @@ To check if data is send properly to HockeyApp and also see some additional SDK
 <a id="documentation"></a>
 ## 4. Documentation
 
-Our documentation can be found on [HockeyApp](http://hockeyapp.net/help/sdk/ios/3.8.4/index.html).
+Our documentation can be found on [HockeyApp](http://hockeyapp.net/help/sdk/ios/3.8.5/index.html).
 
 <a id="troubleshooting"></a>
 ## 5.Troubleshooting
@@ -469,7 +469,7 @@ Our documentation can be found on [HockeyApp](http://hockeyapp.net/help/sdk/ios/
     Make sure none of the following files are copied into your app bundle, check under app target, `Build Phases`, `Copy Bundle Resources` or in the `.app` bundle after building:
 
         - `HockeySDK.framework` (except if you build a dynamic framework version of the SDK yourself!)
-        - `de.bitstadium.HockeySDK-iOS-3.8.4.docset`
+        - `de.bitstadium.HockeySDK-iOS-3.8.5.docset`
 
 3. Feature are not working as expected
 

Support/HockeySDK.xcconfig

@@ -1,3 +1,4 @@
 OTHER_LDFLAGS=$(inherited) -framework CoreText -framework CoreGraphics -framework Foundation -framework QuartzCore -framework SystemConfiguration -framework UIKit -framework Security -framework AssetsLibrary -framework MobileCoreServices -framework QuickLook -lc++
 HOCKEYSDK_DOCSET_NAME=HockeySDK-iOS
 HOCKEYSDK_GCC_PREPROCESSOR_DEFINITIONS=$(inherited) $(XCODEBUILD_GCC_PREPROCESSOR_DEFINITIONS)
+HOCKEYSDK_WARNING_FLAGS = -Wshorten-64-to-32 -Wall

Support/HockeySDK.xcodeproj/project.pbxproj

@@ -1802,7 +1802,6 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2315,7 +2314,6 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2369,7 +2367,6 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2421,7 +2418,6 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = (

Support/buildnumber.xcconfig

@@ -1,10 +1,10 @@
 #include "HockeySDK.xcconfig"
 
-BUILD_NUMBER = 56
-VERSION_STRING = 3.8.4
+BUILD_NUMBER = 58
+VERSION_STRING = 3.8.5
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) $(HOCKEYSDK_GCC_PREPROCESSOR_DEFINITIONS) HOCKEYSDK_CONFIGURATION_$(CONFIGURATION) BITHOCKEY_VERSION="@\""$(VERSION_STRING)"\"" BITHOCKEY_BUILD="@\""$(BUILD_NUMBER)"\"" BITHOCKEY_C_VERSION="\""$(VERSION_STRING)"\"" BITHOCKEY_C_BUILD="\""$(BUILD_NUMBER)"\""
 BIT_ARM_ARCHS = armv7 armv7s arm64
 BIT_SIM_ARCHS = x86_64 i386
 ARCHS = $(BIT_ARM_ARCHS)
 VALID_ARCHS = $(BIT_ARM_ARCHS)
-OTHER_CFLAGS = -Wshorten-64-to-32 -Wall
+OTHER_CFLAGS = $(HOCKEYSDK_WARNING_FLAGS)

Support/release.xcconfig

@@ -1,4 +1,4 @@
 #include "buildnumber.xcconfig"
 
-OTHER_CFLAGS[sdk=iphoneos9.*] = -Wshorten-64-to-32 -Wall -fembed-bitcode
-OTHER_CFLAGS[sdk=iphonesimulator9.*] = -Wshorten-64-to-32 -Wall
+OTHER_CFLAGS[sdk=iphoneos9.*] = $(HOCKEYSDK_WARNING_FLAGS) -fembed-bitcode
+OTHER_CFLAGS[sdk=iphonesimulator9.*] = $(HOCKEYSDK_WARNING_FLAGS)

docs/Changelog-template.md

@@ -1,3 +1,9 @@
+## Version 3.8.5
+
+- [UPDATE] Some minor improvements to our documentation
+- [BUGFIX] Fix a crash where `appStoreReceiptURL` was accidentally accessed on iOS 6
+- [BUGFIX] Fix a warning when implementing `BITHockeyManagerDelegate`
+
 ## Version 3.8.4
 
 - [BUGFIX] Fix a missing header in the `HockeySDK.h` umbrella

docs/Guide-Installation-Setup-template.md

@@ -1,6 +1,6 @@
-## Version 3.8.4
+## Version 3.8.5
 
-- [Changelog](http://www.hockeyapp.net/help/sdk/ios/3.8.4/docs/docs/Changelog.html)
+- [Changelog](http://www.hockeyapp.net/help/sdk/ios/3.8.5/docs/docs/Changelog.html)
 
 ## Introduction
 
@@ -439,7 +439,7 @@ To check if data is send properly to HockeyApp and also see some additional SDK
 <a id="documentation"></a>
 ## 4. Documentation
 
-Our documentation can be found on [HockeyApp](http://hockeyapp.net/help/sdk/ios/3.8.4/index.html).
+Our documentation can be found on [HockeyApp](http://hockeyapp.net/help/sdk/ios/3.8.5/index.html).
 
 <a id="troubleshooting"></a>
 ## 5.Troubleshooting
@@ -453,7 +453,7 @@ Our documentation can be found on [HockeyApp](http://hockeyapp.net/help/sdk/ios/
     Make sure none of the following files are copied into your app bundle, check under app target, `Build Phases`, `Copy Bundle Resources` or in the `.app` bundle after building:
 
         - `HockeySDK.framework` (except if you build a dynamic framework version of the SDK yourself!)
-        - `de.bitstadium.HockeySDK-iOS-3.8.4.docset`
+        - `de.bitstadium.HockeySDK-iOS-3.8.5.docset`
 
 3. Feature are not working as expected