feat: update to support android 10

Plac3hold3r · Mar 21, 2020 · 902054b · 902054b
1 parent 99289bb
commit 902054b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/nuspec/MaterialDateTimePicker.nuspec b/nuspec/MaterialDateTimePicker.nuspec
@@ -9,7 +9,7 @@
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/Plac3hold3r/PH.Wdullaer.Materialdatetimepicker</projectUrl>
     <repository type="git" url="https://github.com/Plac3hold3r/PH.Wdullaer.Materialdatetimepicker" />
-    <iconUrl>https://raw.githubusercontent.com/Plac3hold3r/PH.Wdullaer.Materialdatetimepicker/master/nuspec/nuget_icon.png</iconUrl>
+    <icon>images\nuget_icon.png</icon>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>A Xamarin Android binding for Wdullaer Material Datetime Picker. Supports Android 4 (API 16) and greater. Includes a material design themable timepicker and datepicker</description>
     <summary>A Xamarin Android binding for Wdullaer Material Datetime Picker.</summary>
@@ -19,12 +19,18 @@
     <releaseNotes>Add support latest version 4.2.3 and Android X packages</releaseNotes>
 
     <dependencies>
-      <dependency id="Xamarin.AndroidX.AppCompat" version="1.1.0" />
-      <dependency id="Xamarin.AndroidX.RecyclerView" version="1.1.0" />
+      <group targetFramework="MonoAndroid9.0">
+        <dependency id="Xamarin.AndroidX.AppCompat" version="1.1.0" />
+        <dependency id="Xamarin.AndroidX.RecyclerView" version="1.1.0" />
+      </group>
     </dependencies>
+    <frameworkAssemblies>
+      <frameworkAssembly assemblyName="Java.Interop" targetFramework="MonoAndroid9.0" />
+    </frameworkAssemblies>
   </metadata>
   <files>
-    <file src="..\src\Binding\bin\Release\MaterialDateTimePicker.dll" target="lib\MonoAndroid81\MaterialDateTimePicker.dll" />
-    <file src="..\src\Binding\bin\Release\MaterialDateTimePicker.pdb" target="lib\MonoAndroid81\MaterialDateTimePicker.pdb" />
+    <file src="nuget_icon.png" target="images\" />
+    <file src="..\src\Binding\bin\Release\MaterialDateTimePicker.dll" target="lib\MonoAndroid90\MaterialDateTimePicker.dll" />
+    <file src="..\src\Binding\bin\Release\MaterialDateTimePicker.pdb" target="lib\MonoAndroid90\MaterialDateTimePicker.pdb" />
   </files>
 </package>
diff --git a/src/Binding/Binding.csproj b/src/Binding/Binding.csproj
@@ -12,7 +12,7 @@
     <RootNamespace>MaterialDateTimePicker</RootNamespace>
     <AssemblyName>MaterialDateTimePicker</AssemblyName>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
     <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>

diff --git a/src/SampleApp/Properties/AndroidManifest.xml b/src/SampleApp/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="za.co.plac3hold3r.materialdatetimepicker" android:versionCode="1" android:versionName="1.0" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
+	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="29" />
 	<application android:allowBackup="true" android:label="@string/app_name" android:icon="@mipmap/ic_launcher"></application>
 </manifest>
diff --git a/src/SampleApp/SampleApp.csproj b/src/SampleApp/SampleApp.csproj
@@ -16,7 +16,7 @@
     <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>