Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Android Ecosystem updates for net9.0-rc.2 #24665

Merged
merged 5 commits into from
Sep 25, 2024
Merged

Android Ecosystem updates for net9.0-rc.2 #24665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bd509da
nuget bumps
moljac Sep 9, 2024
ddc8f6c
nuget bumps
moljac Sep 15, 2024
a7337f0
nullability fixes
moljac Sep 15, 2024
4082db2
fixes according to review
moljac Sep 22, 2024
f15a903
Merge branch 'net9.0' into dev/moljac/net9.0-rc2-android-ecosystem
moljac Sep 24, 2024
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
26 changes: 13 additions & 13 deletions eng/AndroidX.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,55 +2,55 @@
<ItemGroup>
<PackageReference
Update="Xamarin.AndroidX.AppCompat.AppCompatResources"
Version="1.7.0.1"
Version="1.7.0.3"
/>
<PackageReference
Update="Xamarin.AndroidX.Browser"
Version="1.8.0.4"
Version="1.8.0.6"
/>
<PackageReference
Update="Xamarin.AndroidX.SwipeRefreshLayout"
Version="1.1.0.22"
Version="1.1.0.24"
/>
<PackageReference
Update="Xamarin.AndroidX.Lifecycle.LiveData"
Version="2.8.3.1"
Version="2.8.5.1"
/>
<PackageReference
Update="Xamarin.AndroidX.Navigation.UI"
Version="2.7.7.5"
Version="2.8.0.1"
/>
<PackageReference
Update="Xamarin.AndroidX.Navigation.Fragment"
Version="2.7.7.5"
Version="2.8.0.1"
/>
<PackageReference
Update="Xamarin.AndroidX.Navigation.Runtime"
Version="2.7.7.5"
Version="2.8.0.1"
/>
<PackageReference
Update="Xamarin.AndroidX.Navigation.Common"
Version="2.7.7.5"
Version="2.8.0.1"
/>
<PackageReference
Update="Xamarin.AndroidX.MediaRouter"
Version="1.7.0.4"
Version="1.7.0.6"
/>
<PackageReference
Update="Xamarin.AndroidX.Palette"
Version="1.0.0.27"
Version="1.0.0.29"
/>
<PackageReference
Update="Xamarin.AndroidX.RecyclerView"
Version="1.3.2.6"
Version="1.3.2.8"
/>
<PackageReference
Update="Xamarin.Build.Download"
Version="0.11.4"
/>
<PackageReference
Update="Xamarin.Google.Android.Material"
Version="1.11.0.1"
Version="1.11.0.3"
/>
<PackageReference
Update="Xamarin.AndroidX.Migration"
Expand All @@ -59,7 +59,7 @@
/>
<PackageReference
Update="Xamarin.AndroidX.Window.WindowJava"
Version="1.3.0.1"
Version="1.3.0.3"
/>
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,11 @@
<_MicrosoftWebWebView2Version>1.0.2592.51</_MicrosoftWebWebView2Version>
<!-- GLIDE - the android maven artifact in /src/Core/AndroidNative/maui/build.gradle -->
<!-- must be kept in sync with the binding library version to it here: -->
<_XamarinAndroidGlideVersion>4.16.0.5</_XamarinAndroidGlideVersion>
<_XamarinAndroidGlideVersion>4.16.0.6</_XamarinAndroidGlideVersion>
<_XamarinAndroidXSecurityVersion>1.1.0.2-alpha06</_XamarinAndroidXSecurityVersion>
<_XamarinGoogleCryptoTinkAndroidVersion>1.14.0.1</_XamarinGoogleCryptoTinkAndroidVersion>
<_XamarinGoogleCryptoTinkAndroidVersion>1.15.0.1</_XamarinGoogleCryptoTinkAndroidVersion>
<!-- Android Maps -->
<XamarinGooglePlayServicesMaps>118.2.0.4</XamarinGooglePlayServicesMaps>
<XamarinGooglePlayServicesMaps>119.0.0.2</XamarinGooglePlayServicesMaps>
<!--
SKIASHARP & HARFBUZZSHARP - the various things must be kept in sync with maui graphics:
- NuGet versions below
Expand Down
4 changes: 2 additions & 2 deletions src/Compatibility/Android.AppLinks/src/Compatibility.Android.AppLinks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Firebase.AppIndexing" Version="120.0.0.15" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.2" />
<PackageReference Include="Xamarin.Firebase.AppIndexing" Version="120.0.0.21" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.5.1" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/Compatibility/ControlGallery/src/Android/Compatibility.ControlGallery.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="Xam.Plugin.DeviceInfo" Version="4.1.1" />
<PackageReference Include="Xamarin.Build.Download" Version="0.11.4" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.3.1" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.8.0.4" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.27" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.11.0.1" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.5.1" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.8.0.6" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.29" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.11.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions ...ompatibility/ControlGallery/src/EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project>
<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.8.0.4" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.27" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.3.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.11.0.1" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.8.0.6" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.29" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.5.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.11.0.3" />
</ItemGroup>
<Import Project="..\..\..\..\..\eng\AndroidX.targets" />
</Project>
6 changes: 3 additions & 3 deletions src/Compatibility/Maps/src/Android/Compatibility.Maps.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.3.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.11.0.1" />
<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="118.2.0.4" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.5.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.11.0.3" />
<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="119.0.0.2" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Compatibility/Material/src/Android/Compatibility.Material.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<AndroidResource Include="Resources\**\*" />
</ItemGroup>
<ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) " >
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.3.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.11.0.1" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.5.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.11.0.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
Expand Down
6 changes: 3 additions & 3 deletions src/Controls/Foldable/src/Controls.Foldable.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
</ItemGroup>
<ItemGroup Condition=" '$(UseMaui)' != 'true' and '$(TargetPlatformIdentifier)' == 'android' ">
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.3.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.11.0.1" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.5.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.11.0.3" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' ">
<PackageReference Include="Xamarin.AndroidX.Window.WindowJava" Version="1.3.0.1" />
<PackageReference Include="Xamarin.AndroidX.Window.WindowJava" Version="1.3.0.3" />
</ItemGroup>

<Import Project="$(MauiSrcDirectory)Workload\Shared\LibraryPacks.targets" />
Expand Down
16 changes: 14 additions & 2 deletions src/Core/maps/src/Handlers/Map/MapHandler.Android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,15 +419,19 @@ void AddPins(IList pins)
foreach (var p in pins)
{
IMapPin pin = (IMapPin)p;
Marker marker;
Marker? marker;

var pinHandler = pin.ToHandler(MauiContext);
if (pinHandler is IMapPinHandler iMapPinHandler)
{
marker = Map.AddMarker(iMapPinHandler.PlatformView);
if (marker == null)
{
throw new System.Exception("Map.AddMarker returned null");
}
// associate pin with marker for later lookup in event handlers
pin.MarkerId = marker.Id;
_markers.Add(marker);
_markers.Add(marker!);
moljac marked this conversation as resolved.
Show resolved Hide resolved
}

}
Expand Down Expand Up @@ -539,6 +543,10 @@ void AddPolygon(IGeoPathMapElement polygon)
_polygons = new List<APolygon>();

var options = polygon.ToHandler(MauiContext!)?.PlatformView as PolygonOptions;
if(options is null)
{
throw new System.Exception("PolygonOptions is null");
}
var nativePolygon = map.AddPolygon(options);

polygon.MapElementId = nativePolygon.Id;
Expand All @@ -556,6 +564,10 @@ void AddCircle(ICircleMapElement circle)
_circles = new List<ACircle>();

var options = circle.ToHandler(MauiContext!)?.PlatformView as CircleOptions;
moljac marked this conversation as resolved.
Show resolved Hide resolved
if(options is null)
{
throw new System.Exception("CircleOptions is null");
}
var nativeCircle = map.AddCircle(options);

circle.MapElementId = nativeCircle.Id;
Expand Down
14 changes: 7 additions & 7 deletions src/Core/src/Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-android'))">
<PackageReference Include="Xamarin.Android.Glide" Version="$(_XamarinAndroidGlideVersion)" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.3.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.11.0.1" />
<PackageReference Include="Xamarin.AndroidX.SwipeRefreshLayout" Version="1.1.0.22" />
<PackageReference Include="Xamarin.AndroidX.Navigation.UI" Version="2.7.7.5" />
<PackageReference Include="Xamarin.AndroidX.Navigation.Fragment" Version="2.7.7.5" />
<PackageReference Include="Xamarin.AndroidX.Navigation.Runtime" Version="2.7.7.5" />
<PackageReference Include="Xamarin.AndroidX.Navigation.Common" Version="2.7.7.5" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.5.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.11.0.3" />
<PackageReference Include="Xamarin.AndroidX.SwipeRefreshLayout" Version="1.1.0.24" />
<PackageReference Include="Xamarin.AndroidX.Navigation.UI" Version="2.8.0.1" />
<PackageReference Include="Xamarin.AndroidX.Navigation.Fragment" Version="2.8.0.1" />
<PackageReference Include="Xamarin.AndroidX.Navigation.Runtime" Version="2.8.0.1" />
<PackageReference Include="Xamarin.AndroidX.Navigation.Common" Version="2.8.0.1" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-tizen'))">
<PackageReference Include="Tizen.UIExtensions.NUI" />
Expand Down
4 changes: 2 additions & 2 deletions src/Essentials/src/Essentials.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
<Compile Include="**\*.android.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
<Compile Include="**\*.android.*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
<AndroidResource Include="Resources\xml\*.xml" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.8.0.4" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.8.0.6" />
<PackageReference Include="Xamarin.AndroidX.Security.SecurityCrypto" Version="1.1.0.2-alpha06" />
<PackageReference Include="Xamarin.Google.Crypto.Tink.Android" Version="1.14.0.1" />
<PackageReference Include="Xamarin.Google.Crypto.Tink.Android" Version="1.15.0.1" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'ios' Or '$(TargetPlatformIdentifier)' == 'maccatalyst' ">
<Compile Include="**\*.ios.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
Expand Down
Loading