Move to Kotlin 1.5.31 (#226)

samples/SkiaJsSample/build.gradle.kts

-import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
-
 plugins {
-    kotlin("multiplatform") version "1.5.10"
+    // Cannot move to 1.5.31 due to
+    // "Cannot change attributes of dependency configuration ':commonTestApiDependenciesMetadata' after it has been resolved"
+    kotlin("multiplatform") version "1.5.20"
 }
 
 repositories {
@@ -33,7 +33,6 @@ tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile>().configureEach
     dependsOn(unzipTask)
 }
 
-
 kotlin {
 
     js(IR) {
@@ -58,7 +57,7 @@ kotlin {
 
 // a temporary workaround for a bug in jsRun invocation - see https://youtrack.jetbrains.com/issue/KT-48273
 afterEvaluate {
-    extensions.configure<NodeJsRootExtension> {
+    extensions.configure<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension> {
         versions.webpackDevServer.version = "4.0.0"
     }
 }

samples/SkiaJvmSample/build.gradle.kts

 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.5.10"
+    kotlin("jvm") version "1.5.31"
     application
 }
 

samples/SkiaNativeSample/build.gradle.kts

 plugins {
-    kotlin("multiplatform") version "1.5.21"
+    kotlin("multiplatform") version "1.5.31"
 }
 
 repositories {
@@ -65,6 +65,7 @@ kotlin {
         val macosX64Main by getting {
             dependsOn(nativeMain)
             dependencies {
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-macosx64:1.5.2")
                 implementation("org.jetbrains.skiko:skiko-native-runtime-$target:$version")
             }
         }

samples/SkiaNativeSample/gradle.properties

 kotlin.code.style=official
-kotlin.native.version=1.5.21-dev-329
 kotlin.native.cacheKind.macosX64=none

skiko/build.gradle.kts

@@ -5,14 +5,14 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile
 import org.jetbrains.kotlin.utils.keysToMap
 
 plugins {
-    kotlin("multiplatform") version "1.5.10"
+    kotlin("multiplatform") version "1.5.31"
     `cpp-library`
     `maven-publish`
     id("org.gradle.crypto.checksum") version "1.1.0"
     id("de.undercouch.download") version "4.1.1"
 }
 
-val coroutinesVersion = "1.5.0"
+val coroutinesVersion = "1.5.2"
 
 fun targetSuffix(os: OS, arch: Arch): String {
     return "${os.id}_${arch.id}"

skiko/gradle.properties

 kotlin.code.style=official
 deploy.version=0.0.0
-kotlin.native.version=1.5.21-dev-329
 
 dependencies.skia.windows-x64=m94-fd7c5792ca
 dependencies.skia.linux-x64=m94-fd7c5792ca

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

@@ -22,7 +22,7 @@ SKIKO_EXPORT KNativePointer org_jetbrains_skia_Drawable__1nMake
 
 
 SKIKO_EXPORT void org_jetbrains_skia_Drawable__1nInit
-  (KNativePointer ptr) {
+  (KInteropPointer kthis, KNativePointer ptr) {
     TODO("implement org_jetbrains_skia_Drawable__1nInit");
 }
      

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad
@@ -65,13 +64,13 @@ class BackendRenderTarget internal constructor(ptr: NativePointer) : Managed(ptr
     }
 
     private object _FinalizerHolder {
-        val PTR = _nGetFinalizer()
+        val PTR = BackendRenderTarget_nGetFinalizer()
     }
 }
 
 
 @ExternalSymbolName("org_jetbrains_skia_BackendRenderTarget__1nGetFinalizer")
-private external fun _nGetFinalizer(): NativePointer
+private external fun BackendRenderTarget_nGetFinalizer(): NativePointer
 
 @ExternalSymbolName("org_jetbrains_skia_BackendRenderTarget__1nMakeGL")
 private external fun _nMakeGL(width: Int, height: Int, sampleCnt: Int, stencilBits: Int, fbId: Int, fbFormat: Int): NativePointer

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.*
@@ -792,7 +791,7 @@ class Bitmap internal constructor(ptr: NativePointer) : Managed(ptr, _FinalizerH
     fun getColor(x: Int, y: Int): Int {
         return try {
             Stats.onNativeCall()
-            _nGetColor(_ptr, x, y)
+            Bitmap_nGetColor(_ptr, x, y)
         } finally {
             reachabilityBarrier(this)
         }
@@ -1151,7 +1150,7 @@ private external fun _nEraseColor(ptr: NativePointer, color: Int)
 private external fun _nErase(ptr: NativePointer, color: Int, left: Int, top: Int, right: Int, bottom: Int)
 
 @ExternalSymbolName("org_jetbrains_skia_Bitmap__1nGetColor")
-private external fun _nGetColor(ptr: NativePointer, x: Int, y: Int): Int
+private external fun Bitmap_nGetColor(ptr: NativePointer, x: Int, y: Int): Int
 
 @ExternalSymbolName("org_jetbrains_skia_Bitmap__1nGetAlphaf")
 private external fun _nGetAlphaf(ptr: NativePointer, x: Int, y: Int): Float

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.ImageFilter.Companion.makeDropShadowOnly

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 /**

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.*

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.*
@@ -116,16 +115,15 @@ abstract class Drawable : RefCnt(Drawable_nMake()) {
         onDraw(Canvas(canvasPtr, false, this))
     }
 
-    @ExternalSymbolName("org_jetbrains_skia_Drawable__1nInit")
-    external fun _nInit(ptr: NativePointer)
-
     init {
         Stats.onNativeCall()
         Stats.onNativeCall()
-        _nInit(_ptr)
+        Drawable_nInit(this, _ptr)
     }
 }
 
+@ExternalSymbolName("org_jetbrains_skia_Drawable__1nInit")
+private external fun Drawable_nInit(drawable: Drawable, ptr: NativePointer)
 
 @ExternalSymbolName("org_jetbrains_skia_Drawable__1nMake")
 private external fun Drawable_nMake(): NativePointer

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.*

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.*

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

 package org.jetbrains.skia
 
-
 enum class MipmapMode {
     /**
      * ignore mipmap levels, sample from the "base"

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad
@@ -165,7 +164,7 @@ class Paint : Managed {
     var color: Int
         get() = try {
             Stats.onNativeCall()
-            _nGetColor(_ptr)
+            Paint_nGetColor(_ptr)
         } finally {
             reachabilityBarrier(this)
         }
@@ -642,7 +641,7 @@ private external fun _nGetMode(ptr: NativePointer): Int
 private external fun _nSetMode(ptr: NativePointer, value: Int)
 
 @ExternalSymbolName("org_jetbrains_skia_Paint__1nGetColor")
-private external fun _nGetColor(ptr: NativePointer): Int
+private external fun Paint_nGetColor(ptr: NativePointer): Int
 
 @ExternalSymbolName("org_jetbrains_skia_Paint__1nGetColor4f")
 private external fun _nGetColor4f(ptr: NativePointer): Color4f

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.*

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.*

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.*

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.*
@@ -255,7 +254,7 @@ class Pixmap internal constructor(ptr: NativePointer, managed: Boolean) :
 
         fun make(info: ImageInfo, addr: NativePointer, rowBytes: Int): Pixmap {
             return try {
-                val ptr = _nMake(
+                val ptr = Pixmap_nMake(
                     info.width, info.height,
                     info.colorInfo.colorType.ordinal,
                     info.colorInfo.alphaType.ordinal,
@@ -299,7 +298,7 @@ private external fun Pixmap_nGetColor(ptr: NativePointer, x: Int, y: Int): Int
 private external fun _nMakeNull(): NativePointer
 
 @ExternalSymbolName("org_jetbrains_skia_Pixmap__1nMake")
-private external fun _nMake(
+private external fun Pixmap_nMake(
     width: Int,
     height: Int,
     colorType: Int,
@@ -309,7 +308,6 @@ private external fun _nMake(
     rowBytes: Int
 ): NativePointer
 
-
 @ExternalSymbolName("org_jetbrains_skia_Pixmap__1nResetWithInfo")
 private external fun _nResetWithInfo(
     ptr: NativePointer,

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
-
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.*
@@ -23,7 +21,7 @@ class Region : Managed(Region_nMake(), _FinalizerHolder.PTR) {
     fun set(r: Region?): Boolean {
         return try {
             Stats.onNativeCall()
-            _nSet(_ptr, getPtr(r))
+            Region_nSet(_ptr, getPtr(r))
         } finally {
             reachabilityBarrier(this)
             reachabilityBarrier(r)
@@ -47,7 +45,7 @@ class Region : Managed(Region_nMake(), _FinalizerHolder.PTR) {
     val isComplex: Boolean
         get() = try {
             Stats.onNativeCall()
-            _nIsComplex(_ptr)
+            Region_nIsComplex(_ptr)
         } finally {
             reachabilityBarrier(this)
         }
@@ -62,7 +60,7 @@ class Region : Managed(Region_nMake(), _FinalizerHolder.PTR) {
     fun computeRegionComplexity(): Int {
         return try {
             Stats.onNativeCall()
-            _nComputeRegionComplexity(_ptr)
+            Region_nComputeRegionComplexity(_ptr)
         } finally {
             reachabilityBarrier(this)
         }
@@ -71,7 +69,7 @@ class Region : Managed(Region_nMake(), _FinalizerHolder.PTR) {
     fun getBoundaryPath(p: Path?): Boolean {
         return try {
             Stats.onNativeCall()
-            _nGetBoundaryPath(
+            Region_nGetBoundaryPath(
                 _ptr,
                 getPtr(p)
             )
@@ -84,7 +82,7 @@ class Region : Managed(Region_nMake(), _FinalizerHolder.PTR) {
     fun setEmpty(): Boolean {
         return try {
             Stats.onNativeCall()
-            _nSetEmpty(_ptr)
+            Region_nSetEmpty(_ptr)
         } finally {
             reachabilityBarrier(this)
         }
@@ -93,7 +91,7 @@ class Region : Managed(Region_nMake(), _FinalizerHolder.PTR) {
     fun setRect(rect: IRect): Boolean {
         return try {
             Stats.onNativeCall()
-            _nSetRect(_ptr, rect.left, rect.top, rect.right, rect.bottom)
+            Region_nSetRect(_ptr, rect.left, rect.top, rect.right, rect.bottom)
         } finally {
             reachabilityBarrier(this)
         }
@@ -110,7 +108,7 @@ class Region : Managed(Region_nMake(), _FinalizerHolder.PTR) {
             }
             Stats.onNativeCall()
             interopScope {
-                _nSetRects(_ptr, toInterop(arr))
+                Region_nSetRects(_ptr, toInterop(arr))
             }
         } finally {
             reachabilityBarrier(this)
@@ -120,7 +118,7 @@ class Region : Managed(Region_nMake(), _FinalizerHolder.PTR) {
     fun setRegion(r: Region?): Boolean {
         return try {
             Stats.onNativeCall()
-            _nSetRegion(_ptr, getPtr(r))
+            Region_nSetRegion(_ptr, getPtr(r))
         } finally {
             reachabilityBarrier(this)
             reachabilityBarrier(r)
@@ -130,7 +128,7 @@ class Region : Managed(Region_nMake(), _FinalizerHolder.PTR) {
     fun setPath(path: Path?, clip: Region?): Boolean {
         return try {
             Stats.onNativeCall()
-            _nSetPath(
+            Region_nSetPath(
                 _ptr,
                 getPtr(path),
                 getPtr(clip)
@@ -145,7 +143,7 @@ class Region : Managed(Region_nMake(), _FinalizerHolder.PTR) {
     fun intersects(rect: IRect): Boolean {
         return try {
             Stats.onNativeCall()
-            _nIntersectsIRect(_ptr, rect.left, rect.top, rect.right, rect.bottom)
+            Region_nIntersectsIRect(_ptr, rect.left, rect.top, rect.right, rect.bottom)
         } finally {
             reachabilityBarrier(this)
         }
@@ -154,7 +152,7 @@ class Region : Managed(Region_nMake(), _FinalizerHolder.PTR) {
     fun intersects(r: Region?): Boolean {
         return try {
             Stats.onNativeCall()
-            _nIntersectsRegion(
+            Region_nIntersectsRegion(
                 _ptr,
                 getPtr(r)
             )
@@ -167,7 +165,7 @@ class Region : Managed(Region_nMake(), _FinalizerHolder.PTR) {
     fun contains(x: Int, y: Int): Boolean {
         return try {
             Stats.onNativeCall()
-            _nContainsIPoint(_ptr, x, y)
+            Region_nContainsIPoint(_ptr, x, y)
         } finally {
             reachabilityBarrier(this)
         }
@@ -176,7 +174,7 @@ class Region : Managed(Region_nMake(), _FinalizerHolder.PTR) {
     operator fun contains(rect: IRect): Boolean {
         return try {
             Stats.onNativeCall()
-            _nContainsIRect(_ptr, rect.left, rect.top, rect.right, rect.bottom)
+            Region_nContainsIRect(_ptr, rect.left, rect.top, rect.right, rect.bottom)
         } finally {
             reachabilityBarrier(this)
         }
@@ -185,7 +183,7 @@ class Region : Managed(Region_nMake(), _FinalizerHolder.PTR) {
     operator fun contains(r: Region?): Boolean {
         return try {
             Stats.onNativeCall()
-            _nContainsRegion(_ptr, getPtr(r))
+            Region_nContainsRegion(_ptr, getPtr(r))
         } finally {
             reachabilityBarrier(this)
             reachabilityBarrier(r)
@@ -195,7 +193,7 @@ class Region : Managed(Region_nMake(), _FinalizerHolder.PTR) {
     fun quickContains(rect: IRect): Boolean {
         return try {
             Stats.onNativeCall()
-            _nQuickContains(_ptr, rect.left, rect.top, rect.right, rect.bottom)
+            Region_nQuickContains(_ptr, rect.left, rect.top, rect.right, rect.bottom)
         } finally {
             reachabilityBarrier(this)
         }
@@ -204,7 +202,7 @@ class Region : Managed(Region_nMake(), _FinalizerHolder.PTR) {
     fun quickReject(rect: IRect): Boolean {
         return try {
             Stats.onNativeCall()
-            _nQuickRejectIRect(_ptr, rect.left, rect.top, rect.right, rect.bottom)
+            Region_nQuickRejectIRect(_ptr, rect.left, rect.top, rect.right, rect.bottom)
         } finally {
             reachabilityBarrier(this)
         }
@@ -213,7 +211,7 @@ class Region : Managed(Region_nMake(), _FinalizerHolder.PTR) {
     fun quickReject(r: Region?): Boolean {
         return try {
             Stats.onNativeCall()
-            _nQuickRejectRegion(
+            Region_nQuickRejectRegion(
                 _ptr,
                 getPtr(r)
             )
@@ -226,7 +224,7 @@ class Region : Managed(Region_nMake(), _FinalizerHolder.PTR) {
     fun translate(dx: Int, dy: Int) {
         try {
             Stats.onNativeCall()
-            _nTranslate(_ptr, dx, dy)
+            Region_nTranslate(_ptr, dx, dy)
         } finally {
             reachabilityBarrier(this)
         }
@@ -235,7 +233,7 @@ class Region : Managed(Region_nMake(), _FinalizerHolder.PTR) {
     fun op(rect: IRect, op: Op): Boolean {
         return try {
             Stats.onNativeCall()
-            _nOpIRect(
+            Region_nOpIRect(
                 _ptr,
                 rect.left,
                 rect.top,
@@ -251,7 +249,7 @@ class Region : Managed(Region_nMake(), _FinalizerHolder.PTR) {
     fun op(r: Region?, op: Op): Boolean {
         return try {
             Stats.onNativeCall()
-            _nOpRegion(
+            Region_nOpRegion(
                 _ptr,
                 getPtr(r),
                 op.ordinal
@@ -265,7 +263,7 @@ class Region : Managed(Region_nMake(), _FinalizerHolder.PTR) {
     fun op(rect: IRect, r: Region?, op: Op): Boolean {
         return try {
             Stats.onNativeCall()
-            _nOpIRectRegion(
+            Region_nOpIRectRegion(
                 _ptr,
                 rect.left,
                 rect.top,
@@ -283,7 +281,7 @@ class Region : Managed(Region_nMake(), _FinalizerHolder.PTR) {
     fun op(r: Region?, rect: IRect, op: Op): Boolean {
         return try {
             Stats.onNativeCall()
-            _nOpRegionIRect(
+            Region_nOpRegionIRect(
                 _ptr,
                 getPtr(r),
                 rect.left,
@@ -301,7 +299,7 @@ class Region : Managed(Region_nMake(), _FinalizerHolder.PTR) {
     fun op(a: Region?, b: Region?, op: Op): Boolean {
         return try {
             Stats.onNativeCall()
-            _nOpRegionRegion(
+            Region_nOpRegionRegion(
                 _ptr,
                 getPtr(a),
                 getPtr(b),
@@ -340,67 +338,67 @@ private external fun Region_nIsRect(ptr: NativePointer): Boolean
 private external fun Region_nGetBounds(ptr: NativePointer): IRect
 
 @ExternalSymbolName("org_jetbrains_skia_Region__1nSet")
-private external fun _nSet(ptr: NativePointer, regoinPtr: NativePointer): Boolean
+private external fun Region_nSet(ptr: NativePointer, regoinPtr: NativePointer): Boolean
 
 @ExternalSymbolName("org_jetbrains_skia_Region__1nIsComplex")
-private external fun _nIsComplex(ptr: NativePointer): Boolean
+private external fun Region_nIsComplex(ptr: NativePointer): Boolean
 
 @ExternalSymbolName("org_jetbrains_skia_Region__1nComputeRegionComplexity")
-private external fun _nComputeRegionComplexity(ptr: NativePointer): Int
+private external fun Region_nComputeRegionComplexity(ptr: NativePointer): Int
 
 @ExternalSymbolName("org_jetbrains_skia_Region__1nGetBoundaryPath")
-private external fun _nGetBoundaryPath(ptr: NativePointer, pathPtr: NativePointer): Boolean
+private external fun Region_nGetBoundaryPath(ptr: NativePointer, pathPtr: NativePointer): Boolean
 
 @ExternalSymbolName("org_jetbrains_skia_Region__1nSetEmpty")
-private external fun _nSetEmpty(ptr: NativePointer): Boolean
+private external fun Region_nSetEmpty(ptr: NativePointer): Boolean
 
 @ExternalSymbolName("org_jetbrains_skia_Region__1nSetRect")
-private external fun _nSetRect(ptr: NativePointer, left: Int, top: Int, right: Int, bottom: Int): Boolean
+private external fun Region_nSetRect(ptr: NativePointer, left: Int, top: Int, right: Int, bottom: Int): Boolean
 
 @ExternalSymbolName("org_jetbrains_skia_Region__1nSetRects")
-private external fun _nSetRects(ptr: NativePointer, rects: InteropPointer): Boolean
+private external fun Region_nSetRects(ptr: NativePointer, rects: InteropPointer): Boolean
 
 @ExternalSymbolName("org_jetbrains_skia_Region__1nSetRegion")
-private external fun _nSetRegion(ptr: NativePointer, regionPtr: NativePointer): Boolean
+private external fun Region_nSetRegion(ptr: NativePointer, regionPtr: NativePointer): Boolean
 
 @ExternalSymbolName("org_jetbrains_skia_Region__1nSetPath")
-private external fun _nSetPath(ptr: NativePointer, pathPtr: NativePointer, regionPtr: NativePointer): Boolean
+private external fun Region_nSetPath(ptr: NativePointer, pathPtr: NativePointer, regionPtr: NativePointer): Boolean
 
 @ExternalSymbolName("org_jetbrains_skia_Region__1nIntersectsIRect")
-private external fun _nIntersectsIRect(ptr: NativePointer, left: Int, top: Int, right: Int, bottom: Int): Boolean
+private external fun Region_nIntersectsIRect(ptr: NativePointer, left: Int, top: Int, right: Int, bottom: Int): Boolean
 
 @ExternalSymbolName("org_jetbrains_skia_Region__1nIntersectsRegion")
-private external fun _nIntersectsRegion(ptr: NativePointer, regionPtr: NativePointer): Boolean
+private external fun Region_nIntersectsRegion(ptr: NativePointer, regionPtr: NativePointer): Boolean
 
 @ExternalSymbolName("org_jetbrains_skia_Region__1nContainsIPoint")
-private external fun _nContainsIPoint(ptr: NativePointer, x: Int, y: Int): Boolean
+private external fun Region_nContainsIPoint(ptr: NativePointer, x: Int, y: Int): Boolean
 
 @ExternalSymbolName("org_jetbrains_skia_Region__1nContainsIRect")
-private external fun _nContainsIRect(ptr: NativePointer, left: Int, top: Int, right: Int, bottom: Int): Boolean
+private external fun Region_nContainsIRect(ptr: NativePointer, left: Int, top: Int, right: Int, bottom: Int): Boolean
 
 @ExternalSymbolName("org_jetbrains_skia_Region__1nContainsRegion")
-private external fun _nContainsRegion(ptr: NativePointer, regionPtr: NativePointer): Boolean
+private external fun Region_nContainsRegion(ptr: NativePointer, regionPtr: NativePointer): Boolean
 
 @ExternalSymbolName("org_jetbrains_skia_Region__1nQuickContains")
-private external fun _nQuickContains(ptr: NativePointer, left: Int, top: Int, right: Int, bottom: Int): Boolean
+private external fun Region_nQuickContains(ptr: NativePointer, left: Int, top: Int, right: Int, bottom: Int): Boolean
 
 @ExternalSymbolName("org_jetbrains_skia_Region__1nQuickRejectIRect")
-private external fun _nQuickRejectIRect(ptr: NativePointer, left: Int, top: Int, right: Int, bottom: Int): Boolean
+private external fun Region_nQuickRejectIRect(ptr: NativePointer, left: Int, top: Int, right: Int, bottom: Int): Boolean
 
 @ExternalSymbolName("org_jetbrains_skia_Region__1nQuickRejectRegion")
-private external fun _nQuickRejectRegion(ptr: NativePointer, regionPtr: NativePointer): Boolean
+private external fun Region_nQuickRejectRegion(ptr: NativePointer, regionPtr: NativePointer): Boolean
 
 @ExternalSymbolName("org_jetbrains_skia_Region__1nTranslate")
-private external fun _nTranslate(ptr: NativePointer, dx: Int, dy: Int)
+private external fun Region_nTranslate(ptr: NativePointer, dx: Int, dy: Int)
 
 @ExternalSymbolName("org_jetbrains_skia_Region__1nOpIRect")
-private external fun _nOpIRect(ptr: NativePointer, left: Int, top: Int, right: Int, bottom: Int, op: Int): Boolean
+private external fun Region_nOpIRect(ptr: NativePointer, left: Int, top: Int, right: Int, bottom: Int, op: Int): Boolean
 
 @ExternalSymbolName("org_jetbrains_skia_Region__1nOpRegion")
-private external fun _nOpRegion(ptr: NativePointer, regionPtr: NativePointer, op: Int): Boolean
+private external fun Region_nOpRegion(ptr: NativePointer, regionPtr: NativePointer, op: Int): Boolean
 
 @ExternalSymbolName("org_jetbrains_skia_Region__1nOpIRectRegion")
-private external fun _nOpIRectRegion(
+private external fun Region_nOpIRectRegion(
     ptr: NativePointer,
     left: Int,
     top: Int,
@@ -412,7 +410,7 @@ private external fun _nOpIRectRegion(
 
 
 @ExternalSymbolName("org_jetbrains_skia_Region__1nOpRegionIRect")
-private external fun _nOpRegionIRect(
+private external fun Region_nOpRegionIRect(
     ptr: NativePointer,
     regionPtr: NativePointer,
     left: Int,
@@ -424,7 +422,7 @@ private external fun _nOpRegionIRect(
 
 
 @ExternalSymbolName("org_jetbrains_skia_Region__1nOpRegionRegion")
-private external fun _nOpRegionRegion(
+private external fun Region_nOpRegionRegion(
     ptr: NativePointer,
     regionPtrA: NativePointer,
     regionPtrB: NativePointer,

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.*

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

 package org.jetbrains.skia
 
-import org.jetbrains.skia.impl.NativePointer
-
 /**
  * @see org.jetbrains.skia.FilterMipmap
  *

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.*

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.*

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.*

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.*

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad

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

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad

skiko/src/commonMain/kotlin/org/jetbrains/skia/impl/BufferUtil.kt

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia.impl
 
 import org.jetbrains.skia.ByteBuffer

skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/FontCollection.kt

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia.paragraph
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad

skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/Paragraph.kt

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia.paragraph
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad
@@ -256,7 +255,7 @@ class Paragraph internal constructor(ptr: NativePointer, text: ManagedString?) :
     }
 
     private object _FinalizerHolder {
-        val PTR = _nGetFinalizer()
+        val PTR = Paragraph_nGetFinalizer()
     }
 
     init {
@@ -267,7 +266,7 @@ class Paragraph internal constructor(ptr: NativePointer, text: ManagedString?) :
 
 
 @ExternalSymbolName("org_jetbrains_skia_paragraph_Paragraph__1nGetFinalizer")
-private external fun _nGetFinalizer(): NativePointer
+private external fun Paragraph_nGetFinalizer(): NativePointer
 
 @ExternalSymbolName("org_jetbrains_skia_paragraph_Paragraph__1nGetMaxWidth")
 private external fun _nGetMaxWidth(ptr: NativePointer): Float

skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/ParagraphBuilder.kt

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia.paragraph
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad

skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/ParagraphCache.kt

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia.paragraph
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad

skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/ParagraphStyle.kt

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia.paragraph
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad

skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/StrutStyle.kt

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia.paragraph
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad

skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/TypefaceFontProvider.kt

-@file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia.paragraph
 
 import org.jetbrains.skia.impl.Library.Companion.staticLoad

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

@@ -7,7 +7,7 @@ static void deleteBackendRenderTarget(GrBackendRenderTarget* rt) {
     delete rt;
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_BackendRenderTargetKt__1nGetFinalizer
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_BackendRenderTargetKt_BackendRenderTarget_1nGetFinalizer
   (JNIEnv* env, jclass jclass) {
     return static_cast<jlong>(reinterpret_cast<uintptr_t>(&deleteBackendRenderTarget));
 }

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

@@ -202,7 +202,7 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_BitmapKt__1nErase
     instance->erase(color, {left, top, right, bottom});
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_BitmapKt__1nGetColor
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_BitmapKt_Bitmap_1nGetColor
   (JNIEnv* env, jclass jclass, jlong ptr, jint x, jint y) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     return instance->getColor(x, y);

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

@@ -44,8 +44,8 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_DrawableKt_Drawable_1
     return reinterpret_cast<jlong>(instance);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_DrawableKt__1nInit
-  (JNIEnv* env, jobject jthis, jlong ptr) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_DrawableKt_Drawable__1nInit
+  (JNIEnv* env,  jclass jclass, jobject jthis, jlong ptr) {
     SkijaDrawableImpl* instance = reinterpret_cast<SkijaDrawableImpl*>(static_cast<uintptr_t>(ptr));
     instance->init(env, jthis);
 }

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

@@ -68,7 +68,7 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_PaintKt__1nSetDither
     instance->setDither(value);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_PaintKt__1nGetColor
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_PaintKt_Paint_1nGetColor
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     return instance->getColor();

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

@@ -17,7 +17,7 @@ extern "C" {
         return ptrToJlong(new SkPixmap());
     }
 
-    JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_PixmapKt__1nMake
+    JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_PixmapKt_Pixmap_1nMake
       (JNIEnv *env, jclass klass,
       jint width, jint height, jint colorType, jint alphaType, jlong colorSpacePtr, jlong pixelsPtr, jint rowBytes) {
         SkColorSpace* colorSpace = jlongToPtr<SkColorSpace*>(colorSpacePtr);

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

@@ -17,7 +17,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_RegionKt_Region_1nGet
     return static_cast<jlong>(reinterpret_cast<uintptr_t>(&deleteRegion));
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt__1nSet(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt_Region_1nSet(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     SkRegion* other = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(regionPtr));
     return instance->set(*other);
@@ -33,7 +33,7 @@ extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt_Region_1n
     return instance->isRect();
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt__1nIsComplex(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt_Region_1nIsComplex(JNIEnv* env, jclass jclass, jlong ptr) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     return instance->isComplex();
 }
@@ -43,28 +43,28 @@ extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_RegionKt_Region_1nG
     return skija::IRect::fromSkIRect(env, instance->getBounds());
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_RegionKt__1nComputeRegionComplexity(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_RegionKt_Region_1nComputeRegionComplexity(JNIEnv* env, jclass jclass, jlong ptr) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     return instance->computeRegionComplexity();
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt__1nGetBoundaryPath(JNIEnv* env, jclass jclass, jlong ptr, jlong pathPtr) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt_Region_1nGetBoundaryPath(JNIEnv* env, jclass jclass, jlong ptr, jlong pathPtr) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     SkPath* path = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(pathPtr));
     return instance->getBoundaryPath(path);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt__1nSetEmpty(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt_Region_1nSetEmpty(JNIEnv* env, jclass jclass, jlong ptr) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     return instance->setEmpty();
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt__1nSetRect(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt_Region_1nSetRect(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     return instance->setRect({left, top, right, bottom});
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt__1nSetRects(JNIEnv* env, jclass jclass, jlong ptr, jintArray coords) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt_Region_1nSetRects(JNIEnv* env, jclass jclass, jlong ptr, jintArray coords) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     int len = env->GetArrayLength(coords);
     std::vector<SkIRect> rects(len / 4);
@@ -75,91 +75,91 @@ extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt__1nSetRec
     return instance->setRects(rects.data(), len / 4);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt__1nSetRegion(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt_Region_1nSetRegion(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     SkRegion* region = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(regionPtr));
     return instance->setRegion(*region);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt__1nSetPath(JNIEnv* env, jclass jclass, jlong ptr, jlong pathPtr, jlong regionPtr) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt_Region_1nSetPath(JNIEnv* env, jclass jclass, jlong ptr, jlong pathPtr, jlong regionPtr) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     SkPath* path = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(pathPtr));
     SkRegion* region = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(regionPtr));
     return instance->setPath(*path, *region);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt__1nIntersectsIRect(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt_Region_1nIntersectsIRect(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     return instance->intersects({left, top, right, bottom});
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt__1nIntersectsRegion(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt_Region_1nIntersectsRegion(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     SkRegion* region = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(regionPtr));
     return instance->intersects(*region);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt__1nContainsIPoint(JNIEnv* env, jclass jclass, jlong ptr, jint x, jint y) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt_Region_1nContainsIPoint(JNIEnv* env, jclass jclass, jlong ptr, jint x, jint y) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     return instance->contains(x, y);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt__1nContainsIRect(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt_Region_1nContainsIRect(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     return instance->contains({left, top, right, bottom});
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt__1nContainsRegion(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt_Region_1nContainsRegion(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     SkRegion* region = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(regionPtr));
     return instance->contains(*region);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt__1nQuickContains(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt_Region_1nQuickContains(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     return instance->quickContains({left, top, right, bottom});
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt__1nQuickRejectIRect(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt_Region_1nQuickRejectIRect(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     return instance->quickReject({left, top, right, bottom});
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt__1nQuickRejectRegion(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt_Region_1nQuickRejectRegion(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     SkRegion* region = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(regionPtr));
     return instance->contains(*region);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_RegionKt__1nTranslate(JNIEnv* env, jclass jclass, jlong ptr, jint dx, jint dy) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_RegionKt_Region_1nTranslate(JNIEnv* env, jclass jclass, jlong ptr, jint dx, jint dy) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     instance->translate(dx, dy);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt__1nOpIRect(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom, jint op) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt_Region_1nOpIRect(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom, jint op) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     return instance->op({left, top, right, bottom}, static_cast<SkRegion::Op>(op));
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt__1nOpRegion(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr, jint op) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt_Region_1nOpRegion(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr, jint op) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     SkRegion* region = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(regionPtr));
     return instance->op(*region, static_cast<SkRegion::Op>(op));
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt__1nOpIRectRegion(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom, jlong regionPtr, jint op) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt_Region_1nOpIRectRegion(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom, jlong regionPtr, jint op) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     SkRegion* region = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(regionPtr));
     return instance->op({left, top, right, bottom}, *region, static_cast<SkRegion::Op>(op));
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt__1nOpRegionIRect(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr, jint left, jint top, jint right, jint bottom, jint op) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt_Region_1nOpRegionIRect(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr, jint left, jint top, jint right, jint bottom, jint op) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     SkRegion* region = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(regionPtr));
     return instance->op(*region, {left, top, right, bottom}, static_cast<SkRegion::Op>(op));
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt__1nOpRegionRegion(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtrA, jlong regionPtrB, jint op) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_RegionKt_Region_1nOpRegionRegion(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtrA, jlong regionPtrB, jint op) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     SkRegion* regionA = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(regionPtrA));
     SkRegion* regionB = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(regionPtrB));

skiko/src/jvmMain/cpp/common/paragraph/Paragraph.cc

@@ -13,7 +13,7 @@ static void deleteParagraph(Paragraph* instance) {
     delete instance;
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_paragraph_ParagraphKt__1nGetFinalizer
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_paragraph_ParagraphKt_Paragraph_1nGetFinalizer
   (JNIEnv* env, jclass jclass) {
     return static_cast<jlong>(reinterpret_cast<uintptr_t>(&deleteParagraph));
 }