chore: Update Skia

.github/workflows/publish.yml

@@ -28,12 +28,15 @@ jobs:
     env:
       NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v3
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '9'      
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
         with:
           name: nuke
           path: build/bin/Debug/publish/
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: nupkgs
           path: dist/.organize/nupkgs
@@ -43,23 +46,26 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build]
     env:
-      OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-      OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}    
-      SONATYPE_SIGNING_KEY: ${{ secrets.SONATYPE_SIGNING_KEY }}
-      SONATYPE_SIGNING_KEY_ID: ${{ secrets.SONATYPE_SIGNING_KEY_ID }}
-      SONATYPE_SIGNING_PASSWORD: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}
-      SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}    
+      ORG_GRADLE_PROJECT_mavenCentralUsername: ${{secrets.OSSRH_USERTOKEN_USERNAME}}
+      ORG_GRADLE_PROJECT_mavenCentralPassword: ${{secrets.OSSRH_USERTOKEN_PASSWORD}}
+      ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{secrets.SONATYPE_SIGNING_KEY_ID}}
+      ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{secrets.SONATYPE_SIGNING_PASSWORD}}
+      ORG_GRADLE_PROJECT_signingInMemoryKey: ${{secrets.SONATYPE_SIGNING_KEY}}
+
     steps:
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '9'      
+      - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'
-      - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v3
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
         with:
           name: nuke
           path: build/bin/Debug/publish/
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           # workaround until we know how to upload existing maven packages
           # https://discuss.gradle.org/t/how-to-push-maven-to-ossrh-from-previous-local-publish/46875
@@ -74,16 +80,19 @@ jobs:
     env:
       NPMJS_AUTH_TOKEN: ${{ secrets.NPMJS_AUTH_TOKEN }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v3
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '9'      
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
         with:
           name: nuke
           path: build/bin/Debug/publish/
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: nodetars
           path: dist/.organize/node
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: "lts/*"
           registry-url: https://registry.npmjs.org/

.github/workflows/~dotnet.yml

@@ -21,17 +21,17 @@ jobs:
     steps:
     - uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '8'
-    - uses: actions/checkout@v3
-    - uses: actions/download-artifact@v3
+        dotnet-version: '9'
+    - uses: actions/checkout@v4
+    - uses: actions/download-artifact@v4
       with:
         name: nuke
         path: build/bin/Debug/publish/
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         path: dist/.organize
     - run: ./build.cmd DotNet
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: nupkgs
         path: |
@@ -43,13 +43,13 @@ jobs:
         include: 
           - runs-on: ubuntu-latest
             architecture: x64
-            framework: net8.0
+            framework: net9.0
           - runs-on: macos-latest
             architecture: arm64
-            framework: net8.0
+            framework: net9.0
           - runs-on: windows-latest
             architecture: x64
-            framework: net8.0
+            framework: net9.0
           - runs-on: windows-latest
             architecture: x64
             framework: net48
@@ -58,14 +58,14 @@ jobs:
     steps:
     - uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '8'      
-    - uses: actions/checkout@v3
-    - uses: actions/download-artifact@v3
+        dotnet-version: '9'      
+    - uses: actions/checkout@v4
+    - uses: actions/download-artifact@v4
       with:
         name: nupkgs
         path: dist/.organize/nupkgs
     - run: ./build.cmd DotNetTest --architecture ${{ matrix.architecture }} --framework ${{ matrix.framework }}
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: always()
       with:
         name: dotnettest-${{ matrix.runs-on }}-${{ matrix.architecture }}--${{ matrix.framework  }}

.github/workflows/~java.yml

@@ -19,25 +19,29 @@ jobs:
   java:
     runs-on: ubuntu-latest
     env:
-      SONATYPE_SIGNING_KEY: ${{ secrets.SONATYPE_SIGNING_KEY }}
-      SONATYPE_SIGNING_KEY_ID: ${{ secrets.SONATYPE_SIGNING_KEY_ID }}
-      SONATYPE_SIGNING_PASSWORD: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}
-      SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}    
+      ORG_GRADLE_PROJECT_mavenCentralUsername: ${{secrets.OSSRH_USERTOKEN_USERNAME}}
+      ORG_GRADLE_PROJECT_mavenCentralPassword: ${{secrets.OSSRH_USERTOKEN_PASSWORD}}
+      ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{secrets.SONATYPE_SIGNING_KEY_ID}}
+      ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{secrets.SONATYPE_SIGNING_PASSWORD}}
+      ORG_GRADLE_PROJECT_signingInMemoryKey: ${{secrets.SONATYPE_SIGNING_KEY}}
     steps:
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: '17'      
-    - uses: actions/checkout@v3
-    - uses: actions/download-artifact@v3
+        java-version: '17'
+    - uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '9'
+    - uses: actions/checkout@v4
+    - uses: actions/download-artifact@v4
       with:
         name: nuke
         path: build/bin/Debug/publish/
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         path: dist/.organize
     - run: ./build.cmd Java
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: maven
         path: |
@@ -53,21 +57,24 @@ jobs:
     runs-on: ${{ matrix.runs-on }}
     needs: [java]
     steps:
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: '17'
-    - uses: actions/checkout@v3
-    - uses: actions/download-artifact@v3
+    - uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '9'        
+    - uses: actions/checkout@v4
+    - uses: actions/download-artifact@v4
       with:
         name: nuke
         path: build/bin/Debug/publish/
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: maven
         path: dist/.organize/maven
     - run: ./build.cmd JavaTest
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: always()
       with:
         name: javatest-${{ matrix.runs-on }}

.github/workflows/~native.yml

@@ -48,17 +48,20 @@ jobs:
       matrix:
         architecture: ${{ fromJson( inputs.architectures ) }}
     steps:
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '9'      
       - name: Cloning Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Fetching Pre-Built Nuke
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: nuke
           path: build/bin/Debug/publish/
 
       - name: Fetch Cached LibSkia
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
         if: ${{ inputs.use-skia-cache }}
         with:
           path: dist
@@ -70,13 +73,13 @@ jobs:
         id: build
 
       - name: Uploading LibSkia to Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: libskia-${{ inputs.target-os }}-${{ matrix.architecture }}-static
           path: artifacts
 
       - name: Uploading LibSkia to Build Cache
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
         if: ${{ steps.build.outputs.build-skipped != 'true' }}
         with:
           path: dist
@@ -92,19 +95,22 @@ jobs:
         architecture: ${{ fromJson( inputs.architectures ) }}
         variant: ${{ fromJson( inputs.variants ) }}
     steps:
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '9'      
       - name: Cloning Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
 
       - name: Fetching Pre-Built Nuke
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: nuke
           path: build/bin/Debug/publish/
 
       - name: Downloading LibSkia
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: dist/.organize/libskia-${{ inputs.target-os }}-${{ matrix.architecture }}-static
           name: libskia-${{ inputs.target-os }}-${{ matrix.architecture }}-static
@@ -113,14 +119,14 @@ jobs:
         run: dotnet build/bin/Debug/publish/_build.dll LibAlphaSkia LibAlphaSkiaTest --target-os ${{ inputs.target-os }} --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }}
 
       - name: Uploading LibAlphaSkia to Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
           name: libalphaskia-${{ inputs.target-os }}-${{ matrix.architecture }}-${{ matrix.variant }}
           path: artifacts
 
       - name: Uploading LibAlphaSkiaTest to Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
           name: libalphaskiatest-${{ inputs.target-os }}-${{ matrix.architecture }}-${{ matrix.variant }}

.github/workflows/~node.yml

@@ -19,16 +19,19 @@ jobs:
   node:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/download-artifact@v3
+    - uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '9'      
+    - uses: actions/checkout@v4
+    - uses: actions/download-artifact@v4
       with:
         name: nuke
         path: build/bin/Debug/publish/
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         path: dist/.organize
     - run: ./build.cmd Node
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: nodetars
         path: |
@@ -42,20 +45,23 @@ jobs:
     runs-on: ${{ matrix.runs-on }}
     needs: [node]
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/download-artifact@v3
+    - uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '9'      
+    - uses: actions/checkout@v4
+    - uses: actions/download-artifact@v4
       with:
         name: nodetars
         path: dist/.organize/node
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
       with:
         node-version:  ${{ matrix.node }}
     - run: ./build.cmd NodeTest
     - id: sanitize-node-version
       if: always()
       run:  echo "NODE_VERSION=${{ matrix.node }}" | sed 's/[*\/]//g' >> "$GITHUB_OUTPUT"
       shell: bash
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: always()
       with:
         name: nodetest-${{ matrix.runs-on }}-${{ steps.sanitize-node-version.outputs.NODE_VERSION }}

.github/workflows/~reusable-full-build.yml

@@ -25,9 +25,12 @@ jobs:
   nuke: 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - run: dotnet publish ./build/_build.csproj
-      - uses: actions/upload-artifact@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '9'
+      - run: dotnet publish --configuration Debug ./build/_build.csproj 
+      - uses: actions/upload-artifact@v4
         with:
           name: nuke
           path: build/bin/Debug/publish/

.gitmodules

@@ -5,7 +5,7 @@
 [submodule "externals/skia"]
 	path = externals/skia
 	url = https://skia.googlesource.com/skia.git
-	branch = chrome/m120
+	branch = chrome/m135
 [submodule "externals/node-api-headers"]
 	path = externals/node-api-headers
 	url = https://github.com/nodejs/node-api-headers.git

build/Architecture.cs

@@ -9,7 +9,7 @@ public class Architecture : Enumeration
     public static readonly Architecture X64 = new()
         { Value = "x64", LinuxArch = "amd64", LinuxCrossToolchain = "", LinuxCrossTargetArch = "" };
 
-    public static Architecture X86 = new()
+    public static readonly Architecture X86 = new()
     {
         Value = "x86", LinuxArch = "i386", LinuxCrossToolchain = "i686-linux-gnu",
         LinuxCrossTargetArch = "i686-linux-gnu"