remove hockeyapp and integrate appcenter

.gitmodules

@@ -25,9 +25,6 @@
 [submodule "libs/curl-win"]
 	path = libs/curl-win
 	url = https://bitbucket.org/omigamedev/curl-win64.git
-[submodule "libs/hockeyapp"]
-	path = libs/hockeyapp
-	url = https://bitbucket.org/omigamedev/hockeyapp.git
 [submodule "libs/sqlite3"]
 	path = libs/sqlite3
 	url = https://bitbucket.org/omigamedev/sqlite3.git
@@ -58,3 +55,6 @@
 [submodule "libs/wave_sdk"]
 	path = libs/wave_sdk
 	url = https://bitbucket.org/omigamedev/wave_sdk.git
+[submodule "libs/appcenter-apple"]
+	path = libs/appcenter-apple
+	url = https://bitbucket.org/omigamedev/appcenter-apple.git

PanoPainter-OSX/main.cpp

@@ -13,11 +13,14 @@
 #include <CoreVideo/CoreVideo.h>
 #include <OpenGL/OpenGL.h>
 #import "objc_utils.h"
-#import <HockeySDK/HockeySDK.h>
 
 #include <deque>
 #include <chrono>
 
+@import AppCenter;
+@import AppCenterAnalytics;
+@import AppCenterCrashes;
+
 @implementation View
 {
     NSSharingService *airdrop_service;
@@ -36,7 +39,7 @@
 }
 - (void)hockeyapp_crash
 {
-    [[[BITHockeyManager sharedHockeyManager] crashManager] generateTestCrash];
+    [MSCrashes generateTestCrash];
 }
 - (void)async_lock
 {
@@ -446,11 +449,10 @@
 }
 - (void)applicationDidFinishLaunching:(NSNotification *)notification
 {
-    //[[NSUserDefaults standardUserDefaults] registerDefaults:@{ @"NSApplicationCrashOnExceptions": @YES }];
+    [MSAppCenter start:@"1500ff4a-32eb-4076-be3b-5147e2d8e27e" withServices:@[
-    
+      [MSAnalytics class],
-    [[BITHockeyManager sharedHockeyManager] configureWithIdentifier:@"1500ff4a32eb4076be3b5147e2d8e27e"];
+      [MSCrashes class]
-    // Do some additional configuration if needed here
+    ]];
-    [[BITHockeyManager sharedHockeyManager] startManager];
 
     App::I->initLog();
     App::I->create();

PanoPainter.xcodeproj/project.pbxproj

@@ -108,6 +108,12 @@
 		AD439B612210F56F006EAE8E /* format.cc in Sources */ = {isa = PBXBuildFile; fileRef = AD439B5F2210F421006EAE8E /* format.cc */; };
 		AD439B642210F5EA006EAE8E /* abr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD439B632210F5EA006EAE8E /* abr.cpp */; };
 		AD439B652210F61B006EAE8E /* abr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD439B632210F5EA006EAE8E /* abr.cpp */; };
+		AD46901722FF4319003DA1A6 /* AppCenter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD46901422FF4319003DA1A6 /* AppCenter.framework */; };
+		AD46901822FF431A003DA1A6 /* AppCenterCrashes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD46901522FF4319003DA1A6 /* AppCenterCrashes.framework */; };
+		AD46901922FF431A003DA1A6 /* AppCenterAnalytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD46901622FF4319003DA1A6 /* AppCenterAnalytics.framework */; };
+		AD46901D22FF4328003DA1A6 /* AppCenterCrashes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD46901A22FF4327003DA1A6 /* AppCenterCrashes.framework */; };
+		AD46901E22FF4328003DA1A6 /* AppCenterAnalytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD46901B22FF4327003DA1A6 /* AppCenterAnalytics.framework */; };
+		AD46901F22FF4328003DA1A6 /* AppCenter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD46901C22FF4328003DA1A6 /* AppCenter.framework */; };
 		AD4CEF142156B2C60097F4BD /* node_about.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD4CEF122156B2C50097F4BD /* node_about.cpp */; };
 		AD4CEF152156B2DA0097F4BD /* node_about.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD4CEF122156B2C50097F4BD /* node_about.cpp */; };
 		AD5016591EBFC7F00079A826 /* data in Resources */ = {isa = PBXBuildFile; fileRef = AD58E0611E17F23D006ACC15 /* data */; };
@@ -153,9 +159,6 @@
 		ADA2A57922BE8D8E00C6B6C9 /* node_tool_bucket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADA2A57622BE8D8E00C6B6C9 /* node_tool_bucket.cpp */; };
 		ADA3ABF6222C8C370083B825 /* node_panel_quick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADA3ABF4222C8C350083B825 /* node_panel_quick.cpp */; };
 		ADA3ABF7222C8C370083B825 /* node_panel_quick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADA3ABF4222C8C350083B825 /* node_panel_quick.cpp */; };
-		ADAE4B2E216D06CE00B1DD8C /* HockeySDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADAE4B2D216D06CC00B1DD8C /* HockeySDK.framework */; };
-		ADAE4B30216D075400B1DD8C /* HockeySDKResources.bundle in Resources */ = {isa = PBXBuildFile; fileRef = ADAE4B2F216D075400B1DD8C /* HockeySDKResources.bundle */; };
-		ADAE4B31216D0A2000B1DD8C /* HockeySDK.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = ADC8F775216675A80084ECAD /* HockeySDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		ADBC8C4E1FAE7D360094B339 /* node_dialog_browse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADBC8C471FAE7CC20094B339 /* node_dialog_browse.cpp */; };
 		ADBC8C4F1FAE7D370094B339 /* node_dialog_browse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADBC8C471FAE7CC20094B339 /* node_dialog_browse.cpp */; };
 		ADBC8C551FAFD0520094B339 /* app_cloud.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADBC8C511FAFD0360094B339 /* app_cloud.cpp */; };
@@ -170,7 +173,6 @@
 		ADC6F4631F3AFF2D004177FA /* node_dialog_layer_rename.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADC6F4611F3AFA2B004177FA /* node_dialog_layer_rename.cpp */; };
 		ADC6F4671F3E66FB004177FA /* app_dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADC6F4651F3E66FA004177FA /* app_dialogs.cpp */; };
 		ADC6F4681F3E66FB004177FA /* app_dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADC6F4651F3E66FA004177FA /* app_dialogs.cpp */; };
-		ADC8F776216675A90084ECAD /* HockeySDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADC8F775216675A80084ECAD /* HockeySDK.framework */; };
 		ADC8F77F216678270084ECAD /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADC8F779216678260084ECAD /* CoreTelephony.framework */; };
 		ADC8F780216678270084ECAD /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADC8F77A216678260084ECAD /* CoreText.framework */; };
 		ADC8F781216678270084ECAD /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADC8F77B216678260084ECAD /* QuartzCore.framework */; };
@@ -266,25 +268,6 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
-		AD06989C20CC89370010825F /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		AD30D8201F783B5600B6A112 /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-				ADAE4B31216D0A2000B1DD8C /* HockeySDK.framework in CopyFiles */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		AD787AEE20D4611100C4712A /* Embed App Extensions */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -392,6 +375,12 @@
 		AD439B5F2210F421006EAE8E /* format.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = format.cc; path = libs/fmt/src/format.cc; sourceTree = "<group>"; };
 		AD439B622210F5EA006EAE8E /* abr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = abr.h; sourceTree = "<group>"; };
 		AD439B632210F5EA006EAE8E /* abr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = abr.cpp; sourceTree = "<group>"; };
+		AD46901422FF4319003DA1A6 /* AppCenter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppCenter.framework; path = "libs/appcenter-apple/iOS/AppCenter.framework"; sourceTree = "<group>"; };
+		AD46901522FF4319003DA1A6 /* AppCenterCrashes.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppCenterCrashes.framework; path = "libs/appcenter-apple/iOS/AppCenterCrashes.framework"; sourceTree = "<group>"; };
+		AD46901622FF4319003DA1A6 /* AppCenterAnalytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppCenterAnalytics.framework; path = "libs/appcenter-apple/iOS/AppCenterAnalytics.framework"; sourceTree = "<group>"; };
+		AD46901A22FF4327003DA1A6 /* AppCenterCrashes.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppCenterCrashes.framework; path = "libs/appcenter-apple/macOS/AppCenterCrashes.framework"; sourceTree = "<group>"; };
+		AD46901B22FF4327003DA1A6 /* AppCenterAnalytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppCenterAnalytics.framework; path = "libs/appcenter-apple/macOS/AppCenterAnalytics.framework"; sourceTree = "<group>"; };
+		AD46901C22FF4328003DA1A6 /* AppCenter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppCenter.framework; path = "libs/appcenter-apple/macOS/AppCenter.framework"; sourceTree = "<group>"; };
 		AD4C08CF1E89BD0F0051D85F /* asset.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = asset.cpp; sourceTree = "<group>"; };
 		AD4C08D01E89BD0F0051D85F /* asset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = asset.h; sourceTree = "<group>"; };
 		AD4C08D11E89BD0F0051D85F /* bezier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bezier.cpp; sourceTree = "<group>"; };
@@ -480,7 +469,6 @@
 		ADA2A57722BE8D8E00C6B6C9 /* node_tool_bucket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = node_tool_bucket.h; sourceTree = "<group>"; };
 		ADA3ABF4222C8C350083B825 /* node_panel_quick.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = node_panel_quick.cpp; sourceTree = "<group>"; };
 		ADA3ABF5222C8C370083B825 /* node_panel_quick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = node_panel_quick.h; sourceTree = "<group>"; };
-		ADAE4B2D216D06CC00B1DD8C /* HockeySDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HockeySDK.framework; path = "libs/hockeyapp/HockeySDK-iOS/HockeySDK.embeddedframework/HockeySDK.framework"; sourceTree = "<group>"; };
 		ADAE4B2F216D075400B1DD8C /* HockeySDKResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = HockeySDKResources.bundle; path = "libs/hockeyapp/HockeySDK-iOS/HockeySDK.embeddedframework/HockeySDKResources.bundle"; sourceTree = "<group>"; };
 		ADB1C3D81EA3A156009A65BD /* event.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = event.cpp; sourceTree = "<group>"; };
 		ADB1C3D91EA3A156009A65BD /* event.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = event.h; sourceTree = "<group>"; };
@@ -501,7 +489,6 @@
 		ADC6F4601F3AFA2A004177FA /* node_dialog_layer_rename.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = node_dialog_layer_rename.h; sourceTree = "<group>"; };
 		ADC6F4611F3AFA2B004177FA /* node_dialog_layer_rename.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = node_dialog_layer_rename.cpp; sourceTree = "<group>"; };
 		ADC6F4651F3E66FA004177FA /* app_dialogs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = app_dialogs.cpp; sourceTree = "<group>"; };
-		ADC8F775216675A80084ECAD /* HockeySDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HockeySDK.framework; path = "libs/hockeyapp/HockeySDK-Mac/HockeySDK.framework"; sourceTree = "<group>"; };
 		ADC8F779216678260084ECAD /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.4.sdk/System/Library/Frameworks/CoreTelephony.framework; sourceTree = DEVELOPER_DIR; };
 		ADC8F77A216678260084ECAD /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.4.sdk/System/Library/Frameworks/CoreText.framework; sourceTree = DEVELOPER_DIR; };
 		ADC8F77B216678260084ECAD /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.4.sdk/System/Library/Frameworks/QuartzCore.framework; sourceTree = DEVELOPER_DIR; };
@@ -570,13 +557,15 @@
 			buildActionMask = 2147483647;
 			files = (
 				AD3087C4205F0177009F9260 /* AVFoundation.framework in Frameworks */,
+				AD46901F22FF4328003DA1A6 /* AppCenter.framework in Frameworks */,
+				AD46901D22FF4328003DA1A6 /* AppCenterCrashes.framework in Frameworks */,
 				AD30D82F1F783E0100B6A112 /* libcurl.4.tbd in Frameworks */,
 				AD0E5CB11ECC726C00C35669 /* OpenGL.framework in Frameworks */,
+				AD46901E22FF4328003DA1A6 /* AppCenterAnalytics.framework in Frameworks */,
 				AD0E5CB01ECC726400C35669 /* Cocoa.framework in Frameworks */,
 				AD0E5CAF1ECC726000C35669 /* CoreFoundation.framework in Frameworks */,
 				ADF396DD216F749200024722 /* AppKit.framework in Frameworks */,
 				AD0E5CAE1ECC725400C35669 /* CoreVideo.framework in Frameworks */,
-				ADC8F776216675A90084ECAD /* HockeySDK.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -603,6 +592,7 @@
 				ADC8F780216678270084ECAD /* CoreText.framework in Frameworks */,
 				ADC8F781216678270084ECAD /* QuartzCore.framework in Frameworks */,
 				ADC8F782216678270084ECAD /* QuickLook.framework in Frameworks */,
+				AD46901922FF431A003DA1A6 /* AppCenterAnalytics.framework in Frameworks */,
 				ADC8F783216678270084ECAD /* MobileCoreServices.framework in Frameworks */,
 				ADC8F784216678270084ECAD /* SystemConfiguration.framework in Frameworks */,
 				ADE0863321239D0700945972 /* Accelerate.framework in Frameworks */,
@@ -611,13 +601,14 @@
 				AD3087C82061D1CD009F9260 /* CoreGraphics.framework in Frameworks */,
 				AD3087C62061D1B4009F9260 /* CoreVideo.framework in Frameworks */,
 				AD3087C2205F016F009F9260 /* AVFoundation.framework in Frameworks */,
+				AD46901722FF4319003DA1A6 /* AppCenter.framework in Frameworks */,
 				AD30D8331F8049BD00B6A112 /* Photos.framework in Frameworks */,
 				AD759B691F279B3900211963 /* GLKit.framework in Frameworks */,
 				ADD7D2B31EBFA42C00D5A897 /* Security.framework in Frameworks */,
 				ADE0862D212395B600945972 /* libSonarPenUniversal.a in Frameworks */,
+				AD46901822FF431A003DA1A6 /* AppCenterCrashes.framework in Frameworks */,
 				ADD7D2B11EBFA42600D5A897 /* libz.tbd in Frameworks */,
 				AD759B681F2796EA00211963 /* OpenGLES.framework in Frameworks */,
-				ADAE4B2E216D06CE00B1DD8C /* HockeySDK.framework in Frameworks */,
 				ADD7D28D1EBF9D6F00D5A897 /* CoreFoundation.framework in Frameworks */,
 				ADD7D28B1EBF9D5D00D5A897 /* UIKit.framework in Frameworks */,
 				ADD7D2871EBF9C6700D5A897 /* Foundation.framework in Frameworks */,
@@ -638,7 +629,9 @@
 		AD06989520CC6C210010825F /* iOS */ = {
 			isa = PBXGroup;
 			children = (
-				ADAE4B2D216D06CC00B1DD8C /* HockeySDK.framework */,
+				AD46901422FF4319003DA1A6 /* AppCenter.framework */,
+				AD46901622FF4319003DA1A6 /* AppCenterAnalytics.framework */,
+				AD46901522FF4319003DA1A6 /* AppCenterCrashes.framework */,
 				ADC8F779216678260084ECAD /* CoreTelephony.framework */,
 				ADC8F77A216678260084ECAD /* CoreText.framework */,
 				ADC8F77D216678270084ECAD /* MobileCoreServices.framework */,
@@ -656,7 +649,9 @@
 		AD06989820CC6C3E0010825F /* OSX */ = {
 			isa = PBXGroup;
 			children = (
-				ADC8F775216675A80084ECAD /* HockeySDK.framework */,
+				AD46901C22FF4328003DA1A6 /* AppCenter.framework */,
+				AD46901B22FF4327003DA1A6 /* AppCenterAnalytics.framework */,
+				AD46901A22FF4327003DA1A6 /* AppCenterCrashes.framework */,
 				AD06989920CC6C4C0010825F /* ZipArchive.framework */,
 			);
 			name = OSX;
@@ -1059,9 +1054,7 @@
 				AD0E5C991ECC6F2B00C35669 /* Frameworks */,
 				AD0E5C9A1ECC6F2B00C35669 /* Resources */,
 				AD2286BB214E96E60074567E /* Versioning Info.plist */,
-				AD30D8201F783B5600B6A112 /* CopyFiles */,
 				ADFD32202166AA6000F46F85 /* CopyFiles */,
-				ADC8F77421665FD20084ECAD /* Hockeyapp */,
 			);
 			buildRules = (
 			);
@@ -1119,9 +1112,7 @@
 				ADD7D2681EBF9AE300D5A897 /* Frameworks */,
 				ADD7D2691EBF9AE300D5A897 /* Resources */,
 				ADB86F66214EFC04004E7CB8 /* Versioning Info.plist */,
-				AD06989C20CC89370010825F /* CopyFiles */,
 				AD787AEE20D4611100C4712A /* Embed App Extensions */,
-				ADC8F7782166778C0084ECAD /* Hockeyapp */,
 			);
 			buildRules = (
 			);
@@ -1249,7 +1240,6 @@
 			files = (
 				AD5016591EBFC7F00079A826 /* data in Resources */,
 				ADD7D27C1EBF9AE300D5A897 /* Main.storyboard in Resources */,
-				ADAE4B30216D075400B1DD8C /* HockeySDKResources.bundle in Resources */,
 				ADD7D27E1EBF9AE300D5A897 /* Assets.xcassets in Resources */,
 				ADD7D2811EBF9AE300D5A897 /* LaunchScreen.storyboard in Resources */,
 			);
@@ -1365,7 +1355,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "python scripts/pre-build.py $CONFIGURATION";
+			shellScript = "python scripts/pre-build.py $CONFIGURATION\n";
 		};
 		ADB86F65214EFBCD004E7CB8 /* Generate Version */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -1395,34 +1385,6 @@
 			shellPath = /bin/sh;
 			shellScript = "# Use the commit count as CFBundleVersion\nGIT_COMMIT_COUNT=`git rev-list --count HEAD`\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion ${GIT_COMMIT_COUNT}\" \"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}\"\n\n## Use the last annotated tag as CFBundleShortVersionString\nGIT_TAG=`git describe --tags --abbrev=0 | cut -d'-' -f1`\n/usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString ${GIT_TAG}\" \"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}\"\n";
 		};
-		ADC8F77421665FD20084ECAD /* Hockeyapp */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = Hockeyapp;
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "FILE=\"${SRCROOT}/libs/hockeyapp/HockeySDK-Mac/BuildAgent\"\nif [ -f \"$FILE\" ]; then\n    \"$FILE\"\nfi\n";
-		};
-		ADC8F7782166778C0084ECAD /* Hockeyapp */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = Hockeyapp;
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "FILE=\"${SRCROOT}/libs/hockeyapp/HockeySDK-iOS/BuildAgent\"\nif [ -f \"$FILE\" ]; then\n    \"$FILE\"\nfi";
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -1719,10 +1681,17 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"libs/hockeyapp/HockeySDK-Mac",
+					"$(PROJECT_DIR)/libs/AppCenter-SDK-Apple/macOS",
+					"$(PROJECT_DIR)/libs/appcenter-apple/macOS",
 				);
 				INFOPLIST_FILE = "PanoPainter-OSX/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-fcxx-modules",
+					"-fmodules",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.omixlab.panopainter.osx;
 				PRODUCT_NAME = PanoPainter;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1743,10 +1712,17 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"libs/hockeyapp/HockeySDK-Mac",
+					"$(PROJECT_DIR)/libs/AppCenter-SDK-Apple/macOS",
+					"$(PROJECT_DIR)/libs/appcenter-apple/macOS",
 				);
 				INFOPLIST_FILE = "PanoPainter-OSX/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-fcxx-modules",
+					"-fmodules",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.omixlab.panopainter.osx;
 				PRODUCT_NAME = PanoPainter;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1759,7 +1735,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
 				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = NO;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -1827,7 +1803,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
 				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = NO;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -2057,7 +2033,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
-				CLANG_ENABLE_MODULES = NO;
+				CLANG_ENABLE_MODULES = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = ERD9AYQ49S;
@@ -2065,6 +2041,8 @@
 					"$(inherited)",
 					"libs/hockeyapp/HockeySDK-iOS",
 					"libs/hockeyapp/HockeySDK-iOS/HockeySDK.embeddedframework",
+					"$(PROJECT_DIR)/libs/AppCenter-SDK-Apple/iOS",
+					"$(PROJECT_DIR)/libs/appcenter-apple/iOS",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2078,6 +2056,11 @@
 					"libs/curl-android-ios/iOS",
 					libs/libSonarPen,
 				);
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-fcxx-modules",
+					"-fmodules",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.omixlab.panopainter.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -2090,13 +2073,15 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
-				CLANG_ENABLE_MODULES = NO;
+				CLANG_ENABLE_MODULES = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DEVELOPMENT_TEAM = ERD9AYQ49S;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"libs/hockeyapp/HockeySDK-iOS",
 					"libs/hockeyapp/HockeySDK-iOS/HockeySDK.embeddedframework",
+					"$(PROJECT_DIR)/libs/AppCenter-SDK-Apple/iOS",
+					"$(PROJECT_DIR)/libs/appcenter-apple/iOS",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2110,6 +2095,11 @@
 					"libs/curl-android-ios/iOS",
 					libs/libSonarPen,
 				);
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-fcxx-modules",
+					"-fmodules",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.omixlab.panopainter.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;

PanoPainter/AppDelegate.m

@@ -10,7 +10,10 @@
 #import "GameViewController.h"
 #include "app.h"
 #include <WTSonarPenDriver.h>
-#import <HockeySDK/HockeySDK.h>
+
+@import AppCenter;
+@import AppCenterAnalytics;
+@import AppCenterCrashes;
 
 @interface AppDelegate () {
     GameViewController* view;
@@ -29,7 +32,7 @@
 
 - (void)hockeyapp_crash
 {
-    [[[BITHockeyManager sharedHockeyManager] crashManager] generateTestCrash];
+    [MSCrashes generateTestCrash];
 }
 
 - (float)sonarpen_pressure
@@ -58,10 +61,11 @@
 }
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-    [[BITHockeyManager sharedHockeyManager] configureWithIdentifier:@"c2dccca196294ecca8fd5d58af2738cf"];
+    //[[BITHockeyManager sharedHockeyManager] configureWithIdentifier:@"c2dccca196294ecca8fd5d58af2738cf"];
-    // Do some additional configuration if needed here
+    [MSAppCenter start:@"c2dccca1-9629-4ecc-a8fd-5d58af2738cf" withServices:@[
-    [[BITHockeyManager sharedHockeyManager] startManager];
+      [MSAnalytics class],
-    //[[BITHockeyManager sharedHockeyManager].authenticator authenticateInstallation];
+      [MSCrashes class]
+    ]];
 //    sonarpen_driver = [[WTSonarPenDriver alloc] initWithApplication:application];
 //    [sonarpen_driver start];
 //    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(penStatusChanged) name:WTSonarPenDriverStateChangedNotification object:nil];

PanoPainter/main.cpp

@@ -11,7 +11,7 @@
 #include "objc_utils.h"
 
 int main(int argc, char * argv[]) {
-    install_global_handlers();
+    //install_global_handlers();
     @autoreleasepool {
         return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
     }

src/objc_utils.cpp

@@ -63,7 +63,8 @@ void exception_handler(NSException *exception)
     NSString* callstack = [[NSThread callStackSymbols] componentsJoinedByString:@"\n"];
     LOG("base:\n%s\ncallstack:\n%s", base_address.c_str(), [callstack cStringUsingEncoding:NSUTF8StringEncoding]);
     save_recovery();
-    exit(0);
+    uinstall_global_handlers();
+    //exit(0);
 }
 
 static void signal_handler (int signo) {
@@ -73,19 +74,30 @@ static void signal_handler (int signo) {
     NSString* callstack = [[NSThread callStackSymbols] componentsJoinedByString:@"\n"];
     LOG("base:\n%s\ncallstack:\n%s", base_address.c_str(), [callstack cStringUsingEncoding:NSUTF8StringEncoding]);
     save_recovery();
-    exit(0);
+    uinstall_global_handlers();
+    //exit(0);
 }
 
 void SignalHandler(int sig, siginfo_t *info, void *context)
 {
     save_recovery();
-    exit(0);
+    //exit(0);
 }
 
 void TerminateHandler()
 {
     save_recovery();
-    exit(0);
+    //exit(0);
+}
+
+void uinstall_global_handlers()
+{
+    signal(SIGABRT, SIG_DFL);
+    signal(SIGILL, SIG_DFL);
+    signal(SIGSEGV, SIG_DFL);
+    signal(SIGFPE, SIG_DFL);
+    signal(SIGBUS, SIG_DFL);
+    signal(SIGPIPE, SIG_DFL);
 }
 
 void install_global_handlers()

src/objc_utils.h

@@ -11,6 +11,7 @@
 #endif
 
 void install_global_handlers();
+void uinstall_global_handlers();
 void delete_all_files_in_path(const std::string& source_path);
 void export_mp4(const std::string& rec_path, int width, int height, int tot, void(^progress_callback)(float));
 void save_image_library(const std::string& path);