1.修改Apex Mobile，升级Google Map SDK。

Apex Mobile/Apex Mobile.xcodeproj/project.pbxproj

@@ -22,6 +22,11 @@
 		426E8ABA202163EC0073BA5D /* JLPresentationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 426E8AB8202163EC0073BA5D /* JLPresentationController.m */; };
 		426E8ABD2021AEC50073BA5D /* JLCustomerNavigationAlertController.m in Sources */ = {isa = PBXBuildFile; fileRef = 426E8ABC2021AEC50073BA5D /* JLCustomerNavigationAlertController.m */; };
 		427CF5D02023F5560041472A /* NewImages.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 427CF5CF2023F5560041472A /* NewImages.xcassets */; };
+		427CF5E0202452460041472A /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 427CF5DF202452450041472A /* Accelerate.framework */; };
+		427CF5E5202454750041472A /* GoogleMaps.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 427CF5E2202454750041472A /* GoogleMaps.framework */; };
+		427CF5E6202454750041472A /* GoogleMapsBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 427CF5E3202454750041472A /* GoogleMapsBase.framework */; };
+		427CF5E7202454750041472A /* GoogleMapsCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 427CF5E4202454750041472A /* GoogleMapsCore.framework */; };
+		427CF5E9202454860041472A /* GoogleMaps.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 427CF5E8202454860041472A /* GoogleMaps.bundle */; };
 		711BA6C1191E0525002EDE6F /* MessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 711BA6C0191E0525002EDE6F /* MessageViewController.m */; };
 		711BA6C4191E0553002EDE6F /* MessageItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 711BA6C3191E0553002EDE6F /* MessageItem.m */; };
 		711DC6B218C30A4800FB1749 /* TableCellEdit.m in Sources */ = {isa = PBXBuildFile; fileRef = 711DC6B118C30A4800FB1749 /* TableCellEdit.m */; };
@@ -145,8 +150,6 @@
 		71E0D1D72022AB7E009A08EB /* FullyShowViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71E0D1D22022AB7E009A08EB /* FullyShowViewController.m */; };
 		71E0D1D82022AB7E009A08EB /* ResultViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71E0D1D32022AB7E009A08EB /* ResultViewController.m */; };
 		71E0D1D92022AB7E009A08EB /* Result.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 71E0D1D52022AB7E009A08EB /* Result.storyboard */; };
-		71F57D7E19CD55A50014C893 /* GoogleMaps.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71F57D7D19CD55A50014C893 /* GoogleMaps.framework */; };
-		71F57D8019CD5C320014C893 /* GoogleMaps.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 71F57D7F19CD5C320014C893 /* GoogleMaps.bundle */; };
 		71F67CF619063612004E8462 /* ApexHistoryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71F67CF519063612004E8462 /* ApexHistoryViewController.m */; };
 		71F67CF919065EA8004E8462 /* SimpleMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 71F67CF819065EA8004E8462 /* SimpleMenu.m */; };
 		71F67CFC19066375004E8462 /* PulldownMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 71F67CFB19066375004E8462 /* PulldownMenu.m */; };
@@ -188,6 +191,11 @@
 		426E8ABB2021AEC50073BA5D /* JLCustomerNavigationAlertController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JLCustomerNavigationAlertController.h; sourceTree = "<group>"; };
 		426E8ABC2021AEC50073BA5D /* JLCustomerNavigationAlertController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JLCustomerNavigationAlertController.m; sourceTree = "<group>"; };
 		427CF5CF2023F5560041472A /* NewImages.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = NewImages.xcassets; sourceTree = "<group>"; };
+		427CF5DF202452450041472A /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; };
+		427CF5E2202454750041472A /* GoogleMaps.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = GoogleMaps.framework; sourceTree = "<group>"; };
+		427CF5E3202454750041472A /* GoogleMapsBase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = GoogleMapsBase.framework; sourceTree = "<group>"; };
+		427CF5E4202454750041472A /* GoogleMapsCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = GoogleMapsCore.framework; sourceTree = "<group>"; };
+		427CF5E8202454860041472A /* GoogleMaps.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = GoogleMaps.bundle; path = GoogleMaps.framework/Versions/A/Resources/GoogleMaps.bundle; sourceTree = "<group>"; };
 		711BA6BF191E0525002EDE6F /* MessageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageViewController.h; sourceTree = "<group>"; };
 		711BA6C0191E0525002EDE6F /* MessageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageViewController.m; sourceTree = "<group>"; };
 		711BA6C2191E0553002EDE6F /* MessageItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageItem.h; sourceTree = "<group>"; };
@@ -403,8 +411,6 @@
 		71E0D1D42022AB7E009A08EB /* ResultViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultViewController.h; path = ../../common/customUI/ResultViewController.h; sourceTree = "<group>"; };
 		71E0D1D52022AB7E009A08EB /* Result.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Result.storyboard; path = ../../common/customUI/Result.storyboard; sourceTree = "<group>"; };
 		71E0D1D62022AB7E009A08EB /* FullyShowViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FullyShowViewController.h; path = ../../common/customUI/FullyShowViewController.h; sourceTree = "<group>"; };
-		71F57D7D19CD55A50014C893 /* GoogleMaps.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = GoogleMaps.framework; sourceTree = "<group>"; };
-		71F57D7F19CD5C320014C893 /* GoogleMaps.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = GoogleMaps.bundle; path = GoogleMaps.framework/Versions/A/Resources/GoogleMaps.bundle; sourceTree = "<group>"; };
 		71F67CF419063612004E8462 /* ApexHistoryViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApexHistoryViewController.h; sourceTree = "<group>"; };
 		71F67CF519063612004E8462 /* ApexHistoryViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ApexHistoryViewController.m; sourceTree = "<group>"; };
 		71F67CF719065EA8004E8462 /* SimpleMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimpleMenu.h; sourceTree = "<group>"; };
@@ -418,14 +424,17 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				427CF5E5202454750041472A /* GoogleMaps.framework in Frameworks */,
+				427CF5E0202452460041472A /* Accelerate.framework in Frameworks */,
 				71514ED2191B7E2500009C00 /* AddressBookUI.framework in Frameworks */,
 				719E7E3518C0395E003408FF /* libsqlite3.dylib in Frameworks */,
 				7120DD0118BE266000E7546F /* SystemConfiguration.framework in Frameworks */,
+				427CF5E6202454750041472A /* GoogleMapsBase.framework in Frameworks */,
 				7120DCFF18BE265100E7546F /* QuartzCore.framework in Frameworks */,
 				7120DCFD18BE264300E7546F /* OpenGLES.framework in Frameworks */,
 				7120DCFB18BE263800E7546F /* libz.dylib in Frameworks */,
-				71F57D7E19CD55A50014C893 /* GoogleMaps.framework in Frameworks */,
 				7120DCF918BE262E00E7546F /* libicucore.dylib in Frameworks */,
+				427CF5E7202454750041472A /* GoogleMapsCore.framework in Frameworks */,
 				7120DCF718BE262300E7546F /* libc++.dylib in Frameworks */,
 				7120DCF518BE261500E7546F /* ImageIO.framework in Frameworks */,
 				7120DCF318BE260700E7546F /* GLKit.framework in Frameworks */,
@@ -531,6 +540,17 @@
 			path = ../../common/customUI/Alert;
 			sourceTree = "<group>";
 		};
+		427CF5E1202454750041472A /* GoogleMap */ = {
+			isa = PBXGroup;
+			children = (
+				427CF5E8202454860041472A /* GoogleMaps.bundle */,
+				427CF5E2202454750041472A /* GoogleMaps.framework */,
+				427CF5E3202454750041472A /* GoogleMapsBase.framework */,
+				427CF5E4202454750041472A /* GoogleMapsCore.framework */,
+			);
+			path = GoogleMap;
+			sourceTree = "<group>";
+		};
 		713AA79E1917366A00B44092 /* documents */ = {
 			isa = PBXGroup;
 			children = (
@@ -855,8 +875,8 @@
 		719EF8DF18BB839F00EFFF5F /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				71F57D7F19CD5C320014C893 /* GoogleMaps.bundle */,
-				71F57D7D19CD55A50014C893 /* GoogleMaps.framework */,
+				427CF5E1202454750041472A /* GoogleMap */,
+				427CF5DF202452450041472A /* Accelerate.framework */,
 				71514ED1191B7E2500009C00 /* AddressBookUI.framework */,
 				719E7E3418C0395E003408FF /* libsqlite3.dylib */,
 				7120DD0018BE266000E7546F /* SystemConfiguration.framework */,
@@ -1101,6 +1121,7 @@
 			files = (
 				71625470201C5205009E3A41 /* fake_container_list.json in Resources */,
 				7162546B201C3AF1009E3A41 /* readme.txt in Resources */,
+				427CF5E9202454860041472A /* GoogleMaps.bundle in Resources */,
 				42604129201C57A7002374A8 /* ShipSearch.storyboard in Resources */,
 				715643DC201C117300B04267 /* search.json in Resources */,
 				4235C30320229F7200A99D04 /* Result.xib in Resources */,
@@ -1120,7 +1141,6 @@
 				715643B720198A1400B04267 /* Main.storyboard in Resources */,
 				7162546D201C412E009E3A41 /* ShippingStatusCell.xib in Resources */,
 				719EF8EB18BB839F00EFFF5F /* InfoPlist.strings in Resources */,
-				71F57D8019CD5C320014C893 /* GoogleMaps.bundle in Resources */,
 				4235C3052022A60A00A99D04 /* ResultCell.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1405,12 +1425,16 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
-				ENABLE_BITCODE = NO;
+				ENABLE_BITCODE = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					/xcode_workspace/ERPSuiteIOS/Apex,
 					Mobile,
 					"$(PROJECT_DIR)",
+					"$(PROJECT_DIR)/Apex\\ Mobile/Google\\ Map",
+					"$(PROJECT_DIR)/Apex\\ Mobile/Google\\ Map",
+					"$(PROJECT_DIR)/Apex\\ Mobile/Google\\ Map",
+					"$(PROJECT_DIR)/GoogleMap",
 				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Apex Mobile/Apex Mobile-Prefix.pch";
@@ -1443,12 +1467,16 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
-				ENABLE_BITCODE = NO;
+				ENABLE_BITCODE = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					/xcode_workspace/ERPSuiteIOS/Apex,
 					Mobile,
 					"$(PROJECT_DIR)",
+					"$(PROJECT_DIR)/Apex\\ Mobile/Google\\ Map",
+					"$(PROJECT_DIR)/Apex\\ Mobile/Google\\ Map",
+					"$(PROJECT_DIR)/Apex\\ Mobile/Google\\ Map",
+					"$(PROJECT_DIR)/GoogleMap",
 				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Apex Mobile/Apex Mobile-Prefix.pch";

Apex Mobile/Apex Mobile/Apex Mobile-Prefix.pch

@@ -14,3 +14,6 @@
     #import <UIKit/UIKit.h>
     #import <Foundation/Foundation.h>
 #endif
+
+#define APREDCOLOR [UIColor colorWithRed:168 / 255.0 green:9 / 255.0 blue:26 / 255.0 alpha:1.0]
+#define APGRAYCOLOR [UIColor colorWithRed:53 / 255.0 green:53 / 255.0 blue:55 / 255.0 alpha:1.0]

Apex Mobile/Apex Mobile/AppDelegate.m

@@ -41,6 +41,8 @@
 
     self.window.backgroundColor = [UIColor whiteColor];
     
+    [self changeAppearance];
+    
     return YES;
 }
 -(void)Logout
@@ -108,4 +110,15 @@
 - (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error {
     NSLog(@"Registfail%@",error);
 }
+
+-(void)changeAppearance{
+    // TabBar
+    [[UITabBarItem appearance] setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:APREDCOLOR, NSForegroundColorAttributeName, nil] forState:UIControlStateSelected];
+    [[UITabBarItem appearance] setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:APGRAYCOLOR, NSForegroundColorAttributeName, nil] forState:UIControlStateNormal];
+    
+    // Nav Bar
+    [[UIBarButtonItem appearance] setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:APREDCOLOR, NSForegroundColorAttributeName, nil] forState:UIControlStateSelected];
+    [[UIBarButtonItem appearance] setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:APGRAYCOLOR, NSForegroundColorAttributeName, nil] forState:UIControlStateNormal];
+    [[UIBarButtonItem appearance] setTintColor:APGRAYCOLOR];
+}
 @end

Apex Mobile/Apex Mobile/HistoryViewController.m

@@ -91,23 +91,23 @@
     
     if ([module_name isEqualToString:@"Ocean Booking"]) {
         
-        cell.icon.image = [[UIImage imageNamed:@"mode_booking"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+        cell.icon.image = [[UIImage imageNamed:@"mode_booking"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
         
     } else if ([module_name isEqualToString:@"Container detail"]) {
         
-        cell.icon.image = [[UIImage imageNamed:@"mode_container"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+        cell.icon.image = [[UIImage imageNamed:@"mode_container"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
         
     } else if ([module_name isEqualToString:@"Ocean B/L info."]) {
         
-        cell.icon.image = [[UIImage imageNamed:@"mode_bl"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+        cell.icon.image = [[UIImage imageNamed:@"mode_bl"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
         
     } else if ([module_name isEqualToString:@"Cargo Tracking"]) {
         
-        cell.icon.image = [[UIImage imageNamed:@"mode_cargo_tracking"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+        cell.icon.image = [[UIImage imageNamed:@"mode_cargo_tracking"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
         
     } else {
         
-        cell.icon.image = [[UIImage imageNamed:@"mode_document"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+        cell.icon.image = [[UIImage imageNamed:@"mode_document"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
     }
     
     cell.name.text = name;

Apex Mobile/Apex Mobile/Main.storyboard

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="YOs-rL-bRV">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="YOs-rL-bRV">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment version="2304" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -20,7 +20,7 @@
             <objects>
                 <navigationController id="YOs-rL-bRV" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="Cv3-js-Kre">
-                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="375" height="48"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>

Apex Mobile/Apex Mobile/NewImages.xcassets/bar_search.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "bar_seach.png",
+      "filename" : "bar_search.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "bar_seach@2x.png",
+      "filename" : "bar_search@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "bar_seach@3x.png",
+      "filename" : "bar_search@3x.png",
       "scale" : "3x"
     }
   ],

Apex Mobile/Apex Mobile/OrderHistoryViewController.m

@@ -226,37 +226,37 @@ static const int history_delta = 7;
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     
-    NSMutableDictionary *params = [[NSMutableDictionary alloc] init];
-
-    [params setObject:@"dumb" forKey:@"id"];
-    NSString* h_field;
-    //if(self.radioContainer.selected==true)
-    //{
-    //    [params setObject:@"1" forKey:@"criterion_type"];
-    //    h_field = @"ctnr";
-    //}
-    //else
-    {
-        [params setObject:@"0" forKey:@"criterion_type"];
-        h_field = @"h_bol";
-    }
-
-    NSDictionary *item = [self.shipArray objectAtIndex:indexPath.section];
-    NSString * cargo_criterion = item[@"hbol"];
-    if(cargo_criterion==nil)
-        cargo_criterion=@"";
-    [params setObject:cargo_criterion forKey:@"cargo_criterion"];
-
-
-    [ApexMobileDB savehistory:h_field value:cargo_criterion];
-
-    DetailTabBarController *detailViewController=[[DetailTabBarController alloc] init:@"Cargo Tracking" actions:[NSArray arrayWithObjects:@"Tracking",nil] params:params];
-    [self.navigationController pushViewController:detailViewController animated:YES];
+//    NSMutableDictionary *params = [[NSMutableDictionary alloc] init];
+//
+//    [params setObject:@"dumb" forKey:@"id"];
+//    NSString* h_field;
+//    //if(self.radioContainer.selected==true)
+//    //{
+//    //    [params setObject:@"1" forKey:@"criterion_type"];
+//    //    h_field = @"ctnr";
+//    //}
+//    //else
+//    {
+//        [params setObject:@"0" forKey:@"criterion_type"];
+//        h_field = @"h_bol";
+//    }
+//
+//    NSDictionary *item = [self.shipArray objectAtIndex:indexPath.section];
+//    NSString * cargo_criterion = item[@"hbol"];
+//    if(cargo_criterion==nil)
+//        cargo_criterion=@"";
+//    [params setObject:cargo_criterion forKey:@"cargo_criterion"];
+//
+//
+//    [ApexMobileDB savehistory:h_field value:cargo_criterion];
+//
+//    DetailTabBarController *detailViewController=[[DetailTabBarController alloc] init:@"Cargo Tracking" actions:[NSArray arrayWithObjects:@"Tracking",nil] params:params];
+//    [self.navigationController pushViewController:detailViewController animated:YES];
     
     
-//    AMResultViewController *resultVC = [[AMResultViewController alloc] initWithNibName:@"Result" bundle:nil];
-//    resultVC.params = [NSMutableDictionary dictionary];
-//    [self.navigationController pushViewController:resultVC animated:YES];
+    AMResultViewController *resultVC = [[AMResultViewController alloc] initWithNibName:@"Result" bundle:nil];
+    resultVC.params = [NSMutableDictionary dictionary];
+    [self.navigationController pushViewController:resultVC animated:YES];
     
 }
 

Apex Mobile/Apex Mobile/fake_container_list.json

@@ -23,38 +23,6 @@
                        "detail": "Container# UACU3259986 available for pickup or delivery",
                        "date": "12/10/2017 - 02/18/2018",
                        "port": "CNTAO - USLAX"
-                       },
-                       {
-                       "title": "FACTORY/CUSTOMER",
-                       "icon": "status_delivery",
-                       "description": "A1801350973 (6 containers)",
-                       "detail": "Container# UACU3259986 available for pickup or delivery",
-                       "date": "12/10/2017 - 02/18/2018",
-                       "port": "CNTAO - USLAX"
-                       },
-                       {
-                       "title": "FACTORY/CUSTOMER",
-                       "icon": "status_delivery",
-                       "description": "A1801350973 (6 containers)",
-                       "detail": "Container# UACU3259986 available for pickup or delivery",
-                       "date": "12/10/2017 - 02/18/2018",
-                       "port": "CNTAO - USLAX"
-                       },
-                       {
-                       "title": "FACTORY/CUSTOMER",
-                       "icon": "status_delivery",
-                       "description": "A1801350973 (6 containers)",
-                       "detail": "Container# UACU3259986 available for pickup or delivery",
-                       "date": "12/10/2017 - 02/18/2018",
-                       "port": "CNTAO - USLAX"
-                       },
-                       {
-                       "title": "FACTORY/CUSTOMER",
-                       "icon": "status_delivery",
-                       "description": "A1801350973 (6 containers)",
-                       "detail": "Container# UACU3259986 available for pickup or delivery",
-                       "date": "12/10/2017 - 02/18/2018",
-                       "port": "CNTAO - USLAX"
                        }
                        ],
     "result": -1

Apex Mobile/FavoritesViewController.m

@@ -95,23 +95,23 @@
     
     if ([module_name isEqualToString:@"Ocean Booking"]) {
         
-        cell.icon.image = [[UIImage imageNamed:@"mode_booking"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+        cell.icon.image = [[UIImage imageNamed:@"mode_booking"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
         
     } else if ([module_name isEqualToString:@"Container detail"]) {
         
-        cell.icon.image = [[UIImage imageNamed:@"mode_container"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+        cell.icon.image = [[UIImage imageNamed:@"mode_container"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
         
     } else if ([module_name isEqualToString:@"Ocean B/L info."]) {
         
-        cell.icon.image = [[UIImage imageNamed:@"mode_bl"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+        cell.icon.image = [[UIImage imageNamed:@"mode_bl"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
         
     } else if ([module_name isEqualToString:@"Cargo Tracking"]) {
         
-        cell.icon.image = [[UIImage imageNamed:@"mode_cargo_tracking"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+        cell.icon.image = [[UIImage imageNamed:@"mode_cargo_tracking"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
         
     } else {
         
-        cell.icon.image = [[UIImage imageNamed:@"mode_document"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+        cell.icon.image = [[UIImage imageNamed:@"mode_document"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
     }
     
     cell.name.text = name;

Apex Mobile/GoogleMap/GoogleMaps.framework/Modules

@@ -0,0 +1 @@
+Versions/Current/Modules

Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSAddress.h

@@ -0,0 +1,78 @@
+//
+//  GMSAddress.h
+//  Google Maps SDK for iOS
+//
+//  Copyright 2014 Google Inc.
+//
+//  Usage of this SDK is subject to the Google Maps/Google Earth APIs Terms of
+//  Service: https://developers.google.com/maps/terms
+//
+
+#import <CoreLocation/CoreLocation.h>
+
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
+#import <GoogleMaps/GMSDeprecationMacros.h>
+
+GMS_ASSUME_NONNULL_BEGIN
+
+/**
+ * A result from a reverse geocode request, containing a human-readable address. This class is
+ * immutable and should be obtained via GMSGeocoder.
+ *
+ * Some of the fields may be nil, indicating they are not present.
+ */
+@interface GMSAddress : NSObject<NSCopying>
+
+/** Location, or kLocationCoordinate2DInvalid if unknown. */
+@property(nonatomic, readonly) CLLocationCoordinate2D coordinate;
+
+/** Street number and name. */
+@property(nonatomic, copy, readonly) NSString *GMS_NULLABLE_PTR thoroughfare;
+
+/** Locality or city. */
+@property(nonatomic, copy, readonly) NSString *GMS_NULLABLE_PTR locality;
+
+/** Subdivision of locality, district or park. */
+@property(nonatomic, copy, readonly) NSString *GMS_NULLABLE_PTR subLocality;
+
+/** Region/State/Administrative area. */
+@property(nonatomic, copy, readonly) NSString *GMS_NULLABLE_PTR administrativeArea;
+
+/** Postal/Zip code. */
+@property(nonatomic, copy, readonly) NSString *GMS_NULLABLE_PTR postalCode;
+
+/** The country name. */
+@property(nonatomic, copy, readonly) NSString *GMS_NULLABLE_PTR country;
+
+/** An array of NSString containing formatted lines of the address. May be nil. */
+@property(nonatomic, copy, readonly) GMS_NSArrayOf(NSString *) *GMS_NULLABLE_PTR lines;
+
+/**
+ * Returns the first line of the address.
+ *
+ * This method is obsolete and deprecated and will be removed in a future release.
+ * Use the lines property instead.
+ */
+- (NSString *GMS_NULLABLE_PTR)addressLine1 __GMS_AVAILABLE_BUT_DEPRECATED;
+
+/**
+ * Returns the second line of the address.
+ *
+ * This method is obsolete and deprecated and will be removed in a future release.
+ * Use the lines property instead.
+ */
+- (NSString *GMS_NULLABLE_PTR)addressLine2 __GMS_AVAILABLE_BUT_DEPRECATED;
+
+@end
+
+/**
+ * The former type of geocode results (pre-1.7). This remains here for migration and will be
+ * removed in future releases.
+ */
+@compatibility_alias GMSReverseGeocodeResult GMSAddress;
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSCameraPosition.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSCameraPosition.h

@@ -10,10 +10,18 @@
 
 #import <CoreLocation/CoreLocation.h>
 
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
+
+GMS_ASSUME_NONNULL_BEGIN
+
 /**
 * An immutable class that aggregates all camera position parameters.
  */
-@interface GMSCameraPosition : NSObject <NSCopying, NSMutableCopying>
+@interface GMSCameraPosition : NSObject<NSCopying, NSMutableCopying>
 
 /**
  * Location on the Earth towards which the camera points.
@@ -33,8 +41,11 @@
 @property(nonatomic, readonly) CLLocationDirection bearing;
 
 /**
- * The angle, in degrees, of the camera angle from the nadir (directly facing the Earth). 0 is
- * straight down, 90 is parallel to the ground. Note that the maximum angle allowed is 45 degrees.
+ * The angle, in degrees, of the camera from the nadir (directly facing the Earth). 0 is
+ * straight down, 90 is parallel to the ground. Note that the maximum angle allowed is dependent
+ * on the zoom. You can think of it as a series of line segments as a function of zoom, rather
+ * than a step function. For zoom 16 and above, the maximum angle is 65 degrees. For zoom 10 and
+ * below, the maximum angle is 30 degrees.
  */
 @property(nonatomic, readonly) double viewingAngle;
 
@@ -43,10 +54,11 @@
  * Building a GMSCameraPosition via this initializer (or by the following convenience constructors)
  * will implicitly clamp camera values.
  *
- * @param target location on the earth which the camera points
- * @param zoom the zoom level near the center of the screen
- * @param bearing of the camera in degrees from true north
- * @param viewingAngle in degrees, of the camera angle from the nadir
+ * @param target Location on the earth towards which the camera points.
+ * @param zoom The zoom level near the center of the screen.
+ * @param bearing Bearing of the camera in degrees clockwise from true north.
+ * @param viewingAngle The angle, in degrees, of the camera angle from the nadir (directly facing
+ *                     the Earth)
  */
 - (id)initWithTarget:(CLLocationCoordinate2D)target
                 zoom:(float)zoom
@@ -115,3 +127,5 @@ FOUNDATION_EXTERN const float kGMSMaxZoomLevel;
 
 /** The minimum zoom (farthest from the Earth's surface) permitted by the map camera. */
 FOUNDATION_EXTERN const float kGMSMinZoomLevel;
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSCameraUpdate.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSCameraUpdate.h

@@ -11,9 +11,17 @@
 #import <CoreLocation/CoreLocation.h>
 #import <UIKit/UIKit.h>
 
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
+
 @class GMSCameraPosition;
 @class GMSCoordinateBounds;
 
+GMS_ASSUME_NONNULL_BEGIN
+
 /**
  * GMSCameraUpdate represents an update that may be applied to a GMSMapView.
  * It encapsulates some logic for modifying the current camera.
@@ -104,3 +112,4 @@
 
 @end
 
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSCircle.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSCircle.h

@@ -12,6 +12,14 @@
 
 #import <Foundation/Foundation.h>
 
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
+
+GMS_ASSUME_NONNULL_BEGIN
+
 /**
  * A circle on the Earth's surface (spherical cap).
  */
@@ -31,13 +39,13 @@
 @property(nonatomic, assign) CGFloat strokeWidth;
 
 /** The color of this circle's outline. The default value is black. */
-@property(nonatomic, strong) UIColor *strokeColor;
+@property(nonatomic, strong) UIColor *GMS_NULLABLE_PTR strokeColor;
 
 /**
  * The interior of the circle is painted with fillColor.
  * The default value is nil, resulting in no fill.
  */
-@property(nonatomic, strong) UIColor *fillColor;
+@property(nonatomic, strong) UIColor *GMS_NULLABLE_PTR fillColor;
 
 /**
  * Convenience constructor for GMSCircle for a particular position and radius.
@@ -47,3 +55,5 @@
                             radius:(CLLocationDistance)radius;
 
 @end
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSCoordinateBounds+GoogleMaps.h

@@ -0,0 +1,44 @@
+//
+//  GMSCoordinateBounds+GoogleMaps.h
+//  Google Maps SDK for iOS
+//
+//  Copyright 2013 Google Inc.
+//
+//  Usage of this SDK is subject to the Google Maps/Google Earth APIs Terms of
+//  Service: https://developers.google.com/maps/terms
+//
+
+
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
+
+#import <GoogleMaps/GMSProjection.h>
+
+@class GMSPath;
+
+GMS_ASSUME_NONNULL_BEGIN
+
+@interface GMSCoordinateBounds (GoogleMaps)
+
+/**
+ * Inits with bounds that encompass |region|.
+ */
+- (id)initWithRegion:(GMSVisibleRegion)region;
+
+/**
+ * Inits with bounds that encompass |path|.
+ */
+- (id)initWithPath:(GMSPath *)path;
+
+/**
+ * Returns a GMSCoordinateBounds representing the current bounds extended to
+ * include |path|.
+ */
+- (GMSCoordinateBounds *)includingPath:(GMSPath *)path;
+
+@end
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSDeprecationMacros.h

@@ -0,0 +1,18 @@
+//
+//  GMSDeprecationMacros.h
+//  Google Maps SDK for iOS
+//
+//  Copyright 2015 Google Inc.
+//
+//  Usage of this SDK is subject to the Google Maps/Google Earth APIs Terms of
+//  Service: https://developers.google.com/maps/terms
+//
+
+#ifndef IPHONE_MAPS_SDK_MAPS_GMSDEPRECATIONMACROS_H_
+#define IPHONE_MAPS_SDK_MAPS_GMSDEPRECATIONMACROS_H_
+
+#ifndef __GMS_AVAILABLE_BUT_DEPRECATED
+#define __GMS_AVAILABLE_BUT_DEPRECATED __deprecated
+#endif
+
+#endif

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSGeocoder.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSGeocoder.h

@@ -10,8 +10,15 @@
 
 #import <CoreLocation/CoreLocation.h>
 
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
 #import <GoogleMaps/GMSAddress.h>
 
+GMS_ASSUME_NONNULL_BEGIN
+
 @class GMSReverseGeocodeResponse;
 
 /** GMSGeocoder error codes, embedded in NSError. */
@@ -21,7 +28,8 @@ typedef NS_ENUM(NSInteger, GMSGeocoderErrorCode) {
 };
 
 /** Handler that reports a reverse geocoding response, or error. */
-typedef void (^GMSReverseGeocodeCallback)(GMSReverseGeocodeResponse *, NSError *);
+typedef void (^GMSReverseGeocodeCallback)(GMSReverseGeocodeResponse *GMS_NULLABLE_PTR,
+                                          NSError *GMS_NULLABLE_PTR);
 
 /**
  * Exposes a service for reverse geocoding. This maps Earth coordinates (latitude and longitude) to
@@ -48,9 +56,11 @@ typedef void (^GMSReverseGeocodeCallback)(GMSReverseGeocodeResponse *, NSError *
 @interface GMSReverseGeocodeResponse : NSObject<NSCopying>
 
 /** Returns the first result, or nil if no results were available. */
-- (GMSAddress *)firstResult;
+- (GMSAddress *GMS_NULLABLE_PTR)firstResult;
 
 /** Returns an array of all the results (contains GMSAddress), including the first result. */
-- (NSArray *)results;
+- (GMS_NSArrayOf(GMSAddress *) * GMS_NULLABLE_PTR)results;
 
 @end
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSGeometryUtils.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSGeometryUtils.h

@@ -15,11 +15,18 @@
 
 #import <CoreLocation/CoreLocation.h>
 
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
 #import <GoogleMaps/GMSPath.h>
 
-#define OVERLOADABLE __attribute__((overloadable))
-
 @class GMSPath;
+@class GMSStrokeStyle;
+@class GMSStyleSpan;
+
+GMS_ASSUME_NONNULL_BEGIN
 
 /** Average Earth radius in meters. */
 static const CLLocationDistance kGMSEarthRadius = 6371009.0;
@@ -63,7 +70,7 @@ FOUNDATION_EXPORT
 double GMSMapPointDistance(GMSMapPoint a, GMSMapPoint b);
 
 /**
- * Returns whether |point| lies inside of path. The path is always cosidered
+ * Returns whether |point| lies inside of path. The path is always considered
  * closed, regardless of whether the last point equals the first or not.
  * Inside is defined as not containing the South Pole -- the South Pole is
  * always outside.
@@ -91,16 +98,19 @@ BOOL GMSGeometryContainsLocation(CLLocationCoordinate2D point, GMSPath *path,
  * sphere of radius R: tolerance = toleranceR * (RadiusEarth / R),
  * with RadiusEarth==6371009.
  */
-FOUNDATION_EXPORT OVERLOADABLE
-BOOL GMSGeometryIsLocationOnPath(CLLocationCoordinate2D point, GMSPath *path,
-                                 BOOL geodesic, CLLocationDistance tolerance);
+FOUNDATION_EXPORT
+BOOL GMSGeometryIsLocationOnPathTolerance(CLLocationCoordinate2D point,
+                                          GMSPath *path,
+                                          BOOL geodesic,
+                                          CLLocationDistance tolerance);
 
 /**
  * Same as GMSGeometryIsLocationOnPath(point, path, geodesic, tolerance),
  * with a default tolerance of 0.1 meters.
  */
-FOUNDATION_EXPORT OVERLOADABLE
-BOOL GMSGeometryIsLocationOnPath(CLLocationCoordinate2D point, GMSPath *path,
+FOUNDATION_EXPORT
+BOOL GMSGeometryIsLocationOnPath(CLLocationCoordinate2D point,
+                                 GMSPath *path,
                                  BOOL geodesic);
 
 /**
@@ -109,7 +119,7 @@ BOOL GMSGeometryIsLocationOnPath(CLLocationCoordinate2D point, GMSPath *path,
  * This is the shortest distance between the two coordinates on the sphere.
  * Both coordinates must be valid.
  */
-FOUNDATION_EXPORT OVERLOADABLE
+FOUNDATION_EXPORT
 CLLocationDistance GMSGeometryDistance(CLLocationCoordinate2D from,
                                        CLLocationCoordinate2D to);
 
@@ -118,7 +128,7 @@ CLLocationDistance GMSGeometryDistance(CLLocationCoordinate2D from,
  * This is the sum of GMSGeometryDistance() over the path segments.
  * All the coordinates of the path must be valid.
  */
-FOUNDATION_EXPORT OVERLOADABLE
+FOUNDATION_EXPORT
 CLLocationDistance GMSGeometryLength(GMSPath *path);
 
 /**
@@ -132,7 +142,7 @@ CLLocationDistance GMSGeometryLength(GMSPath *path);
  * unique great circle segment on the sphere.
  * The polygon must be simple (not self-overlapping) and may be concave.
  */
-FOUNDATION_EXPORT OVERLOADABLE
+FOUNDATION_EXPORT
 double GMSGeometryArea(GMSPath *path);
 
 /**
@@ -141,7 +151,7 @@ double GMSGeometryArea(GMSPath *path);
  * if the points of path are in counter-clockwise order, and negative otherwise.
  * The same restrictions as on GMSGeometryArea() apply.
  */
-FOUNDATION_EXPORT OVERLOADABLE
+FOUNDATION_EXPORT
 double GMSGeometrySignedArea(GMSPath *path);
 
 /**
@@ -165,7 +175,7 @@ CLLocationDirection GMSGeometryHeading(CLLocationCoordinate2D from,
  * The resulting longitude is in the range [-180, 180).
  * Both coordinates must be valid.
  */
-FOUNDATION_EXPORT OVERLOADABLE
+FOUNDATION_EXPORT
 CLLocationCoordinate2D GMSGeometryOffset(CLLocationCoordinate2D from,
                                          CLLocationDistance distance,
                                          CLLocationDirection heading);
@@ -202,8 +212,11 @@ CLLocationCoordinate2D GMSGeometryInterpolate(CLLocationCoordinate2D from,
  * polyline.spans = GMSStyleSpans(path, styles, lengths, kGMSLengthRhumb);
  * </pre>
  */
-FOUNDATION_EXPORT OVERLOADABLE
-NSArray *GMSStyleSpans(GMSPath *path, NSArray *styles, NSArray *lengths, GMSLengthKind lengthKind);
+FOUNDATION_EXPORT
+GMS_NSArrayOf(GMSStyleSpan *) *GMSStyleSpans(GMSPath *path,
+                                             GMS_NSArrayOf(GMSStrokeStyle *) *styles,
+                                             GMS_NSArrayOf(NSNumber *) *lengths,
+                                             GMSLengthKind lengthKind);
 
 /**
  * Similar to GMSStyleSpans(path, styles, lengths, lengthKind) but additionally takes an initial
@@ -211,8 +224,13 @@ NSArray *GMSStyleSpans(GMSPath *path, NSArray *styles, NSArray *lengths, GMSLeng
  *
  * |lengthOffset| the length (e.g. in meters) that should be skipped initially from |lengths|.
  */
-FOUNDATION_EXPORT OVERLOADABLE
-NSArray *GMSStyleSpans(GMSPath *path, NSArray *styles, NSArray *lengths, GMSLengthKind lengthKind,
-                       double lengthOffset);
+FOUNDATION_EXPORT
+GMS_NSArrayOf(GMSStyleSpan *) *GMSStyleSpansOffset(GMSPath *path,
+                                                   GMS_NSArrayOf(GMSStrokeStyle *) *styles,
+                                                   GMS_NSArrayOf(NSNumber *) *lengths,
+                                                   GMSLengthKind lengthKind,
+                                                   double lengthOffset);
 
 /**@}*/
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSGroundOverlay.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSGroundOverlay.h

@@ -10,8 +10,16 @@
 
 #import <GoogleMaps/GMSOverlay.h>
 
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
+
 @class GMSCoordinateBounds;
 
+GMS_ASSUME_NONNULL_BEGIN
+
 /**
  * GMSGroundOverlay specifies the available options for a ground overlay that
  * exists on the Earth's surface. Unlike a marker, the position of a ground
@@ -37,7 +45,13 @@
  * Icon to render within |bounds| on the Earth. If this is nil, the overlay will
  * not be visible (unlike GMSMarker which has a default image).
  */
-@property(nonatomic, strong) UIImage *icon;
+@property(nonatomic, strong) UIImage *GMS_NULLABLE_PTR icon;
+
+/**
+ * Sets the opacity of the ground overlay, between 0 (completely transparent)
+ * and 1 (default) inclusive.
+ */
+@property(nonatomic, assign) float opacity;
 
 /**
  * Bearing of this ground overlay, in degrees. The default value, zero, points
@@ -49,21 +63,21 @@
  * The 2D bounds on the Earth in which |icon| is drawn. Changing this value
  * will adjust |position| accordingly.
  */
-@property(nonatomic, strong) GMSCoordinateBounds *bounds;
+@property(nonatomic, strong) GMSCoordinateBounds *GMS_NULLABLE_PTR bounds;
 
 /**
  * Convenience constructor for GMSGroundOverlay for a particular |bounds| and
  * |icon|. Will set |position| accordingly.
  */
-+ (instancetype)groundOverlayWithBounds:(GMSCoordinateBounds *)bounds
-                                   icon:(UIImage *)icon;
++ (instancetype)groundOverlayWithBounds:(GMSCoordinateBounds *GMS_NULLABLE_PTR)bounds
+                                   icon:(UIImage *GMS_NULLABLE_PTR)icon;
 
 /**
  * Constructs a GMSGroundOverlay that renders the given |icon| at |position|,
  * as if the image's actual size matches camera pixels at |zoomLevel|.
  */
 + (instancetype)groundOverlayWithPosition:(CLLocationCoordinate2D)position
-                                     icon:(UIImage *)icon
+                                     icon:(UIImage *GMS_NULLABLE_PTR)icon
                                 zoomLevel:(CGFloat)zoomLevel;
 
 @end
@@ -73,3 +87,5 @@
  * point of the icon.
  */
 FOUNDATION_EXTERN const CGPoint kGMSGroundOverlayDefaultAnchor;
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSIndoorBuilding.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSIndoorBuilding.h

@@ -9,6 +9,18 @@
 //
 
 
+#import <Foundation/Foundation.h>
+
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
+
+GMS_ASSUME_NONNULL_BEGIN
+
+@class GMSIndoorLevel;
+
 /**
  * Describes a building which contains levels.
  */
@@ -18,7 +30,7 @@
  * Array of GMSIndoorLevel describing the levels which make up the building.
  * The levels are in 'display order' from top to bottom.
  */
-@property(nonatomic, strong, readonly) NSArray *levels;
+@property(nonatomic, strong, readonly) GMS_NSArrayOf(GMSIndoorLevel *) * levels;
 
 /**
  * Index in the levels array of the default level.
@@ -31,3 +43,5 @@
 @property(nonatomic, assign, readonly, getter=isUnderground) BOOL underground;
 
 @end
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSIndoorDisplay.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSIndoorDisplay.h

@@ -10,11 +10,19 @@
 
 #import <Foundation/Foundation.h>
 
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
+
 @class GMSIndoorBuilding;
 @class GMSIndoorLevel;
 
+GMS_ASSUME_NONNULL_BEGIN
+
 /** Delegate for events on GMSIndoorDisplay. */
-@protocol GMSIndoorDisplayDelegate <NSObject>
+@protocol GMSIndoorDisplayDelegate<NSObject>
 @optional
 
 /**
@@ -22,13 +30,13 @@
  * already been updated for the new building, but didChangeActiveLevel: will
  * be raised after this method.
  */
-- (void)didChangeActiveBuilding:(GMSIndoorBuilding *)building;
+- (void)didChangeActiveBuilding:(GMSIndoorBuilding *GMS_NULLABLE_PTR)building;
 
 /**
  * Raised when the activeLevel has changed.  This event is raised for all
  * changes, including explicit setting of the property.
  */
-- (void)didChangeActiveLevel:(GMSIndoorLevel *)level;
+- (void)didChangeActiveLevel:(GMSIndoorLevel *GMS_NULLABLE_PTR)level;
 
 @end
 
@@ -40,13 +48,13 @@
 @interface GMSIndoorDisplay : NSObject
 
 /** GMSIndoorDisplay delegate */
-@property(nonatomic, weak) id<GMSIndoorDisplayDelegate> delegate;
+@property(nonatomic, weak) id<GMSIndoorDisplayDelegate> GMS_NULLABLE_PTR delegate;
 
 /**
  * Provides the currently focused building, will be nil if there is no
  * building with indoor data currently under focus.
  */
-@property(nonatomic, strong, readonly) GMSIndoorBuilding *activeBuilding;
+@property(nonatomic, strong, readonly) GMSIndoorBuilding *GMS_NULLABLE_PTR activeBuilding;
 
 /**
  * Provides and controls the active level for activeBuilding.  Will be updated
@@ -56,6 +64,8 @@
  * Will always be nil if activeBuilding is nil.
  * Any attempt to set it to an invalid value will be ignored.
  */
-@property(nonatomic, strong) GMSIndoorLevel *activeLevel;
+@property(nonatomic, strong) GMSIndoorLevel *GMS_NULLABLE_PTR activeLevel;
 
 @end
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSIndoorLevel.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSIndoorLevel.h

@@ -9,6 +9,16 @@
 //
 
 
+#import <Foundation/Foundation.h>
+
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
+
+GMS_ASSUME_NONNULL_BEGIN
+
 /**
  * Describes a single level in a building.
  * Multiple buildings can share a level - in this case the level instances will
@@ -17,9 +27,11 @@
 @interface GMSIndoorLevel : NSObject
 
 /** Localized display name for the level, e.g. "Ground floor". */
-@property(nonatomic, copy, readonly) NSString *name;
+@property(nonatomic, copy, readonly) NSString *GMS_NULLABLE_PTR name;
 
 /** Localized short display name for the level, e.g. "1". */
-@property(nonatomic, copy, readonly) NSString *shortName;
+@property(nonatomic, copy, readonly) NSString *GMS_NULLABLE_PTR shortName;
 
 @end
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSMapLayer.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSMapLayer.h

@@ -13,6 +13,14 @@
 
 #import <GoogleMaps/GMSCALayer.h>
 
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
+
+GMS_ASSUME_NONNULL_BEGIN
+
 /**
  * The following layer properties and constants describe the camera properties
  * that may be animated on the custom model layer of a GMSMapView with Core
@@ -94,3 +102,5 @@ extern NSString *const kGMSLayerCameraViewingAngleKey;
 @property(nonatomic, assign) float cameraZoomLevel;
 @property(nonatomic, assign) double cameraViewingAngle;
 @end
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSMapView+Animation.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSMapView+Animation.h

@@ -10,6 +10,14 @@
 
 #import <GoogleMaps/GMSMapView.h>
 
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
+
+GMS_ASSUME_NONNULL_BEGIN
+
 /**
  * GMSMapView (Animation) offers several animation helper methods.
  *
@@ -55,3 +63,5 @@
 - (void)animateWithCameraUpdate:(GMSCameraUpdate *)cameraUpdate;
 
 @end
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSMapView.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSMapView.h

@@ -11,13 +11,15 @@
 #import <CoreLocation/CoreLocation.h>
 #import <UIKit/UIKit.h>
 
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
+#import <GoogleMaps/GMSDeprecationMacros.h>
 #import <GoogleMaps/GMSMapLayer.h>
 #import <GoogleMaps/GMSUISettings.h>
 
-#ifndef __GMS_AVAILABLE_BUT_DEPRECATED
-#define __GMS_AVAILABLE_BUT_DEPRECATED __deprecated
-#endif
-
 @class GMSCameraPosition;
 @class GMSCameraUpdate;
 @class GMSCoordinateBounds;
@@ -28,8 +30,10 @@
 @class GMSOverlay;
 @class GMSProjection;
 
+GMS_ASSUME_NONNULL_BEGIN
+
 /** Delegate for events on GMSMapView. */
-@protocol GMSMapViewDelegate <NSObject>
+@protocol GMSMapViewDelegate<NSObject>
 
 @optional
 
@@ -48,23 +52,20 @@
  * camera positions. It is always called for the final position of an animation
  * or gesture.
  */
-- (void)mapView:(GMSMapView *)mapView
-    didChangeCameraPosition:(GMSCameraPosition *)position;
+- (void)mapView:(GMSMapView *)mapView didChangeCameraPosition:(GMSCameraPosition *)position;
 
 /**
  * Called when the map becomes idle, after any outstanding gestures or
  * animations have completed (or after the camera has been explicitly set).
  */
-- (void)mapView:(GMSMapView *)mapView
-    idleAtCameraPosition:(GMSCameraPosition *)position;
+- (void)mapView:(GMSMapView *)mapView idleAtCameraPosition:(GMSCameraPosition *)position;
 
 /**
  * Called after a tap gesture at a particular coordinate, but only if a marker
  * was not tapped.  This is called before deselecting any currently selected
  * marker (the implicit action for tapping on the map).
  */
-- (void)mapView:(GMSMapView *)mapView
-    didTapAtCoordinate:(CLLocationCoordinate2D)coordinate;
+- (void)mapView:(GMSMapView *)mapView didTapAtCoordinate:(CLLocationCoordinate2D)coordinate;
 
 /**
  * Called after a long-press gesture at a particular coordinate.
@@ -72,8 +73,7 @@
  * @param mapView The map view that was pressed.
  * @param coordinate The location that was pressed.
  */
-- (void)mapView:(GMSMapView *)mapView
-    didLongPressAtCoordinate:(CLLocationCoordinate2D)coordinate;
+- (void)mapView:(GMSMapView *)mapView didLongPressAtCoordinate:(CLLocationCoordinate2D)coordinate;
 
 /**
  * Called after a marker has been tapped.
@@ -89,8 +89,12 @@
 /**
  * Called after a marker's info window has been tapped.
  */
-- (void)mapView:(GMSMapView *)mapView
-    didTapInfoWindowOfMarker:(GMSMarker *)marker;
+- (void)mapView:(GMSMapView *)mapView didTapInfoWindowOfMarker:(GMSMarker *)marker;
+
+/**
+ * Called after a marker's info window has been long pressed.
+ */
+- (void)mapView:(GMSMapView *)mapView didLongPressInfoWindowOfMarker:(GMSMarker *)marker;
 
 /**
  * Called after an overlay has been tapped.
@@ -116,7 +120,7 @@
  *
  * @return The custom info window for the specified marker, or nil for default
  */
-- (UIView *)mapView:(GMSMapView *)mapView markerInfoWindow:(GMSMarker *)marker;
+- (UIView *GMS_NULLABLE_PTR)mapView:(GMSMapView *)mapView markerInfoWindow:(GMSMarker *)marker;
 
 /**
  * Called when mapView:markerInfoWindow: returns nil. If this method returns a
@@ -125,11 +129,16 @@
  *
  * @param mapView The map view that was pressed.
  * @param marker The marker that was pressed.
- * @return The custom view to disaply as contents in the info window, or null to
+ * @return The custom view to display as contents in the info window, or nil to
  * use the default content rendering instead
  */
 
-- (UIView *)mapView:(GMSMapView *)mapView markerInfoContents:(GMSMarker *)marker;
+- (UIView *GMS_NULLABLE_PTR)mapView:(GMSMapView *)mapView markerInfoContents:(GMSMarker *)marker;
+
+/**
+ * Called when the marker's info window is closed.
+ */
+- (void)mapView:(GMSMapView *)mapView didCloseInfoWindowOfMarker:(GMSMarker *)marker;
 
 /**
  * Called when dragging has been initiated on a marker.
@@ -155,6 +164,22 @@
  */
 - (BOOL)didTapMyLocationButtonForMapView:(GMSMapView *)mapView;
 
+/**
+ * Called when tiles have just been requested or labels have just started rendering.
+ */
+- (void)mapViewDidStartTileRendering:(GMSMapView *)mapView;
+
+/**
+ * Called when all tiles have been loaded (or failed permanently) and labels have been rendered.
+ */
+- (void)mapViewDidFinishTileRendering:(GMSMapView *)mapView;
+
+/**
+ * Called when map is stable (tiles loaded, labels rendered, camera idle) and overlay objects have
+ * been rendered.
+ */
+- (void)mapViewSnapshotReady:(GMSMapView *)mapView;
+
 @end
 
 /**
@@ -178,6 +203,26 @@ typedef enum {
 
 } GMSMapViewType;
 
+/**
+ * Rendering frame rates for GMSMapView.
+ */
+typedef enum {
+  /** Use the minimum frame rate to conserve battery usage. */
+  kGMSFrameRatePowerSave,
+
+  /**
+   * Use a median frame rate to provide smoother rendering and conserve processing cycles.
+   */
+  kGMSFrameRateConservative,
+
+  /**
+   * Use the maximum frame rate for a device. For low end devices this will be 30 FPS,
+   * for high end devices 60 FPS.
+   */
+  kGMSFrameRateMaximum,
+
+} GMSFrameRate;
+
 /**
  * This is the main class of the Google Maps SDK for iOS and is the entry point
  * for all methods related to the map.
@@ -194,7 +239,7 @@ typedef enum {
 @interface GMSMapView : UIView
 
 /** GMSMapView delegate. */
-@property(nonatomic, weak) id<GMSMapViewDelegate> delegate;
+@property(nonatomic, weak) IBOutlet id<GMSMapViewDelegate> GMS_NULLABLE_PTR delegate;
 
 /**
  * Controls the camera, which defines how the map is oriented. Modification of
@@ -224,7 +269,7 @@ typedef enum {
  * drawn. If it is disabled, or it is enabled but no location data is available,
  * this will be nil.  This property is observable using KVO.
  */
-@property(nonatomic, strong, readonly) CLLocation *myLocation;
+@property(nonatomic, strong, readonly) CLLocation *GMS_NULLABLE_PTR myLocation;
 
 /**
  * The marker that is selected.  Setting this property selects a particular
@@ -232,7 +277,7 @@ typedef enum {
  * it to nil deselects the marker, hiding the info window.  This property is
  * observable using KVO.
  */
-@property(nonatomic, strong) GMSMarker *selectedMarker;
+@property(nonatomic, strong) GMSMarker *GMS_NULLABLE_PTR selectedMarker;
 
 /**
  * Controls whether the map is drawing traffic data, if available.  This is
@@ -289,7 +334,7 @@ typedef enum {
 
 /**
  * Controls the 'visible' region of the view.  By applying padding an area
- * arround the edge of the view can be created which will contain map data
+ * around the edge of the view can be created which will contain map data
  * but will not contain UI controls.
  *
  * If the padding is not balanced, the visual center of the view will move as
@@ -316,6 +361,12 @@ typedef enum {
  */
 @property(nonatomic, readonly, retain) GMSMapLayer *layer;
 
+/**
+ * Controls the rendering frame rate.
+ * Default value is kGMSFrameRateMaximum.
+ */
+@property(nonatomic, assign) GMSFrameRate preferredFrameRate;
+
 /**
  * Builds and returns a GMSMapView, with a frame and camera target.
  */
@@ -323,11 +374,15 @@ typedef enum {
 
 /**
  * Tells this map to power up its renderer. This is optional and idempotent.
+ *
+ * This method is obsolete and deprecated and will be removed in a future release.
  */
 - (void)startRendering __GMS_AVAILABLE_BUT_DEPRECATED;
 
 /**
  * Tells this map to power down its renderer. This is optional and idempotent.
+ *
+ * This method is obsolete and deprecated and will be removed in a future release.
  */
 - (void)stopRendering __GMS_AVAILABLE_BUT_DEPRECATED;
 
@@ -350,10 +405,10 @@ typedef enum {
  * will have a zero bearing and tilt (i.e., facing north and looking directly at
  * the Earth). This takes the frame and padding of this GMSMapView into account.
  *
- * If the bounds is nil or invalid this method will return a nil camera.
+ * If the bounds is invalid this method will return a nil camera.
  */
-- (GMSCameraPosition *)cameraForBounds:(GMSCoordinateBounds *)bounds
-                                insets:(UIEdgeInsets)insets;
+- (GMSCameraPosition *GMS_NULLABLE_PTR)cameraForBounds:(GMSCoordinateBounds *)bounds
+                                                insets:(UIEdgeInsets)insets;
 
 /**
  * Changes the camera according to |update|.
@@ -372,3 +427,5 @@ extern NSString *const kGMSAccessibilityCompass;
  * Accessibility identifier for the "my location" button.
  */
 extern NSString *const kGMSAccessibilityMyLocation;
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSMarker.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSMarker.h

@@ -10,10 +10,18 @@
 
 #import <GoogleMaps/GMSOverlay.h>
 
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
+
 @class GMSMarkerLayer;
 @class GMSPanoramaView;
 @class UIImage;
 
+GMS_ASSUME_NONNULL_BEGIN
+
 /**
  * Animation types for GMSMarker.
  */
@@ -37,7 +45,7 @@ typedef enum {
 @property(nonatomic, assign) CLLocationCoordinate2D position;
 
 /** Snippet text, shown beneath the title in the info window when selected. */
-@property(nonatomic, copy) NSString *snippet;
+@property(nonatomic, copy) NSString *GMS_NULLABLE_PTR snippet;
 
 /**
  * Marker icon to render. If left nil, uses a default SDK place marker.
@@ -49,7 +57,38 @@ typedef enum {
  * also redefines how anchors are specified.  For an animated image the
  * value for the animation is used, not the individual frames.
  */
-@property(nonatomic, strong) UIImage *icon;
+@property(nonatomic, strong) UIImage *GMS_NULLABLE_PTR icon;
+
+/**
+ * Marker view to render. If left nil, falls back to the |icon| property instead.
+ *
+ * Supports animation of all animatable properties of UIView, except |frame| and |center|. Changing
+ * these properties or their corresponding CALayer version, including |position|, is not supported.
+ *
+ * Note that the view behaves as if |clipsToBounds| is set to YES, regardless of its actual
+ * value.
+ */
+@property(nonatomic, strong) UIView *iconView;
+
+/**
+ * Controls whether the icon for this marker should be redrawn every frame.
+ *
+ * Note that when this changes from NO to YES, the icon is guaranteed to be redrawn next frame.
+ *
+ * Defaults to YES.
+ * Has no effect if |iconView| is nil.
+ */
+@property(nonatomic, assign) BOOL tracksViewChanges;
+
+/**
+ * Controls whether the info window for this marker should be redrawn every frame.
+ *
+ * Note that when this changes from NO to YES, the info window is guaranteed to be redrawn next
+ * frame.
+ *
+ * Defaults to NO.
+ */
+@property(nonatomic, assign) BOOL tracksInfoWindowChanges;
 
 /**
  * The ground anchor specifies the point in the icon image that is anchored to
@@ -112,7 +151,7 @@ typedef enum {
  * objects, otherwise a loop may be created (preventing ARC from releasing
  * objects).
  */
-@property(nonatomic, strong) id userData;
+@property(nonatomic, strong) id GMS_NULLABLE_PTR userData;
 
 /**
  * Provides the Core Animation layer for this GMSMarker.
@@ -128,13 +167,13 @@ typedef enum {
  * is attached to.
  * A marker can be shown on both a panorama and a map at the same time.
  */
-@property(nonatomic, weak) GMSPanoramaView *panoramaView;
+@property(nonatomic, weak) GMSPanoramaView *GMS_NULLABLE_PTR panoramaView;
 
 /** Convenience constructor for a default marker. */
 + (instancetype)markerWithPosition:(CLLocationCoordinate2D)position;
 
 /** Creates a tinted version of the default marker image for use as an icon. */
-+ (UIImage *)markerImageWithColor:(UIColor *)color;
++ (UIImage *)markerImageWithColor:(UIColor *GMS_NULLABLE_PTR)color;
 
 @end
 
@@ -149,3 +188,5 @@ FOUNDATION_EXTERN const CGPoint kGMSMarkerDefaultGroundAnchor;
  * point of the marker icon.
  */
 FOUNDATION_EXTERN const CGPoint kGMSMarkerDefaultInfoWindowAnchor;
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSMarkerLayer.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSMarkerLayer.h

@@ -11,6 +11,14 @@
 #import <CoreLocation/CoreLocation.h>
 #import <QuartzCore/QuartzCore.h>
 
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
+
+GMS_ASSUME_NONNULL_BEGIN
+
 /**
  * GMSMarkerLayer is a custom subclass of CALayer, available on a per-marker
  * basis, that allows animation of several properties of its associated
@@ -40,3 +48,5 @@ extern NSString *const kGMSMarkerLayerLatitude;
 extern NSString *const kGMSMarkerLayerLongitude;
 extern NSString *const kGMSMarkerLayerRotation;
 extern NSString *const kGMSMarkerLayerOpacity;
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSOrientation.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSOrientation.h

@@ -30,7 +30,7 @@ extern "C" {
 #endif
 
 /** Returns a GMSOrientation with the given |heading| and |pitch|. */
-inline GMSOrientation GMSOrientationMake(CLLocationDirection heading, double pitch) {
+inline static GMSOrientation GMSOrientationMake(CLLocationDirection heading, double pitch) {
   GMSOrientation orientation = {heading, pitch};
   return orientation;
 }

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSOverlay.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSOverlay.h

@@ -10,6 +10,14 @@
 
 #import <CoreLocation/CoreLocation.h>
 
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
+
+GMS_ASSUME_NONNULL_BEGIN
+
 @class GMSMapView;
 
 /**
@@ -28,14 +36,14 @@
  * will display the title on the map. The title is also the default
  * accessibility text.
  */
-@property(nonatomic, copy) NSString *title;
+@property(nonatomic, copy) NSString *GMS_NULLABLE_PTR title;
 
 /**
  * The map this overlay is on. Setting this property will add the overlay to the
  * map. Setting it to nil removes this overlay from the map. An overlay may be
  * active on at most one map at any given time.
  */
-@property(nonatomic, weak) GMSMapView *map;
+@property(nonatomic, weak) GMSMapView *GMS_NULLABLE_PTR map;
 
 /**
  * If this overlay should cause tap notifications. Some overlays, such as
@@ -54,3 +62,5 @@
 @property(nonatomic, assign) int zIndex;
 
 @end
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSPanorama.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSPanorama.h

@@ -10,6 +10,16 @@
 
 #import <CoreLocation/CoreLocation.h>
 
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
+
+GMS_ASSUME_NONNULL_BEGIN
+
+@class GMSPanoramaLink;
+
 /**
  * GMSPanorama represents metadata for a specific panorama on the Earth. This class is not
  * instantiable directly and is obtained via GMSPanoramaService or GMSPanoramaView.
@@ -23,6 +33,8 @@
 @property(nonatomic, copy, readonly) NSString *panoramaID;
 
 /** An array of GMSPanoramaLink describing the neighboring panoramas. */
-@property(nonatomic, copy, readonly) NSArray *links;
+@property(nonatomic, copy, readonly) GMS_NSArrayOf(GMSPanoramaLink *) * links;
 
 @end
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSPanoramaCamera.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSPanoramaCamera.h

@@ -10,8 +10,15 @@
 
 #import <CoreLocation/CoreLocation.h>
 
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
 #import <GoogleMaps/GMSOrientation.h>
 
+GMS_ASSUME_NONNULL_BEGIN
+
 /**
  * GMSPanoramaCamera is used to control the viewing direction of a GMSPanoramaView. It does not
  * contain information about which particular panorama should be displayed.
@@ -28,33 +35,36 @@
  * Convenience constructor specifying heading and pitch as part of |orientation|, plus |zoom| and
  * default field of view (90 degrees).
  */
-+ (id)cameraWithOrientation:(GMSOrientation)orientation zoom:(float)zoom;
++ (instancetype)cameraWithOrientation:(GMSOrientation)orientation zoom:(float)zoom;
 
 /**
  * Convenience constructor specifying |heading|, |pitch|, |zoom| with default field of view (90
  * degrees).
  */
-+ (id)cameraWithHeading:(CLLocationDirection)heading pitch:(double)pitch zoom:(float)zoom;
++ (instancetype)cameraWithHeading:(CLLocationDirection)heading pitch:(double)pitch zoom:(float)zoom;
 
 /**
  * Convenience constructor for GMSPanoramaCamera, specifying all camera properties with heading and
  * pitch as part of |orientation|.
  */
-+ (id)cameraWithOrientation:(GMSOrientation)orientation zoom:(float)zoom FOV:(double)FOV;
++ (instancetype)cameraWithOrientation:(GMSOrientation)orientation zoom:(float)zoom FOV:(double)FOV;
 
 /**
  * Convenience constructor for GMSPanoramaCamera, specifying all camera properties.
  */
-+ (id)cameraWithHeading:(CLLocationDirection)heading
-                  pitch:(double)pitch
-                   zoom:(float)zoom
-                    FOV:(double)FOV;
++ (instancetype)cameraWithHeading:(CLLocationDirection)heading
+                            pitch:(double)pitch
+                             zoom:(float)zoom
+                              FOV:(double)FOV;
 
 /**
  * The field of view (FOV) encompassed by the larger dimension (width or height) of the view in
- * degrees. This is clamped to the range [1, 160] degrees, and has a default value of 90.
+ * degrees at zoom 1. This is clamped to the range [1, 160] degrees, and has a default value of 90.
  *
  * Lower FOV values produce a zooming in effect; larger FOV values produce an fisheye effect.
+ *
+ * Note: This is not the displayed FOV if zoom is anything other than 1.  User zoom gestures
+ * control the zoom property, not this property.
  */
 @property(nonatomic, assign, readonly) double FOV;
 
@@ -72,3 +82,5 @@
 @property(nonatomic, assign, readonly) GMSOrientation orientation;
 
 @end
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSPanoramaCameraUpdate.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSPanoramaCameraUpdate.h

@@ -8,6 +8,14 @@
 //  Service: https://developers.google.com/maps/terms
 //
 
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
+
+GMS_ASSUME_NONNULL_BEGIN
+
 @interface GMSPanoramaCameraUpdate : NSObject
 
 /** Returns an update that increments the camera heading with |deltaHeading|. */
@@ -23,3 +31,5 @@
 + (GMSPanoramaCameraUpdate *)setZoom:(CGFloat)zoom;
 
 @end
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSPanoramaLayer.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSPanoramaLayer.h

@@ -13,6 +13,14 @@
 
 #import <GoogleMaps/GMSCALayer.h>
 
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
+
+GMS_ASSUME_NONNULL_BEGIN
+
 /** kGMSLayerPanoramaHeadingKey ranges from [0, 360). */
 extern NSString *const kGMSLayerPanoramaHeadingKey;
 
@@ -35,3 +43,5 @@ extern NSString *const kGMSLayerPanoramaFOVKey;
 @property(nonatomic, assign) float cameraZoom;
 @property(nonatomic, assign) double cameraFOV;
 @end
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSPanoramaLink.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSPanoramaLink.h

@@ -8,6 +8,14 @@
 //  Service: https://developers.google.com/maps/terms
 //
 
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
+
+GMS_ASSUME_NONNULL_BEGIN
+
 /** Links from a GMSPanorama to neighboring panoramas. */
 @interface GMSPanoramaLink : NSObject
 
@@ -21,3 +29,5 @@
 @property(nonatomic, copy) NSString *panoramaID;
 
 @end
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSPanoramaService.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSPanoramaService.h

@@ -10,14 +10,23 @@
 
 #import <CoreLocation/CoreLocation.h>
 
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
+
 @class GMSPanorama;
 
+GMS_ASSUME_NONNULL_BEGIN
+
 /**
  * Callback for when a panorama metadata becomes available.
  * If an error occured, |panorama| is nil and |error| is not nil.
  * Otherwise, |panorama| is not nil and |error| is nil.
  */
-typedef void (^GMSPanoramaCallback)(GMSPanorama *panorama, NSError *error);
+typedef void (^GMSPanoramaCallback)(GMSPanorama *GMS_NULLABLE_PTR panorama,
+                                    NSError *GMS_NULLABLE_PTR error);
 
 /**
  * GMSPanoramaService can be used to request panorama metadata even when a
@@ -46,7 +55,8 @@ typedef void (^GMSPanoramaCallback)(GMSPanorama *panorama, NSError *error);
  * |callback| will be called with the result. Only panoramaIDs obtained
  * from the Google Maps SDK for iOS are supported.
  */
-- (void)requestPanoramaWithID:(NSString *)panoramaID
-                     callback:(GMSPanoramaCallback)callback;
+- (void)requestPanoramaWithID:(NSString *)panoramaID callback:(GMSPanoramaCallback)callback;
 
 @end
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSPanoramaView.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSPanoramaView.h

@@ -10,6 +10,11 @@
 
 #import <CoreLocation/CoreLocation.h>
 
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
 #import <GoogleMaps/GMSOrientation.h>
 #import <GoogleMaps/GMSPanoramaLayer.h>
 
@@ -19,8 +24,10 @@
 @class GMSPanoramaCameraUpdate;
 @class GMSPanoramaView;
 
+GMS_ASSUME_NONNULL_BEGIN
+
 /** Delegate for events on GMSPanoramaView. */
-@protocol GMSPanoramaViewDelegate <NSObject>
+@protocol GMSPanoramaViewDelegate<NSObject>
 @optional
 
 /**
@@ -38,7 +45,7 @@
  * This is invoked every time the |view|.panorama property changes.
  */
 - (void)panoramaView:(GMSPanoramaView *)view
-    didMoveToPanorama:(GMSPanorama *)panorama;
+    didMoveToPanorama:(GMSPanorama *GMS_NULLABLE_PTR)panorama;
 
 /**
  * Called when the panorama change was caused by invoking
@@ -84,6 +91,18 @@
 - (BOOL)panoramaView:(GMSPanoramaView *)panoramaView
         didTapMarker:(GMSMarker *)marker;
 
+/**
+ * Called when the panorama tiles for the current view have just been requested
+ * and are beginning to load.
+ */
+- (void)panoramaViewDidStartRendering:(GMSPanoramaView *)panoramaView;
+
+/**
+ * Called when the panorama tiles have been loaded (or permanently failed to load)
+ * and rendered on screen.
+ */
+- (void)panoramaViewDidFinishRendering:(GMSPanoramaView *)panoramaView;
+
 @end
 
 /**
@@ -107,10 +126,10 @@
  *
  * Can be set to nil to clear the view.
  */
-@property(nonatomic, strong) GMSPanorama *panorama;
+@property(nonatomic, strong) GMSPanorama *GMS_NULLABLE_PTR panorama;
 
 /** GMSPanoramaView delegate. */
-@property(nonatomic, weak) id<GMSPanoramaViewDelegate> delegate;
+@property(nonatomic, weak) IBOutlet id<GMSPanoramaViewDelegate> GMS_NULLABLE_PTR delegate;
 
 /**
  * Sets the preference for whether all gestures should be enabled (default) or
@@ -244,5 +263,6 @@
                    nearCoordinate:(CLLocationCoordinate2D)coordinate
                            radius:(NSUInteger)radius;
 
-
 @end
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSPath.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSPath.h

@@ -10,11 +10,19 @@
 
 #import <CoreLocation/CoreLocation.h>
 
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
+
+GMS_ASSUME_NONNULL_BEGIN
+
 /**
  * GMSPath encapsulates an immutable array of CLLocationCooordinate2D. All the coordinates of a
  * GMSPath must be valid. The mutable counterpart is GMSMutablePath.
  */
-@interface GMSPath : NSObject <NSCopying, NSMutableCopying>
+@interface GMSPath : NSObject<NSCopying, NSMutableCopying>
 
 /** Convenience constructor for an empty path. */
 + (instancetype)path;
@@ -32,7 +40,7 @@
  * Initializes a newly allocated path from |encodedPath|. This format is described at:
  * https://developers.google.com/maps/documentation/utilities/polylinealgorithm
  */
-+ (instancetype)pathFromEncodedPath:(NSString *)encodedPath;
++ (GMS_NULLABLE_INSTANCETYPE)pathFromEncodedPath:(NSString *)encodedPath;
 
 /** Returns an encoded string of the path in the format described above. */
 - (NSString *)encodedPath;
@@ -46,7 +54,6 @@
 
 @end
 
-
 /**
  * kGMSEquatorProjectedMeter may be useful when specifying lengths for segment in "projected" units.
  * The value of kGMSEquatorProjectedMeter, 1/(pi * EarthRadius), represents the length of one meter
@@ -86,7 +93,6 @@ typedef enum {
   kGMSLengthProjected
 } GMSLengthKind;
 
-
 @interface GMSPath (GMSPathLength)
 
 /**
@@ -101,3 +107,5 @@ typedef enum {
 - (CLLocationDistance)lengthOfKind:(GMSLengthKind)kind;
 
 @end
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSPolygon.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSPolygon.h

@@ -8,8 +8,15 @@
 //  Service: https://developers.google.com/maps/terms
 //
 
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
 #import <GoogleMaps/GMSOverlay.h>
 
+GMS_ASSUME_NONNULL_BEGIN
+
 @class GMSPath;
 
 /**
@@ -20,16 +27,22 @@
 @interface GMSPolygon : GMSOverlay
 
 /** The path that describes this polygon. The coordinates composing the path must be valid. */
-@property(nonatomic, copy) GMSPath *path;
+@property(nonatomic, copy) GMSPath *GMS_NULLABLE_PTR path;
+
+/**
+ * The array of GMSPath instances that describes any holes in this polygon. The coordinates
+ * composing each path must be valid.
+ */
+@property(nonatomic, copy) GMS_NSArrayOf(GMSPath *) * GMS_NULLABLE_PTR holes;
 
 /** The width of the polygon outline in screen points. Defaults to 1. */
 @property(nonatomic, assign) CGFloat strokeWidth;
 
 /** The color of the polygon outline. Defaults to nil. */
-@property(nonatomic, strong) UIColor *strokeColor;
+@property(nonatomic, strong) UIColor *GMS_NULLABLE_PTR strokeColor;
 
 /** The fill color. Defaults to blueColor. */
-@property(nonatomic, strong) UIColor *fillColor;
+@property(nonatomic, strong) UIColor *GMS_NULLABLE_PTR fillColor;
 
 /** Whether this polygon should be rendered with geodesic correction. */
 @property(nonatomic, assign) BOOL geodesic;
@@ -38,6 +51,8 @@
  * Convenience constructor for GMSPolygon for a particular path. Other properties will have default
  * values.
  */
-+ (instancetype)polygonWithPath:(GMSPath *)path;
++ (instancetype)polygonWithPath:(GMSPath *GMS_NULLABLE_PTR)path;
 
 @end
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSPolyline.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSPolyline.h

@@ -8,10 +8,17 @@
 //  Service: https://developers.google.com/maps/terms
 //
 
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
 #import <GoogleMaps/GMSOverlay.h>
 
 @class GMSPath;
 
+GMS_ASSUME_NONNULL_BEGIN
+
 /** Describes the drawing style for one-dimensional entities such as polylines. */
 @interface GMSStrokeStyle : NSObject
 
@@ -23,7 +30,6 @@
 
 @end
 
-
 /** Describes the style for some region of a polyline. */
 @interface GMSStyleSpan : NSObject
 
@@ -59,7 +65,6 @@
 
 @end
 
-
 /**
  * GMSPolyline specifies the available options for a polyline that exists on the Earth's surface.
  * It is drawn as a physical line between the points specified in |path|.
@@ -69,7 +74,7 @@
 /**
  * The path that describes this polyline.
  */
-@property(nonatomic, copy) GMSPath *path;
+@property(nonatomic, copy) GMSPath *GMS_NULLABLE_PTR path;
 
 /**
  * The width of the line in screen points. Defaults to 1.
@@ -88,7 +93,7 @@
  * Convenience constructor for GMSPolyline for a particular path. Other properties will have
  * default values.
  */
-+ (instancetype)polylineWithPath:(GMSPath *)path;
++ (instancetype)polylineWithPath:(GMSPath *GMS_NULLABLE_PTR)path;
 
 /**
  * An array containing GMSStyleSpan, the spans used to render this polyline.
@@ -97,6 +102,8 @@
  * over the remaining length. If this array is unset or empty, then |strokeColor| is used for the
  * entire line instead.
  */
-@property(nonatomic, copy) NSArray *spans;
+@property(nonatomic, copy) GMS_NSArrayOf(GMSStyleSpan *) * GMS_NULLABLE_PTR spans;
 
 @end
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSServices.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSServices.h

@@ -8,6 +8,14 @@
 //  Service: https://developers.google.com/maps/terms
 //
 
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
+
+GMS_ASSUME_NONNULL_BEGIN
+
 /** Service class for the Google Maps SDK for iOS. */
 @interface GMSServices : NSObject
 
@@ -30,8 +38,8 @@
 /**
  * Provides your API key to the Google Maps SDK for iOS.  This key is generated
  * for your application via the Google APIs Console, and is paired with your
- * application's bundle ID to identify it.  This should be called exactly once
- * by your application, e.g., in application: didFinishLaunchingWithOptions:.
+ * application's bundle ID to identify it.  This must be called exactly once
+ * by your application before any iOS Maps SDK object is initialized.
  *
  * @return YES if the APIKey was successfully provided
  */
@@ -49,3 +57,5 @@
 + (NSString *)SDKVersion;
 
 @end
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSSyncTileLayer.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSSyncTileLayer.h

@@ -10,6 +10,14 @@
 
 #import <GoogleMaps/GMSTileLayer.h>
 
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
+
+GMS_ASSUME_NONNULL_BEGIN
+
 /**
  * GMSSyncTileLayer is an abstract subclass of GMSTileLayer that provides a sync
  * interface to generate image tile data.
@@ -24,6 +32,8 @@
  * Calls to this method may also be made from multiple threads so
  * implementations must be threadsafe.
  */
-- (UIImage *)tileForX:(NSUInteger)x y:(NSUInteger)y zoom:(NSUInteger)zoom;
+- (UIImage *GMS_NULLABLE_PTR)tileForX:(NSUInteger)x y:(NSUInteger)y zoom:(NSUInteger)zoom;
 
 @end
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSTileLayer.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSTileLayer.h

@@ -8,8 +8,16 @@
 //  Service: https://developers.google.com/maps/terms
 //
 
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
+
 @class GMSMapView;
 
+GMS_ASSUME_NONNULL_BEGIN
+
 /**
  * Stub tile that is used to indicate that no tile exists for a specific tile
  * coordinate. May be returned by tileForX:y:zoom: on GMSTileProvider.
@@ -24,7 +32,7 @@ FOUNDATION_EXTERN UIImage *const kGMSTileLayerNoTile;
 - (void)receiveTileWithX:(NSUInteger)x
                        y:(NSUInteger)y
                     zoom:(NSUInteger)zoom
-                   image:(UIImage *)image;
+                   image:(UIImage *GMS_NULLABLE_PTR)image;
 @end
 
 /**
@@ -65,7 +73,7 @@ FOUNDATION_EXTERN UIImage *const kGMSTileLayerNoTile;
  * the layer to the map. Setting it to nil removes this layer from the map. A
  * layer may be active on at most one map at any given time.
  */
-@property(nonatomic, weak) GMSMapView *map;
+@property(nonatomic, weak) GMSMapView *GMS_NULLABLE_PTR map;
 
 /**
  * Higher |zIndex| value tile layers will be drawn on top of lower |zIndex|
@@ -101,3 +109,5 @@ FOUNDATION_EXTERN UIImage *const kGMSTileLayerNoTile;
 @property(nonatomic, assign) BOOL fadeIn;
 
 @end
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSUISettings.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSUISettings.h

@@ -54,7 +54,7 @@
  *
  * When the GMSMapView is contained by a UIScrollView (or other scrollable area),
  * this means that gestures on the map will not be additional consumed as scroll
- * gestures.  However, disabling this (set to NO) may be userful to support
+ * gestures.  However, disabling this (set to NO) may be useful to support
  * complex view hierarchies or requirements.
  */
 @property(nonatomic, assign) BOOL consumesGesturesInView;
@@ -80,9 +80,15 @@
 /**
  * Enables (default) or disables the indoor floor picker. If enabled, it is only
  * visible when the view is focused on a building with indoor floor data.
- * If disabled, the selected floor can still be controlled programatically via
+ * If disabled, the selected floor can still be controlled programmatically via
  * the indoorDisplay mapView property.
  */
 @property(nonatomic, assign) BOOL indoorPicker;
 
+/**
+ * Controls whether rotate and zoom gestures can be performed off-center and scrolled around
+ * (default YES).
+ */
+@property(nonatomic, assign) BOOL allowScrollGesturesDuringRotateOrZoom;
+
 @end

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GMSURLTileLayer.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GMSURLTileLayer.h

@@ -10,20 +10,30 @@
 
 #import <GoogleMaps/GMSTileLayer.h>
 
+#if __has_feature(modules)
+@import GoogleMapsBase;
+#else
+#import <GoogleMapsBase/GoogleMapsBase.h>
+#endif
+
 @class NSURL;
 
+GMS_ASSUME_NONNULL_BEGIN
+
 /**
  * |GMSTileURLConstructor| is a block taking |x|, |y| and |zoom|
  * and returning an NSURL, or nil to indicate no tile for that location.
  */
-typedef NSURL *(^GMSTileURLConstructor)(NSUInteger x, NSUInteger y, NSUInteger zoom);
+typedef NSURL *GMS_NULLABLE_PTR (^GMSTileURLConstructor)(NSUInteger x, NSUInteger y,
+                                                         NSUInteger zoom);
 
 /**
  * GMSURLTileProvider fetches tiles based on the URLs returned from a
  * GMSTileURLConstructor. For example:
  * <pre>
  *   GMSTileURLConstructor constructor = ^(NSUInteger x, NSUInteger y, NSUInteger zoom) {
- *     NSString *URLStr = [NSString stringWithFormat:@"http://example.com/%d/%d/%d.png", x, y, zoom];
+ *     NSString *URLStr =
+ *         [NSString stringWithFormat:@"https://example.com/%d/%d/%d.png", x, y, zoom];
  *     return [NSURL URLWithString:URLStr];
  *   };
  *   GMSTileLayer *layer =
@@ -44,6 +54,8 @@ typedef NSURL *(^GMSTileURLConstructor)(NSUInteger x, NSUInteger y, NSUInteger z
  * Specify the user agent to describe your application. If this is nil (the
  * default), the default iOS user agent is used for HTTP requests.
  */
-@property(nonatomic, copy) NSString *userAgent;
+@property(nonatomic, copy) NSString *GMS_NULLABLE_PTR userAgent;
 
 @end
+
+GMS_ASSUME_NONNULL_END

Apex Mobile/GoogleMaps.framework/Versions/A/Headers/GoogleMaps.h → Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Headers/GoogleMaps.h

@@ -9,14 +9,14 @@
 //
 
 #import <CoreLocation/CoreLocation.h>
-#import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #import <GoogleMaps/GMSAddress.h>
 #import <GoogleMaps/GMSCALayer.h>
 #import <GoogleMaps/GMSCameraPosition.h>
 #import <GoogleMaps/GMSCameraUpdate.h>
 #import <GoogleMaps/GMSCircle.h>
-#import <GoogleMaps/GMSCoordinateBounds.h>
+#import <GoogleMaps/GMSCoordinateBounds+GoogleMaps.h>
+#import <GoogleMaps/GMSDeprecationMacros.h>
 #import <GoogleMaps/GMSGeocoder.h>
 #import <GoogleMaps/GMSGeometryUtils.h>
 #import <GoogleMaps/GMSGroundOverlay.h>

Apex Mobile/GoogleMap/GoogleMaps.framework/Versions/A/Modules/module.modulemap

@@ -0,0 +1,39 @@
+framework module GoogleMaps { umbrella header "GoogleMaps.h"
+header "GMSAddress.h"
+header "GMSCALayer.h"
+header "GMSCameraPosition.h"
+header "GMSCameraUpdate.h"
+header "GMSCircle.h"
+header "GMSCoordinateBounds+GoogleMaps.h"
+header "GMSDeprecationMacros.h"
+header "GMSGeocoder.h"
+header "GMSGeometryUtils.h"
+header "GMSGroundOverlay.h"
+header "GMSIndoorBuilding.h"
+header "GMSIndoorDisplay.h"
+header "GMSIndoorLevel.h"
+header "GMSMapLayer.h"
+header "GMSMapView+Animation.h"
+header "GMSMapView.h"
+header "GMSMarker.h"
+header "GMSMarkerLayer.h"
+header "GMSMutablePath.h"
+header "GMSOrientation.h"
+header "GMSOverlay.h"
+header "GMSPanorama.h"
+header "GMSPanoramaCamera.h"
+header "GMSPanoramaCameraUpdate.h"
+header "GMSPanoramaLayer.h"
+header "GMSPanoramaLink.h"
+header "GMSPanoramaService.h"
+header "GMSPanoramaView.h"
+header "GMSPath.h"
+header "GMSPolygon.h"
+header "GMSPolyline.h"
+header "GMSProjection.h"
+header "GMSServices.h"
+header "GMSSyncTileLayer.h"
+header "GMSTileLayer.h"
+header "GMSUISettings.h"
+header "GMSURLTileLayer.h"
+export * module * { export * } }