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

20250121 Android Ecosystem Updates #27271

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

20250121 Android Ecosystem Updates #27271

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0adcacb
Android ecosystem nugets bumps
moljac Jan 22, 2025
4501c7f
obsoleted members fixes
moljac Jan 22, 2025
986d1ea
fixes for obsolete members in tests
moljac Jan 22, 2025
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
24 changes: 12 additions & 12 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.3"
Version="1.7.0.5"
/>
<PackageReference
Update="Xamarin.AndroidX.Browser"
Version="1.8.0.6"
Version="1.8.0.8"
/>
<PackageReference
Update="Xamarin.AndroidX.SwipeRefreshLayout"
Version="1.1.0.24"
/>
<PackageReference
Update="Xamarin.AndroidX.Lifecycle.LiveData"
Version="2.8.5.1"
Version="2.8.7.2"
/>
<PackageReference
Update="Xamarin.AndroidX.Navigation.UI"
Version="2.8.0.1"
Version="2.8.5.1"
/>
<PackageReference
Update="Xamarin.AndroidX.Navigation.Fragment"
Version="2.8.0.1"
Version="2.8.5.1"
/>
<PackageReference
Update="Xamarin.AndroidX.Navigation.Runtime"
Version="2.8.0.1"
Version="2.8.5.1"
/>
<PackageReference
Update="Xamarin.AndroidX.Navigation.Common"
Version="2.8.0.1"
Version="2.8.5.1"
/>
<PackageReference
Update="Xamarin.AndroidX.MediaRouter"
Version="1.7.0.6"
Version="1.7.0.8"
/>
<PackageReference
Update="Xamarin.AndroidX.Palette"
Version="1.0.0.29"
Version="1.0.0.31"
/>
<PackageReference
Update="Xamarin.AndroidX.RecyclerView"
Version="1.3.2.8"
Version="1.3.2.10"
/>
<PackageReference
Update="Xamarin.Build.Download"
Version="0.11.4"
/>
<PackageReference
Update="Xamarin.Google.Android.Material"
Version="1.11.0.3"
Version="1.12.0.2"
/>
<PackageReference
Update="Xamarin.AndroidX.Migration"
Expand All @@ -59,7 +59,7 @@
/>
<PackageReference
Update="Xamarin.AndroidX.Window.WindowJava"
Version="1.3.0.3"
Version="1.3.0.5"
/>
</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 @@ -107,11 +107,11 @@
<SystemRuntimeCompilerServicesUnsafePackageVersion>6.0.0</SystemRuntimeCompilerServicesUnsafePackageVersion>
<!-- 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.6</_XamarinAndroidGlideVersion>
<_XamarinAndroidGlideVersion>4.16.0.11</_XamarinAndroidGlideVersion>
<_XamarinAndroidXSecurityVersion>1.1.0.2-alpha06</_XamarinAndroidXSecurityVersion>
<_XamarinGoogleCryptoTinkAndroidVersion>1.15.0.1</_XamarinGoogleCryptoTinkAndroidVersion>
<_XamarinGoogleCryptoTinkAndroidVersion>1.16.0.1</_XamarinGoogleCryptoTinkAndroidVersion>
<!-- Android Maps -->
<XamarinGooglePlayServicesMaps>119.0.0.2</XamarinGooglePlayServicesMaps>
<XamarinGooglePlayServicesMaps>119.0.0.4</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.21" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.5.1" />
<PackageReference Include="Xamarin.Firebase.AppIndexing" Version="120.0.0.23" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.2" />
</ItemGroup>

<ItemGroup>
Expand Down
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.5.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.11.0.3" />
<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="119.0.0.2" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.2" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.12.0.2" />
<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="119.0.0.4" />
</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.5.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.11.0.3" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.2" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.12.0.2" />
</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.5.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.11.0.3" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.2" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.12.0.2" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' ">
<PackageReference Include="Xamarin.AndroidX.Window.WindowJava" Version="1.3.0.3" />
<PackageReference Include="Xamarin.AndroidX.Window.WindowJava" Version="1.3.0.5" />
</ItemGroup>

<Import Project="$(MauiSrcDirectory)Workload\Shared\LibraryPacks.targets" />
Expand Down
2 changes: 2 additions & 0 deletions src/Controls/src/Core/Platform/Android/Extensions/ButtonExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ public static void UpdateContentLayout(this MaterialButton materialButton, Butto
return;

var icon = materialButton.Icon ??
#pragma warning disable CS0618 // Type or member is obsolete
TextViewCompat.GetCompoundDrawablesRelative(materialButton)[3];
#pragma warning restore CS0618 // Type or member is obsolete

if (icon != null &&
!String.IsNullOrEmpty(button.Text))
Expand Down
2 changes: 2 additions & 0 deletions src/Controls/src/Core/Platform/GestureManager/GesturePlatformManager.Android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,9 @@ ScaleGestureDetector InitializeScaleDetector()
var context = Control.Context;
var listener = new InnerScaleListener(new PinchGestureHandler(() => View), context.FromPixels);
var detector = new ScaleGestureDetector(context, listener, Control.Handler);
#pragma warning disable CS0618 // Type or member is obsolete
ScaleGestureDetectorCompat.SetQuickScaleEnabled(detector, true);
#pragma warning restore CS0618 // Type or member is obsolete

return detector;
}
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 @@ -46,13 +46,13 @@
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-android'))">
<PackageReference Include="Xamarin.Android.Glide" Version="$(_XamarinAndroidGlideVersion)" />
<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" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.2" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.12.0.2" />
<PackageReference Include="Xamarin.AndroidX.SwipeRefreshLayout" Version="1.1.0.26" />
<PackageReference Include="Xamarin.AndroidX.Navigation.UI" Version="2.8.5.1" />
<PackageReference Include="Xamarin.AndroidX.Navigation.Fragment" Version="2.8.5.1" />
<PackageReference Include="Xamarin.AndroidX.Navigation.Runtime" Version="2.8.5.1" />
<PackageReference Include="Xamarin.AndroidX.Navigation.Common" Version="2.8.5.1" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-tizen'))">
<PackageReference Include="Tizen.UIExtensions.NUI" />
Expand Down
4 changes: 4 additions & 0 deletions src/Core/src/Platform/Android/MauiMaterialButton.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,14 @@ protected override void OnLayout(bool changed, int left, int top, int right, int
// After the layout pass, we swap the icon from the top to the bottom.
if (ForceBottomIconGravity)
{
#pragma warning disable CS0618 // Type or member is obsolete
var icons = TextViewCompat.GetCompoundDrawablesRelative(this);
#pragma warning restore CS0618 // Type or member is obsolete
if (icons[1] is { } icon)
{
#pragma warning disable CS0618 // Type or member is obsolete
TextViewCompat.SetCompoundDrawablesRelative(this, null, null, null, icon);
#pragma warning restore CS0618 // Type or member is obsolete
icon.SetBounds(0, 0, icon.IntrinsicWidth, icon.IntrinsicHeight);
}
}
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 @@ -43,9 +43,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.6" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.8.0.8" />
<PackageReference Include="Xamarin.AndroidX.Security.SecurityCrypto" Version="1.1.0.2-alpha06" />
<PackageReference Include="Xamarin.Google.Crypto.Tink.Android" Version="1.15.0.1" />
<PackageReference Include="Xamarin.Google.Crypto.Tink.Android" Version="1.16.0.1" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'ios' Or '$(TargetPlatformIdentifier)' == 'maccatalyst' ">
<Compile Include="**\*.ios.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
Expand Down
Loading