2.4.0, Target SDK 33

maxim-saplin · Mar 23, 2023 · ed6abe4 · ed6abe4
1 parent 6da8d29
commit ed6abe4
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 20 deletions.
diff --git a/References/CPDT.Extra.Android.dll b/References/CPDT.Extra.Android.dll
diff --git a/References/CPDT.Extra.Android.pdb b/References/CPDT.Extra.Android.pdb
diff --git a/References/CPDT.Extra.dll b/References/CPDT.Extra.dll
diff --git a/Saplin.CPDT.Android/CachePurger/PurgeService.cs b/Saplin.CPDT.Android/CachePurger/PurgeService.cs
@@ -23,7 +23,7 @@ public class PurgeService : Service
         public override void OnCreate()
         {
             base.OnCreate();
-            messenger = new Messenger(new PurheServiceHandler(this));
+            messenger = new Messenger(new PurgeServiceHandler(this));
             Log.Debug(TAG, "OnCreate");
             //Toast.MakeText(Android.App.Application.Context, "PurgeService.OnCreate", ToastLength.Short).Show();
         }

diff --git a/Saplin.CPDT.Android/CachePurger/PurgeServiceHandler.cs b/Saplin.CPDT.Android/CachePurger/PurgeServiceHandler.cs
@@ -3,11 +3,11 @@
 
 namespace Saplin.CPDT.Droid.CachePurger
 {
-    public class PurheServiceHandler : Android.OS.Handler
+    public class PurgeServiceHandler : Android.OS.Handler
     {
         WeakReference<PurgeService> serviceRef;
 
-        public PurheServiceHandler(PurgeService service)
+        public PurgeServiceHandler(PurgeService service) : base(Looper.MainLooper)
         {
             serviceRef = new WeakReference<PurgeService>(service);
         }

diff --git a/Saplin.CPDT.Android/MainActivity.cs b/Saplin.CPDT.Android/MainActivity.cs
@@ -1,14 +1,10 @@
-using System;
-using System.Threading.Tasks;
-using Android.App;
+using Android.App;
 using Android.Content;
 using Android.Content.PM;
 using Android.Content.Res;
 using Android.OS;
 using Android.Runtime;
 using Android.Views;
-using Android.Widget;
-using Saplin.CPDT.Droid.CachePurger;
 using static Android.App.ActivityManager;
 
 namespace Saplin.CPDT.Droid

diff --git a/Saplin.CPDT.Android/Properties/AndroidManifest.xml b/Saplin.CPDT.Android/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="500035" android:versionName="2.3.9" package="com.Saplin.CPDT" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="32" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="500036" android:versionName="2.4.0" package="com.Saplin.CPDT" android:installLocation="auto">
+	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="33" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
 	<application android:label="Cross Platform Disk Test" android:icon="@mipmap/ic_launcher" android:largeHeap="true">
 		<provider android:name="androidx.core.content.FileProvider" android:authorities="com.Saplin.CPDT.provider" android:exported="false" android:grantUriPermissions="true">

diff --git a/Saplin.CPDT.Android/Resources/Resource.designer.cs b/Saplin.CPDT.Android/Resources/Resource.designer.cs
diff --git a/Saplin.CPDT.Android/Saplin.CPDT.Android.csproj b/Saplin.CPDT.Android/Saplin.CPDT.Android.csproj
@@ -14,7 +14,7 @@
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <TargetFrameworkVersion>v12.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v13.0</TargetFrameworkVersion>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <SynchReleaseVersion>false</SynchReleaseVersion>
@@ -36,7 +36,6 @@
     <AndroidLinkMode>None</AndroidLinkMode>
     <AndroidTlsProvider>legacy</AndroidTlsProvider>
     <AndroidUseSharedRuntime>true</AndroidUseSharedRuntime>
-    <AndroidHttpClientHandlerType>System.Net.Http.HttpClientHandler</AndroidHttpClientHandlerType>
 <LangVersion>latestmajor</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -58,7 +57,6 @@
     <AndroidLinkSkip>Saplin.CPDT.UICore;Saplin.CPDT.UICore.resources;Saplin.StorageSpeedMeter;CPDT.Extra.Android;Saplin.CPDT.Android;</AndroidLinkSkip>
     <AndroidTlsProvider>legacy</AndroidTlsProvider>
     <AndroidAotAdditionalArguments>no-write-symbols,nodebug</AndroidAotAdditionalArguments>
-    <AndroidHttpClientHandlerType>System.Net.Http.HttpClientHandler</AndroidHttpClientHandlerType>
     <AndroidLinkTool>r8</AndroidLinkTool>
     <AndroidR8ExtraArguments>--no-tree-shaking</AndroidR8ExtraArguments>
     <!-- Out of process cache purging service crashes with R8 default settings as there's some Mono class which can't be found, possible the result of R8 -->
@@ -83,7 +81,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.Forms">
-      <Version>5.0.0.2478</Version>
+      <Version>5.0.0.2578</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Saplin.CPDT.UICore/Saplin.CPDT.UICore.csproj b/Saplin.CPDT.UICore/Saplin.CPDT.UICore.csproj
@@ -7,10 +7,10 @@
     </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
     <DebugType>pdbonly</DebugType>
-    <ReleaseVersion>2.3.9</ReleaseVersion>
-    <Version>2.3.8</Version>
-    <AssemblyVersion>2.3.9.0</AssemblyVersion>
-    <FileVersion>2.3.9.0</FileVersion>
+    <ReleaseVersion>2.4.0</ReleaseVersion>
+    <Version>2.4.0</Version>
+    <AssemblyVersion>2.4.0.0</AssemblyVersion>
+    <FileVersion>2.4.0.0</FileVersion>
     <SynchReleaseVersion>false</SynchReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -202,7 +202,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2478" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2578" />
     <PackageReference Include="SkiaSharp.Views.Forms" Version="2.88.0" />
   </ItemGroup>
 </Project>