[Update] Google Maps and Places for iOS v3.1.0

Google.Maps/component/component.yaml

@@ -1,4 +1,4 @@
-version: 3.0.3.0
+version: 3.1.0.0
 name: Google Maps for iOS
 id: googleiosmaps
 publisher: Xamarin Inc.
@@ -15,7 +15,7 @@ libraries:
 is_shell: true
 packages:
   ios-unified:
-  - Xamarin.Google.iOS.Maps, Version=3.0.3.0
+  - Xamarin.Google.iOS.Maps, Version=3.1.0.0
 samples:
 - name: Google Maps Sample
   path: ../samples/GoogleMapsSample/GoogleMapsSample.sln

Google.Maps/externals/Podfile

@@ -4,5 +4,5 @@ platform :ios, '9.0'
 install! 'cocoapods', :integrate_targets => false
 
 target 'GoogleMaps' do
-	pod 'GoogleMaps', '3.0.3'
+	pod 'GoogleMaps', '3.1.0'
 end

Google.Maps/nuget/Xamarin.Google.iOS.Maps.nuspec

@@ -3,7 +3,7 @@
   <metadata>
     <id>Xamarin.Google.iOS.Maps</id>
     <title>Google APIs Maps iOS Library</title>
-    <version>3.0.3.0</version>
+    <version>3.1.0.0</version>
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>

Google.Maps/source/Google.Maps/Google.Maps.targets

@@ -3,14 +3,14 @@
 
 	<PropertyGroup>
 		<_GoogleMapsAssemblyName>Google.Maps, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</_GoogleMapsAssemblyName>
-		<_GoogleMapsItemsFolder>GMps-3.0.3</_GoogleMapsItemsFolder>
+		<_GoogleMapsItemsFolder>GMps-3.1.0</_GoogleMapsItemsFolder>
 		<_GoogleMapsSDKBaseFolder>$(XamarinBuildDownloadDir)$(_GoogleMapsItemsFolder)\Maps\Frameworks\</_GoogleMapsSDKBaseFolder>
 		<_GoogleMapsBaseSDKBaseFolder>$(XamarinBuildDownloadDir)$(_GoogleMapsItemsFolder)\Base\Frameworks\</_GoogleMapsBaseSDKBaseFolder>
 	</PropertyGroup>
 
 	<ItemGroup Condition="('$(OutputType)'!='Library' OR '$(IsAppExtension)'=='True')">
 		<XamarinBuildDownload Include="$(_GoogleMapsItemsFolder)">
-			<Url>https://dl.google.com/dl/cpdc/4fb8b2192f32cf7c/GoogleMaps-3.0.3.tar.gz</Url>
+			<Url>https://dl.google.com/dl/cpdc/d308af63f78a5a1a/GoogleMaps-3.1.0.tar.gz</Url>
 			<Kind>Tgz</Kind>
 		</XamarinBuildDownload>
 		<NativeReference Include="$(_GoogleMapsSDKBaseFolder)GoogleMaps.framework">
@@ -379,10 +379,6 @@
 				<LogicalName>__monotouch_content_GoogleMaps.bundle_fGMSCoreResources.bundle_fit.lproj_fGMSCore.strings</LogicalName>
 				<AssemblyName>$(_GoogleMapsAssemblyName)</AssemblyName>
 			</RestoreAssemblyResource>
-			<RestoreAssemblyResource Include="$(_GoogleMapsSDKBaseFolder)GoogleMaps.framework\Resources\GoogleMaps.bundle\GMSCoreResources.bundle\iw.lproj\GMSCore.strings">
-				<LogicalName>__monotouch_content_GoogleMaps.bundle_fGMSCoreResources.bundle_fiw.lproj_fGMSCore.strings</LogicalName>
-				<AssemblyName>$(_GoogleMapsAssemblyName)</AssemblyName>
-			</RestoreAssemblyResource>
 			<RestoreAssemblyResource Include="$(_GoogleMapsSDKBaseFolder)GoogleMaps.framework\Resources\GoogleMaps.bundle\GMSCoreResources.bundle\ja.lproj\GMSCore.strings">
 				<LogicalName>__monotouch_content_GoogleMaps.bundle_fGMSCoreResources.bundle_fja.lproj_fGMSCore.strings</LogicalName>
 				<AssemblyName>$(_GoogleMapsAssemblyName)</AssemblyName>
@@ -411,10 +407,6 @@
 				<LogicalName>__monotouch_content_GoogleMaps.bundle_fGMSCoreResources.bundle_fnl.lproj_fGMSCore.strings</LogicalName>
 				<AssemblyName>$(_GoogleMapsAssemblyName)</AssemblyName>
 			</RestoreAssemblyResource>
-			<RestoreAssemblyResource Include="$(_GoogleMapsSDKBaseFolder)GoogleMaps.framework\Resources\GoogleMaps.bundle\GMSCoreResources.bundle\no.lproj\GMSCore.strings">
-				<LogicalName>__monotouch_content_GoogleMaps.bundle_fGMSCoreResources.bundle_fno.lproj_fGMSCore.strings</LogicalName>
-				<AssemblyName>$(_GoogleMapsAssemblyName)</AssemblyName>
-			</RestoreAssemblyResource>
 			<RestoreAssemblyResource Include="$(_GoogleMapsSDKBaseFolder)GoogleMaps.framework\Resources\GoogleMaps.bundle\GMSCoreResources.bundle\pl.lproj\GMSCore.strings">
 				<LogicalName>__monotouch_content_GoogleMaps.bundle_fGMSCoreResources.bundle_fpl.lproj_fGMSCore.strings</LogicalName>
 				<AssemblyName>$(_GoogleMapsAssemblyName)</AssemblyName>

Google.Maps/source/Google.Maps/Properties/AssemblyInfo.cs

@@ -26,7 +26,7 @@
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
 [assembly: AssemblyVersion ("1.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.3.0")]
+[assembly: AssemblyFileVersion("3.1.0.0")]
 
 // The following attributes are used to specify the signing key for the assembly,
 // if desired. See the Mono documentation for more information about signing.

Google.Places/component/component.yaml

@@ -1,4 +1,4 @@
-version: 3.0.3.0
+version: 3.1.0.0
 name: Google Places for iOS
 id: googleiosplaces
 publisher: Xamarin Inc.
@@ -15,7 +15,7 @@ libraries:
 is_shell: true
 packages:
   ios-unified:
-  - Xamarin.Google.iOS.Places, Version=3.0.3.0
+  - Xamarin.Google.iOS.Places, Version=3.1.0.0
 samples:
 - name: Google Places Sample
   path: ../samples/GooglePlacesSample/GooglePlacesSample.sln

Google.Places/externals/Podfile

@@ -4,5 +4,5 @@ platform :ios, '9.0'
 install! 'cocoapods', :integrate_targets => false
 
 target 'GoogleMaps' do
-	pod 'GooglePlaces', '3.0.3'
+	pod 'GooglePlaces', '3.1.0'
 end

Google.Places/nuget/Xamarin.Google.iOS.Places.nuspec

@@ -3,7 +3,7 @@
   <metadata>
     <id>Xamarin.Google.iOS.Places</id>
     <title>Google APIs Places iOS Library</title>
-    <version>3.0.3.0</version>
+    <version>3.1.0.0</version>
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
@@ -14,7 +14,7 @@
     <iconUrl>https://raw.githubusercontent.com/xamarin/GoogleApisForiOSComponents/master/icons/googleiosplaces_128x128.png</iconUrl>
     <dependencies>
       <group targetFramework="Xamarin.iOS10">
-        <dependency id="Xamarin.Google.iOS.Maps" version="3.0.3.0" />
+        <dependency id="Xamarin.Google.iOS.Maps" version="3.1.0.0" />
         <dependency id="Xamarin.Build.Download" version="0.4.11" />
       </group>
     </dependencies>

Google.Places/source/Google.Places/ApiDefinition.cs

@@ -14,16 +14,23 @@ namespace Google.Places
 	interface AddressComponent
 	{
 		// @property(nonatomic, readonly, copy) NSString *type;
+		[Obsolete ("Type property is deprecated in favor of Types.")]
 		[BindAs (typeof (PlaceType))]
 		[Export ("type")]
 		NSString Type { get; }
 
+		// @property (readonly, nonatomic, strong) NSArray<NSString *> * _Nonnull types;
+		[BindAs (typeof (PlaceType []))]
+		[Export ("types", ArgumentSemantic.Strong)]
+		NSString [] Types { get; }
+
 		// @property(nonatomic, readonly, copy) NSString *name;
 		[Export ("name")]
 		string Name { get; }
 
 		// @property (readonly, copy, nonatomic) NSString * _Nullable shortName;
-		[NullAllowed, Export ("shortName")]
+		[NullAllowed]
+		[Export ("shortName")]
 		string ShortName { get; }
 	}