Update SkiaSharp to v4

.github/workflows/main.yml

@@ -25,7 +25,7 @@ jobs:
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
-      run: dotnet build --no-restore
+      run: dotnet build --no-restore -warnaserror -p:TreatWarningsAsErrors=true
     - name: Test
       run: dotnet test --no-build --verbosity normal
     - name: Process test results

README.md

@@ -100,7 +100,7 @@
    // Draw on white background.
    canvas.Clear(SKColors.White);
    using var bitmap = wcg.Draw();
-   canvas.DrawBitmap(bitmap, 0, 0);
+   canvas.DrawBitmap(bitmap, 0, 0, SKSamplingOptions.Default);
 
    // Save to PNG.
    using var data = final.Encode(SKEncodedImageFormat.Png, 100);

examples/WordFrequency.ConsoleApp/Program.cs

@@ -66,7 +66,7 @@ static int Main(string[] args)
                 using var canvas = new SKCanvas(final);
                 canvas.Clear(SKColors.White);
                 using var bitmap = wcg.Draw();
-                canvas.DrawBitmap(bitmap, 0, 0);
+                canvas.DrawBitmap(bitmap, 0, 0, SKSamplingOptions.Default);
 
                 // Save to PNG.
                 using var data = final.Encode(SKEncodedImageFormat.Png, 100);

src/KnowledgePicker.WordCloud/Drawing/SkGraphicEngine.cs

@@ -73,7 +73,7 @@ public void Draw(PointD location, RectangleD measured, string text, int count, s
                 textPaint.Color = defaultColor;
             }
             canvas.DrawText(text, (float)(location.X - measured.Left),
-                (float)(location.Y - measured.Top), font, textPaint);
+                (float)(location.Y - measured.Top), SKTextAlign.Left, font, textPaint);
         }
 
         public IGraphicEngine<SKBitmap> Clone()

src/KnowledgePicker.WordCloud/KnowledgePicker.WordCloud.csproj

@@ -28,7 +28,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="3.119.4" />
+    <PackageReference Include="SkiaSharp" Version="4.148.0" />
   </ItemGroup>
 
   <ItemGroup>

test/KnowledgePicker.WordCloud.Tests/IntegrationTests.cs

@@ -174,7 +174,7 @@ private static byte[] GenerateWordCloud(
         using var canvas = new SKCanvas(final);
         canvas.Clear(SKColors.White);
         using var bitmap = wcg.Draw();
-        canvas.DrawBitmap(bitmap, 0, 0);
+        canvas.DrawBitmap(bitmap, 0, 0, SKSamplingOptions.Default);
 
         // Save to PNG.
         using var data = final.Encode(SKEncodedImageFormat.Png, 100);

test/KnowledgePicker.WordCloud.Tests/KnowledgePicker.WordCloud.Tests.csproj

@@ -24,7 +24,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\KnowledgePicker.WordCloud\KnowledgePicker.WordCloud.csproj" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="3.119.4" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="4.148.0" />
   </ItemGroup>
 
 </Project>