From d58671f17b9d9dd66329c8732033d100201c3f72 Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Thu, 5 Oct 2023 14:08:50 +0200
Subject: [PATCH 01/20] Setup som ebasics

---
 .github/workflows/build.yml |  39 ++++++++++++++
 .github/workflows/test.yml  |  11 ++++
 build/Build.Osx.cs          | 104 ++++++++++++++++++++++++++++++++++++
 3 files changed, 154 insertions(+)
 create mode 100644 .github/workflows/test.yml
 create mode 100644 build/Build.Osx.cs

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 668f736..8180d59 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -125,6 +125,45 @@ jobs:
           name: alphaskia-android-jni-${{ matrix.architecture }}-${{ matrix.variant }}
           path: artifacts
 
+  osx:
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        architecture: [x64, arm64]
+        variant: ['shared', 'static']
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+      - run: ./build.sh OsxSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }}
+      - uses: actions/upload-artifact@v3
+        with:
+          name: alphaskia-osx-${{ matrix.architecture }}-${{ matrix.variant }}
+          path: artifacts
+
+  osx-jni:
+    runs-on: macos-latest
+    needs: [osx]
+    strategy:
+      fail-fast: false
+      matrix:
+        architecture: [x64, arm64]
+        variant: ['shared', 'static']
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+      - uses: actions/download-artifact@v3
+        with:
+          path: dist
+      - run: ./build.cmd OsxJni --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }}
+      - uses: actions/upload-artifact@v3
+        with:
+          name: alphaskia-osx-jni-${{ matrix.architecture }}-${{ matrix.variant }}
+          path: artifacts
+
   dotnet:
     runs-on: windows-latest
     needs: [windows, linux]
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 0000000..2761c11
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,11 @@
+on:
+  workflow_dispatch:
+  pull_request:
+
+jobs:
+  osx:
+    runs-on: macos-latest
+    steps:
+      - run: echo $JAVA_HOME
+      - run: ls -l $JAVA_HOME
+      - run: ls -l $JAVA_HOME/include
\ No newline at end of file
diff --git a/build/Build.Osx.cs b/build/Build.Osx.cs
new file mode 100644
index 0000000..c401d97
--- /dev/null
+++ b/build/Build.Osx.cs
@@ -0,0 +1,104 @@
+using System;
+using System.Collections.Generic;
+using Nuke.Common;
+
+partial class Build
+{
+    public Target OsxSkia => _ => _
+        .DependsOn(GitSyncDepsSkia, PatchSkiaBuildFiles)
+        .Requires(() => Architecture)
+        .Requires(() => Variant)
+        .OnlyWhenStatic(OperatingSystem.IsMacOS)
+        .Executes(() =>
+        {
+            BuildSkiaOsxMain(Architecture, Variant);
+        });
+
+    public Target OsxJni => _ => _
+        .DependsOn(PrepareGitHubArtifacts, GitSyncDepsJni, PatchSkiaBuildFiles)
+        .Requires(() => Architecture)
+        .Requires(() => Variant == Variant.Shared)
+        .OnlyWhenStatic(OperatingSystem.IsMacOS)
+        .Executes(() =>
+        {
+            BuildSkiaOsxJni(Architecture, Variant);
+        });
+
+    void BuildSkiaOsxMain(Architecture arch, Variant variant)
+    {
+        var gnArgs = new Dictionary<string, string>();
+        string[] filesToCopy;
+        var isShared = variant == Variant.Shared;
+        if (isShared)
+        {
+            filesToCopy = new[]
+            {
+                "libAlphaSkia.so"
+            };
+        }
+        else
+        {
+            filesToCopy = new[]
+            {
+                "libAlphaSkia.a",
+                "libskia.a"
+            };
+        }
+
+        BuildSkiaOsx("libAlphaSkia", arch, variant, gnArgs, filesToCopy);
+    }
+
+    void BuildSkiaOsxJni(Architecture arch, Variant variant)
+    {
+        var gnArgs = new Dictionary<string, string>();
+        var alphaSkiaInclude = DistBasePath / "include";
+        var jniInclude = JavaHome / "include";
+        var jniWinInclude = JavaHome / "include" / "osx"; // TODO
+        gnArgs["extra_cflags"] = $"[ '-I{alphaSkiaInclude}', '-I{jniInclude}', '-I{jniWinInclude}' ]";
+
+        // Add Libs and lib search paths
+        var staticLibPath = DistBasePath / $"libAlphaSkia-osx-{arch}-static";
+        gnArgs["extra_ldflags"] =
+            $"[ '-L{staticLibPath}', '-lAlphaSkia', '-lskia' ]";
+
+        BuildSkiaOsx("libAlphaSkiaJni", arch, variant, gnArgs, new[] { "libAlphaSkiaJni.so" });
+    }
+
+    void BuildSkiaOsx(string buildTarget, Architecture arch, Variant variant, Dictionary<string, string> gnArgs,
+        string[] filesToCopy)
+    {
+        SetClangOsx(arch, gnArgs);
+
+        gnArgs["skia_use_system_freetype2"] = "false";
+
+        BuildSkia(buildTarget, "mac", arch, variant, gnArgs, filesToCopy);
+    }
+
+    void SetClangOsx(Architecture arch, Dictionary<string, string> gnArgs)
+    {
+        AppendToFlagList(gnArgs, "extra_cflags", "'-DHAVE_SYSCALL_GETRANDOM', '-DXML_DEV_URANDOM'");
+
+        if (arch == Architecture.X64)
+        {
+            gnArgs["cc"] = "clang";
+            gnArgs["cxx"] = "'clang++'";
+            AppendToFlagList(gnArgs, "extra_ldflags", "'-static-libstdc++', '-static-libgcc'");
+        }
+        else if (arch == Architecture.X86)
+        {
+            // TODO
+            gnArgs["cc"] = "clang";
+            gnArgs["cxx"] = "'clang++'";
+            AppendToFlagList(gnArgs, "extra_ldflags", "'-static-libstdc++', '-static-libgcc'");
+        }
+        else if (arch == Architecture.Arm64) // aka AArch64
+        {
+            // TODO
+            gnArgs["cc"] = "clang";
+            gnArgs["cxx"] = "'clang++'";
+            AppendToFlagList(gnArgs, "extra_ldflags", "'-static-libstdc++', '-static-libgcc'");
+        }
+
+        // gnArgs["ar"] = "llvm-ar";
+    }
+}
\ No newline at end of file

From 1b8a1c75d5170cedab719731336f3e91ab6ce493 Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Thu, 5 Oct 2023 14:27:19 +0200
Subject: [PATCH 02/20] Add MacOs Build infrastructure

---
 .github/workflows/build.yml                   |  19 ++--
 .github/workflows/test.yml                    |  11 --
 build/Build.MacOs.cs                          |  88 +++++++++++++++
 build/Build.Osx.cs                            | 104 ------------------
 .../AlphaSkia.Native.MacOs.csproj             |  15 +++
 lib/dotnet/AlphaSkia.Native.MacOs/Marker.cs   |   6 +
 lib/dotnet/AlphaSkia.Native.MacOs/README.md   |   3 +
 .../AlphaSkia.Test/AlphaSkia.Test.csproj      |   9 ++
 lib/dotnet/AlphaSkia.sln                      |   6 +
 lib/dotnet/AlphaSkia/AlphaSkiaPlatform.cs     |   4 +-
 lib/java/.idea/gradle.xml                     |   1 +
 lib/java/.idea/misc.xml                       |   2 +-
 lib/java/linux/build.gradle.kts               |   2 +-
 lib/java/macos/build.gradle.kts               |  20 ++++
 .../main/java/alphaskia/AlphaSkiaMacOs.java   |  18 +++
 .../alphaskia/MusicSheetRenderTest.java       |   2 +-
 lib/java/settings.gradle.kts                  |   1 +
 17 files changed, 180 insertions(+), 131 deletions(-)
 delete mode 100644 .github/workflows/test.yml
 create mode 100644 build/Build.MacOs.cs
 delete mode 100644 build/Build.Osx.cs
 create mode 100644 lib/dotnet/AlphaSkia.Native.MacOs/AlphaSkia.Native.MacOs.csproj
 create mode 100644 lib/dotnet/AlphaSkia.Native.MacOs/Marker.cs
 create mode 100644 lib/dotnet/AlphaSkia.Native.MacOs/README.md
 create mode 100644 lib/java/macos/build.gradle.kts
 create mode 100644 lib/java/macos/src/main/java/alphaskia/AlphaSkiaMacOs.java

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8180d59..02e42c1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -125,7 +125,7 @@ jobs:
           name: alphaskia-android-jni-${{ matrix.architecture }}-${{ matrix.variant }}
           path: artifacts
 
-  osx:
+  macos:
     runs-on: macos-latest
     strategy:
       fail-fast: false
@@ -136,15 +136,15 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: true
-      - run: ./build.sh OsxSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }}
+      - run: ./build.sh MacOsSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }}
       - uses: actions/upload-artifact@v3
         with:
-          name: alphaskia-osx-${{ matrix.architecture }}-${{ matrix.variant }}
+          name: alphaskia-macos-${{ matrix.architecture }}-${{ matrix.variant }}
           path: artifacts
 
-  osx-jni:
+  macos-jni:
     runs-on: macos-latest
-    needs: [osx]
+    needs: [macos]
     strategy:
       fail-fast: false
       matrix:
@@ -158,10 +158,10 @@ jobs:
       - uses: actions/download-artifact@v3
         with:
           path: dist
-      - run: ./build.cmd OsxJni --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }}
+      - run: ./build.cmd MacOsJni --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }}
       - uses: actions/upload-artifact@v3
         with:
-          name: alphaskia-osx-jni-${{ matrix.architecture }}-${{ matrix.variant }}
+          name: alphaskia-macos-jni-${{ matrix.architecture }}-${{ matrix.variant }}
           path: artifacts
 
   dotnet:
@@ -197,7 +197,4 @@ jobs:
       with:
         name: Jars
         path: |
-          lib/java/main/build/libs/*.jar
-          lib/java/linux/build/libs/*.jar
-          lib/java/android/build/libs/*.jar
-          lib/java/windows/build/libs/*.jar
+          lib/java/*/build/libs/*.jar
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
deleted file mode 100644
index 2761c11..0000000
--- a/.github/workflows/test.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-on:
-  workflow_dispatch:
-  pull_request:
-
-jobs:
-  osx:
-    runs-on: macos-latest
-    steps:
-      - run: echo $JAVA_HOME
-      - run: ls -l $JAVA_HOME
-      - run: ls -l $JAVA_HOME/include
\ No newline at end of file
diff --git a/build/Build.MacOs.cs b/build/Build.MacOs.cs
new file mode 100644
index 0000000..af2571c
--- /dev/null
+++ b/build/Build.MacOs.cs
@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using Nuke.Common;
+
+partial class Build
+{
+    public Target MacOsSkia => _ => _
+        .DependsOn(GitSyncDepsSkia, PatchSkiaBuildFiles)
+        .Requires(() => Architecture)
+        .Requires(() => Variant)
+        .OnlyWhenStatic(OperatingSystem.IsMacOS)
+        .Executes(() =>
+        {
+            BuildSkiaMacOsMain(Architecture, Variant);
+        });
+
+    public Target MacOsJni => _ => _
+        .DependsOn(PrepareGitHubArtifacts, GitSyncDepsJni, PatchSkiaBuildFiles)
+        .Requires(() => Architecture)
+        .Requires(() => Variant == Variant.Shared)
+        .OnlyWhenStatic(OperatingSystem.IsMacOS)
+        .Executes(() =>
+        {
+            BuildSkiaMacOsJni(Architecture, Variant);
+        });
+
+    void BuildSkiaMacOsMain(Architecture arch, Variant variant)
+    {
+        var gnArgs = new Dictionary<string, string>();
+        string[] filesToCopy;
+        var isShared = variant == Variant.Shared;
+        if (isShared)
+        {
+            filesToCopy = new[]
+            {
+                "libAlphaSkia.so"
+            };
+        }
+        else
+        {
+            filesToCopy = new[]
+            {
+                "libAlphaSkia.a",
+                "libskia.a"
+            };
+        }
+
+        BuildSkiaMacOs("libAlphaSkia", arch, variant, gnArgs, filesToCopy);
+    }
+
+    void BuildSkiaMacOsJni(Architecture arch, Variant variant)
+    {
+        var gnArgs = new Dictionary<string, string>();
+        var alphaSkiaInclude = DistBasePath / "include";
+        var jniInclude = JavaHome / "include";
+        var jniWinInclude = JavaHome / "include" / "darwin";
+        gnArgs["extra_cflags"] = $"[ '-I{alphaSkiaInclude}', '-I{jniInclude}', '-I{jniWinInclude}' ]";
+
+        // Add Libs and lib search paths
+        var staticLibPath = DistBasePath / $"libAlphaSkia-macos-{arch}-static";
+        gnArgs["extra_ldflags"] =
+            $"[ '-L{staticLibPath}', '-lAlphaSkia', '-lskia' ]";
+
+        BuildSkiaMacOs("libAlphaSkiaJni", arch, variant, gnArgs, new[] { "libAlphaSkiaJni.so" });
+    }
+
+    void BuildSkiaMacOs(string buildTarget, Architecture arch, Variant variant, Dictionary<string, string> gnArgs,
+        string[] filesToCopy)
+    {
+        SetClangMacOs(arch, gnArgs);
+
+        gnArgs["skia_use_system_freetype2"] = "false";
+        gnArgs["skia_use_metal"] = "true";
+
+        BuildSkia(buildTarget, "mac", arch, variant, gnArgs, filesToCopy);
+    }
+
+    void SetClangMacOs(Architecture arch, Dictionary<string, string> gnArgs)
+    {
+        AppendToFlagList(gnArgs, "extra_cflags", "'-DHAVE_ARC4RANDOM_BUF, '-stdlib=libc++'");
+
+        gnArgs["cc"] = "clang";
+        gnArgs["cxx"] = "'clang++'";
+        AppendToFlagList(gnArgs, "extra_ldflags", "'-stdlib=libc++'");
+
+        // gnArgs["ar"] = "llvm-ar";
+    }
+}
\ No newline at end of file
diff --git a/build/Build.Osx.cs b/build/Build.Osx.cs
deleted file mode 100644
index c401d97..0000000
--- a/build/Build.Osx.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Nuke.Common;
-
-partial class Build
-{
-    public Target OsxSkia => _ => _
-        .DependsOn(GitSyncDepsSkia, PatchSkiaBuildFiles)
-        .Requires(() => Architecture)
-        .Requires(() => Variant)
-        .OnlyWhenStatic(OperatingSystem.IsMacOS)
-        .Executes(() =>
-        {
-            BuildSkiaOsxMain(Architecture, Variant);
-        });
-
-    public Target OsxJni => _ => _
-        .DependsOn(PrepareGitHubArtifacts, GitSyncDepsJni, PatchSkiaBuildFiles)
-        .Requires(() => Architecture)
-        .Requires(() => Variant == Variant.Shared)
-        .OnlyWhenStatic(OperatingSystem.IsMacOS)
-        .Executes(() =>
-        {
-            BuildSkiaOsxJni(Architecture, Variant);
-        });
-
-    void BuildSkiaOsxMain(Architecture arch, Variant variant)
-    {
-        var gnArgs = new Dictionary<string, string>();
-        string[] filesToCopy;
-        var isShared = variant == Variant.Shared;
-        if (isShared)
-        {
-            filesToCopy = new[]
-            {
-                "libAlphaSkia.so"
-            };
-        }
-        else
-        {
-            filesToCopy = new[]
-            {
-                "libAlphaSkia.a",
-                "libskia.a"
-            };
-        }
-
-        BuildSkiaOsx("libAlphaSkia", arch, variant, gnArgs, filesToCopy);
-    }
-
-    void BuildSkiaOsxJni(Architecture arch, Variant variant)
-    {
-        var gnArgs = new Dictionary<string, string>();
-        var alphaSkiaInclude = DistBasePath / "include";
-        var jniInclude = JavaHome / "include";
-        var jniWinInclude = JavaHome / "include" / "osx"; // TODO
-        gnArgs["extra_cflags"] = $"[ '-I{alphaSkiaInclude}', '-I{jniInclude}', '-I{jniWinInclude}' ]";
-
-        // Add Libs and lib search paths
-        var staticLibPath = DistBasePath / $"libAlphaSkia-osx-{arch}-static";
-        gnArgs["extra_ldflags"] =
-            $"[ '-L{staticLibPath}', '-lAlphaSkia', '-lskia' ]";
-
-        BuildSkiaOsx("libAlphaSkiaJni", arch, variant, gnArgs, new[] { "libAlphaSkiaJni.so" });
-    }
-
-    void BuildSkiaOsx(string buildTarget, Architecture arch, Variant variant, Dictionary<string, string> gnArgs,
-        string[] filesToCopy)
-    {
-        SetClangOsx(arch, gnArgs);
-
-        gnArgs["skia_use_system_freetype2"] = "false";
-
-        BuildSkia(buildTarget, "mac", arch, variant, gnArgs, filesToCopy);
-    }
-
-    void SetClangOsx(Architecture arch, Dictionary<string, string> gnArgs)
-    {
-        AppendToFlagList(gnArgs, "extra_cflags", "'-DHAVE_SYSCALL_GETRANDOM', '-DXML_DEV_URANDOM'");
-
-        if (arch == Architecture.X64)
-        {
-            gnArgs["cc"] = "clang";
-            gnArgs["cxx"] = "'clang++'";
-            AppendToFlagList(gnArgs, "extra_ldflags", "'-static-libstdc++', '-static-libgcc'");
-        }
-        else if (arch == Architecture.X86)
-        {
-            // TODO
-            gnArgs["cc"] = "clang";
-            gnArgs["cxx"] = "'clang++'";
-            AppendToFlagList(gnArgs, "extra_ldflags", "'-static-libstdc++', '-static-libgcc'");
-        }
-        else if (arch == Architecture.Arm64) // aka AArch64
-        {
-            // TODO
-            gnArgs["cc"] = "clang";
-            gnArgs["cxx"] = "'clang++'";
-            AppendToFlagList(gnArgs, "extra_ldflags", "'-static-libstdc++', '-static-libgcc'");
-        }
-
-        // gnArgs["ar"] = "llvm-ar";
-    }
-}
\ No newline at end of file
diff --git a/lib/dotnet/AlphaSkia.Native.MacOs/AlphaSkia.Native.MacOs.csproj b/lib/dotnet/AlphaSkia.Native.MacOs/AlphaSkia.Native.MacOs.csproj
new file mode 100644
index 0000000..f4b3528
--- /dev/null
+++ b/lib/dotnet/AlphaSkia.Native.MacOs/AlphaSkia.Native.MacOs.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <IsPackable>true</IsPackable>
+        <IncludeBuildOutput>false</IncludeBuildOutput>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+        <NoWarn>$(NoWarn);NU5128</NoWarn>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <None Include="../../../dist/libAlphaSkia-macos-x64-shared/libAlphaSkia.so" Pack="True" PackagePath="runtimes/osx-x64/native" Condition=" Exists('../../../dist/libAlphaSkia-macos-x64-shared/libAlphaSkia.so') " />
+        <None Include="../../../dist/libAlphaSkia-macos-arm64-shared/libAlphaSkia.so" Pack="True" PackagePath="runtimes/osx-arm64/native" Condition=" Exists('../../../dist/libAlphaSkia-macos-arm64-shared/libAlphaSkia.so') " />
+        <None Update="README.md" Pack="true" PackagePath="/" />
+    </ItemGroup>
+</Project>
diff --git a/lib/dotnet/AlphaSkia.Native.MacOs/Marker.cs b/lib/dotnet/AlphaSkia.Native.MacOs/Marker.cs
new file mode 100644
index 0000000..ad3c170
--- /dev/null
+++ b/lib/dotnet/AlphaSkia.Native.MacOs/Marker.cs
@@ -0,0 +1,6 @@
+namespace AlphaSkia.Native.Linux
+{
+    internal class Marker
+    {
+    }
+}
\ No newline at end of file
diff --git a/lib/dotnet/AlphaSkia.Native.MacOs/README.md b/lib/dotnet/AlphaSkia.Native.MacOs/README.md
new file mode 100644
index 0000000..a3b4da2
--- /dev/null
+++ b/lib/dotnet/AlphaSkia.Native.MacOs/README.md
@@ -0,0 +1,3 @@
+# AlphaSkia Linux Runtime Dependencies
+
+This package contains the AlphaSkia runtime dependencies for Linux
\ No newline at end of file
diff --git a/lib/dotnet/AlphaSkia.Test/AlphaSkia.Test.csproj b/lib/dotnet/AlphaSkia.Test/AlphaSkia.Test.csproj
index 4530cbf..7217817 100644
--- a/lib/dotnet/AlphaSkia.Test/AlphaSkia.Test.csproj
+++ b/lib/dotnet/AlphaSkia.Test/AlphaSkia.Test.csproj
@@ -42,5 +42,14 @@
         <None Include="$(RootDirectory)dist/libAlphaSkia-win-arm64-shared/libAlphaSkia.dll" LinkBase="runtimes/win-arm/native"
               Condition=" Exists('$(RootDirectory)dist/libAlphaSkia-win-arm64-shared/libAlphaSkia.dll') "
               CopyToOutputDirectory="PreserveNewest"/>
+
+
+        <None Include="$(RootDirectory)dist/libAlphaSkia-macos-x64-shared/libAlphaSkia.so" LinkBase="runtimes/osx-x64/native"
+              Condition=" Exists('$(RootDirectory)dist/libAlphaSkia-macos-x64-shared/libAlphaSkia.so') "
+              CopyToOutputDirectory="PreserveNewest"/>
+        <None Include="$(RootDirectory)dist/libAlphaSkia-macos-arm64-shared/libAlphaSkia.so" LinkBase="runtimes/osx-arm64/native"
+              Condition=" Exists('$(RootDirectory)dist/libAlphaSkia-macos-arm64-shared/libAlphaSkia.so') "
+              CopyToOutputDirectory="PreserveNewest"/>
+
     </ItemGroup>
 </Project>
diff --git a/lib/dotnet/AlphaSkia.sln b/lib/dotnet/AlphaSkia.sln
index 15bd3c2..903164b 100644
--- a/lib/dotnet/AlphaSkia.sln
+++ b/lib/dotnet/AlphaSkia.sln
@@ -12,6 +12,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AlphaSkia.Test", "AlphaSkia
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AlphaSkia.Native.Android", "AlphaSkia.Native.Android\AlphaSkia.Native.Android.csproj", "{0500984B-5733-499A-850F-3CD964B9BE5A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AlphaSkia.Native.MacOs", "AlphaSkia.Native.MacOs\AlphaSkia.Native.MacOs.csproj", "{6727C66F-7AD0-4E81-BDDE-E9422B0601A5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -38,6 +40,10 @@ Global
 		{0500984B-5733-499A-850F-3CD964B9BE5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0500984B-5733-499A-850F-3CD964B9BE5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0500984B-5733-499A-850F-3CD964B9BE5A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6727C66F-7AD0-4E81-BDDE-E9422B0601A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6727C66F-7AD0-4E81-BDDE-E9422B0601A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6727C66F-7AD0-4E81-BDDE-E9422B0601A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6727C66F-7AD0-4E81-BDDE-E9422B0601A5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{3693A53C-386E-4DBC-9B5E-9C3B7723FBE0} = {20757D78-DE4E-450B-97CC-24F926593193}
diff --git a/lib/dotnet/AlphaSkia/AlphaSkiaPlatform.cs b/lib/dotnet/AlphaSkia/AlphaSkiaPlatform.cs
index 00f28b1..bfb77a8 100644
--- a/lib/dotnet/AlphaSkia/AlphaSkiaPlatform.cs
+++ b/lib/dotnet/AlphaSkia/AlphaSkiaPlatform.cs
@@ -64,7 +64,7 @@ private static string BuildKnownRid(out string libExtension)
         {
             PlatformID.Unix => ".so",
             PlatformID.Win32NT => ".dll",
-            PlatformID.MacOSX => ".dylib",
+            PlatformID.MacOSX => ".so", //TODO .dylib?
             _ => ""
         };
         
@@ -72,7 +72,7 @@ private static string BuildKnownRid(out string libExtension)
         {
             PlatformID.Unix => "linux",
             PlatformID.Win32NT => "win",
-            PlatformID.MacOSX => "osx",
+            PlatformID.MacOSX => "macos",
             _ => officialOs
         };
         if (string.IsNullOrEmpty(os))
diff --git a/lib/java/.idea/gradle.xml b/lib/java/.idea/gradle.xml
index 0ccee45..5bd1ce6 100644
--- a/lib/java/.idea/gradle.xml
+++ b/lib/java/.idea/gradle.xml
@@ -11,6 +11,7 @@
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/android" />
             <option value="$PROJECT_DIR$/linux" />
+            <option value="$PROJECT_DIR$/macos" />
             <option value="$PROJECT_DIR$/main" />
             <option value="$PROJECT_DIR$/windows" />
           </set>
diff --git a/lib/java/.idea/misc.xml b/lib/java/.idea/misc.xml
index cbc4de8..c608721 100644
--- a/lib/java/.idea/misc.xml
+++ b/lib/java/.idea/misc.xml
@@ -4,7 +4,7 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="14" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_14" default="true" project-jdk-name="14" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/lib/java/linux/build.gradle.kts b/lib/java/linux/build.gradle.kts
index 21ad208..93723a3 100644
--- a/lib/java/linux/build.gradle.kts
+++ b/lib/java/linux/build.gradle.kts
@@ -9,7 +9,7 @@ java {
 }
 
 tasks.jar {
-    archiveBaseName = "net.alphatab.alphaskia.windows"
+    archiveBaseName = "net.alphatab.alphaskia.linux"
 
     into("native/linux-x64/") {
         from(rootProject.projectDir.resolve("../../dist/libAlphaSkiaJni-linux-x64-shared/"))
diff --git a/lib/java/macos/build.gradle.kts b/lib/java/macos/build.gradle.kts
new file mode 100644
index 0000000..3c15711
--- /dev/null
+++ b/lib/java/macos/build.gradle.kts
@@ -0,0 +1,20 @@
+plugins {
+    id("java-library")
+}
+
+java {
+    toolchain{
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
+
+tasks.jar {
+    archiveBaseName = "net.alphatab.alphaskia.macos"
+
+    into("native/macos-x64/") {
+        from(rootProject.projectDir.resolve("../../dist/libAlphaSkiaJni-macos-x64-shared/"))
+    }
+    into("native/macos-arm64/") {
+        from(rootProject.projectDir.resolve("../../dist/libAlphaSkiaJni-macos-arm64-shared/"))
+    }
+}
\ No newline at end of file
diff --git a/lib/java/macos/src/main/java/alphaskia/AlphaSkiaMacOs.java b/lib/java/macos/src/main/java/alphaskia/AlphaSkiaMacOs.java
new file mode 100644
index 0000000..04fe313
--- /dev/null
+++ b/lib/java/macos/src/main/java/alphaskia/AlphaSkiaMacOs.java
@@ -0,0 +1,18 @@
+package alphaskia;
+
+public class AlphaSkiaMacOs {
+    public static final String[] libraries = {
+            "native/macos-" + getCurrentArchitecture() + "/libAlphaSkiaJni.so"
+    };
+
+    private static String getCurrentArchitecture() {
+        var jarch = System.getProperty("os.arch");
+        return switch (jarch) {
+            case "x86", "i368", "i486", "i586", "i686" -> "x86";
+            case "x86_64", "amd64" -> "x64";
+            case "arm" -> "arm";
+            case "aarch64" -> "arm64";
+            default -> jarch;
+        };
+    }
+}
diff --git a/lib/java/main/src/test/java/net/alphatab/alphaskia/MusicSheetRenderTest.java b/lib/java/main/src/test/java/net/alphatab/alphaskia/MusicSheetRenderTest.java
index 81c7434..c213620 100644
--- a/lib/java/main/src/test/java/net/alphatab/alphaskia/MusicSheetRenderTest.java
+++ b/lib/java/main/src/test/java/net/alphatab/alphaskia/MusicSheetRenderTest.java
@@ -40,7 +40,7 @@ public static void setup() throws IOException {
         String libName;
         String target;
         if (os.startsWith("Mac")) {
-            target = "osx";
+            target = "macos";
             libName = "libAlphaSkiaJni.dylib";
         } else if (os.startsWith("Win")) {
             target = "win";
diff --git a/lib/java/settings.gradle.kts b/lib/java/settings.gradle.kts
index 3f5003e..86cb29e 100644
--- a/lib/java/settings.gradle.kts
+++ b/lib/java/settings.gradle.kts
@@ -4,3 +4,4 @@ include("main")
 include("linux")
 include("windows")
 include("android")
+include("macos")

From 204b434465e6a84b3df55e4521174424f9d34ecb Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Thu, 5 Oct 2023 14:31:12 +0200
Subject: [PATCH 03/20] Add missing quote

---
 build/Build.MacOs.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/Build.MacOs.cs b/build/Build.MacOs.cs
index af2571c..3c0b5ba 100644
--- a/build/Build.MacOs.cs
+++ b/build/Build.MacOs.cs
@@ -77,7 +77,7 @@ void BuildSkiaMacOs(string buildTarget, Architecture arch, Variant variant, Dict
 
     void SetClangMacOs(Architecture arch, Dictionary<string, string> gnArgs)
     {
-        AppendToFlagList(gnArgs, "extra_cflags", "'-DHAVE_ARC4RANDOM_BUF, '-stdlib=libc++'");
+        AppendToFlagList(gnArgs, "extra_cflags", "'-DHAVE_ARC4RANDOM_BUF', '-stdlib=libc++'");
 
         gnArgs["cc"] = "clang";
         gnArgs["cxx"] = "'clang++'";

From 25cf84f4db38f519ef5007eece5c7011fcb74ac8 Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Thu, 5 Oct 2023 14:48:00 +0200
Subject: [PATCH 04/20] Adjust packaging

---
 build/Build.MacOs.cs                             |  2 +-
 .../AlphaSkia.Native.MacOs.csproj                |  4 ++--
 lib/dotnet/AlphaSkia.Test/AlphaSkia.Test.csproj  |  8 ++++----
 lib/dotnet/AlphaSkia/AlphaSkiaPlatform.cs        |  2 +-
 lib/java/android/build.gradle.kts                | 16 ++++++++++++----
 lib/java/linux/build.gradle.kts                  | 12 +++++++++---
 lib/java/macos/build.gradle.kts                  |  8 ++++++--
 lib/java/main/build.gradle.kts                   |  2 +-
 lib/java/windows/build.gradle.kts                | 14 ++++++++++----
 9 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/build/Build.MacOs.cs b/build/Build.MacOs.cs
index 3c0b5ba..6fd9831 100644
--- a/build/Build.MacOs.cs
+++ b/build/Build.MacOs.cs
@@ -33,7 +33,7 @@ void BuildSkiaMacOsMain(Architecture arch, Variant variant)
         {
             filesToCopy = new[]
             {
-                "libAlphaSkia.so"
+                "libAlphaSkia.dylib"
             };
         }
         else
diff --git a/lib/dotnet/AlphaSkia.Native.MacOs/AlphaSkia.Native.MacOs.csproj b/lib/dotnet/AlphaSkia.Native.MacOs/AlphaSkia.Native.MacOs.csproj
index f4b3528..04ef781 100644
--- a/lib/dotnet/AlphaSkia.Native.MacOs/AlphaSkia.Native.MacOs.csproj
+++ b/lib/dotnet/AlphaSkia.Native.MacOs/AlphaSkia.Native.MacOs.csproj
@@ -8,8 +8,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <None Include="../../../dist/libAlphaSkia-macos-x64-shared/libAlphaSkia.so" Pack="True" PackagePath="runtimes/osx-x64/native" Condition=" Exists('../../../dist/libAlphaSkia-macos-x64-shared/libAlphaSkia.so') " />
-        <None Include="../../../dist/libAlphaSkia-macos-arm64-shared/libAlphaSkia.so" Pack="True" PackagePath="runtimes/osx-arm64/native" Condition=" Exists('../../../dist/libAlphaSkia-macos-arm64-shared/libAlphaSkia.so') " />
+        <None Include="../../../dist/libAlphaSkia-macos-x64-shared/libAlphaSkia.dylib" Pack="True" PackagePath="runtimes/osx-x64/native" Condition=" Exists('../../../dist/libAlphaSkia-macos-x64-shared/libAlphaSkia.dylib') " />
+        <None Include="../../../dist/libAlphaSkia-macos-arm64-shared/libAlphaSkia.dylib" Pack="True" PackagePath="runtimes/osx-arm64/native" Condition=" Exists('../../../dist/libAlphaSkia-macos-arm64-shared/libAlphaSkia.dylib') " />
         <None Update="README.md" Pack="true" PackagePath="/" />
     </ItemGroup>
 </Project>
diff --git a/lib/dotnet/AlphaSkia.Test/AlphaSkia.Test.csproj b/lib/dotnet/AlphaSkia.Test/AlphaSkia.Test.csproj
index 7217817..cca3adc 100644
--- a/lib/dotnet/AlphaSkia.Test/AlphaSkia.Test.csproj
+++ b/lib/dotnet/AlphaSkia.Test/AlphaSkia.Test.csproj
@@ -44,11 +44,11 @@
               CopyToOutputDirectory="PreserveNewest"/>
 
 
-        <None Include="$(RootDirectory)dist/libAlphaSkia-macos-x64-shared/libAlphaSkia.so" LinkBase="runtimes/osx-x64/native"
-              Condition=" Exists('$(RootDirectory)dist/libAlphaSkia-macos-x64-shared/libAlphaSkia.so') "
+        <None Include="$(RootDirectory)dist/libAlphaSkia-macos-x64-shared/libAlphaSkia.dylib" LinkBase="runtimes/osx-x64/native"
+              Condition=" Exists('$(RootDirectory)dist/libAlphaSkia-macos-x64-shared/libAlphaSkia.dylib') "
               CopyToOutputDirectory="PreserveNewest"/>
-        <None Include="$(RootDirectory)dist/libAlphaSkia-macos-arm64-shared/libAlphaSkia.so" LinkBase="runtimes/osx-arm64/native"
-              Condition=" Exists('$(RootDirectory)dist/libAlphaSkia-macos-arm64-shared/libAlphaSkia.so') "
+        <None Include="$(RootDirectory)dist/libAlphaSkia-macos-arm64-shared/libAlphaSkia.dylib" LinkBase="runtimes/osx-arm64/native"
+              Condition=" Exists('$(RootDirectory)dist/libAlphaSkia-macos-arm64-shared/libAlphaSkia.dylib') "
               CopyToOutputDirectory="PreserveNewest"/>
 
     </ItemGroup>
diff --git a/lib/dotnet/AlphaSkia/AlphaSkiaPlatform.cs b/lib/dotnet/AlphaSkia/AlphaSkiaPlatform.cs
index bfb77a8..9a2911e 100644
--- a/lib/dotnet/AlphaSkia/AlphaSkiaPlatform.cs
+++ b/lib/dotnet/AlphaSkia/AlphaSkiaPlatform.cs
@@ -64,7 +64,7 @@ private static string BuildKnownRid(out string libExtension)
         {
             PlatformID.Unix => ".so",
             PlatformID.Win32NT => ".dll",
-            PlatformID.MacOSX => ".so", //TODO .dylib?
+            PlatformID.MacOSX => ".dylib",
             _ => ""
         };
         
diff --git a/lib/java/android/build.gradle.kts b/lib/java/android/build.gradle.kts
index ce5a378..ac36738 100644
--- a/lib/java/android/build.gradle.kts
+++ b/lib/java/android/build.gradle.kts
@@ -12,15 +12,23 @@ tasks.jar {
     archiveBaseName = "net.alphatab.alphaskia.android"
 
     into("native/android-x64/") {
-        from(rootProject.projectDir.resolve("../../dist/libAlphaSkiaJni-android-x64-shared/"))
+        from(rootProject.projectDir.resolve("../../dist/libAlphaSkiaJni-android-x64-shared/")) {
+            include("*.so")
+        }
     }
     into("native/android-x86/") {
-        from(rootProject.projectDir.resolve("../../dist/libAlphaSkiaJni-android-x86-shared/"))
+        from(rootProject.projectDir.resolve("../../dist/libAlphaSkiaJni-android-x86-shared/")) {
+            include("*.so")
+        }
     }
     into("native/android-arm64/") {
-        from(rootProject.projectDir.resolve("../../dist/libAlphaSkiaJni-android-arm64-shared/"))
+        from(rootProject.projectDir.resolve("../../dist/libAlphaSkiaJni-android-arm64-shared/")) {
+            include("*.so")
+        }
     }
     into("native/android-arm/") {
-        from(rootProject.projectDir.resolve("../../dist/libAlphaSkiaJni-android-arm-shared/"))
+        from(rootProject.projectDir.resolve("../../dist/libAlphaSkiaJni-android-arm-shared/")) {
+            include("*.so")
+        }
     }
 }
\ No newline at end of file
diff --git a/lib/java/linux/build.gradle.kts b/lib/java/linux/build.gradle.kts
index 93723a3..bcb16ff 100644
--- a/lib/java/linux/build.gradle.kts
+++ b/lib/java/linux/build.gradle.kts
@@ -12,12 +12,18 @@ tasks.jar {
     archiveBaseName = "net.alphatab.alphaskia.linux"
 
     into("native/linux-x64/") {
-        from(rootProject.projectDir.resolve("../../dist/libAlphaSkiaJni-linux-x64-shared/"))
+        from(rootProject.projectDir.resolve("../../dist/libAlphaSkiaJni-linux-x64-shared/")) {
+            include("*.so")
+        }
     }
     into("native/linux-x86/") {
-        from(rootProject.projectDir.resolve("../../dist/libAlphaSkiaJni-linux-x86-shared/"))
+        from(rootProject.projectDir.resolve("../../dist/libAlphaSkiaJni-linux-x86-shared/")) {
+            include("*.so")
+        }
     }
     into("native/linux-arm64/") {
-        from(rootProject.projectDir.resolve("../../dist/libAlphaSkiaJni-linux-arm64-shared/"))
+        from(rootProject.projectDir.resolve("../../dist/libAlphaSkiaJni-linux-arm64-shared/")) {
+            include("*.so")
+        }
     }
 }
\ No newline at end of file
diff --git a/lib/java/macos/build.gradle.kts b/lib/java/macos/build.gradle.kts
index 3c15711..1078d93 100644
--- a/lib/java/macos/build.gradle.kts
+++ b/lib/java/macos/build.gradle.kts
@@ -12,9 +12,13 @@ tasks.jar {
     archiveBaseName = "net.alphatab.alphaskia.macos"
 
     into("native/macos-x64/") {
-        from(rootProject.projectDir.resolve("../../dist/libAlphaSkiaJni-macos-x64-shared/"))
+        from(rootProject.projectDir.resolve("../../dist/libAlphaSkiaJni-macos-x64-shared/")) {
+            include("*.dylib")
+        }
     }
     into("native/macos-arm64/") {
-        from(rootProject.projectDir.resolve("../../dist/libAlphaSkiaJni-macos-arm64-shared/"))
+        from(rootProject.projectDir.resolve("../../dist/libAlphaSkiaJni-macos-arm64-shared/")) {
+            include("*.dylib")
+        }
     }
 }
\ No newline at end of file
diff --git a/lib/java/main/build.gradle.kts b/lib/java/main/build.gradle.kts
index 52e4ac3..ff86134 100644
--- a/lib/java/main/build.gradle.kts
+++ b/lib/java/main/build.gradle.kts
@@ -22,5 +22,5 @@ tasks.test {
 }
 
 tasks.jar {
-    archiveBaseName = "net.alphatab.alphaskia.windows"
+    archiveBaseName = "net.alphatab.alphaskia"
 }
\ No newline at end of file
diff --git a/lib/java/windows/build.gradle.kts b/lib/java/windows/build.gradle.kts
index 045b258..1217561 100644
--- a/lib/java/windows/build.gradle.kts
+++ b/lib/java/windows/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 java {
-    toolchain{
+    toolchain {
         languageVersion.set(JavaLanguageVersion.of(17))
     }
 }
@@ -12,12 +12,18 @@ tasks.jar {
     archiveBaseName = "net.alphatab.alphaskia.windows"
 
     into("native/win-x64/") {
-        include(rootProject.projectDir.resolve("../../dist/libAlphaSkiaJni-win-x64-shared/").absolutePath)
+        from(rootProject.projectDir.resolve("../../dist/libAlphaSkiaJni-win-x64-shared/").absolutePath) {
+            include("*.dll")
+        }
     }
     into("native/win-x86/") {
-        include(rootProject.projectDir.resolve("../../dist/libAlphaSkiaJni-win-x86-shared/").absolutePath)
+        from(rootProject.projectDir.resolve("../../dist/libAlphaSkiaJni-win-x86-shared/").absolutePath) {
+            include("*.dll")
+        }
     }
     into("native/win-arm64/") {
-        include(rootProject.projectDir.resolve("../../dist/libAlphaSkiaJni-win-arm64-shared/").absolutePath)
+        from(rootProject.projectDir.resolve("../../dist/libAlphaSkiaJni-win-arm64-shared/").absolutePath) {
+            include("*.dll")
+        }
     }
 }
\ No newline at end of file

From 173c4937131b185ad5145ce277b2129ff245480b Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Thu, 5 Oct 2023 14:57:41 +0200
Subject: [PATCH 05/20] Chain builds correctly

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 02e42c1..e53b3e8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -166,7 +166,7 @@ jobs:
 
   dotnet:
     runs-on: windows-latest
-    needs: [windows, linux]
+    needs: [windows, linux, android, macos]
     steps:
     - uses: actions/checkout@v3
       with:
@@ -184,7 +184,7 @@ jobs:
 
   java:
     runs-on: ubuntu-latest
-    needs: [windows-jni, linux-jni, android-jni]
+    needs: [windows-jni, linux-jni, android-jni, macos-jni]
     steps:
     - uses: actions/checkout@v3
       with:

From 5afa003ae9b569b76cf5629cf49c3fb488d4de8e Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Thu, 5 Oct 2023 15:09:53 +0200
Subject: [PATCH 06/20] Adjust paths.

---
 build/Build.MacOs.cs  |  2 +-
 build/Build.Native.cs | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build/Build.MacOs.cs b/build/Build.MacOs.cs
index 6fd9831..7f86b0b 100644
--- a/build/Build.MacOs.cs
+++ b/build/Build.MacOs.cs
@@ -72,7 +72,7 @@ void BuildSkiaMacOs(string buildTarget, Architecture arch, Variant variant, Dict
         gnArgs["skia_use_system_freetype2"] = "false";
         gnArgs["skia_use_metal"] = "true";
 
-        BuildSkia(buildTarget, "mac", arch, variant, gnArgs, filesToCopy);
+        BuildSkia(buildTarget, "mac", arch, variant, gnArgs, filesToCopy, "macos");
     }
 
     void SetClangMacOs(Architecture arch, Dictionary<string, string> gnArgs)
diff --git a/build/Build.Native.cs b/build/Build.Native.cs
index a7757a5..7b42660 100644
--- a/build/Build.Native.cs
+++ b/build/Build.Native.cs
@@ -417,10 +417,12 @@ void BuildSkia(
         string arch,
         Variant variant,
         Dictionary<string, string> gnArgs,
-        string[] filesToCopy)
+        string[] filesToCopy,
+        string targetOsOutDir = null)
     {
+        targetOsOutDir ??= targetOs;
         var isShared = variant == Variant.Shared;
-        var artifactDir = $"{buildTarget}-{targetOs}-{arch}-{variant}";
+        var artifactDir = $"{buildTarget}-{targetOsOutDir}-{arch}-{variant}";
         var distPath = DistBasePath / artifactDir;
         var artifactsLibPath = IsGitHubActions ? ArtifactBasePath / artifactDir : null;
 
@@ -460,9 +462,9 @@ void BuildSkia(
         gnArgs["skia_enable_ganesh"] = "true";
         gnArgs["skia_use_vulkan"] = "true";
 
-        GnNinja($"out/{buildTarget}/{targetOs}/{arch}/{variant}", buildTarget, gnArgs, SkiaPath);
+        GnNinja($"out/{buildTarget}/{targetOsOutDir}/{arch}/{variant}", buildTarget, gnArgs, SkiaPath);
 
-        var outDir = SkiaPath / "out" / buildTarget / targetOs / arch / variant;
+        var outDir = SkiaPath / "out" / buildTarget / targetOsOutDir / arch / variant;
         try
         {
             foreach (var file in filesToCopy)

From ebb81bc224ca84f410e742f366bb358ff618a714 Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Thu, 5 Oct 2023 15:45:20 +0200
Subject: [PATCH 07/20] Add Frameworks to linker

---
 README.md            | 4 ++--
 build/Build.MacOs.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 26582bf..6217895 100644
--- a/README.md
+++ b/README.md
@@ -23,8 +23,8 @@ In the initial release of the library we plan to support following platform matr
 | linux-x86           | ✅    | ✅    | ✅       |
 | linux-arm           | ✅    | ✅    | ✅       |
 | linux-arm64         | ✅    | ✅    | ✅       |
-| osx-x64             | ✅    | ✅    | ✅       |
-| osx-arm64           | ✅    | ✅    | ✅       |
+| macos-x64           | ✅    | ✅    | ✅       |
+| macos-arm64         | ✅    | ✅    | ✅       |
 | android-x64         | ✅    | ✅    |         |
 | android-x86         | ✅    | ✅    |         |
 | android-arm         | ✅    | ✅    |         |
diff --git a/build/Build.MacOs.cs b/build/Build.MacOs.cs
index 7f86b0b..514f542 100644
--- a/build/Build.MacOs.cs
+++ b/build/Build.MacOs.cs
@@ -59,7 +59,7 @@ void BuildSkiaMacOsJni(Architecture arch, Variant variant)
         // Add Libs and lib search paths
         var staticLibPath = DistBasePath / $"libAlphaSkia-macos-{arch}-static";
         gnArgs["extra_ldflags"] =
-            $"[ '-L{staticLibPath}', '-lAlphaSkia', '-lskia' ]";
+            $"[ '-L{staticLibPath}', '-lAlphaSkia', '-lskia', '-Wl-framework', '-WlAppKit', '-Wl-framework', '-WlApplicationServices' ]";
 
         BuildSkiaMacOs("libAlphaSkiaJni", arch, variant, gnArgs, new[] { "libAlphaSkiaJni.so" });
     }

From fdaddac363f30d543d8fcc76fef01e5376c97d53 Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Thu, 5 Oct 2023 16:12:38 +0200
Subject: [PATCH 08/20] Try specifying frameworks in build.gn

---
 build/Build.MacOs.cs  | 2 +-
 build/Build.Native.cs | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/build/Build.MacOs.cs b/build/Build.MacOs.cs
index 514f542..7f86b0b 100644
--- a/build/Build.MacOs.cs
+++ b/build/Build.MacOs.cs
@@ -59,7 +59,7 @@ void BuildSkiaMacOsJni(Architecture arch, Variant variant)
         // Add Libs and lib search paths
         var staticLibPath = DistBasePath / $"libAlphaSkia-macos-{arch}-static";
         gnArgs["extra_ldflags"] =
-            $"[ '-L{staticLibPath}', '-lAlphaSkia', '-lskia', '-Wl-framework', '-WlAppKit', '-Wl-framework', '-WlApplicationServices' ]";
+            $"[ '-L{staticLibPath}', '-lAlphaSkia', '-lskia' ]";
 
         BuildSkiaMacOs("libAlphaSkiaJni", arch, variant, gnArgs, new[] { "libAlphaSkiaJni.so" });
     }
diff --git a/build/Build.Native.cs b/build/Build.Native.cs
index 7b42660..3fd3f86 100644
--- a/build/Build.Native.cs
+++ b/build/Build.Native.cs
@@ -315,6 +315,12 @@ Dictionary<string, string> ReadDepsData(TextReader reader)
             buildNew.AppendLine("    \"../../lib/java/jni/src/AlphaSkiaImage.cpp\",");
             buildNew.AppendLine("    \"../../lib/java/jni/src/AlphaSkiaTypeface.cpp\"");
             buildNew.AppendLine("  ]");
+            buildNew.AppendLine("  if (is_mac) {");
+            buildNew.AppendLine("    frameworks = [");
+            buildNew.AppendLine("      \"AppKit.framework\",");
+            buildNew.AppendLine("      \"ApplicationServices.framework\",");
+            buildNew.AppendLine("    ]");
+            buildNew.AppendLine("  }");
             buildNew.AppendLine();
             buildNew.AppendLine("}");
             PatchSkiaFile(SkiaPath / "BUILD.gn", buildNew.ToString());

From f97778f009a64ab5c949f30753b927b6258d28f7 Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Thu, 5 Oct 2023 16:29:10 +0200
Subject: [PATCH 09/20] Add cache to speedup builds

---
 .github/workflows/build.yml | 64 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 63 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e53b3e8..09547d5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,5 +1,9 @@
 on:
   workflow_dispatch:
+    inputs:
+      use-skia-cache:
+        type: boolean
+        description: Whether to use the cached skia libraries when possible.
 
 jobs:
   windows:
@@ -14,12 +18,31 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: true
-      - run: ./build.cmd WindowsSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }}
+      - uses: actions/cache/restore@v3
+        if: ${{ github.events.inputs.use-cache == 'true' }}
+        with:
+          path: dist
+          key: alphaskia-windows-${{ matrix.architecture }}-${{ matrix.variant }}
+
+      - run: ./build.cmd WindowsSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ github.events.inputs.use-cache }}
       - uses: actions/upload-artifact@v3
         with:
           name: alphaskia-windows-${{ matrix.architecture }}-${{ matrix.variant }}
           path: artifacts
 
+      - uses: actions/cache/restore@v3
+        if: ${{ github.events.inputs.use-cache == 'true' }}
+        with:
+          path: dist
+          key: alphaskia-windows-${{ matrix.architecture }}-${{ matrix.variant }}
+
+      - uses: actions/cache/save@v3
+        if: ${{ github.events.inputs.use-cache == 'true' }}
+        with:
+          path: dist
+          key: alphaskia-windows-${{ matrix.architecture }}-${{ matrix.variant }}
+
+
   windows-jni:
     runs-on: windows-latest
     needs: [windows]
@@ -54,6 +77,12 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: true
+      - uses: actions/cache/restore@v3
+        if: ${{ github.events.inputs.use-cache == 'true' }}
+        with:
+          path: dist
+          key: alphaskia-linux-${{ matrix.architecture }}-${{ matrix.variant }}
+
       - run: ./externals/skia/tools/install_dependencies.sh
       - run: ./build.sh LinuxSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }}
       - uses: actions/upload-artifact@v3
@@ -61,6 +90,13 @@ jobs:
           name: alphaskia-linux-${{ matrix.architecture }}-${{ matrix.variant }}
           path: artifacts
 
+      - uses: actions/cache/save@v3
+        if: ${{ github.events.inputs.use-cache == 'true' }}
+        with:
+          path: dist
+          key: alphaskia-linux-${{ matrix.architecture }}-${{ matrix.variant }}
+
+
   linux-jni:
     runs-on: ubuntu-latest
     needs: [linux]
@@ -96,6 +132,12 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: true
+      - uses: actions/cache/restore@v3
+        if: ${{ github.events.inputs.use-cache == 'true' }}
+        with:
+          path: dist
+          key: alphaskia-android-${{ matrix.architecture }}-${{ matrix.variant }}
+
       - run: ./externals/skia/tools/install_dependencies.sh
       - run: ./build.sh AndroidSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }}
       - uses: actions/upload-artifact@v3
@@ -103,6 +145,13 @@ jobs:
           name: alphaskia-android-${{ matrix.architecture }}-${{ matrix.variant }}
           path: artifacts
 
+      - uses: actions/cache/save@v3
+        if: ${{ github.events.inputs.use-cache == 'true' }}
+        with:
+          path: dist
+          key: alphaskia-android-${{ matrix.architecture }}-${{ matrix.variant }}
+
+
   android-jni:
     runs-on: ubuntu-latest
     needs: [android]
@@ -136,12 +185,25 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: true
+      - uses: actions/cache/restore@v3
+        if: ${{ github.events.inputs.use-cache == 'true' }}
+        with:
+          path: dist
+          key: alphaskia-macos-${{ matrix.architecture }}-${{ matrix.variant }}
+
       - run: ./build.sh MacOsSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }}
       - uses: actions/upload-artifact@v3
         with:
           name: alphaskia-macos-${{ matrix.architecture }}-${{ matrix.variant }}
           path: artifacts
 
+      - uses: actions/cache/save@v3
+        if: ${{ github.events.inputs.use-cache == 'true' }}
+        with:
+          path: dist
+          key: alphaskia-macos-${{ matrix.architecture }}-${{ matrix.variant }}
+
+
   macos-jni:
     runs-on: macos-latest
     needs: [macos]

From c22297c5f77354512fbdd198a8acc68ba03711b2 Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Thu, 5 Oct 2023 16:34:54 +0200
Subject: [PATCH 10/20] Add cache handling to Nuke targets

---
 .github/workflows/build.yml | 6 +++---
 build/Build.Android.cs      | 1 +
 build/Build.Linux.cs        | 1 +
 build/Build.MacOs.cs        | 1 +
 build/Build.Native.cs       | 1 +
 build/Build.Windows.cs      | 5 +++--
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 09547d5..34fb43d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -84,7 +84,7 @@ jobs:
           key: alphaskia-linux-${{ matrix.architecture }}-${{ matrix.variant }}
 
       - run: ./externals/skia/tools/install_dependencies.sh
-      - run: ./build.sh LinuxSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }}
+      - run: ./build.sh LinuxSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ github.events.inputs.use-cache }}
       - uses: actions/upload-artifact@v3
         with:
           name: alphaskia-linux-${{ matrix.architecture }}-${{ matrix.variant }}
@@ -139,7 +139,7 @@ jobs:
           key: alphaskia-android-${{ matrix.architecture }}-${{ matrix.variant }}
 
       - run: ./externals/skia/tools/install_dependencies.sh
-      - run: ./build.sh AndroidSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }}
+      - run: ./build.sh AndroidSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ github.events.inputs.use-cache }}
       - uses: actions/upload-artifact@v3
         with:
           name: alphaskia-android-${{ matrix.architecture }}-${{ matrix.variant }}
@@ -191,7 +191,7 @@ jobs:
           path: dist
           key: alphaskia-macos-${{ matrix.architecture }}-${{ matrix.variant }}
 
-      - run: ./build.sh MacOsSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }}
+      - run: ./build.sh MacOsSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ github.events.inputs.use-cache }}
       - uses: actions/upload-artifact@v3
         with:
           name: alphaskia-macos-${{ matrix.architecture }}-${{ matrix.variant }}
diff --git a/build/Build.Android.cs b/build/Build.Android.cs
index 0e71cb2..f660591 100644
--- a/build/Build.Android.cs
+++ b/build/Build.Android.cs
@@ -46,6 +46,7 @@ static string FindNdk()
     }
 
     public Target AndroidSkia => _ => _
+        .OnlyWhenDynamic(() => !UseCache)
         .DependsOn(GitSyncDepsSkia, PatchSkiaBuildFiles)
         .Requires(() => Architecture)
         .Requires(() => Variant)
diff --git a/build/Build.Linux.cs b/build/Build.Linux.cs
index 5ed4545..4b477eb 100644
--- a/build/Build.Linux.cs
+++ b/build/Build.Linux.cs
@@ -5,6 +5,7 @@
 partial class Build
 {
     public Target LinuxSkia => _ => _
+        .OnlyWhenDynamic(() => !UseCache)
         .DependsOn(GitSyncDepsSkia, PatchSkiaBuildFiles)
         .Requires(() => Architecture)
         .Requires(() => Variant)
diff --git a/build/Build.MacOs.cs b/build/Build.MacOs.cs
index 7f86b0b..aad37d3 100644
--- a/build/Build.MacOs.cs
+++ b/build/Build.MacOs.cs
@@ -5,6 +5,7 @@
 partial class Build
 {
     public Target MacOsSkia => _ => _
+        .OnlyWhenDynamic(() => !UseCache)
         .DependsOn(GitSyncDepsSkia, PatchSkiaBuildFiles)
         .Requires(() => Architecture)
         .Requires(() => Variant)
diff --git a/build/Build.Native.cs b/build/Build.Native.cs
index 3fd3f86..ce0e32c 100644
--- a/build/Build.Native.cs
+++ b/build/Build.Native.cs
@@ -59,6 +59,7 @@ partial class Build
     [Parameter] readonly Architecture Architecture;
 
     [Parameter] readonly Variant Variant;
+    [Parameter(Name = "use-cache")] readonly bool UseCache;
 
     public Target GitSyncDepsSkia => _ => _
         .DependsOn(SetupDepotTools)
diff --git a/build/Build.Windows.cs b/build/Build.Windows.cs
index 29a277f..0d58a84 100644
--- a/build/Build.Windows.cs
+++ b/build/Build.Windows.cs
@@ -9,6 +9,7 @@
 partial class Build
 {
     public Target WindowsSkia => _ => _
+        .OnlyWhenDynamic(() => !UseCache)
         .DependsOn(GitSyncDepsSkia, PatchSkiaBuildFiles)
         .Requires(() => Architecture)
         .Requires(() => Variant)
@@ -128,7 +129,7 @@ void SetClangWindows(Dictionary<string, string> gnArgs)
 
         gnArgs["cc"] = "clang";
         gnArgs["cxx"] = "'clang++'";
-        
+
         // override win_vc with the command line args
         var vsInstall = VsInstall;
         if (!string.IsNullOrEmpty(vsInstall))
@@ -137,7 +138,7 @@ void SetClangWindows(Dictionary<string, string> gnArgs)
             winVc /= "VC";
             gnArgs["win_vc"] = winVc;
         }
-        
+
         AppendToFlagList(gnArgs, "extra_cflags", "'/MT', '/EHsc', '/Z7', '-D_HAS_AUTO_PTR_ETC=1'");
         AppendToFlagList(gnArgs, "extra_ldflags", "'/DEBUG:FULL'");
     }

From f3b4113408bd7cb808870ae4b9309f49c65ed2cd Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Thu, 5 Oct 2023 16:44:37 +0200
Subject: [PATCH 11/20] Check if cached files exist

---
 .github/workflows/build.yml | 2 +-
 build/Build.Android.cs      | 2 +-
 build/Build.Linux.cs        | 2 +-
 build/Build.MacOs.cs        | 2 +-
 build/Build.Native.cs       | 6 ++++++
 build/Build.Windows.cs      | 2 +-
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 34fb43d..a228896 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ on:
     inputs:
       use-skia-cache:
         type: boolean
-        description: Whether to use the cached skia libraries when possible.
+        description: Use Skia Binary from cache
 
 jobs:
   windows:
diff --git a/build/Build.Android.cs b/build/Build.Android.cs
index f660591..df02351 100644
--- a/build/Build.Android.cs
+++ b/build/Build.Android.cs
@@ -46,7 +46,7 @@ static string FindNdk()
     }
 
     public Target AndroidSkia => _ => _
-        .OnlyWhenDynamic(() => !UseCache)
+        .OnlyWhenDynamic(() => !UseCache || !HasCachedFiles("libAlphaSkia", "android"))
         .DependsOn(GitSyncDepsSkia, PatchSkiaBuildFiles)
         .Requires(() => Architecture)
         .Requires(() => Variant)
diff --git a/build/Build.Linux.cs b/build/Build.Linux.cs
index 4b477eb..9956592 100644
--- a/build/Build.Linux.cs
+++ b/build/Build.Linux.cs
@@ -5,7 +5,7 @@
 partial class Build
 {
     public Target LinuxSkia => _ => _
-        .OnlyWhenDynamic(() => !UseCache)
+        .OnlyWhenDynamic(() => !UseCache || !HasCachedFiles("libAlphaSkia", "linux"))
         .DependsOn(GitSyncDepsSkia, PatchSkiaBuildFiles)
         .Requires(() => Architecture)
         .Requires(() => Variant)
diff --git a/build/Build.MacOs.cs b/build/Build.MacOs.cs
index aad37d3..27f5ea6 100644
--- a/build/Build.MacOs.cs
+++ b/build/Build.MacOs.cs
@@ -5,7 +5,7 @@
 partial class Build
 {
     public Target MacOsSkia => _ => _
-        .OnlyWhenDynamic(() => !UseCache)
+        .OnlyWhenDynamic(() => !UseCache || !HasCachedFiles("libAlphaSkia", "macos"))
         .DependsOn(GitSyncDepsSkia, PatchSkiaBuildFiles)
         .Requires(() => Architecture)
         .Requires(() => Variant)
diff --git a/build/Build.Native.cs b/build/Build.Native.cs
index ce0e32c..869523d 100644
--- a/build/Build.Native.cs
+++ b/build/Build.Native.cs
@@ -501,4 +501,10 @@ void BuildSkia(
             throw new IOException("Copy files failed. existing files: " + string.Join(", ", fileList), e);
         }
     }
+    
+    bool HasCachedFiles(string buildTarget, string targetOsOutDir)
+    {
+        var expectedDirectory = DistBasePath / $"{buildTarget}-{targetOsOutDir}-{Architecture}-{Variant}";
+        return expectedDirectory.DirectoryExists() && expectedDirectory.GetFiles().Any();
+    }
 }
\ No newline at end of file
diff --git a/build/Build.Windows.cs b/build/Build.Windows.cs
index 0d58a84..39e677b 100644
--- a/build/Build.Windows.cs
+++ b/build/Build.Windows.cs
@@ -9,7 +9,7 @@
 partial class Build
 {
     public Target WindowsSkia => _ => _
-        .OnlyWhenDynamic(() => !UseCache)
+        .OnlyWhenDynamic(() => !UseCache || !HasCachedFiles("libAlphaSkia", "win"))
         .DependsOn(GitSyncDepsSkia, PatchSkiaBuildFiles)
         .Requires(() => Architecture)
         .Requires(() => Variant)

From d63e22ef508eae27626a644be2479a95187d3009 Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Thu, 5 Oct 2023 16:45:54 +0200
Subject: [PATCH 12/20] Always update caches

---
 .github/workflows/build.yml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a228896..9b6d21e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,14 +30,7 @@ jobs:
           name: alphaskia-windows-${{ matrix.architecture }}-${{ matrix.variant }}
           path: artifacts
 
-      - uses: actions/cache/restore@v3
-        if: ${{ github.events.inputs.use-cache == 'true' }}
-        with:
-          path: dist
-          key: alphaskia-windows-${{ matrix.architecture }}-${{ matrix.variant }}
-
       - uses: actions/cache/save@v3
-        if: ${{ github.events.inputs.use-cache == 'true' }}
         with:
           path: dist
           key: alphaskia-windows-${{ matrix.architecture }}-${{ matrix.variant }}
@@ -91,7 +84,6 @@ jobs:
           path: artifacts
 
       - uses: actions/cache/save@v3
-        if: ${{ github.events.inputs.use-cache == 'true' }}
         with:
           path: dist
           key: alphaskia-linux-${{ matrix.architecture }}-${{ matrix.variant }}
@@ -146,7 +138,6 @@ jobs:
           path: artifacts
 
       - uses: actions/cache/save@v3
-        if: ${{ github.events.inputs.use-cache == 'true' }}
         with:
           path: dist
           key: alphaskia-android-${{ matrix.architecture }}-${{ matrix.variant }}
@@ -198,7 +189,6 @@ jobs:
           path: artifacts
 
       - uses: actions/cache/save@v3
-        if: ${{ github.events.inputs.use-cache == 'true' }}
         with:
           path: dist
           key: alphaskia-macos-${{ matrix.architecture }}-${{ matrix.variant }}

From 9de9d0e31c9a363584be0762690c90bb97c7f724 Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Thu, 5 Oct 2023 17:12:38 +0200
Subject: [PATCH 13/20] Add metal framework

---
 .github/workflows/build.yml | 3 ++-
 build/Build.Native.cs       | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9b6d21e..f287919 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,6 +4,7 @@ on:
       use-skia-cache:
         type: boolean
         description: Use Skia Binary from cache
+        default: 'false'
 
 jobs:
   windows:
@@ -201,7 +202,7 @@ jobs:
       fail-fast: false
       matrix:
         architecture: [x64, arm64]
-        variant: ['shared', 'static']
+        variant: ['shared']
 
     steps:
       - uses: actions/checkout@v3
diff --git a/build/Build.Native.cs b/build/Build.Native.cs
index 869523d..43b9abc 100644
--- a/build/Build.Native.cs
+++ b/build/Build.Native.cs
@@ -320,6 +320,7 @@ Dictionary<string, string> ReadDepsData(TextReader reader)
             buildNew.AppendLine("    frameworks = [");
             buildNew.AppendLine("      \"AppKit.framework\",");
             buildNew.AppendLine("      \"ApplicationServices.framework\",");
+            buildNew.AppendLine("      \"Metal.framework\",");
             buildNew.AppendLine("    ]");
             buildNew.AppendLine("  }");
             buildNew.AppendLine();

From 55497cd29bd9294dee254d7647f5e02f8992e57f Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Thu, 5 Oct 2023 17:39:54 +0200
Subject: [PATCH 14/20] Change use-cache parameter

---
 .github/workflows/build.yml | 16 ++++++++--------
 .nuke/build.schema.json     | 17 +++++++++++++++++
 build/Build.Android.cs      |  2 +-
 build/Build.Linux.cs        |  2 +-
 build/Build.MacOs.cs        |  2 +-
 build/Build.Native.cs       |  4 +++-
 build/Build.Windows.cs      |  5 +++--
 build/Build.cs              | 17 +++++++++++++++++
 8 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f287919..3234723 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,12 +20,12 @@ jobs:
         with:
           submodules: true
       - uses: actions/cache/restore@v3
-        if: ${{ github.events.inputs.use-cache == 'true' }}
+        if: ${{ inputs.use-cache == 'true' }}
         with:
           path: dist
           key: alphaskia-windows-${{ matrix.architecture }}-${{ matrix.variant }}
 
-      - run: ./build.cmd WindowsSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ github.events.inputs.use-cache }}
+      - run: ./build.cmd WindowsSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ inputs.use-cache }}
       - uses: actions/upload-artifact@v3
         with:
           name: alphaskia-windows-${{ matrix.architecture }}-${{ matrix.variant }}
@@ -72,13 +72,13 @@ jobs:
         with:
           submodules: true
       - uses: actions/cache/restore@v3
-        if: ${{ github.events.inputs.use-cache == 'true' }}
+        if: ${{ inputs.use-cache == 'true' }}
         with:
           path: dist
           key: alphaskia-linux-${{ matrix.architecture }}-${{ matrix.variant }}
 
       - run: ./externals/skia/tools/install_dependencies.sh
-      - run: ./build.sh LinuxSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ github.events.inputs.use-cache }}
+      - run: ./build.sh LinuxSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ inputs.use-cache }}
       - uses: actions/upload-artifact@v3
         with:
           name: alphaskia-linux-${{ matrix.architecture }}-${{ matrix.variant }}
@@ -126,13 +126,13 @@ jobs:
         with:
           submodules: true
       - uses: actions/cache/restore@v3
-        if: ${{ github.events.inputs.use-cache == 'true' }}
+        if: ${{ inputs.use-cache == 'true' }}
         with:
           path: dist
           key: alphaskia-android-${{ matrix.architecture }}-${{ matrix.variant }}
 
       - run: ./externals/skia/tools/install_dependencies.sh
-      - run: ./build.sh AndroidSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ github.events.inputs.use-cache }}
+      - run: ./build.sh AndroidSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ inputs.use-cache }}
       - uses: actions/upload-artifact@v3
         with:
           name: alphaskia-android-${{ matrix.architecture }}-${{ matrix.variant }}
@@ -178,12 +178,12 @@ jobs:
         with:
           submodules: true
       - uses: actions/cache/restore@v3
-        if: ${{ github.events.inputs.use-cache == 'true' }}
+        if: ${{ inputs.use-cache == 'true' }}
         with:
           path: dist
           key: alphaskia-macos-${{ matrix.architecture }}-${{ matrix.variant }}
 
-      - run: ./build.sh MacOsSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ github.events.inputs.use-cache }}
+      - run: ./build.sh MacOsSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ inputs.use-cache }}
       - uses: actions/upload-artifact@v3
         with:
           name: alphaskia-macos-${{ matrix.architecture }}-${{ matrix.variant }}
diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
index 412b126..b341612 100644
--- a/.nuke/build.schema.json
+++ b/.nuke/build.schema.json
@@ -9,6 +9,7 @@
         "Architecture": {
           "type": "string",
           "enum": [
+            "Arm",
             "Arm64",
             "X64",
             "X86"
@@ -61,6 +62,9 @@
         "LlvmHome": {
           "type": "string"
         },
+        "NdkPath": {
+          "type": "string"
+        },
         "NinjaExe": {
           "type": "string"
         },
@@ -102,6 +106,8 @@
           "items": {
             "type": "string",
             "enum": [
+              "AndroidJni",
+              "AndroidSkia",
               "DotNet",
               "DotNetBuild",
               "DotNetPack",
@@ -111,9 +117,12 @@
               "Java",
               "LinuxJni",
               "LinuxSkia",
+              "MacOsJni",
+              "MacOsSkia",
               "PatchSkiaBuildFiles",
               "PrepareGitHubArtifacts",
               "SetupDepotTools",
+              "Test",
               "WindowsJni",
               "WindowsSkia"
             ]
@@ -125,6 +134,8 @@
           "items": {
             "type": "string",
             "enum": [
+              "AndroidJni",
+              "AndroidSkia",
               "DotNet",
               "DotNetBuild",
               "DotNetPack",
@@ -134,14 +145,20 @@
               "Java",
               "LinuxJni",
               "LinuxSkia",
+              "MacOsJni",
+              "MacOsSkia",
               "PatchSkiaBuildFiles",
               "PrepareGitHubArtifacts",
               "SetupDepotTools",
+              "Test",
               "WindowsJni",
               "WindowsSkia"
             ]
           }
         },
+        "use-cache": {
+          "type": "string"
+        },
         "Variant": {
           "type": "string",
           "enum": [
diff --git a/build/Build.Android.cs b/build/Build.Android.cs
index df02351..da0323c 100644
--- a/build/Build.Android.cs
+++ b/build/Build.Android.cs
@@ -46,7 +46,7 @@ static string FindNdk()
     }
 
     public Target AndroidSkia => _ => _
-        .OnlyWhenDynamic(() => !UseCache || !HasCachedFiles("libAlphaSkia", "android"))
+        .OnlyWhenDynamic(() => !CanUseCachedBinaries("libAlphaSkia", "android"))
         .DependsOn(GitSyncDepsSkia, PatchSkiaBuildFiles)
         .Requires(() => Architecture)
         .Requires(() => Variant)
diff --git a/build/Build.Linux.cs b/build/Build.Linux.cs
index 9956592..424eabb 100644
--- a/build/Build.Linux.cs
+++ b/build/Build.Linux.cs
@@ -5,7 +5,7 @@
 partial class Build
 {
     public Target LinuxSkia => _ => _
-        .OnlyWhenDynamic(() => !UseCache || !HasCachedFiles("libAlphaSkia", "linux"))
+        .OnlyWhenDynamic(() => !CanUseCachedBinaries("libAlphaSkia", "linux"))
         .DependsOn(GitSyncDepsSkia, PatchSkiaBuildFiles)
         .Requires(() => Architecture)
         .Requires(() => Variant)
diff --git a/build/Build.MacOs.cs b/build/Build.MacOs.cs
index 27f5ea6..e3728b3 100644
--- a/build/Build.MacOs.cs
+++ b/build/Build.MacOs.cs
@@ -5,7 +5,7 @@
 partial class Build
 {
     public Target MacOsSkia => _ => _
-        .OnlyWhenDynamic(() => !UseCache || !HasCachedFiles("libAlphaSkia", "macos"))
+        .OnlyWhenDynamic(() => !CanUseCachedBinaries("libAlphaSkia", "macos"))
         .DependsOn(GitSyncDepsSkia, PatchSkiaBuildFiles)
         .Requires(() => Architecture)
         .Requires(() => Variant)
diff --git a/build/Build.Native.cs b/build/Build.Native.cs
index 43b9abc..d673e30 100644
--- a/build/Build.Native.cs
+++ b/build/Build.Native.cs
@@ -59,7 +59,9 @@ partial class Build
     [Parameter] readonly Architecture Architecture;
 
     [Parameter] readonly Variant Variant;
-    [Parameter(Name = "use-cache")] readonly bool UseCache;
+    [Parameter(Name = "use-cache")] readonly string UseCacheParam;
+
+    bool UseCache => "true".Equals(UseCacheParam, StringComparison.OrdinalIgnoreCase);
 
     public Target GitSyncDepsSkia => _ => _
         .DependsOn(SetupDepotTools)
diff --git a/build/Build.Windows.cs b/build/Build.Windows.cs
index 39e677b..32798a4 100644
--- a/build/Build.Windows.cs
+++ b/build/Build.Windows.cs
@@ -5,11 +5,12 @@
 using Nuke.Common;
 using Nuke.Common.IO;
 using Nuke.Common.Tooling;
+using Serilog;
 
 partial class Build
 {
     public Target WindowsSkia => _ => _
-        .OnlyWhenDynamic(() => !UseCache || !HasCachedFiles("libAlphaSkia", "win"))
+        .OnlyWhenDynamic(() => !CanUseCachedBinaries("libAlphaSkia", "win"))
         .DependsOn(GitSyncDepsSkia, PatchSkiaBuildFiles)
         .Requires(() => Architecture)
         .Requires(() => Variant)
@@ -18,7 +19,7 @@ partial class Build
         {
             BuildSkiaWindowsMain(Architecture, Variant);
         });
-
+    
     public Target WindowsJni => _ => _
         .DependsOn(PrepareGitHubArtifacts, GitSyncDepsJni, PatchSkiaBuildFiles)
         .Requires(() => Architecture)
diff --git a/build/Build.cs b/build/Build.cs
index 1cc9840..28c7dde 100644
--- a/build/Build.cs
+++ b/build/Build.cs
@@ -72,4 +72,21 @@ static void AppendToFlagList(
                 }
             }
         });
+    
+    bool CanUseCachedBinaries(string buildTarget, string targetOsDir)
+    {
+        if (!UseCache)
+        {
+            Log.Debug("Cache use is disabled.");
+            return false;
+        }
+
+        if (!HasCachedFiles(buildTarget, targetOsDir))
+        {
+            Log.Information("Did not find cached binaries.");
+            return false;
+        }
+
+        return true;
+    }
 }
\ No newline at end of file

From 4b8e4fc875f5783fade570f97ab7e766583facd2 Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Thu, 5 Oct 2023 17:41:37 +0200
Subject: [PATCH 15/20] Fix wrong input name

---
 .github/workflows/build.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3234723..b8e8fe8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,12 +20,12 @@ jobs:
         with:
           submodules: true
       - uses: actions/cache/restore@v3
-        if: ${{ inputs.use-cache == 'true' }}
+        if: ${{ inputs.use-skia-cache == 'true' }}
         with:
           path: dist
           key: alphaskia-windows-${{ matrix.architecture }}-${{ matrix.variant }}
 
-      - run: ./build.cmd WindowsSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ inputs.use-cache }}
+      - run: ./build.cmd WindowsSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ inputs.use-skia-cache }}
       - uses: actions/upload-artifact@v3
         with:
           name: alphaskia-windows-${{ matrix.architecture }}-${{ matrix.variant }}
@@ -72,13 +72,13 @@ jobs:
         with:
           submodules: true
       - uses: actions/cache/restore@v3
-        if: ${{ inputs.use-cache == 'true' }}
+        if: ${{ inputs.use-skia-cache == 'true' }}
         with:
           path: dist
           key: alphaskia-linux-${{ matrix.architecture }}-${{ matrix.variant }}
 
       - run: ./externals/skia/tools/install_dependencies.sh
-      - run: ./build.sh LinuxSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ inputs.use-cache }}
+      - run: ./build.sh LinuxSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ inputs.use-skia-cache }}
       - uses: actions/upload-artifact@v3
         with:
           name: alphaskia-linux-${{ matrix.architecture }}-${{ matrix.variant }}
@@ -126,13 +126,13 @@ jobs:
         with:
           submodules: true
       - uses: actions/cache/restore@v3
-        if: ${{ inputs.use-cache == 'true' }}
+        if: ${{ inputs.use-skia-cache == 'true' }}
         with:
           path: dist
           key: alphaskia-android-${{ matrix.architecture }}-${{ matrix.variant }}
 
       - run: ./externals/skia/tools/install_dependencies.sh
-      - run: ./build.sh AndroidSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ inputs.use-cache }}
+      - run: ./build.sh AndroidSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ inputs.use-skia-cache }}
       - uses: actions/upload-artifact@v3
         with:
           name: alphaskia-android-${{ matrix.architecture }}-${{ matrix.variant }}
@@ -178,12 +178,12 @@ jobs:
         with:
           submodules: true
       - uses: actions/cache/restore@v3
-        if: ${{ inputs.use-cache == 'true' }}
+        if: ${{ inputs.use-skia-cache == 'true' }}
         with:
           path: dist
           key: alphaskia-macos-${{ matrix.architecture }}-${{ matrix.variant }}
 
-      - run: ./build.sh MacOsSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ inputs.use-cache }}
+      - run: ./build.sh MacOsSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ inputs.use-skia-cache }}
       - uses: actions/upload-artifact@v3
         with:
           name: alphaskia-macos-${{ matrix.architecture }}-${{ matrix.variant }}

From 6c290f893e607290e3d2a87dd9c0e22c469be34b Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Thu, 5 Oct 2023 17:43:50 +0200
Subject: [PATCH 16/20] Get restore running

---
 .github/workflows/build.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b8e8fe8..0e57673 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
         with:
           submodules: true
       - uses: actions/cache/restore@v3
-        if: ${{ inputs.use-skia-cache == 'true' }}
+        if: ${{ inputs.use-skia-cache }}
         with:
           path: dist
           key: alphaskia-windows-${{ matrix.architecture }}-${{ matrix.variant }}
@@ -72,7 +72,7 @@ jobs:
         with:
           submodules: true
       - uses: actions/cache/restore@v3
-        if: ${{ inputs.use-skia-cache == 'true' }}
+        if: ${{ inputs.use-skia-cache }}
         with:
           path: dist
           key: alphaskia-linux-${{ matrix.architecture }}-${{ matrix.variant }}
@@ -126,7 +126,7 @@ jobs:
         with:
           submodules: true
       - uses: actions/cache/restore@v3
-        if: ${{ inputs.use-skia-cache == 'true' }}
+        if: ${{ inputs.use-skia-cache }}
         with:
           path: dist
           key: alphaskia-android-${{ matrix.architecture }}-${{ matrix.variant }}
@@ -178,7 +178,7 @@ jobs:
         with:
           submodules: true
       - uses: actions/cache/restore@v3
-        if: ${{ inputs.use-skia-cache == 'true' }}
+        if: ${{ inputs.use-skia-cache }}
         with:
           path: dist
           key: alphaskia-macos-${{ matrix.architecture }}-${{ matrix.variant }}

From ac23413a0ff10501b3da9755964e8da8cf794f72 Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Thu, 5 Oct 2023 17:53:51 +0200
Subject: [PATCH 17/20] Copy dist to artifacts with caches

---
 build/Build.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build/Build.cs b/build/Build.cs
index 28c7dde..5b5d2e8 100644
--- a/build/Build.cs
+++ b/build/Build.cs
@@ -86,6 +86,9 @@ bool CanUseCachedBinaries(string buildTarget, string targetOsDir)
             Log.Information("Did not find cached binaries.");
             return false;
         }
+        
+        Log.Information("Can use cached binaries, copying them to artifact output");
+        FileSystemTasks.CopyDirectoryRecursively(DistBasePath, ArtifactBasePath, DirectoryExistsPolicy.Merge, FileExistsPolicy.OverwriteIfNewer);
 
         return true;
     }

From 2df3be89f0dcd5eabcdfdd8a21e7503351ed025a Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Fri, 6 Oct 2023 12:40:34 +0200
Subject: [PATCH 18/20] Adjust caching and fix macos JNI build

---
 .github/workflows/build.yml | 16 ++++++++--------
 .nuke/build.schema.json     |  2 --
 build/Build.MacOs.cs        |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0e57673..4607cc6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
         if: ${{ inputs.use-skia-cache }}
         with:
           path: dist
-          key: alphaskia-windows-${{ matrix.architecture }}-${{ matrix.variant }}
+          restore-keys: alphaskia-windows-${{ matrix.architecture }}-${{ matrix.variant }}
 
       - run: ./build.cmd WindowsSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ inputs.use-skia-cache }}
       - uses: actions/upload-artifact@v3
@@ -34,7 +34,7 @@ jobs:
       - uses: actions/cache/save@v3
         with:
           path: dist
-          key: alphaskia-windows-${{ matrix.architecture }}-${{ matrix.variant }}
+          key: alphaskia-windows-${{ matrix.architecture }}-${{ matrix.variant }}-${{ github.run_id }} 
 
 
   windows-jni:
@@ -75,7 +75,7 @@ jobs:
         if: ${{ inputs.use-skia-cache }}
         with:
           path: dist
-          key: alphaskia-linux-${{ matrix.architecture }}-${{ matrix.variant }}
+          restore-keys: alphaskia-linux-${{ matrix.architecture }}-${{ matrix.variant }}
 
       - run: ./externals/skia/tools/install_dependencies.sh
       - run: ./build.sh LinuxSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ inputs.use-skia-cache }}
@@ -87,7 +87,7 @@ jobs:
       - uses: actions/cache/save@v3
         with:
           path: dist
-          key: alphaskia-linux-${{ matrix.architecture }}-${{ matrix.variant }}
+          key: alphaskia-linux-${{ matrix.architecture }}-${{ matrix.variant }}-${{ github.run_id }} 
 
 
   linux-jni:
@@ -129,7 +129,7 @@ jobs:
         if: ${{ inputs.use-skia-cache }}
         with:
           path: dist
-          key: alphaskia-android-${{ matrix.architecture }}-${{ matrix.variant }}
+          restore-keys: alphaskia-android-${{ matrix.architecture }}-${{ matrix.variant }}
 
       - run: ./externals/skia/tools/install_dependencies.sh
       - run: ./build.sh AndroidSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ inputs.use-skia-cache }}
@@ -141,7 +141,7 @@ jobs:
       - uses: actions/cache/save@v3
         with:
           path: dist
-          key: alphaskia-android-${{ matrix.architecture }}-${{ matrix.variant }}
+          key: alphaskia-android-${{ matrix.architecture }}-${{ matrix.variant }}-${{ github.run_id }} 
 
 
   android-jni:
@@ -181,7 +181,7 @@ jobs:
         if: ${{ inputs.use-skia-cache }}
         with:
           path: dist
-          key: alphaskia-macos-${{ matrix.architecture }}-${{ matrix.variant }}
+          restore-keys: alphaskia-macos-${{ matrix.architecture }}-${{ matrix.variant }}
 
       - run: ./build.sh MacOsSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ inputs.use-skia-cache }}
       - uses: actions/upload-artifact@v3
@@ -192,7 +192,7 @@ jobs:
       - uses: actions/cache/save@v3
         with:
           path: dist
-          key: alphaskia-macos-${{ matrix.architecture }}-${{ matrix.variant }}
+          key: alphaskia-macos-${{ matrix.architecture }}-${{ matrix.variant }}-${{ github.run_id }} 
 
 
   macos-jni:
diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
index b341612..f40e4fe 100644
--- a/.nuke/build.schema.json
+++ b/.nuke/build.schema.json
@@ -122,7 +122,6 @@
               "PatchSkiaBuildFiles",
               "PrepareGitHubArtifacts",
               "SetupDepotTools",
-              "Test",
               "WindowsJni",
               "WindowsSkia"
             ]
@@ -150,7 +149,6 @@
               "PatchSkiaBuildFiles",
               "PrepareGitHubArtifacts",
               "SetupDepotTools",
-              "Test",
               "WindowsJni",
               "WindowsSkia"
             ]
diff --git a/build/Build.MacOs.cs b/build/Build.MacOs.cs
index e3728b3..5e854b3 100644
--- a/build/Build.MacOs.cs
+++ b/build/Build.MacOs.cs
@@ -62,7 +62,7 @@ void BuildSkiaMacOsJni(Architecture arch, Variant variant)
         gnArgs["extra_ldflags"] =
             $"[ '-L{staticLibPath}', '-lAlphaSkia', '-lskia' ]";
 
-        BuildSkiaMacOs("libAlphaSkiaJni", arch, variant, gnArgs, new[] { "libAlphaSkiaJni.so" });
+        BuildSkiaMacOs("libAlphaSkiaJni", arch, variant, gnArgs, new[] { "libAlphaSkiaJni.dylib" });
     }
 
     void BuildSkiaMacOs(string buildTarget, Architecture arch, Variant variant, Dictionary<string, string> gnArgs,

From f541ec568268d586e4f8ca070e248c98ec9b04bc Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Fri, 6 Oct 2023 15:42:54 +0200
Subject: [PATCH 19/20] Reduced code duplication

---
 .github/actions/build-jni/action.yml  |  28 ++++
 .github/actions/build-skia/action.yml |  42 ++++++
 .github/workflows/build.yml           | 177 +++++++-------------------
 .nuke/build.schema.json               |  14 +-
 build/Build.Android.cs                |  52 ++------
 build/Build.DotNet.cs                 |   3 +
 build/Build.Linux.cs                  |  49 ++-----
 build/Build.MacOs.cs                  |  43 ++-----
 build/Build.Native.cs                 | 128 ++++++++++++++++---
 build/Build.Windows.cs                |  42 ++----
 10 files changed, 281 insertions(+), 297 deletions(-)
 create mode 100644 .github/actions/build-jni/action.yml
 create mode 100644 .github/actions/build-skia/action.yml

diff --git a/.github/actions/build-jni/action.yml b/.github/actions/build-jni/action.yml
new file mode 100644
index 0000000..0f5f18e
--- /dev/null
+++ b/.github/actions/build-jni/action.yml
@@ -0,0 +1,28 @@
+name: 'Build JNI'
+description: 'Builds the JNI Native library'
+inputs: 
+  architecture:
+    description: 'The CPU architecture for which to build the lib'
+    required: true
+  variant:
+    description: 'The library type to build'
+    required: true
+  target-os:
+    description: 'The target Operating system identifier'
+    required: true
+
+runs:
+  using: "composite"
+  steps: 
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
+    - uses: actions/download-artifact@v3
+      with:
+        path: dist
+    - run: ./build.cmd LibAlphaSkiaJni --target-os ${{ inputs.target-os }} --architecture ${{ inputs.architecture }} --variant ${{ inputs.variant }}
+    - uses: actions/upload-artifact@v3
+      with:
+        name: alphaskia-${{ inputs.target-os }}-jni-${{ inputs.architecture }}-${{ inputs.variant }}
+        path: artifacts
+
diff --git a/.github/actions/build-skia/action.yml b/.github/actions/build-skia/action.yml
new file mode 100644
index 0000000..f0d9f79
--- /dev/null
+++ b/.github/actions/build-skia/action.yml
@@ -0,0 +1,42 @@
+name: 'Build Skia'
+description: 'Builds the Skia Native library'
+inputs: 
+  use-cache:
+    description: 'Whether to try using the pre-compiled binary from the cache.'
+    required: false
+    default: 'false'
+  architecture:
+    description: 'The CPU architecture for which to build the lib'
+    required: true
+  variant:
+    description: 'The library type to build'
+    required: true
+  target-os:
+    description: 'The target Operating system identifier'
+    required: true
+
+runs:
+  using: "composite"
+  steps: 
+    - uses: actions/checkout@v3
+      with:
+        submodules: false
+
+    - uses: actions/cache/restore@v3
+      if: ${{ inputs.use-cache }}
+      with:
+        path: dist
+        restore-keys: alphaskia-${{ inputs.target-os }}-${{ inputs.architecture }}-${{ inputs.variant }}
+
+    - run: ./build.cmd LibAlphaSkia --target-os ${{ inputs.target-os }} --architecture ${{ inputs.architecture }} --variant ${{ inputs.variant }} --use-cache ${{ inputs.use-cache }}
+    - uses: actions/upload-artifact@v3
+      with:
+        name: alphaskia-${{ inputs.target-os }}-${{ inputs.architecture }}-${{ inputs.variant }}
+        path: artifacts
+
+    - uses: actions/cache/save@v3
+      with:
+        path: dist
+        key: alphaskia-${{ inputs.target-os }}-${{ inputs.architecture }}-${{ inputs.variant }}-${{ github.run_id }} 
+
+
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4607cc6..994c9fb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,6 +7,9 @@ on:
         default: 'false'
 
 jobs:
+
+#
+# Windows
   windows:
     runs-on: windows-latest
     strategy:
@@ -14,29 +17,13 @@ jobs:
       matrix:
         architecture: [x64, x86, arm64]
         variant: ['shared', 'static']
-        
     steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: true
-      - uses: actions/cache/restore@v3
-        if: ${{ inputs.use-skia-cache }}
-        with:
-          path: dist
-          restore-keys: alphaskia-windows-${{ matrix.architecture }}-${{ matrix.variant }}
-
-      - run: ./build.cmd WindowsSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ inputs.use-skia-cache }}
-      - uses: actions/upload-artifact@v3
-        with:
-          name: alphaskia-windows-${{ matrix.architecture }}-${{ matrix.variant }}
-          path: artifacts
-
-      - uses: actions/cache/save@v3
+      - uses: ../actions/build-skia
         with:
-          path: dist
-          key: alphaskia-windows-${{ matrix.architecture }}-${{ matrix.variant }}-${{ github.run_id }} 
-
-
+          use-cache: ${{ inputs.use-skia-cache }}
+          architecture: ${{ matrix.architecture }}
+          variant: ${{ matrix.variant }}
+          target-os: windows
   windows-jni:
     runs-on: windows-latest
     needs: [windows]
@@ -45,20 +32,15 @@ jobs:
       matrix:
         architecture: [x64, x86, arm64]
         variant: ['shared']
-
     steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: true
-      - uses: actions/download-artifact@v3
-        with:
-          path: dist
-      - run: ./build.cmd WindowsJni --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }}
-      - uses: actions/upload-artifact@v3
+      - uses: ../actions/build-jni
         with:
-          name: alphaskia-windows-jni-${{ matrix.architecture }}-${{ matrix.variant }}
-          path: artifacts
+          architecture: ${{ matrix.architecture }}
+          variant: ${{ matrix.variant }}
+          target-os: windows
 
+#
+# Linux
   linux:
     runs-on: ubuntu-latest
     strategy:
@@ -68,28 +50,12 @@ jobs:
         # TODO architecture: [x64, x86, arm64]
         variant: ['shared', 'static']
     steps:
-      - uses: actions/checkout@v3
+      - uses: ../actions/build-skia
         with:
-          submodules: true
-      - uses: actions/cache/restore@v3
-        if: ${{ inputs.use-skia-cache }}
-        with:
-          path: dist
-          restore-keys: alphaskia-linux-${{ matrix.architecture }}-${{ matrix.variant }}
-
-      - run: ./externals/skia/tools/install_dependencies.sh
-      - run: ./build.sh LinuxSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ inputs.use-skia-cache }}
-      - uses: actions/upload-artifact@v3
-        with:
-          name: alphaskia-linux-${{ matrix.architecture }}-${{ matrix.variant }}
-          path: artifacts
-
-      - uses: actions/cache/save@v3
-        with:
-          path: dist
-          key: alphaskia-linux-${{ matrix.architecture }}-${{ matrix.variant }}-${{ github.run_id }} 
-
-
+          use-cache: ${{ inputs.use-skia-cache }}
+          architecture: ${{ matrix.architecture }}
+          variant: ${{ matrix.variant }}
+          target-os: linux
   linux-jni:
     runs-on: ubuntu-latest
     needs: [linux]
@@ -99,20 +65,15 @@ jobs:
         # TODO architecture: [x64, x86, arm64]
         architecture: [x64]
         variant: ['shared']
-
     steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: true
-      - uses: actions/download-artifact@v3
+      - uses: ../actions/build-jni
         with:
-          path: dist
-      - run: ./build.cmd LinuxJni --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }}
-      - uses: actions/upload-artifact@v3
-        with:
-          name: alphaskia-linux-jni-${{ matrix.architecture }}-${{ matrix.variant }}
-          path: artifacts
+          architecture: ${{ matrix.architecture }}
+          variant: ${{ matrix.variant }}
+          target-os: linux
 
+#
+# Android
   android:
     runs-on: ubuntu-latest
     strategy:
@@ -120,30 +81,13 @@ jobs:
       matrix:
         architecture: [x64, x86, arm, arm64]
         variant: ['shared', 'static']
-
     steps:
-      - uses: actions/checkout@v3
+      - uses: ../actions/build-skia
         with:
-          submodules: true
-      - uses: actions/cache/restore@v3
-        if: ${{ inputs.use-skia-cache }}
-        with:
-          path: dist
-          restore-keys: alphaskia-android-${{ matrix.architecture }}-${{ matrix.variant }}
-
-      - run: ./externals/skia/tools/install_dependencies.sh
-      - run: ./build.sh AndroidSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ inputs.use-skia-cache }}
-      - uses: actions/upload-artifact@v3
-        with:
-          name: alphaskia-android-${{ matrix.architecture }}-${{ matrix.variant }}
-          path: artifacts
-
-      - uses: actions/cache/save@v3
-        with:
-          path: dist
-          key: alphaskia-android-${{ matrix.architecture }}-${{ matrix.variant }}-${{ github.run_id }} 
-
-
+          use-cache: ${{ inputs.use-skia-cache }}
+          architecture: ${{ matrix.architecture }}
+          variant: ${{ matrix.variant }}
+          target-os: android
   android-jni:
     runs-on: ubuntu-latest
     needs: [android]
@@ -152,20 +96,14 @@ jobs:
       matrix:
         architecture: [x64, x86, arm, arm64]
         variant: ['shared']
-
     steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: true
-      - uses: actions/download-artifact@v3
+      - uses: ../actions/build-jni
         with:
-          path: dist
-      - run: ./build.cmd AndroidJni --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }}
-      - uses: actions/upload-artifact@v3
-        with:
-          name: alphaskia-android-jni-${{ matrix.architecture }}-${{ matrix.variant }}
-          path: artifacts
-
+          architecture: ${{ matrix.architecture }}
+          variant: ${{ matrix.variant }}
+          target-os: android
+#
+# MacOs
   macos:
     runs-on: macos-latest
     strategy:
@@ -174,27 +112,12 @@ jobs:
         architecture: [x64, arm64]
         variant: ['shared', 'static']
     steps:
-      - uses: actions/checkout@v3
+      - uses: ../actions/build-skia
         with:
-          submodules: true
-      - uses: actions/cache/restore@v3
-        if: ${{ inputs.use-skia-cache }}
-        with:
-          path: dist
-          restore-keys: alphaskia-macos-${{ matrix.architecture }}-${{ matrix.variant }}
-
-      - run: ./build.sh MacOsSkia --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} --use-cache ${{ inputs.use-skia-cache }}
-      - uses: actions/upload-artifact@v3
-        with:
-          name: alphaskia-macos-${{ matrix.architecture }}-${{ matrix.variant }}
-          path: artifacts
-
-      - uses: actions/cache/save@v3
-        with:
-          path: dist
-          key: alphaskia-macos-${{ matrix.architecture }}-${{ matrix.variant }}-${{ github.run_id }} 
-
-
+          use-cache: ${{ inputs.use-skia-cache }}
+          architecture: ${{ matrix.architecture }}
+          variant: ${{ matrix.variant }}
+          target-os: macos
   macos-jni:
     runs-on: macos-latest
     needs: [macos]
@@ -203,20 +126,14 @@ jobs:
       matrix:
         architecture: [x64, arm64]
         variant: ['shared']
-
     steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: true
-      - uses: actions/download-artifact@v3
+      - uses: ../actions/build-jni
         with:
-          path: dist
-      - run: ./build.cmd MacOsJni --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }}
-      - uses: actions/upload-artifact@v3
-        with:
-          name: alphaskia-macos-jni-${{ matrix.architecture }}-${{ matrix.variant }}
-          path: artifacts
-
+          architecture: ${{ matrix.architecture }}
+          variant: ${{ matrix.variant }}
+          target-os: macos
+#
+# Libraries
   dotnet:
     runs-on: windows-latest
     needs: [windows, linux, android, macos]
diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
index f40e4fe..97538c5 100644
--- a/.nuke/build.schema.json
+++ b/.nuke/build.schema.json
@@ -108,6 +108,9 @@
             "enum": [
               "AndroidJni",
               "AndroidSkia",
+              "Compile",
+              "CompileTests",
+              "CompileWithCache",
               "DotNet",
               "DotNetBuild",
               "DotNetPack",
@@ -120,10 +123,12 @@
               "MacOsJni",
               "MacOsSkia",
               "PatchSkiaBuildFiles",
+              "PrepareForBuild",
               "PrepareGitHubArtifacts",
               "SetupDepotTools",
               "WindowsJni",
-              "WindowsSkia"
+              "WindowsSkia",
+              "WithDependencies"
             ]
           }
         },
@@ -135,6 +140,9 @@
             "enum": [
               "AndroidJni",
               "AndroidSkia",
+              "Compile",
+              "CompileTests",
+              "CompileWithCache",
               "DotNet",
               "DotNetBuild",
               "DotNetPack",
@@ -147,10 +155,12 @@
               "MacOsJni",
               "MacOsSkia",
               "PatchSkiaBuildFiles",
+              "PrepareForBuild",
               "PrepareGitHubArtifacts",
               "SetupDepotTools",
               "WindowsJni",
-              "WindowsSkia"
+              "WindowsSkia",
+              "WithDependencies"
             ]
           }
         },
diff --git a/build/Build.Android.cs b/build/Build.Android.cs
index da0323c..8dd82d9 100644
--- a/build/Build.Android.cs
+++ b/build/Build.Android.cs
@@ -44,33 +44,14 @@ static string FindNdk()
 
         return string.Empty;
     }
-
-    public Target AndroidSkia => _ => _
-        .OnlyWhenDynamic(() => !CanUseCachedBinaries("libAlphaSkia", "android"))
-        .DependsOn(GitSyncDepsSkia, PatchSkiaBuildFiles)
-        .Requires(() => Architecture)
-        .Requires(() => Variant)
-        .Executes(() =>
-        {
-            BuildSkiaAndroidMain(Architecture, Variant);
-        });
-
-    public Target AndroidJni => _ => _
-        .DependsOn(PrepareGitHubArtifacts, GitSyncDepsJni, PatchSkiaBuildFiles)
-        .Requires(() => Architecture)
-        .Requires(() => Variant == Variant.Shared)
-        .Executes(() =>
-        {
-            BuildSkiaAndroidJni(Architecture, Variant);
-        });
-
-    void BuildSkiaAndroidMain(Architecture arch, Variant variant)
+    
+    void BuildLibAlphaSkiaAndroid()
     {
         var gnArgs = new Dictionary<string, string>();
         gnArgs["ndk"] = NdkPath;
 
         string[] filesToCopy;
-        var isShared = variant == Variant.Shared;
+        var isShared = Variant == Variant.Shared;
         if (isShared)
         {
             filesToCopy = new[]
@@ -87,10 +68,10 @@ void BuildSkiaAndroidMain(Architecture arch, Variant variant)
             };
         }
 
-        BuildSkiaAndroid("libAlphaSkia", arch, variant, gnArgs, filesToCopy);
+        BuildSkiaAndroid("libAlphaSkia", gnArgs, filesToCopy);
     }
 
-    void BuildSkiaAndroidJni(Architecture arch, Variant variant)
+    void BuildLibAlphaSkiaJniAndroid()
     {
         var gnArgs = new Dictionary<string, string>();
         var alphaSkiaInclude = DistBasePath / "include";
@@ -100,30 +81,17 @@ void BuildSkiaAndroidJni(Architecture arch, Variant variant)
         gnArgs["extra_cflags"] = $"[ '-I{alphaSkiaInclude}', '-I{jniInclude}', '-I{jniWinInclude}' ]";
 
         // Add Libs and lib search paths
-        var staticLibPath = DistBasePath / $"libAlphaSkia-android-{arch}-static";
-        gnArgs["extra_ldflags"] =
-            $"[ '-L{staticLibPath}', '-lAlphaSkia', '-lskia' ]";
+        var staticLibPath = DistBasePath / GetLibDirectory(variant: Variant.Shared);
+        gnArgs["extra_ldflags"] = $"[ '-L{staticLibPath}', '-lAlphaSkia', '-lskia' ]";
 
-        BuildSkiaAndroid("libAlphaSkiaJni", arch, variant, gnArgs, new[] { "libAlphaSkiaJni.so" });
+        BuildSkiaAndroid("libAlphaSkiaJni", gnArgs, new[] { "libAlphaSkiaJni.so" });
     }
 
-    void BuildSkiaAndroid(string buildTarget, Architecture arch, Variant variant, Dictionary<string, string> gnArgs,
+    void BuildSkiaAndroid(string buildTarget, Dictionary<string, string> gnArgs,
         string[] filesToCopy)
     {
-        if (OperatingSystem.IsWindows())
-        {
-            SetClangWindows(gnArgs);
-        }
-        else if (OperatingSystem.IsLinux())
-        {
-            SetClangLinux(arch, gnArgs);
-        }
-        
-        // gnArgs["skia_enable_ganesh"] = "true";
         gnArgs["skia_use_system_freetype2"] = "false";
         
-        // -Wdeprecated-declarations
-
-        BuildSkia(buildTarget, "android", arch, variant, gnArgs, filesToCopy);
+        BuildSkia(buildTarget, gnArgs, filesToCopy);
     }
 }
\ No newline at end of file
diff --git a/build/Build.DotNet.cs b/build/Build.DotNet.cs
index 082f478..8683663 100644
--- a/build/Build.DotNet.cs
+++ b/build/Build.DotNet.cs
@@ -8,6 +8,7 @@ partial class Build
         .DependsOn(DotNetPack);
     
     public Target DotNetPack => _ => _
+        .Unlisted()
         .DependsOn(DotNetTest)
         .Executes(() =>
         {
@@ -17,6 +18,7 @@ partial class Build
             );
         });
     public Target DotNetTest => _ => _
+        .Unlisted()
         .DependsOn(DotNetBuild)
         .Executes(() =>
         {
@@ -26,6 +28,7 @@ partial class Build
             );
         });
     public Target DotNetBuild => _ => _
+        .Unlisted()
         .DependsOn(PrepareGitHubArtifacts)
         .Executes(() =>
         {
diff --git a/build/Build.Linux.cs b/build/Build.Linux.cs
index 424eabb..f0bfeef 100644
--- a/build/Build.Linux.cs
+++ b/build/Build.Linux.cs
@@ -1,35 +1,12 @@
-using System;
 using System.Collections.Generic;
-using Nuke.Common;
 
 partial class Build
 {
-    public Target LinuxSkia => _ => _
-        .OnlyWhenDynamic(() => !CanUseCachedBinaries("libAlphaSkia", "linux"))
-        .DependsOn(GitSyncDepsSkia, PatchSkiaBuildFiles)
-        .Requires(() => Architecture)
-        .Requires(() => Variant)
-        .OnlyWhenStatic(OperatingSystem.IsLinux)
-        .Executes(() =>
-        {
-            BuildSkiaLinuxMain(Architecture, Variant);
-        });
-
-    public Target LinuxJni => _ => _
-        .DependsOn(PrepareGitHubArtifacts, GitSyncDepsJni, PatchSkiaBuildFiles)
-        .Requires(() => Architecture)
-        .Requires(() => Variant == Variant.Shared)
-        .OnlyWhenStatic(OperatingSystem.IsLinux)
-        .Executes(() =>
-        {
-            BuildSkiaLinuxJni(Architecture, Variant);
-        });
-
-    void BuildSkiaLinuxMain(Architecture arch, Variant variant)
+    void BuildLibAlphaSkiaLinux()
     {
         var gnArgs = new Dictionary<string, string>();
         string[] filesToCopy;
-        var isShared = variant == Variant.Shared;
+        var isShared = Variant == Variant.Shared;
         if (isShared)
         {
             filesToCopy = new[]
@@ -46,10 +23,10 @@ void BuildSkiaLinuxMain(Architecture arch, Variant variant)
             };
         }
 
-        BuildSkiaLinux("libAlphaSkia", arch, variant, gnArgs, filesToCopy);
+        BuildSkiaLinux("libAlphaSkia", gnArgs, filesToCopy);
     }
 
-    void BuildSkiaLinuxJni(Architecture arch, Variant variant)
+    void BuildLibAlphaSkiaJniLinux()
     {
         var gnArgs = new Dictionary<string, string>();
         var alphaSkiaInclude = DistBasePath / "include";
@@ -58,41 +35,39 @@ void BuildSkiaLinuxJni(Architecture arch, Variant variant)
         gnArgs["extra_cflags"] = $"[ '-I{alphaSkiaInclude}', '-I{jniInclude}', '-I{jniWinInclude}' ]";
 
         // Add Libs and lib search paths
-        var staticLibPath = DistBasePath / $"libAlphaSkia-linux-{arch}-static";
+        var staticLibPath = DistBasePath / GetLibDirectory(variant: Variant.Shared);
         gnArgs["extra_ldflags"] =
             $"[ '-L{staticLibPath}', '-lAlphaSkia', '-lskia' ]";
 
-        BuildSkiaLinux("libAlphaSkiaJni", arch, variant, gnArgs, new[] { "libAlphaSkiaJni.so" });
+        BuildSkiaLinux("libAlphaSkiaJni", gnArgs, new[] { "libAlphaSkiaJni.so" });
     }
 
-    void BuildSkiaLinux(string buildTarget, Architecture arch, Variant variant, Dictionary<string, string> gnArgs,
+    void BuildSkiaLinux(string buildTarget, Dictionary<string, string> gnArgs,
         string[] filesToCopy)
     {
-        SetClangLinux(arch, gnArgs);
-
         gnArgs["skia_use_system_freetype2"] = "false";
 
-        BuildSkia(buildTarget, "linux", arch, variant, gnArgs, filesToCopy);
+        BuildSkia(buildTarget, gnArgs, filesToCopy);
     }
 
-    void SetClangLinux(Architecture arch, Dictionary<string, string> gnArgs)
+    void SetClangLinux(Dictionary<string, string> gnArgs)
     {
         AppendToFlagList(gnArgs, "extra_cflags", "'-DHAVE_SYSCALL_GETRANDOM', '-DXML_DEV_URANDOM'");
 
-        if (arch == Architecture.X64)
+        if (Architecture == Architecture.X64)
         {
             gnArgs["cc"] = "clang";
             gnArgs["cxx"] = "'clang++'";
             AppendToFlagList(gnArgs, "extra_ldflags", "'-static-libstdc++', '-static-libgcc'");
         }
-        else if (arch == Architecture.X86)
+        else if (Architecture == Architecture.X86)
         {
             // TODO
             gnArgs["cc"] = "clang";
             gnArgs["cxx"] = "'clang++'";
             AppendToFlagList(gnArgs, "extra_ldflags", "'-static-libstdc++', '-static-libgcc'");
         }
-        else if (arch == Architecture.Arm64) // aka AArch64
+        else if (Architecture == Architecture.Arm64) // aka AArch64
         {
             // TODO
             gnArgs["cc"] = "clang";
diff --git a/build/Build.MacOs.cs b/build/Build.MacOs.cs
index 5e854b3..515a3f6 100644
--- a/build/Build.MacOs.cs
+++ b/build/Build.MacOs.cs
@@ -1,35 +1,12 @@
-using System;
 using System.Collections.Generic;
-using Nuke.Common;
 
 partial class Build
 {
-    public Target MacOsSkia => _ => _
-        .OnlyWhenDynamic(() => !CanUseCachedBinaries("libAlphaSkia", "macos"))
-        .DependsOn(GitSyncDepsSkia, PatchSkiaBuildFiles)
-        .Requires(() => Architecture)
-        .Requires(() => Variant)
-        .OnlyWhenStatic(OperatingSystem.IsMacOS)
-        .Executes(() =>
-        {
-            BuildSkiaMacOsMain(Architecture, Variant);
-        });
-
-    public Target MacOsJni => _ => _
-        .DependsOn(PrepareGitHubArtifacts, GitSyncDepsJni, PatchSkiaBuildFiles)
-        .Requires(() => Architecture)
-        .Requires(() => Variant == Variant.Shared)
-        .OnlyWhenStatic(OperatingSystem.IsMacOS)
-        .Executes(() =>
-        {
-            BuildSkiaMacOsJni(Architecture, Variant);
-        });
-
-    void BuildSkiaMacOsMain(Architecture arch, Variant variant)
+    void BuildLibAlphaSkiaMacOs()
     {
         var gnArgs = new Dictionary<string, string>();
         string[] filesToCopy;
-        var isShared = variant == Variant.Shared;
+        var isShared = Variant == Variant.Shared;
         if (isShared)
         {
             filesToCopy = new[]
@@ -46,10 +23,10 @@ void BuildSkiaMacOsMain(Architecture arch, Variant variant)
             };
         }
 
-        BuildSkiaMacOs("libAlphaSkia", arch, variant, gnArgs, filesToCopy);
+        BuildSkiaMacOs("libAlphaSkia", gnArgs, filesToCopy);
     }
 
-    void BuildSkiaMacOsJni(Architecture arch, Variant variant)
+    void BuildLibAlphaSkiaJniMacOs()
     {
         var gnArgs = new Dictionary<string, string>();
         var alphaSkiaInclude = DistBasePath / "include";
@@ -58,25 +35,23 @@ void BuildSkiaMacOsJni(Architecture arch, Variant variant)
         gnArgs["extra_cflags"] = $"[ '-I{alphaSkiaInclude}', '-I{jniInclude}', '-I{jniWinInclude}' ]";
 
         // Add Libs and lib search paths
-        var staticLibPath = DistBasePath / $"libAlphaSkia-macos-{arch}-static";
+        var staticLibPath = DistBasePath / GetLibDirectory(variant: Variant.Static);
         gnArgs["extra_ldflags"] =
             $"[ '-L{staticLibPath}', '-lAlphaSkia', '-lskia' ]";
 
-        BuildSkiaMacOs("libAlphaSkiaJni", arch, variant, gnArgs, new[] { "libAlphaSkiaJni.dylib" });
+        BuildSkiaMacOs("libAlphaSkiaJni", gnArgs, new[] { "libAlphaSkiaJni.dylib" });
     }
 
-    void BuildSkiaMacOs(string buildTarget, Architecture arch, Variant variant, Dictionary<string, string> gnArgs,
+    void BuildSkiaMacOs(string buildTarget, Dictionary<string, string> gnArgs,
         string[] filesToCopy)
     {
-        SetClangMacOs(arch, gnArgs);
-
         gnArgs["skia_use_system_freetype2"] = "false";
         gnArgs["skia_use_metal"] = "true";
 
-        BuildSkia(buildTarget, "mac", arch, variant, gnArgs, filesToCopy, "macos");
+        BuildSkia(buildTarget, gnArgs, filesToCopy);
     }
 
-    void SetClangMacOs(Architecture arch, Dictionary<string, string> gnArgs)
+    void SetClangMacOs(Dictionary<string, string> gnArgs)
     {
         AppendToFlagList(gnArgs, "extra_cflags", "'-DHAVE_ARC4RANDOM_BUF', '-stdlib=libc++'");
 
diff --git a/build/Build.Native.cs b/build/Build.Native.cs
index d673e30..bb5d418 100644
--- a/build/Build.Native.cs
+++ b/build/Build.Native.cs
@@ -11,6 +11,17 @@
 using Serilog;
 using static Nuke.Common.EnvironmentInfo;
 
+[TypeConverter(typeof(TypeConverter<TargetOperatingSystem>))]
+public class TargetOperatingSystem : Enumeration
+{
+    public static TargetOperatingSystem Windows = new() { Value = "windows", SkiaTargetOs = "win", RuntimeIdentifier = "win" };
+    public static TargetOperatingSystem Linux = new() { Value = "linux", SkiaTargetOs = "linux", RuntimeIdentifier = "linux" };
+    public static TargetOperatingSystem Android = new() { Value = "android", SkiaTargetOs = "android", RuntimeIdentifier = "android" };
+    public static TargetOperatingSystem MacOs = new() { Value = "macos", SkiaTargetOs = "mac", RuntimeIdentifier = "macos" };
+
+    public string SkiaTargetOs { get; private set; }
+    public string RuntimeIdentifier { get; private set; }
+}
 
 [TypeConverter(typeof(TypeConverter<Architecture>))]
 public class Architecture : Enumeration
@@ -56,6 +67,7 @@ partial class Build
     Tool GitTool => File.Exists(GitExe) ? ToolResolver.GetTool(GitExe) : ToolResolver.GetPathTool("git");
 
     // Output Options
+    [Parameter] readonly TargetOperatingSystem TargetOs;
     [Parameter] readonly Architecture Architecture;
 
     [Parameter] readonly Variant Variant;
@@ -63,7 +75,8 @@ partial class Build
 
     bool UseCache => "true".Equals(UseCacheParam, StringComparison.OrdinalIgnoreCase);
 
-    public Target GitSyncDepsSkia => _ => _
+    public Target GitSyncDepsAlphaSkia => _ => _
+        .Unlisted()
         .DependsOn(SetupDepotTools)
         .Executes(() =>
         {
@@ -89,7 +102,8 @@ partial class Build
             return GitSyncDepsCustom(requiredDependencies);
         });
 
-    public Target GitSyncDepsJni => _ => _
+    public Target GitSyncDepsLibAlphaSkiaJni => _ => _
+        .Unlisted()
         .DependsOn(SetupDepotTools)
         .Executes(() =>
         {
@@ -101,6 +115,74 @@ partial class Build
             return GitSyncDepsCustom(requiredDependencies);
         });
 
+    public Target LibAlphaSkiaWithCache => _ => _
+        .Unlisted()
+        .OnlyWhenStatic(() => !CanUseCachedBinaries("libAlphaSkia", TargetOs.RuntimeIdentifier))
+        .Requires(() => Architecture)
+        .Requires(() => Variant)
+        .Requires(() => TargetOs)
+        .Triggers(LibAlphaSkia);
+
+    public Target LibAlphaSkia => _ => _
+        .DependsOn(GitSyncDepsAlphaSkia, PatchSkiaBuildFiles)
+        .Requires(() => Architecture)
+        .Requires(() => Variant)
+        .Requires(() => TargetOs)
+        .Executes(() =>
+        {
+            if (TargetOs == TargetOperatingSystem.Windows)
+            {
+                BuildLibAlphaSkiaWindows();
+            }
+            else if (TargetOs == TargetOperatingSystem.Linux)
+            {
+                BuildLibAlphaSkiaLinux();
+            }
+            else if (TargetOs == TargetOperatingSystem.Android)
+            {
+                BuildLibAlphaSkiaAndroid();
+            }
+            else if (TargetOs == TargetOperatingSystem.MacOs)
+            {
+                BuildLibAlphaSkiaMacOs();
+            }
+        });
+    
+    public Target LibAlphaSkiaJni => _ => _
+        .DependsOn(PrepareGitHubArtifacts, GitSyncDepsLibAlphaSkiaJni, PatchSkiaBuildFiles)
+        .Requires(() => Architecture)
+        .Requires(() => Variant)
+        .Requires(() => TargetOs)
+        .Executes(() =>
+        {
+            if (TargetOs == TargetOperatingSystem.Windows)
+            {
+                BuildLibAlphaSkiaJniWindows();
+            }
+            else if (TargetOs == TargetOperatingSystem.Linux)
+            {
+                BuildLibAlphaSkiaJniLinux();
+            }
+            else if (TargetOs == TargetOperatingSystem.Android)
+            {
+                BuildLibAlphaSkiaJniAndroid();
+            }
+            else if (TargetOs == TargetOperatingSystem.MacOs)
+            {
+                BuildLibAlphaSkiaJniMacOs();
+            }
+        });
+    
+    string GetLibDirectory(string libName = "libAlphaSkia", TargetOperatingSystem targetOs = null,
+        Architecture arch = null, Variant variant = null)
+    {
+        targetOs ??= TargetOs;
+        arch ??= Architecture;
+        variant ??= Variant;
+
+        return $"{libName}-{targetOs.RuntimeIdentifier}-{arch}-{variant}";
+    }
+
     Task GitSyncDepsCustom(string[] requiredDependencies)
     {
         var depsFile = SkiaPath / "DEPS";
@@ -233,6 +315,7 @@ Dictionary<string, string> ReadDepsData(TextReader reader)
     }
 
     public Target SetupDepotTools => _ => _
+        .Unlisted()
         .Executes(() =>
         {
             var oldValue = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.Process);
@@ -251,6 +334,7 @@ Dictionary<string, string> ReadDepsData(TextReader reader)
         });
 
     public Target PatchSkiaBuildFiles => _ => _
+        .Unlisted()
         .Executes(() =>
         {
             var buildConfigNew = new StringBuilder();
@@ -423,21 +507,29 @@ string QuoteValue(string value)
 
     void BuildSkia(
         string buildTarget,
-        string targetOs,
-        string arch,
-        Variant variant,
         Dictionary<string, string> gnArgs,
-        string[] filesToCopy,
-        string targetOsOutDir = null)
+        string[] filesToCopy)
     {
-        targetOsOutDir ??= targetOs;
-        var isShared = variant == Variant.Shared;
-        var artifactDir = $"{buildTarget}-{targetOsOutDir}-{arch}-{variant}";
-        var distPath = DistBasePath / artifactDir;
-        var artifactsLibPath = IsGitHubActions ? ArtifactBasePath / artifactDir : null;
-
-        gnArgs["target_os"] = targetOs;
-        gnArgs["target_cpu"] = arch;
+        if (OperatingSystem.IsWindows())
+        {
+            SetClangWindows(gnArgs);
+        }
+        else if (OperatingSystem.IsLinux())
+        {
+            SetClangLinux(gnArgs);
+        }
+        else if (OperatingSystem.IsMacOS())
+        {
+            SetClangMacOs(gnArgs);
+        }
+        
+        var isShared = Variant == Variant.Shared;
+        var libDir = GetLibDirectory(buildTarget, TargetOs, Architecture, Variant);
+        var distPath = DistBasePath / libDir;
+        var artifactsLibPath = IsGitHubActions ? ArtifactBasePath / libDir : null;
+
+        gnArgs["target_os"] = TargetOs.SkiaTargetOs;
+        gnArgs["target_cpu"] = Architecture;
         gnArgs["is_shared_alphaskia"] = isShared.ToString().ToLowerInvariant();
 
         // disable features we don't need
@@ -472,9 +564,9 @@ void BuildSkia(
         gnArgs["skia_enable_ganesh"] = "true";
         gnArgs["skia_use_vulkan"] = "true";
 
-        GnNinja($"out/{buildTarget}/{targetOsOutDir}/{arch}/{variant}", buildTarget, gnArgs, SkiaPath);
+        GnNinja($"out/{libDir}", buildTarget, gnArgs, SkiaPath);
 
-        var outDir = SkiaPath / "out" / buildTarget / targetOsOutDir / arch / variant;
+        var outDir = SkiaPath / "out" / libDir;
         try
         {
             foreach (var file in filesToCopy)
@@ -504,7 +596,7 @@ void BuildSkia(
             throw new IOException("Copy files failed. existing files: " + string.Join(", ", fileList), e);
         }
     }
-    
+
     bool HasCachedFiles(string buildTarget, string targetOsOutDir)
     {
         var expectedDirectory = DistBasePath / $"{buildTarget}-{targetOsOutDir}-{Architecture}-{Variant}";
diff --git a/build/Build.Windows.cs b/build/Build.Windows.cs
index 32798a4..f648158 100644
--- a/build/Build.Windows.cs
+++ b/build/Build.Windows.cs
@@ -2,34 +2,11 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Nuke.Common;
 using Nuke.Common.IO;
 using Nuke.Common.Tooling;
-using Serilog;
 
 partial class Build
 {
-    public Target WindowsSkia => _ => _
-        .OnlyWhenDynamic(() => !CanUseCachedBinaries("libAlphaSkia", "win"))
-        .DependsOn(GitSyncDepsSkia, PatchSkiaBuildFiles)
-        .Requires(() => Architecture)
-        .Requires(() => Variant)
-        .OnlyWhenStatic(OperatingSystem.IsWindows)
-        .Executes(() =>
-        {
-            BuildSkiaWindowsMain(Architecture, Variant);
-        });
-    
-    public Target WindowsJni => _ => _
-        .DependsOn(PrepareGitHubArtifacts, GitSyncDepsJni, PatchSkiaBuildFiles)
-        .Requires(() => Architecture)
-        .Requires(() => Variant == Variant.Shared)
-        .OnlyWhenStatic(OperatingSystem.IsWindows)
-        .Executes(() =>
-        {
-            BuildSkiaWindowsJni(Architecture, Variant);
-        });
-
     Tool VsWhere => ToolResolver.GetPathTool(Path.Combine(
         Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), "Microsoft Visual Studio", "Installer",
         "vswhere.exe"));
@@ -55,11 +32,11 @@ string VsInstall
         }
     }
 
-    void BuildSkiaWindowsMain(Architecture arch, Variant variant)
+    void BuildLibAlphaSkiaWindows()
     {
         var gnArgs = new Dictionary<string, string>();
         string[] filesToCopy;
-        var isShared = variant == Variant.Shared;
+        var isShared = Variant == Variant.Shared;
         if (isShared)
         {
             filesToCopy = new[]
@@ -78,10 +55,10 @@ void BuildSkiaWindowsMain(Architecture arch, Variant variant)
             };
         }
 
-        BuildSkiaWindows("libAlphaSkia", arch, variant, gnArgs, filesToCopy);
+        BuildSkiaWindows("libAlphaSkia", gnArgs, filesToCopy);
     }
 
-    void BuildSkiaWindowsJni(Architecture arch, Variant variant)
+    void BuildLibAlphaSkiaJniWindows()
     {
         var gnArgs = new Dictionary<string, string>();
         var alphaSkiaInclude = DistBasePath / "include";
@@ -90,11 +67,11 @@ void BuildSkiaWindowsJni(Architecture arch, Variant variant)
         gnArgs["extra_cflags"] = $"[ '-I{alphaSkiaInclude}', '-I{jniInclude}', '-I{jniWinInclude}' ]";
 
         // Add Libs and lib search paths
-        var staticLibPath = DistBasePath / $"libAlphaSkia-win-{arch}-static";
+        var staticLibPath = DistBasePath / GetLibDirectory(variant: Variant.Static);
         gnArgs["extra_ldflags"] =
             $"[ '/LIBPATH:{staticLibPath}', 'libAlphaSkia.lib', 'skia.lib', 'user32.lib', 'OpenGL32.lib' ]";
 
-        BuildSkiaWindows("libAlphaSkiaJni", arch, variant, gnArgs, new[]
+        BuildSkiaWindows("libAlphaSkiaJni", gnArgs, new[]
         {
             "libAlphaSkiaJni.dll",
             "libAlphaSkiaJni.dll.lib",
@@ -102,14 +79,11 @@ void BuildSkiaWindowsJni(Architecture arch, Variant variant)
         });
     }
 
-    void BuildSkiaWindows(string buildTarget, Architecture arch, Variant variant, Dictionary<string, string> gnArgs,
+    void BuildSkiaWindows(string buildTarget, Dictionary<string, string> gnArgs,
         string[] filesToCopy)
     {
-        SetClangWindows(gnArgs);
-
         gnArgs["skia_enable_fontmgr_win_gdi"] = "false";
-
-        BuildSkia(buildTarget, "win", arch, variant, gnArgs, filesToCopy);
+        BuildSkia(buildTarget, gnArgs, filesToCopy);
     }
 
     void SetClangWindows(Dictionary<string, string> gnArgs)

From 40bd4df6f67da07f820cfe49a1749a19adb2fa51 Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Fri, 6 Oct 2023 15:45:16 +0200
Subject: [PATCH 20/20] Correct path

---
 .github/workflows/build.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 994c9fb..10692e9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
         architecture: [x64, x86, arm64]
         variant: ['shared', 'static']
     steps:
-      - uses: ../actions/build-skia
+      - uses: ./.github/actions/build-skia
         with:
           use-cache: ${{ inputs.use-skia-cache }}
           architecture: ${{ matrix.architecture }}
@@ -33,7 +33,7 @@ jobs:
         architecture: [x64, x86, arm64]
         variant: ['shared']
     steps:
-      - uses: ../actions/build-jni
+      - uses: ./.github/actions/build-jni
         with:
           architecture: ${{ matrix.architecture }}
           variant: ${{ matrix.variant }}
@@ -50,7 +50,7 @@ jobs:
         # TODO architecture: [x64, x86, arm64]
         variant: ['shared', 'static']
     steps:
-      - uses: ../actions/build-skia
+      - uses: ./.github/actions/build-skia
         with:
           use-cache: ${{ inputs.use-skia-cache }}
           architecture: ${{ matrix.architecture }}
@@ -66,7 +66,7 @@ jobs:
         architecture: [x64]
         variant: ['shared']
     steps:
-      - uses: ../actions/build-jni
+      - uses: ./.github/actions/build-jni
         with:
           architecture: ${{ matrix.architecture }}
           variant: ${{ matrix.variant }}
@@ -82,7 +82,7 @@ jobs:
         architecture: [x64, x86, arm, arm64]
         variant: ['shared', 'static']
     steps:
-      - uses: ../actions/build-skia
+      - uses: ./.github/actions/build-skia
         with:
           use-cache: ${{ inputs.use-skia-cache }}
           architecture: ${{ matrix.architecture }}
@@ -97,7 +97,7 @@ jobs:
         architecture: [x64, x86, arm, arm64]
         variant: ['shared']
     steps:
-      - uses: ../actions/build-jni
+      - uses: ./.github/actions/build-jni
         with:
           architecture: ${{ matrix.architecture }}
           variant: ${{ matrix.variant }}
@@ -112,7 +112,7 @@ jobs:
         architecture: [x64, arm64]
         variant: ['shared', 'static']
     steps:
-      - uses: ../actions/build-skia
+      - uses: ./.github/actions/build-skia
         with:
           use-cache: ${{ inputs.use-skia-cache }}
           architecture: ${{ matrix.architecture }}
@@ -127,7 +127,7 @@ jobs:
         architecture: [x64, arm64]
         variant: ['shared']
     steps:
-      - uses: ../actions/build-jni
+      - uses: ./.github/actions/build-jni
         with:
           architecture: ${{ matrix.architecture }}
           variant: ${{ matrix.variant }}