Skip to content

Commit 136e6c7

Browse files
jonathanpeppersjonathanpeppers
authored
[android] 20250820 net10.0 ecosystem updates (#31265)
Updates to the latest AndroidX & Google Play Services packages from the dotnet/android-libraries repo. I took this approach to clean things up: * Removed any extra `<PackageReference/>` that was needed in 6ddecf5. This should reduce pain of customers updating these packages themselves. * Remove any `<PackageReference Update="..."/>` that is not used in this repo. * Update all packages to latest. * I had to mirror one new package to `dotnet-public`: error NU1101: Unable to find package Xamarin.AndroidX.Tracing.Tracing.Android The main potential behavior changes here will be updating the Java/Kotlin AndroidX.Navigation libraries to 2.9.2.
1 parent 5935d99 commit 136e6c7

File tree

5 files changed

+16
-49
lines changed

5 files changed

+16
-49
lines changed

‎eng/AndroidX.targets‎

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,22 @@
33
<ItemGroup>
44
<!-- GLIDE - the android maven artifact in /src/Core/AndroidNative/maui/build.gradle -->
55
<!-- must be kept in sync with the binding library version to it here: -->
6-
<PackageReference Update="Xamarin.Android.Glide" Version="4.16.0.13" />
7-
<PackageReference Update="Xamarin.AndroidX.Activity" Version="1.10.1.2" />
8-
<PackageReference Update="Xamarin.AndroidX.AppCompat.AppCompatResources" Version="1.7.1" />
9-
<PackageReference Update="Xamarin.AndroidX.Browser" Version="1.8.0.10" />
10-
<PackageReference Update="Xamarin.AndroidX.DynamicAnimation" Version="1.1.0.2" />
11-
<PackageReference Update="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.9.1" />
12-
<PackageReference Update="Xamarin.AndroidX.Lifecycle.Process" Version="2.9.1" />
13-
<PackageReference Update="Xamarin.AndroidX.Lifecycle.Runtime" Version="2.9.1" />
14-
<PackageReference Update="Xamarin.AndroidX.Lifecycle.Runtime.Ktx" Version="2.9.1" />
15-
<PackageReference Update="Xamarin.AndroidX.Lifecycle.ViewModel.Ktx" Version="2.9.1" />
16-
<PackageReference Update="Xamarin.AndroidX.Lifecycle.ViewModelSavedState" Version="2.9.1" />
17-
<PackageReference Update="Xamarin.AndroidX.MediaRouter" Version="1.8.0" />
18-
<PackageReference Update="Xamarin.AndroidX.Migration" Version="1.0.10" NoWarn="NU1701" />
19-
<PackageReference Update="Xamarin.AndroidX.Navigation.Common" Version="2.9.0" />
20-
<PackageReference Update="Xamarin.AndroidX.Navigation.Fragment" Version="2.9.0" />
21-
<PackageReference Update="Xamarin.AndroidX.Navigation.Runtime" Version="2.9.0" />
22-
<PackageReference Update="Xamarin.AndroidX.Navigation.UI" Version="2.9.0" />
23-
<PackageReference Update="Xamarin.AndroidX.Palette" Version="1.0.0.33" />
24-
<PackageReference Update="Xamarin.AndroidX.RecyclerView" Version="1.4.0.2" />
25-
<PackageReference Update="Xamarin.AndroidX.SavedState" Version="1.3.0.1" />
6+
<PackageReference Update="Xamarin.Android.Glide" Version="4.16.0.14" />
7+
<PackageReference Update="Xamarin.AndroidX.Activity" Version="1.10.1.3" />
8+
<PackageReference Update="Xamarin.AndroidX.Browser" Version="1.8.0.11" />
9+
<PackageReference Update="Xamarin.AndroidX.DynamicAnimation" Version="1.1.0.3" />
10+
<PackageReference Update="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.9.2.1" />
11+
<PackageReference Update="Xamarin.AndroidX.Navigation.Common" Version="2.9.2.1" />
12+
<PackageReference Update="Xamarin.AndroidX.Navigation.Fragment" Version="2.9.2.1" />
13+
<PackageReference Update="Xamarin.AndroidX.Navigation.Runtime" Version="2.9.2.1" />
14+
<PackageReference Update="Xamarin.AndroidX.Navigation.UI" Version="2.9.2.1" />
2615
<PackageReference Update="Xamarin.AndroidX.Security.SecurityCrypto" Version="1.1.0.4-alpha07" />
27-
<PackageReference Update="Xamarin.AndroidX.SwipeRefreshLayout" Version="1.1.0.28" />
28-
<PackageReference Update="Xamarin.AndroidX.Transition" Version="1.6.0" />
29-
<PackageReference Update="Xamarin.AndroidX.Window.WindowJava" Version="1.4.0" />
30-
<PackageReference Update="Xamarin.Build.Download" Version="0.11.4" />
31-
<PackageReference Update="Xamarin.Firebase.AppIndexing" Version="120.0.0.25" />
32-
<PackageReference Update="Xamarin.Google.Android.Material" Version="1.12.0.4" />
33-
<PackageReference Update="Xamarin.Google.Crypto.Tink.Android" Version="1.18.0" />
34-
<PackageReference Update="Xamarin.GooglePlayServices.Maps" Version="119.2.0.2" />
16+
<PackageReference Update="Xamarin.AndroidX.SwipeRefreshLayout" Version="1.1.0.29" />
17+
<PackageReference Update="Xamarin.AndroidX.Transition" Version="1.6.0.1" />
18+
<PackageReference Update="Xamarin.AndroidX.Window.WindowJava" Version="1.4.0.1" />
19+
<PackageReference Update="Xamarin.Firebase.AppIndexing" Version="120.0.0.26" />
20+
<PackageReference Update="Xamarin.Google.Android.Material" Version="1.12.0.5" />
21+
<PackageReference Update="Xamarin.Google.Crypto.Tink.Android" Version="1.18.0.1" />
22+
<PackageReference Update="Xamarin.GooglePlayServices.Maps" Version="119.2.0.3" />
3523
</ItemGroup>
3624
</Project>

‎src/Compatibility/Android.AppLinks/src/Compatibility.Android.AppLinks.csproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@
1212
<ItemGroup>
1313
<PackageReference Include="Xamarin.Firebase.AppIndexing" />
1414
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
15-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModel.Ktx" />
16-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModelSavedState" />
17-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Process" />
18-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime" />
19-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime.Ktx" />
2015
</ItemGroup>
2116

2217
<ItemGroup>

‎src/Compatibility/Maps/src/Android/Compatibility.Maps.Android.csproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
14-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Process" />
15-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime" />
16-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime.Ktx" />
17-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModel.Ktx" />
18-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModelSavedState" />
1914
<PackageReference Include="Xamarin.Google.Android.Material" />
2015
<PackageReference Include="Xamarin.GooglePlayServices.Maps" />
2116
</ItemGroup>

‎src/Controls/Foldable/src/Controls.Foldable.csproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@
3535
</ItemGroup>
3636
<ItemGroup Condition=" '$(UseMaui)' != 'true' and '$(TargetPlatformIdentifier)' == 'android' ">
3737
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
38-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Process" />
39-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime" />
40-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime.Ktx" />
41-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModel.Ktx" />
42-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModelSavedState" />
4338
<PackageReference Include="Xamarin.Google.Android.Material" />
4439
</ItemGroup>
4540
<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' ">

‎src/Core/src/Core.csproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,6 @@
5050
<AndroidGradleProject Include="../AndroidNative/build.gradle" ModuleName="maui" />
5151
<PackageReference Include="Xamarin.Android.Glide" />
5252
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
53-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Process" />
54-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime" />
55-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime.Ktx" />
56-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModel.Ktx" />
57-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModelSavedState" />
58-
<PackageReference Include="Xamarin.AndroidX.SavedState" />
5953
<PackageReference Include="Xamarin.Google.Android.Material" />
6054
<PackageReference Include="Xamarin.AndroidX.SwipeRefreshLayout" />
6155
<PackageReference Include="Xamarin.AndroidX.Navigation.UI" />

0 commit comments

Comments
 (0)