Release/5.1.4 to master

.circleci/config.yml

@@ -6,7 +6,7 @@ version: 2
 jobs:
   initialize:
     macos:
-      xcode: "11.3.0"
+      xcode: "11.3.1"
     environment:
       FL_OUTPUT_DIR: output
     steps:
@@ -57,7 +57,7 @@ jobs:
             - .
   unit-tests:
     macos:
-      xcode: "11.3.0"
+      xcode: "11.3.1"
     environment:
       FL_OUTPUT_DIR: output
     steps:
@@ -73,7 +73,7 @@ jobs:
           path: output/scan
   upload-qa:
     macos:
-      xcode: "11.3.0"
+      xcode: "11.3.1"
     steps:
       - attach_workspace:
           at: .
@@ -85,7 +85,7 @@ jobs:
           command: bundle exec fastlane qa
   upload-production-appstore:
     macos:
-      xcode: "11.3.0"
+      xcode: "11.3.1"
     steps:
       - attach_workspace:
           at: .
@@ -97,7 +97,7 @@ jobs:
           command: bundle exec fastlane prod
   upload-production-enterprise:
     macos:
-      xcode: "11.3.0"
+      xcode: "11.3.1"
     steps:
       - attach_workspace:
           at: .
@@ -109,7 +109,7 @@ jobs:
           command: bundle exec fastlane prodenterprise
   building-tests-qa:
     macos:
-      xcode: "11.3.0"
+      xcode: "11.3.1"
     steps:
       - attach_workspace:
           at: .
@@ -121,7 +121,7 @@ jobs:
           command: bundle exec fastlane qa skipupload:true
   building-tests-prod:
     macos:
-      xcode: "11.3.0"
+      xcode: "11.3.1"
     steps:
       - attach_workspace:
           at: .
@@ -133,7 +133,7 @@ jobs:
           command: bundle exec fastlane prod skipupload:true
   building-tests-prodenterprise:
     macos:
-      xcode: "11.3.0"
+      xcode: "11.3.1"
     steps:
       - attach_workspace:
           at: .

FuelMeDriver/DriverMappingTests/Info.plist

@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>580</string>
+	<string>584</string>
 </dict>
 </plist>

FuelMeDriver/DriverUITests/Info.plist

@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>580</string>
+	<string>584</string>
 </dict>
 </plist>

FuelMeDriver/DriverUnitTestsSwift/Info.plist

@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>580</string>
+	<string>584</string>
 </dict>
 </plist>

FuelMeDriver/FuelMeDriver/Classes/Managers/RASessionManager.m

@@ -152,7 +152,7 @@ - (void)loginWithFacebookFromViewController:(UIViewController *_Nonnull)viewCont
     NSParameterAssert(completion);
     __weak __typeof__(self) weakself = self;
     FBSDKLoginManager *login = [FBSDKLoginManager new];
-    [login logInWithReadPermissions:@[@"public_profile", @"email"] fromViewController:viewController handler:^(FBSDKLoginManagerLoginResult *result, NSError *error) {
+    [login logInWithPermissions:@[@"public_profile", @"email"] fromViewController:viewController handler:^(FBSDKLoginManagerLoginResult *result, NSError *error) {
         if (error) {
             BOOL userDidntAllowToOpenFacebook = [error.domain isEqualToString:@"com.apple.SafariServices.Authentication"] && error.code == 1;
             if (userDidntAllowToOpenFacebook) {

FuelMeDriver/scripts/templates/RideDriverEnterprise-Info.plist.template

@@ -42,7 +42,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>580</string>
+	<string>584</string>
 	<key>FacebookAppID</key>
 	<string>{{facebookAppId}}</string>
 	<key>FacebookDisplayName</key>
@@ -75,10 +75,6 @@
 	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>MKDirectionsApplicationSupportedModes</key>
-	<array>
-		<string>MKDirectionsModeCar</string>
-	</array>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
@@ -109,11 +105,11 @@
 		</dict>
 	</dict>
 	<key>NSBluetoothAlwaysUsageDescription</key>
-	<string>$(PRODUCT_NAME) uses bluetooth to find, connect and transfer data between different devices</string>
+	<string>DriveAustin uses bluetooth to find, connect and transfer data between different devices</string>
 	<key>NSCameraUsageDescription</key>
-	<string>$(PRODUCT_NAME) will request your photos to help riders recognize you and your car</string>
+	<string>DriveAustin will request your photos to help riders recognize you and your car</string>
 	<key>NSContactsUsageDescription</key>
-	<string>$(PRODUCT_NAME) uses your contacts to refer a friend so that you can receive incentives</string>
+	<string>DriveAustin uses your contacts to refer a friend so that you can receive incentives</string>
 	<key>NSExceptionDomains</key>
 	<dict>
 		<key>akamaidh.net</key>
@@ -139,13 +135,13 @@
 		</dict>
 	</dict>
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-	<string>$(PRODUCT_NAME) will give you ride requests that are near your location when you are online</string>
+	<string>DriveAustin will give you ride requests that are near your location when you are online</string>
 	<key>NSLocationAlwaysUsageDescription</key>
-	<string>$(PRODUCT_NAME) will give you ride requests that are near your location when you are online</string>
+	<string>DriveAustin will give you ride requests that are near your location when you are online</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>$(PRODUCT_NAME) will give you ride requests that are near your location when you are online</string>
+	<string>DriveAustin will give you ride requests that are near your location when you are online</string>
 	<key>NSPhotoLibraryUsageDescription</key>
-	<string>$(PRODUCT_NAME) will request your photos to help riders recognize you and your car</string>
+	<string>DriveAustin will request your photos to help riders recognize you and your car</string>
 	<key>UIAppFonts</key>
 	<array>
 		<string>Montserrat-SemiBold.otf</string>

Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
-gem 'fastlane'
 gem 'cocoapods'
+gem 'fastlane'
 gem 'xcode-install'
 
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')

Gemfile.lock

@@ -1,55 +1,60 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.1)
-    activesupport (4.2.10)
+    CFPropertyList (3.0.2)
+    activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
+    algoliasearch (1.27.1)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
     atomos (0.1.3)
     babosa (1.0.3)
     claide (1.0.3)
-    cocoapods (1.5.3)
+    cocoapods (1.8.4)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.5.3)
-      cocoapods-deintegrate (>= 1.0.2, < 2.0)
-      cocoapods-downloader (>= 1.2.0, < 2.0)
+      cocoapods-core (= 1.8.4)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.3.0, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (~> 2.0.1)
+      fourflusher (>= 2.3.0, < 3.0)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.6.5)
+      molinillo (~> 0.6.6)
       nap (~> 1.0)
-      ruby-macho (~> 1.1)
-      xcodeproj (>= 1.5.7, < 2.0)
-    cocoapods-core (1.5.3)
+      ruby-macho (~> 1.4)
+      xcodeproj (>= 1.11.1, < 2.0)
+    cocoapods-core (1.8.4)
       activesupport (>= 4.0.2, < 6)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.2)
-    cocoapods-downloader (1.2.1)
+    cocoapods-deintegrate (1.0.4)
+    cocoapods-downloader (1.3.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
-    cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.3.1)
+    cocoapods-stats (1.1.0)
+    cocoapods-trunk (1.4.1)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
     commander-fastlane (4.4.6)
       highline (~> 1.7.2)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.5)
     declarative (0.0.10)
     declarative-option (0.1.0)
     digest-crc (0.4.1)
@@ -58,16 +63,16 @@ GEM
     dotenv (2.7.5)
     emoji_regex (1.0.1)
     escape (0.0.4)
-    excon (0.69.1)
-    faraday (0.17.1)
+    excon (0.71.1)
+    faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.7)
-    fastlane (2.137.0)
+    fastlane (2.139.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -76,13 +81,13 @@ GEM
       commander-fastlane (>= 4.4.6, < 5.0.0)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 2.0)
-      excon (>= 0.45.0, < 1.0.0)
+      excon (>= 0.71.0, < 1.0.0)
       faraday (~> 0.17)
       faraday-cookie_jar (~> 0.0.6)
       faraday_middleware (~> 0.13.1)
       fastimage (>= 2.1.0, < 3.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
-      google-api-client (>= 0.21.2, < 0.24.0)
+      google-api-client (>= 0.29.2, < 0.37.0)
       google-cloud-storage (>= 1.15.0, < 2.0.0)
       highline (>= 1.7.2, < 2.0.0)
       json (< 3.0.0)
@@ -101,51 +106,51 @@ GEM
       tty-screen (>= 0.6.3, < 1.0.0)
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.8.1, < 2.0.0)
+      xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-appcenter (1.6.0)
-    fourflusher (2.0.1)
+    fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    google-api-client (0.23.9)
+    google-api-client (0.36.4)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.5, < 0.7.0)
+      googleauth (~> 0.9)
       httpclient (>= 2.8.1, < 3.0)
-      mime-types (~> 3.0)
+      mini_mime (~> 1.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-      signet (~> 0.9)
+      signet (~> 0.12)
     google-cloud-core (1.4.1)
       google-cloud-env (~> 1.0)
     google-cloud-env (1.3.0)
       faraday (~> 0.11)
-    google-cloud-storage (1.16.0)
+    google-cloud-storage (1.25.0)
+      addressable (~> 2.5)
       digest-crc (~> 0.4)
-      google-api-client (~> 0.23)
+      google-api-client (~> 0.33)
       google-cloud-core (~> 1.2)
-      googleauth (>= 0.6.2, < 0.10.0)
-    googleauth (0.6.7)
+      googleauth (~> 0.9)
+      mini_mime (~> 1.0)
+    googleauth (0.10.0)
       faraday (~> 0.12)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.7)
+      signet (~> 0.12)
     highline (1.7.10)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    json (2.2.0)
+    json (2.3.0)
     jwt (2.1.0)
-    memoist (0.16.1)
-    mime-types (3.3)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
-    mini_magick (4.9.5)
-    minitest (5.11.3)
+    memoist (0.16.2)
+    mini_magick (4.10.1)
+    mini_mime (1.0.2)
+    minitest (5.13.0)
     molinillo (0.6.6)
     multi_json (1.14.1)
     multi_xml (0.6.0)
@@ -163,15 +168,15 @@ GEM
       uber (< 0.2.0)
     retriable (3.1.2)
     rouge (2.0.7)
-    ruby-macho (1.3.1)
+    ruby-macho (1.4.0)
     rubyzip (1.3.0)
     security (0.1.3)
     signet (0.12.0)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simctl (1.6.6)
+    simctl (1.6.7)
       CFPropertyList
       naturally
     slack-notifier (2.3.2)
@@ -181,20 +186,20 @@ GEM
     thread_safe (0.3.6)
     tty-cursor (0.7.0)
     tty-screen (0.7.0)
-    tty-spinner (0.9.1)
+    tty-spinner (0.9.2)
       tty-cursor (~> 0.7)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.6)
     unicode-display_width (1.6.0)
     word_wrap (1.0.0)
-    xcode-install (2.6.1)
+    xcode-install (2.6.3)
       claide (>= 0.9.1, < 1.1.0)
       fastlane (>= 2.1.0, < 3.0.0)
-    xcodeproj (1.13.0)
+    xcodeproj (1.14.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)