Move to skia-pack m91-71fcb16fc2

samples/SkijaInjectSample/src/main/kotlin/SkijaInjectSample/App.kt

@@ -198,7 +198,7 @@ fun displayScene(renderer: Renderer, width: Int, height: Int, nanoTime: Long, xp
     val style = ParagraphStyle()
     val paragraph = ParagraphBuilder(style, fontCollection)
             .pushStyle(TextStyle().setColor(0xFF000000.toInt()))
-            .addText("Graphics API: ${renderer.layer.renderApi}")
+            .addText("Graphics API: ${renderer.layer.renderApi} ✿ﾟ")
             .popStyle()
             .build()
     paragraph.layout(Float.POSITIVE_INFINITY)

skiko/build.gradle.kts

@@ -170,17 +170,10 @@ kotlin {
             compilations.getByName("main") {
                 val skia by cinterops.creating {
                     defFile("src/nativeInterop/cinterop/skia.def")
-
-                        val skiaDir = skiaDir.get().absolutePath
-                        val kotlinNativeDataPath = System.getenv("KONAN_DATA_DIR")?.let { File(it) }
-                    ?: File(System.getProperty("user.home")).resolve(".konan")
-
-                        compilerOpts(
-                                "-I$skiaDir"
-                                )
-
-                        extraOpts("-staticLibrary", "libskia.a")
-                        extraOpts("-libraryPath", "$skiaDir/out/${buildType.id}-${targetArch.id}")
+                    val skiaDir = skiaDir.get().absolutePath
+                    compilerOpts("-I$skiaDir")
+                    extraOpts("-staticLibrary", "libskia.a")
+                    extraOpts("-libraryPath", "$skiaDir/out/${buildType.id}-${targetArch.id}")
                 }
             }
         }
@@ -492,7 +485,7 @@ library {
     dependencies {
         implementation(
             skiaDir.map {
-                fileTree(it.resolve("out/${buildType.id}-${targetArch.id}"))
+                fileTree(it.resolve("out/${buildType.id}-${targetOs.id}-${targetArch.id}"))
                     .matching { include(if (targetOs.isWindows) "**.lib" else "**.a") }
             }
         )

skiko/gradle.properties

@@ -3,7 +3,7 @@ deploy.version=0.0.0
 kotlin.native.version=1.5.30-dev-184
 
 dependencies.skija.git.commit=adf4d3aac4402a32096cf0a79ed75a0dc82c796d
-dependencies.skia.windows-x64=m91-d18efa37cb/Skia-m91-d18efa37cb-windows-Release-x64
-dependencies.skia.linux-x64=m91-d18efa37cb/Skia-m91-d18efa37cb-linux-Release-x64-ubuntu14
-dependencies.skia.macos-x64=m91-d18efa37cb/Skia-m91-d18efa37cb-macos-Release-x64
-dependencies.skia.macos-arm64=m91-d18efa37cb/Skia-m91-d18efa37cb-macos-Release-arm64
+dependencies.skia.windows-x64=m91-71fcb16fc2/Skia-m91-71fcb16fc2-windows-Release-x64
+dependencies.skia.linux-x64=m91-71fcb16fc2/Skia-m91-71fcb16fc2-linux-Release-x64-ubuntu14
+dependencies.skia.macos-x64=m91-71fcb16fc2/Skia-m91-71fcb16fc2-macos-Release-x64
+dependencies.skia.macos-arm64=m91-71fcb16fc2/Skia-m91-71fcb16fc2-macos-Release-arm64

skiko/src/jvmMain/kotlin/org/jetbrains/skiko/Library.kt

@@ -51,7 +51,6 @@ object Library {
             loadOrGet(cacheDir, resourcePath, platformName, true)
             val loadIcu = hostOs.isWindows
             if (loadIcu) {
-                println("Loading ICU")
                 loadOrGet(cacheDir, resourcePath, "icudtl.dat", false)
             }
         }