Make proper lazy loading.

.gitignore

-skija
 build
 .gradle
 local.properties

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

@@ -9,7 +9,6 @@ import javax.swing.JFrame
 import javax.swing.JButton
 import javax.swing.event.MouseInputAdapter
 import javax.swing.WindowConstants
-import org.jetbrains.skiko.Library
 import org.jetbrains.skiko.SkiaLayer
 
 fun Button(text: String): JButton {
@@ -19,7 +18,6 @@ fun Button(text: String): JButton {
 }
 
 fun SwingSkia() {
-    Library.load("/", "skiko")
 
     val window = JFrame()
     window.defaultCloseOperation = WindowConstants.EXIT_ON_CLOSE

skiko/gradle.properties

 kotlin.code.style=official
 deploy.version=0.1
 
-dependencies.skija.git.commit=8fc45764727610bd4b3d228198432f6f327a34ad
+dependencies.skija.git.commit=6652e622a76604278c0156dc8acf40b66b05c0e9
 dependencies.skia.windows-x64=m88-59bafeeaa7/Skia-m88-59bafeeaa7-windows-Release-x64
 dependencies.skia.linux-x64=m88-59bafeeaa7/Skia-m88-59bafeeaa7-linux-Release-x64
 dependencies.skia.macos-x64=m88-59bafeeaa7/Skia-m88-59bafeeaa7-macos-Release-x64

skiko/src/jvmMain/kotlin/org/jetbrains/skija/CustomLoader.kt

+package org.jetbrains.skija
+
+class CustomLoader : Runnable {
+    override fun run() {
+        org.jetbrains.skiko.Library.run()
+    }
+}
\ No newline at end of file

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

@@ -7,7 +7,7 @@ import java.nio.file.Files
 import java.nio.file.StandardCopyOption
 import javax.swing.UIManager
 
-object Library {
+object Library : Runnable {
     private var loaded = false
 
     private val cacheRoot = "${System.getProperty("user.home")}/.skiko/"
@@ -31,10 +31,11 @@ object Library {
     // in Skiko's home, and if not - unpacks it. Also, it could load additional
     // localization resource on platforms wher it is needed.
     @Synchronized
-    fun load(resourcePath: String = "/", name: String = "skiko") {
-        // TODO: remove arguments.
+    private fun load() {
         if (loaded) return
 
+        val resourcePath = "/"
+        val name = "skiko"
         val platformName = System.mapLibraryName(name)
 
         val hash = Library::class.java.getResourceAsStream("$resourcePath$platformName.sha256").use {
@@ -73,4 +74,8 @@ object Library {
             // Not all platforms allow this.
         }
     }
+
+    override fun run() {
+        load()
+    }
 }

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

-package org.jetbrains.skiko
-
-import org.jetbrains.skija.Surface
-
-fun main() {
-   println(SkiaLibraryTester().nativeMethod(41))
-   val surface = Surface.makeRasterN32Premul(100, 100)
-   println(surface)
-}
-
-private class SkiaLibraryTester {
-    companion object {
-        init {
-          Library.load()
-        }
-    }
-
-    external fun nativeMethod(param: Long): Long
-}
\ No newline at end of file

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

@@ -123,12 +123,6 @@ open class SkiaLayer() : HardwareLayer() {
 }
 
 open class SkiaWindow : JFrame() {
-    companion object {
-        init {
-            Library.load()
-        }
-    }
-
     val layer: SkiaLayer = SkiaLayer()
 
     init {