Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Android ecosytem updates #15399

Closed
wants to merge 6 commits into from
Closed

Android ecosytem updates #15399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d61d63a
removed `<AndroidLinkMode>None</AndroidLinkMode>`
moljac Jun 29, 2023
b29a3bb
Glide Bump
moljac Jun 30, 2023
1316d8f
Merge branch 'net8.0' into dev/moljac/net8-manual-updates-20230601-an…
moljac Jun 30, 2023
37ce256
nuget versions added
moljac Jun 30, 2023
3a2bb7a
Merge branch 'dev/moljac/net8-manual-updates-20230601-android-depende…
moljac Jun 30, 2023
face530
Merge branch 'net8.0' into dev/moljac/net8-manual-updates-20230601-an…
moljac Jun 30, 2023
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
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 @@ -54,9 +54,9 @@
<_MicrosoftWebWebView2Version>1.0.1823.32</_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.14.2.1</_XamarinAndroidGlideVersion>
<_XamarinAndroidXSecurityVersion>1.1.0-alpha05</_XamarinAndroidXSecurityVersion>
<_XamarinGoogleCryptoTinkAndroidVersion>1.8.0</_XamarinGoogleCryptoTinkAndroidVersion>
<_XamarinAndroidGlideVersion>4.15.1.1</_XamarinAndroidGlideVersion>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need to update the maven also

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

found it.

I am going to hit the sack soon.

<_XamarinAndroidXSecurityVersion>1.1.0-alpha06</_XamarinAndroidXSecurityVersion>
<_XamarinGoogleCryptoTinkAndroidVersion>1.9.0.1</_XamarinGoogleCryptoTinkAndroidVersion>
<!-- Android Maps -->
<XamarinGooglePlayServicesMaps>118.1.0.1</XamarinGooglePlayServicesMaps>
<!--
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -11,7 +11,7 @@

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

<ItemGroup>
Expand Down
13 changes: 6 additions & 7 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 @@ -9,7 +9,6 @@
<IsPackable>false</IsPackable>
<Nullable>disable</Nullable>
<!--<DefineConstants>$(DefineConstants);HAVE_OPENTK</DefineConstants>-->
<AndroidLinkMode>None</AndroidLinkMode>
<NoWarn>IL2036;0618;0612</NoWarn>
</PropertyGroup>

Expand All @@ -36,14 +35,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="Xam.Plugin.DeviceInfo" Version="4.1.1" />
<PackageReference Include="Xamarin.Build.Download" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
<PackageReference Include="Xamarin.AndroidX.Browser" />
<PackageReference Include="Xamarin.AndroidX.Palette" />
<PackageReference Include="Xamarin.Google.Android.Material" />
<PackageReference Include="Xamarin.Build.Download" Version="0.11.4" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.2" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.5.0.2" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.18" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.9.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 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 @@ -9,8 +9,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
<PackageReference Include="Xamarin.Google.Android.Material" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.2" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.9.0.1" />
<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="118.1.0.2" />
</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" />
<PackageReference Include="Xamarin.Google.Android.Material" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.2" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.9.0.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
Expand Down
2 changes: 1 addition & 1 deletion src/Controls/tests/DeviceTests/Elements/Window/WindowTests.Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ await CreateHandlerAndAddToWindow<IWindowHandler>(mainPage, (handler) =>
{
var mainWindow = handler.VirtualView as Window;

mainWindow.Page = secondaryPage;
mainWindow.Page = secondaryPage;
Assert.Equal(mainWindow.Page, secondaryPage);

mainWindow.Page = mainPage;
Expand Down