Refactorings from the AWT Font PR (#729)

* Refactoring from AWT Font PR

Thanks, @rock3r, for refactorings! I extracted them from the AWT font PR (they were reverted in https://github.com/JetBrains/skiko/pull/639/commits/53f00c7d6be5ac0834ba4b4c3b9b4e3ea5cb0f10)

- fix formatting
- fix comments
- split CI steps

I am not sure about mikepenz/action-junit-report. Let's remove it for now (otherwise it should be investigated from functionality and security perspective)

* Refactoring from AWT Font PR

Thanks, @rock3r, for refactorings! I extracted them from the AWT font PR (they were reverted in https://github.com/JetBrains/skiko/pull/639/commits/53f00c7d6be5ac0834ba4b4c3b9b4e3ea5cb0f10)

- fix formatting
- fix comments
- split CI steps

I am not sure about mikepenz/action-junit-report. Let's remove it for now (otherwise it should be investigated from functionality and security perspective)

Also, removed implementation("pl.pragmatists:JUnitParams:1.1.1"), as it isn't used.

.github/workflows/ci.yml

 # Default Skiko CI
 name: CI
 
-# Controls when the action will run.
 on:
-  # Triggers the workflow on push or pull request events but only for the master branch
   push:
     branches: [ master ]
   # TODO: temporary for faster tests, restore!
   pull_request:
     branches: [ master ]
 
-  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   macos:
-    # The type of runner that the job will run on
     runs-on: macos-11
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2
+      - uses: actions/checkout@v3
+        name: 'Check out code'
+
+      - uses: actions/setup-java@v3
+        name: 'Set up JDK 11'
         with:
           distribution: 'adopt'
           java-version: '11'
+          cache: 'gradle'
+
+      - shell: bash
+        name: 'Compile and run AWT tests'
+        run: ./gradlew --stacktrace --info -Pskiko.native.enabled=true -Pskiko.test.onci=true :skiko:awtTest
+
+      - shell: bash
+        name: 'Compile and run macOS x64 tests'
+        run: ./gradlew --stacktrace --info -Pskiko.native.enabled=true -Pskiko.test.onci=true :skiko:macosX64Test
+
       - shell: bash
+        name: 'Publish to Maven Local, check AWT sample'
         run: |
-          ./gradlew --stacktrace --info -Pskiko.native.enabled=true -Pskiko.test.onci=true :skiko:awtTest
-          ./gradlew --stacktrace --info -Pskiko.native.enabled=true -Pskiko.test.onci=true :skiko:macosX64Test
           ./gradlew --stacktrace --info -Pskiko.native.enabled=true :skiko:publishToMavenLocal
-          ./gradlew --stacktrace --info :SkiaAwtSample:installDist # check AWT sample works
-      - uses: actions/upload-artifact@v2
+          ./gradlew --stacktrace --info :SkiaAwtSample:installDist
+
+      - uses: actions/upload-artifact@v3
+        name: 'Save test results as artifact'
         if: always()
         with:
           name: test-reports-macos
@@ -40,24 +47,34 @@ jobs:
           retention-days: 5
 
   ios:
-    # The type of runner that the job will run on
     runs-on: macos-11
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2
+      - uses: actions/checkout@v3
+        name: 'Check out code'
+
+      - uses: actions/setup-java@v3
+        name: 'Set up JDK 11'
         with:
           distribution: 'adopt'
           java-version: '11'
+          cache: 'gradle'
+
       - shell: bash
-        run: |
-          ./gradlew --stacktrace --info -Pskiko.native.enabled=true -Pskiko.test.onci=true :skiko:iosX64Test
+        name: 'Compile and run iOS x64 tests'
+        run: ./gradlew --stacktrace --info -Pskiko.native.enabled=true -Pskiko.test.onci=true :skiko:iosX64Test
+
       # iosSimulatorArm64Test will build the binary but the tests will be skipped due to X64 host machine
-          ./gradlew --stacktrace --info -Pskiko.native.enabled=true -Pskiko.test.onci=true :skiko:iosSimulatorArm64Test
-          ./gradlew --stacktrace --info -Pskiko.native.enabled=true :skiko:publishToMavenLocal
+      - shell: bash
+        name: 'Compile iOS arm64 tests'
+        run: ./gradlew --stacktrace --info -Pskiko.native.enabled=true -Pskiko.test.onci=true :skiko:iosSimulatorArm64Test
+
       # TODO run iOS specific tests on iPhone simulator
-      - uses: actions/upload-artifact@v2
+      - shell: bash
+        name: 'Publish to Maven Local'
+        run: ./gradlew --stacktrace --info -Pskiko.native.enabled=true :skiko:publishToMavenLocal
+
+      - uses: actions/upload-artifact@v3
+        name: 'Save test results as artifact'
         if: always()
         with:
           name: test-reports-macos
@@ -66,21 +83,28 @@ jobs:
 
   linux:
     runs-on: ubuntu-20.04
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2
+      - uses: actions/checkout@v3
+        name: 'Check out code'
+
+      - uses: actions/setup-java@v3
+        name: 'Set up JDK 11'
         with:
           distribution: 'adopt'
           java-version: '11'
+          cache: 'gradle'
+
       - uses: nttld/setup-ndk@v1
+        name: 'Set up Android NDK'
         id: setup-ndk
         with:
           ndk-version: r21e
+
       - uses: android-actions/setup-android@v2
-      # Runs a set of commands using the runners shell
+        name: 'Set up Android SDK'
+
       - shell: bash
+        name: 'Set up Linux build environment'
         env:
           ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
         run: |
@@ -96,23 +120,31 @@ jobs:
           sudo update-alternatives --config gcc
           sudo apt-get install ninja-build fontconfig libfontconfig1-dev libglu1-mesa-dev libxrandr-dev libdbus-1-dev zip xvfb -y
           sudo Xvfb :0 -screen 0 1280x720x24 &
-      - run: |
-          # Test Linux native
+
+      - shell: bash
+        name: 'Compile and run Linux x64 tests'
+        run: |
           export DISPLAY=:0
           ./gradlew --no-daemon --stacktrace --info -Pskiko.native.enabled=true -Pkotlin.native.cacheKind.linuxX64=none -Pskiko.test.onci=true :skiko:linuxX64Test
-      - run: |
-          # Test Linux AWT
+
+      - shell: bash
+        name: 'Compile and run AWT tests'
+        run: |
           export DISPLAY=:0
           ./gradlew --no-daemon --stacktrace --info -Pskiko.native.enabled=true -Pkotlin.native.cacheKind.linuxX64=none -Pskiko.test.onci=true :skiko:awtTest
         timeout-minutes: 25
-      - env:
+
+      - shell: bash
+        name: 'Publish to Maven Local, check AWT sample'
+        env:
           ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
         run: |
-          # Test publishToMavenLocal
           ./gradlew --no-daemon --stacktrace --info -Pkotlin.native.cacheKind.linuxX64=none :skiko:publishToMavenLocal
-          ./gradlew --no-daemon --stacktrace --info :SkiaAwtSample:installDist # check jvm sample works
+          ./gradlew --no-daemon --stacktrace --info :SkiaAwtSample:installDist
           ./gradlew --no-daemon -Pskiko.android.enabled=true :skiko:publishSkikoJvmRuntimeAndroidX64PublicationToMavenLocal :skiko:publishSkikoJvmRuntimeAndroidArm64PublicationToMavenLocal :skiko:publishAndroidPublicationToMavenLocal
-      - uses: actions/upload-artifact@v2
+
+      - uses: actions/upload-artifact@v3
+        name: 'Save test results as artifact'
         if: always()
         with:
           name: test-reports-linux
@@ -121,16 +153,19 @@ jobs:
 
   js:
     runs-on: ubuntu-20.04
-     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-       - uses: actions/checkout@v2
-       - uses: actions/setup-java@v2
+      - uses: actions/checkout@v3
+        name: 'Check out code'
+
+      - uses: actions/setup-java@v3
+        name: 'Set up JDK 11'
         with:
           distribution: 'adopt'
           java-version: '11'
-       # Runs a set of commands using the runners shell
+          cache: 'gradle'
+
       - shell: bash
+        name: 'Set up JS build environment'
         run: |
           cd ./skiko
           sudo apt-get update -y
@@ -146,11 +181,19 @@ jobs:
           fi
           ./emsdk install 2.0.29
           ./emsdk activate 2.0.29
-           source ./emsdk_env.sh
-           cd ..
-           ./gradlew --stacktrace --info -Pskiko.wasm.enabled=true -Pskiko.test.onci=true jsTest
-           ./gradlew --stacktrace --info -Pskiko.wasm.enabled=true publishSkikoWasmRuntimePublicationToMavenLocal
-       - uses: actions/upload-artifact@v2
+      - shell: bash
+        name: 'Compile and run JS tests'
+        run: |
+          source "$(pwd)/skiko/emsdk/emsdk_env.sh"
+          ./gradlew --stacktrace --info -Pskiko.wasm.enabled=true -Pskiko.test.onci=true :skiko:jsTest
+      - shell: bash
+        name: 'Publish WASM runtime to Maven Local'
+        run: |
+          source "$(pwd)/skiko/emsdk/emsdk_env.sh"
+          ./gradlew --stacktrace --info -Pskiko.wasm.enabled=true :skiko:publishSkikoWasmRuntimePublicationToMavenLocal
+
+      - uses: actions/upload-artifact@v3
+        name: 'Save test results as artifact'
         if: always()
         with:
           name: test-reports-js
@@ -160,19 +203,32 @@ jobs:
   windows:
     runs-on: windows-2019
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+        name: 'Check out code'
+
       - uses: microsoft/setup-msbuild@v1
+
       - uses: ilammy/msvc-dev-cmd@v1
-      - uses: actions/setup-java@v2
+
+      - uses: actions/setup-java@v3
+        name: 'Set up JDK 11'
         with:
           distribution: 'adopt'
           java-version: '11'
+          cache: 'gradle'
+
       - shell: bash
+        name: 'Compile and run AWT tests'
+        run: ./gradlew --stacktrace --info -Pskiko.test.onci=true :skiko:awtTest
+
+      - shell: bash
+        name: 'Publish to Maven Local, check AWT sample'
         run: |
-          ./gradlew --stacktrace --info -Pskiko.test.onci=true :skiko:awtTest
           ./gradlew --stacktrace --info :skiko:publishToMavenLocal
-          ./gradlew --stacktrace --info :SkiaAwtSample:installDist # check jvm sample works
-      - uses: actions/upload-artifact@v2
+          ./gradlew --stacktrace --info :SkiaAwtSample:installDist
+
+      - uses: actions/upload-artifact@v3
+        name: 'Save test results as artifact'
         if: always()
         with:
           name: test-reports-windows

.github/workflows/docs.yml

 # Build Skiko documentation
 name: Doc
 
-# Controls when the action will run.
 on:
-  # Triggers the workflow on push or pull request events but only for the master branch
   push:
     branches: [ master ]
   # Temporary, for testing. Remove!
   #pull_request:
   #  branches: [ master ]
 
-  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
-# See https://github.com/marketplace/actions/deploy-to-github-pages
 jobs:
   dokka:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2
+      - uses: actions/checkout@v3
+        name: 'Check out code'
+
+      - uses: actions/setup-java@v3
+        name: 'Set up JDK 11'
         with:
           distribution: 'adopt'
           java-version: '11'
-      - name: Build docs
+          cache: 'gradle'
+
+      - name: 'Build Dokka documentation'
         run: bash -c 'JAVA_OPTS="-Xmx4g" ./gradlew --no-daemon -Pskiko.native.enabled=true -Pskiko.wasm.enabled=true -Pskiko.android.enabled=true :skiko:dokkaHtml'
-      - name: Publish documentation
+
+      - name: 'Publish documentation'
         uses: JamesIves/github-pages-deploy-action@releases/v3
         with:
           ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}

skiko/.gitignore

@@ -4,3 +4,6 @@ build
 local.properties
 .DS_Store
 dependencies/
+
+# Screenshot test actual files
+**/src/**/screenshots/*_actual.png

skiko/.run/awtTest.run.xml

@@ -4,16 +4,20 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="awtTest -Dskiko.test.ui.enabled=true -Dskiko.test.ui.renderApi=all" />
+      <option name="scriptParameters" value="-Dskiko.test.ui.enabled=true -Dskiko.test.ui.renderApi=all" />
       <option name="taskDescriptions">
         <list />
       </option>
       <option name="taskNames">
-        <list />
+        <list>
+          <option value=":awtTest" />
+        </list>
       </option>
       <option name="vmOptions" />
     </ExternalSystemSettings>
-    <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
     <method v="2" />
   </configuration>
 </component>
\ No newline at end of file

skiko/.run/publishToMavenLocal.run.xml

@@ -10,7 +10,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="publishToMavenLocal" />
+          <option value=":publishToMavenLocal" />
         </list>
       </option>
       <option name="vmOptions" value="" />

skiko/build.gradle.kts

 import de.undercouch.gradle.tasks.download.Download
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.crypto.checksum.Checksum
-import org.gradle.api.tasks.testing.AbstractTestTask
 import org.jetbrains.compose.internal.publishing.MavenCentralProperties
-import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
-import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompileTool
-import org.jetbrains.kotlin.konan.target.KonanTarget
 
 plugins {
     kotlin("multiplatform") version "1.8.20"
@@ -911,7 +909,7 @@ fun createLinkJvmBindings(
     val skiaBinDir = skiaJvmBindingsDir.get().absolutePath + "/" + skiaBinSubdir
     val osFlags: Array<String>
 
-        libFiles = fileTree(skiaJvmBindingsDir.map { it.resolve(skiaBinSubdir)}) {
+    libFiles = fileTree(skiaJvmBindingsDir.map { it.resolve(skiaBinSubdir) }) {
         include(if (targetOs.isWindows) "*.lib" else "*.a")
     }
 
@@ -979,7 +977,8 @@ fun createLinkJvmBindings(
             libDirs.set(windowsSdkPaths.libDirs)
             osFlags = mutableListOf<String>().apply {
                 addAll(buildType.msvcLinkerFlags)
-                    addAll(arrayOf(
+                addAll(
+                    arrayOf(
                         "/NOLOGO",
                         "/DLL",
                         "Advapi32.lib",
@@ -988,7 +987,8 @@ fun createLinkJvmBindings(
                         "opengl32.lib",
                         "shcore.lib",
                         "user32.lib",
-                    ))
+                    )
+                )
                 if (buildType == SkiaBuildType.DEBUG) add("dxgi.lib")
             }.toTypedArray()
         }
@@ -1010,7 +1010,7 @@ fun createLinkJvmBindings(
         }
     }
     flags.set(listOf(*osFlags))
-    }
+}
 
 fun KotlinTarget.generateVersion(
     targetOs: OS,
@@ -1034,11 +1034,12 @@ fun KotlinTarget.generateVersion(
 
             val target = "${targetOs.id}-${targetArch.id}"
             val skiaTag = project.property("dependencies.skia.$target") as String
-            File(out).writeText("""
+            File(out).writeText(
+                """
                 package org.jetbrains.skiko
                 object Version {
                   val skiko = "${skiko.deployVersion}"
-                  val skia = "${skiaTag}"
+                  val skia = "$skiaTag"
                 }
                 """.trimIndent()
             )
@@ -1135,7 +1136,7 @@ tasks.withType<Test>().configureEach {
     options {
         val dir = skikoRuntimeDirForTests.map { it.destinationDir }.get()
         systemProperty("skiko.library.path", dir)
-        val jar = skikoJarForTests.get().outputs.files.files.single { it.name.endsWith(".jar")}
+        val jar = skikoJarForTests.get().outputs.files.files.single { it.name.endsWith(".jar") }
         systemProperty("skiko.jar.path", jar.absolutePath)
 
         systemProperty("skiko.test.screenshots.dir", File(project.projectDir, "src/jvmTest/screenshots").absolutePath)
@@ -1144,7 +1145,10 @@ tasks.withType<Test>().configureEach {
         val testingOnCI = System.getProperty("skiko.test.onci", "false").toBoolean()
         val canRunPerformanceTests = testingOnCI
         val canRunUiTests = testingOnCI || System.getProperty("os.name") != "Mac OS X"
-        systemProperty("skiko.test.performance.enabled", System.getProperty("skiko.test.performance.enabled", canRunPerformanceTests.toString()))
+        systemProperty(
+            "skiko.test.performance.enabled",
+            System.getProperty("skiko.test.performance.enabled", canRunPerformanceTests.toString())
+        )
         systemProperty("skiko.test.ui.enabled", System.getProperty("skiko.test.ui.enabled", canRunUiTests.toString()))
         systemProperty("skiko.test.ui.renderApi", System.getProperty("skiko.test.ui.renderApi", "all"))
 

skiko/src/awtMain/kotlin/org/jetbrains/skiko/Actuals.awt.kt

@@ -13,8 +13,8 @@ import javax.swing.UIManager
 
 actual fun setSystemLookAndFeel() = UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName())
 
-internal actual fun makeDefaultRenderFactory(): RenderFactory {
-    return object : RenderFactory {
+internal actual fun makeDefaultRenderFactory(): RenderFactory =
+    object : RenderFactory {
         override fun createRedrawer(
             layer: SkiaLayer,
             renderApi: GraphicsApi,
@@ -36,10 +36,9 @@ internal actual fun makeDefaultRenderFactory(): RenderFactory {
                 GraphicsApi.SOFTWARE_FAST -> LinuxSoftwareRedrawer(layer, analytics, properties)
                 else -> LinuxOpenGLRedrawer(layer, analytics, properties)
             }
-            OS.Android, OS.JS, OS.Ios -> throw UnsupportedOperationException("The awt target doesn't support $hostOs")
+            OS.Android, OS.JS, OS.Ios -> throw UnsupportedOperationException("The AWT target doesn't support $hostOs")
         }
     }
-}
 
 internal actual fun URIHandler_openUri(uri: String) {
     Desktop.getDesktop().browse(URI(uri))
@@ -56,6 +55,7 @@ private val systemClipboard by lazy {
 internal actual fun ClipboardManager_setText(text: String) {
     systemClipboard?.setContents(StringSelection(text), null)
 }
+
 internal actual fun ClipboardManager_getText(): String? {
     return try {
         systemClipboard?.getData(DataFlavor.stringFlavor) as String?

skiko/src/commonMain/kotlin/org/jetbrains/skia/FontMgr.kt

 package org.jetbrains.skia
 
-import org.jetbrains.skia.impl.InteropPointer
+import org.jetbrains.skia.impl.*
 import org.jetbrains.skia.impl.Library.Companion.staticLoad
-import org.jetbrains.skia.impl.NativePointer
-import org.jetbrains.skia.impl.RefCnt
-import org.jetbrains.skia.impl.Stats
-import org.jetbrains.skia.impl.getPtr
-import org.jetbrains.skia.impl.interopScope
-import org.jetbrains.skia.impl.reachabilityBarrier
-import org.jetbrains.skia.impl.withStringResult
 
 open class FontMgr : RefCnt {
     companion object {
@@ -27,8 +20,8 @@ open class FontMgr : RefCnt {
             reachabilityBarrier(this)
         }
 
-    fun getFamilyName(index: Int): String {
-        return try {
+    fun getFamilyName(index: Int): String =
+        try {
             Stats.onNativeCall()
             withStringResult {
                 _nGetFamilyName(_ptr, index)
@@ -36,59 +29,55 @@ open class FontMgr : RefCnt {
         } finally {
             reachabilityBarrier(this)
         }
-    }
 
-    fun makeStyleSet(index: Int): FontStyleSet? {
-        return try {
+    fun makeStyleSet(index: Int): FontStyleSet? =
+        try {
             Stats.onNativeCall()
             val ptr = _nMakeStyleSet(_ptr, index)
             if (ptr == NullPointer) null else FontStyleSet(ptr)
         } finally {
             reachabilityBarrier(this)
         }
-    }
 
     /**
-     * The caller must call [.close] on the returned object.
-     * Never returns null; will return an empty set if the name is not found.
+     * The caller must call [close] on the returned object.
+     * Never returns `null`; will return an empty set if the name is not found.
      *
-     * Passing null as the parameter will return the default system family.
-     * Note that most systems don't have a default system family, so passing null will often
-     * result in the empty set.
+     * Passing `null` as the parameter will return the default system family.
+     * Note that most systems don't have a default system family, so passing
+     * `null` will often result in the empty set.
      *
      * It is possible that this will return a style set not accessible from
-     * [.makeStyleSet] due to hidden or auto-activated fonts.
+     * [makeStyleSet] due to hidden or auto-activated fonts.
      */
-    fun matchFamily(familyName: String?): FontStyleSet {
-        return try {
+    fun matchFamily(familyName: String?): FontStyleSet =
+        try {
             Stats.onNativeCall()
             interopScope { FontStyleSet(_nMatchFamily(_ptr, toInterop(familyName))) }
         } finally {
             reachabilityBarrier(this)
         }
-    }
 
     /**
-     * Find the closest matching typeface to the specified familyName and style
-     * and return a ref to it. The caller must call [.close] on the returned
-     * object. Will return null if no 'good' match is found.
+     * Find the closest matching typeface to the specified [familyName] and [style]
+     * and return it. The caller must call [close] on the returned
+     * object. Will return `null` if no 'good' match is found.
      *
-     * Passing null as the parameter for `familyName` will return the
+     * Passing `null` as the value for [familyName] will return the
      * default system font.
      *
      * It is possible that this will return a style set not accessible from
-     * [.makeStyleSet] or [.matchFamily] due to hidden or
+     * [makeStyleSet] or [matchFamily] due to hidden or
      * auto-activated fonts.
      */
-    fun matchFamilyStyle(familyName: String?, style: FontStyle): Typeface? {
-        return try {
+    fun matchFamilyStyle(familyName: String?, style: FontStyle): Typeface? =
+        try {
             Stats.onNativeCall()
             val ptr = interopScope { _nMatchFamilyStyle(_ptr, toInterop(familyName), style._value) }
             if (ptr == NullPointer) null else Typeface(ptr)
         } finally {
             reachabilityBarrier(this)
         }
-    }
 
     fun matchFamiliesStyle(families: Array<String?>, style: FontStyle): Typeface? {
         for (family in families) {
@@ -103,13 +92,13 @@ open class FontMgr : RefCnt {
      * Note that bcp47 is a combination of ISO 639, 15924, and 3166-1 codes,
      * so it is fine to just pass a ISO 639 here.
      *
-     * Will return null if no family can be found for the character
+     * Will return `null` if no family can be found for the character
      * in the system fallback.
      *
-     * Passing `null` as the parameter for `familyName` will return the
+     * Passing `null` as the value for [familyName] will return the
      * default system font.
      *
-     * bcp47[0] is the least significant fallback, bcp47[bcp47.length-1] is the
+     * `bcp47[0]` is the least significant fallback, `bcp47[bcp47.length-1]` is the
      * most significant. If no specified bcp47 codes match, any font with the
      * requested character will be matched.
      */
@@ -118,8 +107,8 @@ open class FontMgr : RefCnt {
         style: FontStyle,
         bcp47: Array<String>?,
         character: Int
-    ): Typeface? {
-        return try {
+    ): Typeface? =
+        try {
             Stats.onNativeCall()
             val ptr = interopScope {
                 _nMatchFamilyStyleCharacter(
@@ -135,7 +124,6 @@ open class FontMgr : RefCnt {
         } finally {
             reachabilityBarrier(this)
         }
-    }
 
     fun matchFamiliesStyleCharacter(
         families: Array<String?>,
@@ -152,11 +140,11 @@ open class FontMgr : RefCnt {
 
     /**
      * Create a typeface for the specified data and TTC index (pass 0 for none)
-     * or null if the data is not recognized. The caller must call [.close] on
+     * or null if the data is not recognized. The caller must call [close] on
      * the returned object if it is not null.
      */
-    fun makeFromData(data: Data?, ttcIndex: Int = 0): Typeface? {
-        return try {
+    fun makeFromData(data: Data?, ttcIndex: Int = 0): Typeface? =
+        try {
             Stats.onNativeCall()
             val ptr =
                 _nMakeFromData(_ptr, getPtr(data), ttcIndex)
@@ -165,7 +153,6 @@ open class FontMgr : RefCnt {
             reachabilityBarrier(this)
             reachabilityBarrier(data)
         }
-    }
 
     internal constructor(ptr: NativePointer) : super(ptr)
 

skiko/src/commonMain/kotlin/org/jetbrains/skia/FontStyle.kt

@@ -32,9 +32,7 @@ class FontStyle {
         return FontStyle(weight, width, slant)
     }
 
-    override fun toString(): String {
-        return "FontStyle(weight=$weight, width=$width, slant=$slant)"
-    }
+    override fun toString(): String = "FontStyle(weight=$weight, width=$width, slant=$slant)"
 
     override fun equals(other: Any?): Boolean {
         if (other === this) return true

skiko/src/commonMain/kotlin/org/jetbrains/skia/Typeface.kt

 package org.jetbrains.skia
 
-import org.jetbrains.skia.impl.InteropPointer
+import org.jetbrains.skia.impl.*
 import org.jetbrains.skia.impl.Library.Companion.staticLoad
-import org.jetbrains.skia.impl.Native
-import org.jetbrains.skia.impl.NativePointer
-import org.jetbrains.skia.impl.RefCnt
-import org.jetbrains.skia.impl.Stats
-import org.jetbrains.skia.impl.getPtr
-import org.jetbrains.skia.impl.interopScope
-import org.jetbrains.skia.impl.reachabilityBarrier
-import org.jetbrains.skia.impl.withNullableResult
-import org.jetbrains.skia.impl.withResult
-import org.jetbrains.skia.impl.withStringResult
 
 class Typeface internal constructor(ptr: NativePointer) : RefCnt(ptr) {
     companion object {
@@ -401,6 +391,8 @@ class Typeface internal constructor(ptr: NativePointer) : RefCnt(ptr) {
         } finally {
             reachabilityBarrier(this)
         }
+
+    override fun toString() = "Typeface(familyName='$familyName', fontStyle=$fontStyle, uniqueId=$uniqueId)"
 }
 
 @ExternalSymbolName("org_jetbrains_skia_Typeface__1nGetUniqueId")

skiko/src/commonMain/kotlin/org/jetbrains/skiko/RendezvousBroadcastChannel.kt

@@ -6,8 +6,8 @@ import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
 
 /**
- * Behaves as Channel<Unit>(Channel.RENDEZVOUS), but with ability to send value to all current consumers
- * (which await on `receive` method).
+ * Behaves as `Channel<Unit>(Channel.RENDEZVOUS)`, but with ability to send a value to all current consumers
+ * (which will await on `receive` method).
  */
 internal class RendezvousBroadcastChannel<T> {
     private val onRequest = Channel<Unit>(Channel.CONFLATED)
@@ -32,7 +32,7 @@ internal class RendezvousBroadcastChannel<T> {
     }
 
     /**
-     * Wait when the producer will send a value and return it.
+     * Wait until the producer sends a value, and returns it.
      *
      * Can be called concurrently from multiple threads.
      */

skiko/src/commonTest/kotlin/org/jetbrains/skia/FontTests.kt

@@ -4,10 +4,8 @@ import org.jetbrains.skia.impl.use
 import org.jetbrains.skia.tests.assertCloseEnough
 import org.jetbrains.skia.tests.assertContentCloseEnough
 import org.jetbrains.skia.tests.makeFromResource
-import org.jetbrains.skiko.KotlinBackend
 import org.jetbrains.skiko.OS
 import org.jetbrains.skiko.hostOs
-import org.jetbrains.skiko.kotlinBackend
 import org.jetbrains.skiko.tests.runTest
 import kotlin.test.Test
 import kotlin.test.assertContentEquals

skiko/src/commonTest/kotlin/org/jetbrains/skia/TextBlobBuilderTest.kt

@@ -3,12 +3,12 @@ package org.jetbrains.skia
 import org.jetbrains.skia.tests.assertCloseEnough
 import org.jetbrains.skia.tests.assertContentCloseEnough
 import org.jetbrains.skia.tests.makeFromResource
-import org.jetbrains.skiko.KotlinBackend
-import org.jetbrains.skiko.kotlinBackend
 import org.jetbrains.skiko.tests.runTest
 import kotlin.math.cos
 import kotlin.math.sin
-import kotlin.test.*
+import kotlin.test.Test
+import kotlin.test.assertContentEquals
+import kotlin.test.assertEquals
 
 class TextBlobBuilderTest {
 

skiko/src/commonTest/kotlin/org/jetbrains/skiko/TypefaceTest.kt

@@ -3,8 +3,6 @@ package org.jetbrains.skiko
 import org.jetbrains.skia.*
 import org.jetbrains.skia.tests.assertCloseEnough
 import org.jetbrains.skia.tests.makeFromResource
-import org.jetbrains.skiko.tests.SkipJsTarget
-import org.jetbrains.skiko.tests.SkipNativeTarget
 import org.jetbrains.skiko.tests.runTest
 import kotlin.test.*
 

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

@@ -12,8 +12,8 @@ object Library {
     private val skikoLibraryPath = System.getProperty(SKIKO_LIBRARY_PATH_PROPERTY)
     private var copyDir: File? = null
 
-    // Same native library cannot be loaded in several classloaders, so we have to clone
-    // native library to allow Skiko loading to work properly in complex cases, i.e.
+    // A native library cannot be loaded in several classloaders, so we have to clone
+    // the native library to allow Skiko loading to work properly in complex cases, i.e.,
     // several IDEA plugins.
     private fun loadLibraryOrCopy(library: File) {
         try {
@@ -49,8 +49,8 @@ object Library {
 
     // This function does the following: on request to load given resource,
     // it checks if resource with given name is found in content-derived directory
-    // in Skiko's home, and if not - unpacks it. Also, it could load additional
-    // localization resource on platforms where it is needed.
+    // in Skiko's home, and if not - unpacks it. It could also load additional
+    // localization resources, on platforms where it is needed.
     @Synchronized
     fun load() {
         if (!loaded.compareAndSet(false, true)) return