Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

Update google maps to the latest AndroidX bindings #10873

Merged
merged 8 commits into from
Oct 19, 2020
Merged

Update google maps to the latest AndroidX bindings #10873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4656372
update google maps
PureWeen May 27, 2020
5de2c9f
- fix api include
PureWeen May 27, 2020
66fd85e
Update Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj
PureWeen May 27, 2020
f633fa7
Merge branch '5.0.0' into google_maps_bump
PureWeen Aug 27, 2020
c0115a0
Update Xamarin.Forms.Maps.nuspec
PureWeen Oct 16, 2020
3856109
Update Xamarin.Forms.Maps.Android.csproj
PureWeen Oct 16, 2020
460c29b
Update Xamarin.Forms.Maps.nuspec
PureWeen Oct 16, 2020
037bea4
Merge branch '5.0.0' into google_maps_bump
PureWeen Oct 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions .nuspec/Xamarin.Forms.Maps.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,8 @@
<dependency id="Xamarin.Forms" version="$version$"/>
</group>
<group targetFramework="MonoAndroid10.0">
<dependency id="Xamarin.AndroidX.Migration" version="1.0.0.1"/>
<dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="2.1.0.1"/>
<dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0.1"/>
<dependency id="Xamarin.AndroidX.Legacy.Support.Core.UI" version="1.0.0.1"/>
<dependency id="Xamarin.AndroidX.AppCompat" version="1.1.0.1"/>
<dependency id="Xamarin.GooglePlayServices.Maps" version="71.1610.0"/>
<dependency id="Xamarin.GooglePlayServices.Maps" version="117.0.0"/>
<dependency id="Xamarin.Forms" version="$version$"/>
<dependency id="Xamarin.Android.Support.v4" version="28.0.0.3"/>
</group>
<group targetFramework="tizen40">
<dependency id="Tizen.NET" version="4.0.0"/>
Expand Down
10 changes: 3 additions & 7 deletions Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,11 @@
<ProjectReference Include="..\Xamarin.Forms.Platform.Android\Xamarin.Forms.Platform.Android.csproj">
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid10.0'">
<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Migration">
<Version>1.0.0.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="71.1610.0" />
<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="117.0.0" />
<PackageReference Include="Xamarin.AndroidX.Migration" Version="1.0.0.1" />
</ItemGroup>
</Project>