Migrate to Skia m94-975fcdd755 (#199)

.github/workflows/blank.yml

@@ -57,7 +57,7 @@ jobs:
           sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-9
           sudo update-alternatives --config gcc 
           sudo apt-get install ninja-build fontconfig libfontconfig1-dev libglu1-mesa-dev libxrandr-dev zip -y
-          ./gradlew jvmTest
+          ./gradlew -i jvmTest
           ./gradlew publishToMavenLocal
    js:
      runs-on: ubuntu-20.04

skiko/build.gradle.kts

@@ -530,6 +530,7 @@ tasks.withType(LinkSharedLibrary::class.java).configureEach {
             )
         }
         OS.Linux -> {
+            val skia = skiaDir.get().absolutePath + "/" + skiaBinSubdir
             linkerArgs.addAll(
                 listOf(
                     "-static-libstdc++",
@@ -544,8 +545,9 @@ tasks.withType(LinkSharedLibrary::class.java).configureEach {
                     // To fix it we enforce resolve of all GOT entries at library load time, and make it read-only afterwards.
                     "-Wl,-z,relro,-z,now",
                     // Hack to fix problem with linker not always finding certain declarations.
-                    skiaDir.get().absolutePath + "/$skiaBinSubdir/libsksg.a",
-                    skiaDir.get().absolutePath + "/$skiaBinSubdir/libskia.a"
+                    "$skia/libsksg.a",
+                    "$skia/libskia.a",
+                    "$skia/libskunicode.a"
                     )
             )
         }

skiko/gradle.properties

@@ -2,11 +2,11 @@ kotlin.code.style=official
 deploy.version=0.0.0
 kotlin.native.version=1.5.21-dev-329
 
-dependencies.skia.windows-x64=m93-87e8842e8c
-dependencies.skia.linux-x64=m93-87e8842e8c
-dependencies.skia.macos-x64=m93-87e8842e8c
-dependencies.skia.linux-arm64=m93-87e8842e8c
-dependencies.skia.macos-arm64=m93-87e8842e8c
-dependencies.skia.wasm-wasm=m93-87e8842e8c
+dependencies.skia.windows-x64=m94-975fcdd755
+dependencies.skia.linux-x64=m94-975fcdd755
+dependencies.skia.macos-x64=m94-975fcdd755
+dependencies.skia.linux-arm64=m94-975fcdd755
+dependencies.skia.macos-arm64=m94-975fcdd755
+dependencies.skia.wasm-wasm=m94-975fcdd755
 
 org.gradle.jvmargs=-Xmx4G

skiko/src/commonMain/cpp/generated/Paint.cc

@@ -8,7 +8,6 @@
 #include "SkPaint.h"
 #include "SkPathEffect.h"
 #include "SkShader.h"
-#include "SkFilterQuality.h"
 #include "common.h"
 
 void deletePaint(SkPaint* paint) {

skiko/src/jvmMain/cpp/common/Paint.cc

@@ -6,7 +6,6 @@
 #include "SkPaint.h"
 #include "SkPathEffect.h"
 #include "SkShader.h"
-#include "SkFilterQuality.h"
 #include "interop.hh"
 
 static void deletePaint(SkPaint* paint) {