diff --git a/.gitignore b/.gitignore index d1572bc1a6..d2760543ef 100644 --- a/.gitignore +++ b/.gitignore @@ -170,6 +170,8 @@ android/pushwoosh.properties android/libnotify.properties android/google-services.json server +iphone/Maps/com.mapswithme.full/ +iphone/Maps/com.my.maps-beta-enterprise/ *.li diff --git a/iphone/Maps/Bridging-Header.h b/iphone/Maps/Bridging-Header.h index 30efc335bc..5766ababcd 100644 --- a/iphone/Maps/Bridging-Header.h +++ b/iphone/Maps/Bridging-Header.h @@ -6,7 +6,6 @@ #import "AuthenticationServices/AuthenticationServices.h" #import "CarPlay/CarPlay.h" -#import "Crashlytics/Crashlytics.h" #import "FBAudienceNetwork/FBAudienceNetwork.h" #import "FBSDKLoginKit/FBSDKLoginKit.h" #import "GoogleSignIn/GIDSignIn.h" diff --git a/iphone/Maps/Categories/UIKitCategories.m b/iphone/Maps/Categories/UIKitCategories.m index 74444fe021..1219d04b06 100644 --- a/iphone/Maps/Categories/UIKitCategories.m +++ b/iphone/Maps/Categories/UIKitCategories.m @@ -2,7 +2,7 @@ #import "UIButton+RuntimeAttributes.h" #import "UIImageView+Coloring.h" -#import +#import #import @implementation NSObject (Optimized) @@ -180,7 +180,7 @@ userInfo:@{ @"Trying to open nil url" : @YES }]; - [[Crashlytics sharedInstance] recordError:err]; + [[FIRCrashlytics crashlytics] recordError:err]; return; } NSString * scheme = url.scheme; @@ -193,7 +193,7 @@ userInfo:@{ @"Trying to open incorrect url" : urlString }]; - [[Crashlytics sharedInstance] recordError:err]; + [[FIRCrashlytics crashlytics] recordError:err]; return; } diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index bd5800fdf2..4c00e1cdf3 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -25,7 +25,7 @@ #include "geometry/mercator.hpp" -#import +#import // If you have a "missing header error" here, then please run configure.sh script in the root repo // folder. @@ -743,7 +743,7 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing"; auto err = [[NSError alloc] initWithDomain:kMapsmeErrorDomain code:1 userInfo:@{@"Description": @"attempt to get info from empty countryId"}]; - [[Crashlytics sharedInstance] recordError:err]; + [[FIRCrashlytics crashlytics] recordError:err]; #endif return; } diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index 62908ed8e3..06242de27e 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -26,8 +26,7 @@ #import #import -#import -#import +#import #include #import @@ -77,17 +76,16 @@ void InitCrashTrackers() { if ([MWMSettings crashReportingDisabled]) return; - NSString *fabricKey = @(CRASHLYTICS_IOS_KEY); - if (fabricKey.length != 0) { - // Initialize Fabric/Crashlytics SDK. - [Fabric with:@ [[Crashlytics class]]]; + NSString *googleConfig = [[NSBundle mainBundle] pathForResource:@"GoogleService-Info" ofType:@"plist"]; + if ([[NSFileManager defaultManager] fileExistsAtPath:googleConfig]) { + [FIRApp configure]; } #endif } void ConfigCrashTrackers() { #ifdef OMIM_PRODUCTION - [[Crashlytics sharedInstance] setObjectValue:[Alohalytics installationId] forKey:@"AlohalyticsInstallationId"]; + [[FIRCrashlytics crashlytics] setUserID:[Alohalytics installationId]]; #endif } @@ -216,7 +214,7 @@ using namespace osm_auth_ios; } [self enableTTSForTheFirstTime]; - [GIDSignIn sharedInstance].clientID = [[NSBundle mainBundle] loadWithPlist:@"GoogleService-Info"][@"CLIENT_ID"]; + [GIDSignIn sharedInstance].clientID = @(GOOGLE_WEB_CLIENT_ID); self.notificationManager = [[NotificationManager alloc] init]; self.notificationManager.delegate = self; @@ -312,7 +310,7 @@ using namespace osm_auth_ios; auto err = [[NSError alloc] initWithDomain:kMapsmeErrorDomain code:1 userInfo:@{@"Description": @"applicationDidReceiveMemoryWarning"}]; - [[Crashlytics sharedInstance] recordError:err]; + [[FIRCrashlytics crashlytics] recordError:err]; #endif } @@ -323,7 +321,7 @@ using namespace osm_auth_ios; auto err = [[NSError alloc] initWithDomain:kMapsmeErrorDomain code:2 userInfo:@{@"Description": @"applicationWillTerminate"}]; - [[Crashlytics sharedInstance] recordError:err]; + [[FIRCrashlytics crashlytics] recordError:err]; #endif // Global cleanup @@ -724,7 +722,7 @@ using namespace osm_auth_ios; - (void)onConversionDataRequestFailure:(NSError *)error { dispatch_async(dispatch_get_main_queue(), ^{ - [Crashlytics.sharedInstance recordError:error]; + [[FIRCrashlytics crashlytics] recordError:error]; }); } diff --git a/iphone/Maps/Common/Statistics/fabric_logging_ios.mm b/iphone/Maps/Common/Statistics/fabric_logging_ios.mm index d503b23e59..2fbb04c093 100644 --- a/iphone/Maps/Common/Statistics/fabric_logging_ios.mm +++ b/iphone/Maps/Common/Statistics/fabric_logging_ios.mm @@ -1,4 +1,4 @@ -#import +#import #include "fabric_logging.hpp" @@ -23,7 +23,7 @@ void LogMessageFabric(base::LogLevel level, base::SrcPoint const & srcPoint, std std::string const srcString = recordType + DebugPrint(srcPoint) + " " + msg + "\n"; - CLSLog(@"%@", @(srcString.c_str())); + [[FIRCrashlytics crashlytics] logWithFormat:@"%@", @(srcString.c_str())]; } void IosLogMessage(base::LogLevel level, base::SrcPoint const & srcPoint, std::string const & msg) diff --git a/iphone/Maps/Core/Ads/BannersCache.swift b/iphone/Maps/Core/Ads/BannersCache.swift index a07f28bace..4b3efdf23c 100644 --- a/iphone/Maps/Core/Ads/BannersCache.swift +++ b/iphone/Maps/Core/Ads/BannersCache.swift @@ -1,4 +1,4 @@ -import Crashlytics +import FirebaseCrashlytics import MyTrackerSDK @objc(MWMBannersCache) @@ -92,7 +92,7 @@ final class BannersCache: NSObject { var statParams = errorDetails statParams[kStatErrorMessage] = (error as NSError).userInfo.reduce("") { $0 + "\($1.key) : \($1.value)\n" } Statistics.logEvent(event, withParameters: statParams) - Crashlytics.sharedInstance().recordError(error) + Crashlytics.crashlytics().record(error: error) MRMyTracker.trackEvent(withName: event) self.setError(bannerType: bannerType) }, click: { banner in diff --git a/iphone/Maps/Core/DeepLink/Strategies/DeepLinkRouteStrategyAdapter.mm b/iphone/Maps/Core/DeepLink/Strategies/DeepLinkRouteStrategyAdapter.mm index 34c1d8fbb8..162c705a70 100644 --- a/iphone/Maps/Core/DeepLink/Strategies/DeepLinkRouteStrategyAdapter.mm +++ b/iphone/Maps/Core/DeepLink/Strategies/DeepLinkRouteStrategyAdapter.mm @@ -1,6 +1,6 @@ #import "DeepLinkRouteStrategyAdapter.h" #import -#import +#import #import "MWMCoreRouterType.h" #import "MWMRoutePoint+CPP.h" @@ -24,7 +24,7 @@ NSError *err = [[NSError alloc] initWithDomain:kMapsmeErrorDomain code:5 userInfo:@{@"Description": @"Invalid number of route points", @"URL": url}]; - [[Crashlytics sharedInstance] recordError:err]; + [[FIRCrashlytics crashlytics] recordError:err]; return nil; } } diff --git a/iphone/Maps/Core/Notifications/MWMPushNotifications.mm b/iphone/Maps/Core/Notifications/MWMPushNotifications.mm index d134bb4206..e07ac3521f 100644 --- a/iphone/Maps/Core/Notifications/MWMPushNotifications.mm +++ b/iphone/Maps/Core/Notifications/MWMPushNotifications.mm @@ -1,5 +1,5 @@ #import "MWMPushNotifications.h" -#import +#import #import #import "Statistics.h" @@ -42,7 +42,7 @@ NSString * const kPushDeviceTokenLogEvent = @"iOSPushDeviceToken"; didFailToRegisterForRemoteNotificationsWithError:(NSError *)error { [[PushNotificationManager pushManager] handlePushRegistrationFailure:error]; - [[Crashlytics sharedInstance] recordError:error]; + [[FIRCrashlytics crashlytics] recordError:error]; } + (void)application:(UIApplication *)application diff --git a/iphone/Maps/Core/Routing/MWMRouter.mm b/iphone/Maps/Core/Routing/MWMRouter.mm index 924eeb414e..37c43886fc 100644 --- a/iphone/Maps/Core/Routing/MWMRouter.mm +++ b/iphone/Maps/Core/Routing/MWMRouter.mm @@ -1,5 +1,5 @@ #import "MWMRouter.h" -#import +#import #import "MWMAlertViewController+CPP.h" #import "MWMCoreRouterType.h" #import "MWMFrameworkListener.h" @@ -143,7 +143,7 @@ void logPointEvent(MWMRoutePoint * point, NSString * eventType) @"Description" : @"Invalid number of taxi route points", @"Count" : @(routePoints.size()) }]; - [[Crashlytics sharedInstance] recordError:err]; + [[FIRCrashlytics crashlytics] recordError:err]; } [taxiDataSource taxiURL:^(NSURL * url) { @@ -490,7 +490,7 @@ void logPointEvent(MWMRoutePoint * point, NSString * eventType) @"Description" : @"Invalid number of route points", @"Count" : @(routePoints.size()) }]; - [[Crashlytics sharedInstance] recordError:err]; + [[FIRCrashlytics crashlytics] recordError:err]; } }; diff --git a/iphone/Maps/Core/Search/MWMSearch+CoreSpotlight.mm b/iphone/Maps/Core/Search/MWMSearch+CoreSpotlight.mm index 4d4d9177d0..1ea91f445b 100644 --- a/iphone/Maps/Core/Search/MWMSearch+CoreSpotlight.mm +++ b/iphone/Maps/Core/Search/MWMSearch+CoreSpotlight.mm @@ -1,5 +1,5 @@ #import -#import +#import #import #import #import "MWMSearch+CoreSpotlight.h" @@ -59,7 +59,7 @@ if (error) { NSError * err = error; - [[Crashlytics sharedInstance] recordError:err]; + [[FIRCrashlytics crashlytics] recordError:err]; LOG(LERROR, ("addCategoriesToSpotlight failed: ", err.localizedDescription.UTF8String)); } diff --git a/iphone/Maps/GoogleService-Info.plist b/iphone/Maps/GoogleService-Info.plist deleted file mode 100644 index 24d513d1d8..0000000000 --- a/iphone/Maps/GoogleService-Info.plist +++ /dev/null @@ -1,28 +0,0 @@ - - - - - CLIENT_ID - 1033279251462-k2pp753lp1f39dacjn0pkurcc8pbbvsi.apps.googleusercontent.com - REVERSED_CLIENT_ID - com.googleusercontent.apps.1033279251462-k2pp753lp1f39dacjn0pkurcc8pbbvsi - PLIST_VERSION - 1 - BUNDLE_ID - com.mapswithme.full - PROJECT_ID - mapsmeauth - IS_ADS_ENABLED - - IS_ANALYTICS_ENABLED - - IS_APPINVITE_ENABLED - - IS_GCM_ENABLED - - IS_SIGNIN_ENABLED - - GOOGLE_APP_ID - 1:1033279251462:ios:c25db4ed9dea3619 - - \ No newline at end of file diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 54826c455b..fc9a20b56c 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -36,7 +36,6 @@ 340416541E7C09C200E2B6D6 /* PhotoScalingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340416521E7C09C200E2B6D6 /* PhotoScalingView.swift */; }; 340416581E7C0D4100E2B6D6 /* PhotosOverlayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340416561E7C0D4100E2B6D6 /* PhotosOverlayView.swift */; }; 3404165C1E7C29AE00E2B6D6 /* PhotosInteractionAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3404165A1E7C29AE00E2B6D6 /* PhotosInteractionAnimator.swift */; }; - 340474F11E08199D00C92850 /* Crashlytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 340474DC1E08199D00C92850 /* Crashlytics.framework */; }; 340474F41E08199D00C92850 /* Fabric.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 340474DD1E08199D00C92850 /* Fabric.framework */; }; 340475091E08199E00C92850 /* MWMMyTarget.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340474EB1E08199D00C92850 /* MWMMyTarget.mm */; }; 3404750F1E08199E00C92850 /* MyTrackerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 340474EE1E08199D00C92850 /* MyTrackerSDK.framework */; }; @@ -113,7 +112,6 @@ 3457C4261F680F1900028233 /* String+BoundingRect.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3457C4241F680F1900028233 /* String+BoundingRect.swift */; }; 345E8F4E1F83984500A826CC /* GoogleSignIn.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 347D15C71F82362900E86251 /* GoogleSignIn.framework */; }; 345E8F4F1F83984500A826CC /* GoogleSignInDependencies.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 347D15C81F82362900E86251 /* GoogleSignInDependencies.framework */; }; - 345E8F551F839E6C00A826CC /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 345E8F4D1F83976800A826CC /* GoogleService-Info.plist */; }; 3462258F1DDC5DBA001E8752 /* MWMSearchNoResultsAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3462258D1DDC5DBA001E8752 /* MWMSearchNoResultsAlert.mm */; }; 346225921DDC5FBA001E8752 /* MWMSearchNoResultsAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 346225901DDC5FBA001E8752 /* MWMSearchNoResultsAlert.xib */; }; 3463BA671DE81DB90082417F /* MWMTrafficButtonViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3463BA641DE81DB90082417F /* MWMTrafficButtonViewController.mm */; }; @@ -958,7 +956,6 @@ 340416521E7C09C200E2B6D6 /* PhotoScalingView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhotoScalingView.swift; sourceTree = ""; }; 340416561E7C0D4100E2B6D6 /* PhotosOverlayView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhotosOverlayView.swift; sourceTree = ""; }; 3404165A1E7C29AE00E2B6D6 /* PhotosInteractionAnimator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhotosInteractionAnimator.swift; sourceTree = ""; }; - 340474DC1E08199D00C92850 /* Crashlytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Crashlytics.framework; sourceTree = ""; }; 340474DD1E08199D00C92850 /* Fabric.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Fabric.framework; sourceTree = ""; }; 340474EA1E08199D00C92850 /* MWMMyTarget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMyTarget.h; sourceTree = ""; }; 340474EB1E08199D00C92850 /* MWMMyTarget.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMyTarget.mm; sourceTree = ""; }; @@ -1082,7 +1079,6 @@ 3454D7B51E07F045004AF2AD /* UITextView+RuntimeAttributes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UITextView+RuntimeAttributes.m"; sourceTree = ""; }; 34570A3A1B13222600E6D4FD /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; 3457C4241F680F1900028233 /* String+BoundingRect.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+BoundingRect.swift"; sourceTree = ""; }; - 345E8F4D1F83976800A826CC /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 3462258C1DDC5DB9001E8752 /* MWMSearchNoResultsAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchNoResultsAlert.h; sourceTree = ""; }; 3462258D1DDC5DBA001E8752 /* MWMSearchNoResultsAlert.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMSearchNoResultsAlert.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 346225901DDC5FBA001E8752 /* MWMSearchNoResultsAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSearchNoResultsAlert.xib; sourceTree = ""; }; @@ -2227,7 +2223,6 @@ 674A7E291C0DA576003D48E1 /* libsdf_image.a in Frameworks */, 6741AAC91BF356BA002C974C /* libindexer.a in Frameworks */, 6741AACA1BF356BA002C974C /* libjansson.a in Frameworks */, - 340474F11E08199D00C92850 /* Crashlytics.framework in Frameworks */, 47D48BCD242A0F7200FEFB1F /* Chart.framework in Frameworks */, 6741AACC1BF356BA002C974C /* libmap.a in Frameworks */, 6741AACE1BF356BA002C974C /* libopening_hours.a in Frameworks */, @@ -2347,7 +2342,6 @@ 34D7DB77204ED3DD0041D015 /* maps.me dbg.entitlements */, CD08888422BCF1C900C1368D /* maps.me full.entitlements */, CD08888322BCF1C800C1368D /* maps.me rel.entitlements */, - 345E8F4D1F83976800A826CC /* GoogleService-Info.plist */, 34BBD6451F8264980070CA50 /* GoogleSignIn.bundle */, 4A300ED31C6DCFD400140018 /* countries-strings */, 5605022E1B6211E100169CAD /* sound-strings */, @@ -2473,7 +2467,6 @@ isa = PBXGroup; children = ( 45A37B9D20B33F5D005FBDBB /* FBAudienceNetwork.framework */, - 340474DC1E08199D00C92850 /* Crashlytics.framework */, 340474DD1E08199D00C92850 /* Fabric.framework */, 347D15C71F82362900E86251 /* GoogleSignIn.framework */, 347D15C81F82362900E86251 /* GoogleSignInDependencies.framework */, @@ -4942,7 +4935,8 @@ 6741A9411BF340DE002C974C /* Resources */, 6741A9A01BF340DE002C974C /* Sources */, 6741AA311BF340DE002C974C /* Frameworks */, - 34F7422E1E08328300AC1FD6 /* Crashlytics */, + 99B5F1D924A3628C006ACC52 /* Setup Google */, + 34F7422E1E08328300AC1FD6 /* Firebase Crashlytics */, AED76F73852BBAF00EEF9E66 /* [CP] Embed Pods Frameworks */, 4740184523F5BDE900A93C81 /* Embed Frameworks */, ); @@ -5133,7 +5127,6 @@ 3404F48C202894EA0090E401 /* BMCViewController.xib in Resources */, F6E2FD681E097BA00083EBEC /* MWMMapDownloaderPlaceTableViewCell.xib in Resources */, F6E2FD6E1E097BA00083EBEC /* MWMMapDownloaderSubplaceTableViewCell.xib in Resources */, - 345E8F551F839E6C00A826CC /* GoogleService-Info.plist in Resources */, 3477528B1F725002000D46A3 /* UGCAddReviewRatingCell.xib in Resources */, 471C448D2322A7C800C307EC /* SubscriptionGoToCatalogViewController.xib in Resources */, F6E2FD741E097BA00083EBEC /* MWMMapDownloaderTableViewCell.xib in Resources */, @@ -5245,19 +5238,20 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 34F7422E1E08328300AC1FD6 /* Crashlytics */ = { + 34F7422E1E08328300AC1FD6 /* Firebase Crashlytics */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "$(SRCROOT)/$(BUILT_PRODUCTS_DIR)/$(INFOPLIST_PATH)", ); - name = Crashlytics; + name = "Firebase Crashlytics"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "#!/bin/bash\n\nLOWERED_CONFIG=`echo $CONFIGURATION | tr [A-Z] [a-z]`\nif [[ \"$LOWERED_CONFIG\" == *production* || \"$LOWERED_CONFIG\" == *release* ]]; then\n LINE=`grep CRASHLYTICS_IOS_KEY ../../private.h`\n if [[ $LINE =~ \\\"(.*)\\\" ]]; then\n CRASHLYTICS_KEY=${BASH_REMATCH[1]}\n if [[ \"$CRASHLYTICS_KEY\" ]]; then\n bash \"./3party/Fabric.framework/run\" \"$CRASHLYTICS_KEY\"\n fi\n fi\nfi\n"; + shellScript = "#!/bin/bash\necho \"[Firebase Crashlytics] start\"\n\nLOWERED_CONFIG=`echo $CONFIGURATION | tr [A-Z] [a-z]`\nPLIST_PATH=\"${PROJECT_DIR}/${BUNDLE_IDENTIFIER}/GoogleService-Info.plist\"\nDSYM_PATH=${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${TARGET_NAME}\n\necho \"[Firebase Crashlytics] dsyms: ${DSYM_PATH}\"\necho \"[Firebase Crashlytics] plist: ${PLIST_PATH}\"\n# ONLY FOR Release, because for production we use Bitecode\n\nif [[ \"$LOWERED_CONFIG\" == *release* ]]; then\n if [ ! -f \"${PLIST_PATH}\" ]; then\n echo \"[Firebase Crashlytics] Google plist not found!\"\n exit 1\n fi\n bash \"${PODS_ROOT}/FirebaseCrashlytics/run -gsp ${PLIST_PATH} -p ios ${DSYM_PATH}\"\n echo \"[Firebase Crashlytics] done\"\nfi\n"; }; 47C7F96D2191A3B600C2760C /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -5276,6 +5270,24 @@ shellPath = /bin/sh; shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n../../tools/unix/check_cert.sh\n"; }; + 99B5F1D924A3628C006ACC52 /* Setup Google */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Setup Google "; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "#!/bin/bash\necho \"[Setup Google] Start\"\n\nLOWERED_CONFIG=`echo $CONFIGURATION | tr [A-Z] [a-z]`\nBUILD_APP_PATH=\"${TARGET_BUILD_DIR}/${CONTENTS_FOLDER_PATH}\"\nPLIST_PATH=\"${PROJECT_DIR}/${BUNDLE_IDENTIFIER}/GoogleService-Info.plist\"\n\necho \"[Setup Google] config: ${LOWERED_CONFIG}\"\necho \"[Setup Google] plist: ${PLIST_PATH}\"\necho \"[Setup Google] app: ${BUILD_APP_PATH}\"\n\nif [[ \"$LOWERED_CONFIG\" == *production* || \"$LOWERED_CONFIG\" == *release* ]]; then\n if [ ! -f \"${PLIST_PATH}\" ]; then\n echo \"[Setup Google] Google plist not found!\"\n exit 1\n fi\n cp \"${PLIST_PATH}\" \"${BUILD_APP_PATH}\"\n echo \"[Setup Google] done\"\nfi\n"; + }; AED76F73852BBAF00EEF9E66 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -5287,7 +5299,10 @@ "${BUILT_PRODUCTS_DIR}/FBSDKCoreKit/FBSDKCoreKit.framework", "${BUILT_PRODUCTS_DIR}/FBSDKLoginKit/FBSDKLoginKit.framework", "${BUILT_PRODUCTS_DIR}/Flurry-iOS-SDK/Flurry_iOS_SDK.framework", + "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", + "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework", "${BUILT_PRODUCTS_DIR}/mopub-ios-sdk/MoPub.framework", + "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( @@ -5295,7 +5310,10 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKCoreKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKLoginKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flurry_iOS_SDK.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MoPub.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; diff --git a/iphone/Maps/UI/Authorization/AuthorizationViewController.swift b/iphone/Maps/UI/Authorization/AuthorizationViewController.swift index 5b7e9f4c47..558f5a779f 100644 --- a/iphone/Maps/UI/Authorization/AuthorizationViewController.swift +++ b/iphone/Maps/UI/Authorization/AuthorizationViewController.swift @@ -3,6 +3,7 @@ import FBSDKLoginKit import GoogleSignIn import SafariServices import AuthenticationServices +import Firebase @objc enum AuthorizationError: Int { case cancelled @@ -275,7 +276,7 @@ final class AuthorizationViewController: MWMViewController { kStatError: error.localizedDescription ]) textLabel.text = L("profile_authorization_error") - Crashlytics.sharedInstance().recordError(error) + Crashlytics.crashlytics().record(error: error) } private func process(token: String,