feat: Bump to Android 12

unoplatform · Dec 14, 2021 · 1e9cf32 · 1e9cf32
1 parent 54ed773
commit 1e9cf32
Show file tree

Hide file tree

Showing 30 changed files with 230 additions and 226 deletions.
diff --git a/build/Uno.UI.Build.csproj b/build/Uno.UI.Build.csproj
@@ -215,7 +215,7 @@
 
 		<ItemGroup>
 			<MixinTargetFrameworks Include="xamarinios10" />
-			<MixinTargetFrameworks Include="monoandroid10.0" />
+			<MixinTargetFrameworks Include="MonAndroid11.0" />
 			<MixinTargetFrameworks Include="xamarinmac20" />
 			<MixinTargetFrameworks Include="net461" />
 			<MixinTargetFrameworks Include="netstandard2.0" />

diff --git a/build/Uno.WinUI.Lottie.nuspec b/build/Uno.WinUI.Lottie.nuspec
@@ -61,7 +61,7 @@
 		<dependency id="Com.Airbnb.Android.Lottie" version="4.1.0" />
 		<dependency id="Newtonsoft.Json" version="9.0.1" />
 	  </group>
-	  <group targetFramework="MonoAndroid10.0">
+	  <group targetFramework="MonoAndroid12.0">
 		<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
 		<dependency id="Com.Airbnb.Android.Lottie" version="4.1.0" />
         <dependency id="Newtonsoft.Json" version="9.0.1" />
@@ -94,7 +94,7 @@
 	  <group targetFramework="MonoAndroid11.0">
 		<reference file="Uno.UI.Lottie.dll" />
 	  </group>
-	  <group targetFramework="MonoAndroid10.0">
+	  <group targetFramework="MonoAndroid12.0">
 		<reference file="Uno.UI.Lottie.dll" />
 	  </group>
 	  <!-- For UAP (UWP), the reference to Microsoft.Toolkit.Uwp.UI.Lottie will be added manually -->
@@ -105,7 +105,7 @@
 	<file src="..\src\AddIns\Uno.UI.Lottie\bin\Release\xamarinios10\Uno.UI.Lottie.dll" target="lib\xamarinios10" />
 	<file src="..\src\AddIns\Uno.UI.Lottie\bin\Release\xamarinmac20\Uno.UI.Lottie.dll" target="lib\xamarinmac20" />
 	<file src="..\src\AddIns\Uno.UI.Lottie\bin\Release\MonoAndroid11.0\Uno.UI.Lottie.dll" target="lib\MonoAndroid11.0" />
-	<file src="..\src\AddIns\Uno.UI.Lottie\bin\Release\MonoAndroid10.0\Uno.UI.Lottie.dll" target="lib\MonoAndroid10.0" />
+	<file src="..\src\AddIns\Uno.UI.Lottie\bin\Release\MonoAndroid12.0\Uno.UI.Lottie.dll" target="lib\MonoAndroid12.0" />
 
 	<file src="..\src\AddIns\Uno.UI.Lottie\bin\Uno.UI.Lottie.net6\Release\net6.0-android\Uno.UI.Lottie.dll" target="lib\net6.0-android" />
 	<file src="..\src\AddIns\Uno.UI.Lottie\bin\Uno.UI.Lottie.net6\Release\net6.0-ios\Uno.UI.Lottie.dll" target="lib\net6.0-ios" />

diff --git a/build/Uno.WinUI.MSAL.nuspec b/build/Uno.WinUI.MSAL.nuspec
@@ -12,7 +12,7 @@
 	<copyright>nventive</copyright>
 	<repository type="git" url="https://github.com/unoplatform/uno.git" branch="$branch$" commit="$commitid$" />
 	<dependencies>
-	  <group targetFramework="MonoAndroid10.0">
+	  <group targetFramework="MonoAndroid12.0">
 		<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
 		<dependency id="Microsoft.Identity.Client" version="4.15.0" />
 	  </group>
@@ -53,7 +53,7 @@
 	  </group>
 	</dependencies>
 	<frameworkAssemblies>
-	  <frameworkAssembly assemblyName="Java.Interop" targetFramework="MonoAndroid11.0, MonoAndroid10.0" />
+	  <frameworkAssembly assemblyName="Java.Interop" targetFramework="MonoAndroid11.0, MonoAndroid12.0" />
 	</frameworkAssemblies>
   </metadata>
 
@@ -64,7 +64,7 @@
 	<file src="..\src\AddIns\Uno.UI.MSAL\bin\Release\xamarinios10\Uno.UI.MSAL.*" target="lib\xamarinios10" />
 	<file src="..\src\AddIns\Uno.UI.MSAL\bin\Release\xamarinmac20\Uno.UI.MSAL.*" target="lib\xamarinmac20" />
 	<file src="..\src\AddIns\Uno.UI.MSAL\bin\Release\MonoAndroid11.0\Uno.UI.MSAL.*" target="lib\MonoAndroid11.0" />
-	<file src="..\src\AddIns\Uno.UI.MSAL\bin\Release\MonoAndroid10.0\Uno.UI.MSAL.*" target="lib\MonoAndroid10.0" />
+	<file src="..\src\AddIns\Uno.UI.MSAL\bin\Release\MonoAndroid12.0\Uno.UI.MSAL.*" target="lib\MonoAndroid12.0" />
 
 	<file src="..\src\AddIns\Uno.UI.MSAL\bin\Release\uap10.0.17763\Uno.UI.MSAL.*" target="lib\uap10.0.17763" />
 

diff --git a/build/Uno.WinUI.RemoteControl.nuspec b/build/Uno.WinUI.RemoteControl.nuspec
@@ -16,16 +16,16 @@
 
 	<dependencies>
 
-	  <!-- Android 9.0 -->
+	  <!-- Android 11.0 -->
 	  <group targetFramework="MonoAndroid11.0">
 		<dependency id="Uno.WinUI" version="1.29.0-dev.93" />
 
 		<dependency id="Newtonsoft.Json" version="12.0.2" />
 		<dependency id="Microsoft.IO.RecyclableMemoryStream" version="2.2.0" />
 	  </group>
 
-	  <!-- Android 10.0 -->
-	  <group targetFramework="MonoAndroid10.0">
+	  <!-- Android 12.0 -->
+	  <group targetFramework="MonoAndroid12.0">
 		<dependency id="Uno.WinUI" version="1.29.0-dev.93" />
 
 		<dependency id="Newtonsoft.Json" version="12.0.2" />
@@ -112,7 +112,7 @@
 	  </group>
 
 	  <!-- Android 10.0 -->
-	  <group targetFramework="MonoAndroid10.0">
+	  <group targetFramework="MonoAndroid12.0">
 		<reference file="Uno.UI.RemoteControl.dll" />
 	  </group>
 
@@ -137,8 +137,8 @@
 	<file src="..\src\Uno.UI.RemoteControl\bin\Release\MonoAndroid11.0\Uno.UI.RemoteControl.dll" target="lib\MonoAndroid11.0" />
 	<file src="..\src\Uno.UI.RemoteControl\bin\Release\MonoAndroid11.0\Uno.UI.RemoteControl.pdb" target="lib\MonoAndroid11.0" />
 
-	<file src="..\src\Uno.UI.RemoteControl\bin\Release\MonoAndroid10.0\Uno.UI.RemoteControl.dll" target="lib\MonoAndroid10.0" />
-	<file src="..\src\Uno.UI.RemoteControl\bin\Release\MonoAndroid10.0\Uno.UI.RemoteControl.pdb" target="lib\MonoAndroid10.0" />
+	<file src="..\src\Uno.UI.RemoteControl\bin\Release\MonoAndroid12.0\Uno.UI.RemoteControl.dll" target="lib\MonoAndroid12.0" />
+	<file src="..\src\Uno.UI.RemoteControl\bin\Release\MonoAndroid12.0\Uno.UI.RemoteControl.pdb" target="lib\MonoAndroid12.0" />
 
 	<file src="..\src\Uno.UI.RemoteControl\bin\Release\xamarinios10\Uno.UI.RemoteControl.dll" target="lib\xamarinios10" />
 	<file src="..\src\Uno.UI.RemoteControl\bin\Release\xamarinios10\Uno.UI.RemoteControl.pdb" target="lib\xamarinios10" />

diff --git a/build/Uno.WinUI.nuspec b/build/Uno.WinUI.nuspec
@@ -62,7 +62,7 @@
 	  </group>
 
 	  <!-- Android 10.0 -->
-	  <group targetFramework="MonoAndroid10.0">
+	  <group targetFramework="MonoAndroid12.0">
 		<dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0" />
 		<dependency id="Xamarin.AndroidX.AppCompat" version="1.1.0" />
 		<dependency id="Xamarin.AndroidX.RecyclerView" version="1.1.0" />
@@ -280,32 +280,32 @@
 	<file src="..\src\Uno.UI.Toolkit\bin\Release\MonoAndroid11.0\Uno.UI.Toolkit.dll" target="lib\MonoAndroid11.0" />
 	<file src="..\src\Uno.UI.Toolkit\bin\Release\MonoAndroid11.0\Uno.UI.Toolkit.pdb" target="lib\MonoAndroid11.0" />
 
-	<!-- Android 10.0 -->
-	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid10.0\Uno.dll" target="lib\MonoAndroid10.0" />
-	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid10.0\Uno.pdb" target="lib\MonoAndroid10.0" />
-	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid10.0\Uno.Foundation.dll" target="lib\MonoAndroid10.0" />
-	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid10.0\Uno.Foundation.pdb" target="lib\MonoAndroid10.0" />
-	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid10.0\Uno.Foundation.Logging.dll" target="lib\MonoAndroid10.0" />
-	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid10.0\Uno.Foundation.Logging.pdb" target="lib\MonoAndroid10.0" />
-	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid10.0\Uno.UI.BindingHelper.Android.dll" target="lib\MonoAndroid10.0" />
-	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid10.0\Uno.UI.BindingHelper.Android.pdb" target="lib\MonoAndroid10.0" />
-	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid10.0\Uno.UI.dll" target="lib\MonoAndroid10.0" />
-	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid10.0\Uno.UI.pdb" target="lib\MonoAndroid10.0" />
-	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid10.0\Uno.UI.Composition.dll" target="lib\MonoAndroid10.0" />
-	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid10.0\Uno.UI.Composition.pdb" target="lib\MonoAndroid10.0" />
-	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid10.0\Uno.UI.Dispatching.dll" target="lib\MonoAndroid10.0" />
-	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid10.0\Uno.UI.Dispatching.pdb" target="lib\MonoAndroid10.0" />
-	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid10.0\Uno.Xaml.dll" target="lib\MonoAndroid10.0" />
-	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid10.0\Uno.Xaml.pdb" target="lib\MonoAndroid10.0" />
-	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid10.0\*.xml" target="lib\MonoAndroid10.0" />
-	<file src="..\src\Uno.UI.FluentTheme\bin\Release\MonoAndroid10.0\Uno.UI.FluentTheme.dll" target="lib\MonoAndroid10.0" />
-	<file src="..\src\Uno.UI.FluentTheme\bin\Release\MonoAndroid10.0\Uno.UI.FluentTheme.pdb" target="lib\MonoAndroid10.0" />
-	<file src="..\src\Uno.UI.FluentTheme\bin\Release\MonoAndroid10.0\Uno.UI.FluentTheme.v1.dll" target="lib\MonoAndroid10.0" />
-	<file src="..\src\Uno.UI.FluentTheme\bin\Release\MonoAndroid10.0\Uno.UI.FluentTheme.v1.pdb" target="lib\MonoAndroid10.0" />
-	<file src="..\src\Uno.UI.FluentTheme\bin\Release\MonoAndroid10.0\Uno.UI.FluentTheme.v2.dll" target="lib\MonoAndroid10.0" />
-	<file src="..\src\Uno.UI.FluentTheme\bin\Release\MonoAndroid10.0\Uno.UI.FluentTheme.v2.pdb" target="lib\MonoAndroid10.0" />
-	<file src="..\src\Uno.UI.Toolkit\bin\Release\MonoAndroid10.0\Uno.UI.Toolkit.dll" target="lib\MonoAndroid10.0" />
-	<file src="..\src\Uno.UI.Toolkit\bin\Release\MonoAndroid10.0\Uno.UI.Toolkit.pdb" target="lib\MonoAndroid10.0" />
+	<!-- Android 12.0 -->
+	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid12.0\Uno.dll" target="lib\MonoAndroid12.0" />
+	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid12.0\Uno.pdb" target="lib\MonoAndroid12.0" />
+	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid12.0\Uno.Foundation.dll" target="lib\MonoAndroid12.0" />
+	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid12.0\Uno.Foundation.pdb" target="lib\MonoAndroid12.0" />
+	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid12.0\Uno.Foundation.Logging.dll" target="lib\MonoAndroid12.0" />
+	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid12.0\Uno.Foundation.Logging.pdb" target="lib\MonoAndroid12.0" />
+	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid12.0\Uno.UI.BindingHelper.Android.dll" target="lib\MonoAndroid12.0" />
+	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid12.0\Uno.UI.BindingHelper.Android.pdb" target="lib\MonoAndroid12.0" />
+	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid12.0\Uno.UI.dll" target="lib\MonoAndroid12.0" />
+	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid12.0\Uno.UI.pdb" target="lib\MonoAndroid12.0" />
+	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid12.0\Uno.UI.Composition.dll" target="lib\MonoAndroid12.0" />
+	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid12.0\Uno.UI.Composition.pdb" target="lib\MonoAndroid12.0" />
+	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid12.0\Uno.UI.Dispatching.dll" target="lib\MonoAndroid12.0" />
+	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid12.0\Uno.UI.Dispatching.pdb" target="lib\MonoAndroid12.0" />
+	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid12.0\Uno.Xaml.dll" target="lib\MonoAndroid12.0" />
+	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid12.0\Uno.Xaml.pdb" target="lib\MonoAndroid12.0" />
+	<file src="..\src\Uno.UI\Bin\Release\MonoAndroid12.0\*.xml" target="lib\MonoAndroid12.0" />
+	<file src="..\src\Uno.UI.FluentTheme\bin\Release\MonoAndroid12.0\Uno.UI.FluentTheme.dll" target="lib\MonoAndroid12.0" />
+	<file src="..\src\Uno.UI.FluentTheme\bin\Release\MonoAndroid12.0\Uno.UI.FluentTheme.pdb" target="lib\MonoAndroid12.0" />
+	<file src="..\src\Uno.UI.FluentTheme\bin\Release\MonoAndroid12.0\Uno.UI.FluentTheme.v1.dll" target="lib\MonoAndroid12.0" />
+	<file src="..\src\Uno.UI.FluentTheme\bin\Release\MonoAndroid12.0\Uno.UI.FluentTheme.v1.pdb" target="lib\MonoAndroid12.0" />
+	<file src="..\src\Uno.UI.FluentTheme\bin\Release\MonoAndroid12.0\Uno.UI.FluentTheme.v2.dll" target="lib\MonoAndroid12.0" />
+	<file src="..\src\Uno.UI.FluentTheme\bin\Release\MonoAndroid12.0\Uno.UI.FluentTheme.v2.pdb" target="lib\MonoAndroid12.0" />
+	<file src="..\src\Uno.UI.Toolkit\bin\Release\MonoAndroid12.0\Uno.UI.Toolkit.dll" target="lib\MonoAndroid12.0" />
+	<file src="..\src\Uno.UI.Toolkit\bin\Release\MonoAndroid12.0\Uno.UI.Toolkit.pdb" target="lib\MonoAndroid12.0" />
 
 	<!-- iOS -->
 	<file src="..\src\Uno.UI\Bin\Release\xamarinios10\Uno.dll" target="lib\xamarinios10" />
@@ -529,6 +529,11 @@
 	<file src="..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.Skia\Release\netstandard2.0\Uno.UI.Toolkit.dll" target="uno-runtime\skia" />
 	<file src="..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.Skia\Release\netstandard2.0\Uno.UI.Toolkit.pdb" target="uno-runtime\skia" />
 
+	<!-- Unsupported android targets -->
+	<file src="_._" target="lib\MonoAndroid12.0" />
+	<file src="_._" target="lib\MonoAndroid90" />
+	<file src="_._" target="lib\MonoAndroid80" />
+
 	<!-- Analyzers -->
 	<file src="..\src\Uno.Analyzers\Bin\Release\Uno.Analyzers.dll" target="analyzers" />
 	<file src="..\src\Uno.Analyzers\Bin\Release\Uno.Analyzers.pdb" target="analyzers" />

diff --git a/src/AddIns/Uno.UI.Lottie/Uno.UI.Lottie.csproj b/src/AddIns/Uno.UI.Lottie/Uno.UI.Lottie.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>xamarinmac20;MonoAndroid11.0;xamarinios10;net461;netstandard2.0</TargetFrameworks>
-		<TargetFrameworksCI>xamarinmac20;MonoAndroid11.0;MonoAndroid10.0;xamarinios10;net461;netstandard2.0</TargetFrameworksCI>
+		<TargetFrameworksCI>xamarinmac20;MonoAndroid11.0;MonoAndroid12.0;xamarinios10;net461;netstandard2.0</TargetFrameworksCI>
 		<NoWarn>$(NoWarn);NU1701</NoWarn>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 		<Deterministic>true</Deterministic>
@@ -39,7 +39,7 @@
 	  <ProjectReference Include="..\..\Uno.UI\Uno.UI.csproj" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid11.0' or '$(TargetFramework)' == 'MonoAndroid10.0' ">
+	<ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid11.0' or '$(TargetFramework)' == 'MonoAndroid12.0' ">
 		<PackageReference Include="Com.Airbnb.Android.Lottie" Version="4.1.0" PrivateAssets="none" />
 		<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
 	</ItemGroup>

diff --git a/src/AddIns/Uno.UI.MSAL/Uno.UI.MSAL.csproj b/src/AddIns/Uno.UI.MSAL/Uno.UI.MSAL.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>xamarinmac20;MonoAndroid11.0;xamarinios10;net461;netstandard2.0;uap10.0.17763</TargetFrameworks>
-		<TargetFrameworksCI>xamarinmac20;MonoAndroid11.0;MonoAndroid10.0;xamarinios10;net461;netstandard2.0;uap10.0.17763</TargetFrameworksCI>
+		<TargetFrameworksCI>xamarinmac20;MonoAndroid11.0;MonoAndroid12.0;xamarinios10;net461;netstandard2.0;uap10.0.17763</TargetFrameworksCI>
 		<NoWarn>$(NoWarn);NU1701;NU5100;NU5118;NU5128</NoWarn>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 		<Deterministic>true</Deterministic>

diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -77,11 +77,11 @@
 	<!-- <PackageReference Include="xamarin.androidx.vectordrawable" Version="1.1.0" excludeAssets="buildTransitive" />-->
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'MonoAndroid10.0'">
-	<PackageReference Update="Xamarin.AndroidX.Legacy.Support.v4" Version="1.0.0" />
-	<PackageReference Update="Xamarin.AndroidX.AppCompat" Version="1.1.0" />
-	<PackageReference Update="Xamarin.AndroidX.RecyclerView" Version="1.1.0" />
-	<PackageReference Update="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.2.0.2" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'MonoAndroid12.0'">
+	<PackageReference Update="Xamarin.AndroidX.Legacy.Support.v4" Version="1.0.0.11" />
+	<PackageReference Update="Xamarin.AndroidX.AppCompat" Version="1.3.1.4" />
+	<PackageReference Update="Xamarin.AndroidX.RecyclerView" Version="1.2.1.4" />
+	<PackageReference Update="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.4.0.1" />
 	<PackageReference Update="Xamarin.Build.Download" Version="0.10.0" />
   </ItemGroup>
 

diff --git a/src/SamplesApp/SamplesApp.Droid/SamplesApp.Droid.csproj b/src/SamplesApp/SamplesApp.Droid/SamplesApp.Droid.csproj
@@ -15,7 +15,7 @@
     <AndroidApplication>true</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v12.0</TargetFrameworkVersion>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <AndroidUseIntermediateDesignerFile>True</AndroidUseIntermediateDesignerFile>
     <ResourcesDirectory>..\SamplesApp.Shared\Strings</ResourcesDirectory>
@@ -244,4 +244,4 @@
     </PropertyGroup>
     <Error Condition="!$(_MyMdpiAsset.Contains('-nodpi'))" Text="The file nodpi-validationresource.jpeg does not exist under drawable-nodpi directory" />
   </Target>
-</Project>
+</Project>