merge

compottie-dot/src/jsMain/kotlin/io/github/alexzhirkevich/compottie/DecompressionStream.js.kt

@@ -6,31 +6,31 @@ import kotlin.coroutines.resumeWithException
 import kotlin.coroutines.suspendCoroutine
 import kotlin.js.Promise
 
-external class DecompressionStream(alg : String)
+internal external class DecompressionStream(alg : String)
 
-external interface UnderlyingSource {
+internal external interface UnderlyingSource {
     fun start(controller: SourceController)
 }
 
-external interface SourceController {
+internal external interface SourceController {
     fun enqueue(data : ByteArray)
 
     fun close()
 }
 
-external class ReadableStream(
+internal external class ReadableStream(
     source: UnderlyingSource
 ) {
     fun pipeThrough(decompressionStream: DecompressionStream) : ReadableStream
 
     fun getReader() : StreamReader
 }
 
-external interface StreamReader {
+internal external interface StreamReader {
     fun read() : Promise<StreamReadResult>
 }
 
-external interface StreamReadResult {
+internal external interface StreamReadResult {
     val done : Boolean
 
     val value : ArrayBufferView

compottie-dot/src/wasmJsMain/kotlin/io/github/alexzhirkevich/compottie/DecompressionStream.wasmJs.kt

@@ -7,21 +7,21 @@ import kotlin.coroutines.resumeWithException
 import kotlin.coroutines.suspendCoroutine
 import kotlin.js.Promise
 
-external class DecompressionStream(alg : String)
+internal external class DecompressionStream(alg : String)
 
-external class ReadableStream(
+internal external class ReadableStream(
     source: JsAny
 ) {
     fun pipeThrough(decompressionStream: DecompressionStream) : ReadableStream
 
     fun getReader() : StreamReader
 }
 
-external interface StreamReader {
+internal external interface StreamReader {
     fun read() : Promise<StreamReadResult>
 }
 
-external interface StreamReadResult : JsAny {
+internal external interface StreamReadResult : JsAny {
     val done : Boolean
 
     val value : ArrayBufferView

compottie-dot/src/webMain/kotlin/io/github/alexzhirkevich/compottie/FileSystem.web.kt

@@ -8,7 +8,7 @@ import okio.Sink
 import okio.Source
 
 @InternalCompottieApi
-internal actual fun defaultFileSystem() : FileSystem = ThrowingFileSystem
+public actual fun defaultFileSystem() : FileSystem = ThrowingFileSystem
 
 private object ThrowingFileSystem : FileSystem() {
 

compottie/src/androidMain/kotlin/io/github/alexzhirkevich/compottie/CompottieInitializer.kt

@@ -3,7 +3,7 @@ package io.github.alexzhirkevich.compottie
 import android.content.Context
 import androidx.startup.Initializer
 
-class CompottieInitializer : Initializer<Compottie> {
+public class CompottieInitializer : Initializer<Compottie> {
 
     @OptIn(InternalCompottieApi::class)
     override fun create(context: Context): Compottie {

compottie/src/androidMain/kotlin/io/github/alexzhirkevich/compottie/internal/platform/PlatformImage.android.kt

@@ -5,7 +5,7 @@ import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.text.font.Font
 
-actual fun ImageBitmap.Companion.fromBytes(bytes: ByteArray) : ImageBitmap {
+public actual fun ImageBitmap.Companion.fromBytes(bytes: ByteArray) : ImageBitmap {
     return BitmapFactory
         .decodeByteArray(bytes, 0, bytes.size)
         .asImageBitmap()

compottie/src/androidMain/kotlin/io/github/alexzhirkevich/compottie/internal/platform/PlatformText.android.kt

@@ -7,7 +7,7 @@ internal actual fun CharSequence.codePointAt(index : Int) =
 internal actual fun charCount(codePoint : Int): Int = Character.charCount(codePoint)
 
 
-val modifierSet = setOf(
+private val modifierSet = setOf(
     Character.FORMAT,
     Character.MODIFIER_SYMBOL,
     Character.NON_SPACING_MARK,

compottie/src/commonMain/kotlin/io/github/alexzhirkevich/compottie/dynamic/_DynamicShapeLayerProvider.kt

@@ -64,6 +64,8 @@ internal class DynamicShapeLayerProvider(
         val key = nRoot.eachShapes.keys
             .filter { it.second == clazz }
             .fastMaxBy { it.first.orEmpty().commonPrefixWith(path).length }
+            ?.takeIf { it.first?.commonPrefixWith(path)?.length != 0 }
+            ?: return null
 
         return nRoot.eachShapes[key]
     }

compottie/src/webMain/kotlin/io/github/alexzhirkevich/compottie/IoDispatcher.web.kt

@@ -3,4 +3,4 @@ package io.github.alexzhirkevich.compottie
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 
-actual fun ioDispatcher() = Dispatchers.Default
+public actual fun ioDispatcher() : CoroutineDispatcher = Dispatchers.Default

convention-plugins/src/main/kotlin/module.publication.gradle.kts

@@ -50,14 +50,13 @@ publishing {
     }
 }
 
-if (System.getenv("GPG_KEY") != null || findProperty("GPG_KEY") != null) {
-    signing {
-        useInMemoryPgpKeys(
-            Base64.getDecoder().decode(
-                System.getenv("GPG_KEY") ?: findProperty("GPG_KEY") as String
-            ).decodeToString(),
-            System.getenv("GPG_KEY_PWD") ?: findProperty("GPG_KEY_PWD") as String,
-        )
-        sign(publishing.publications)
-    }
+
+signing {
+    useInMemoryPgpKeys(
+        Base64.getDecoder().decode(
+            rootProject.ext.takeIf { it.has("GPG_KEY") }?.get("GPG_KEY") as? String ?: return@signing
+        ).decodeToString(),
+        rootProject.ext.takeIf { it.has("GPG_KEY_PWD") }?.get("GPG_KEY_PWD") as? String ?: return@signing
+    )
+    sign(publishing.publications)
 }

convention-plugins/src/main/kotlin/root.publication.gradle.kts

@@ -1,7 +1,24 @@
+import gradle.kotlin.dsl.accessors._2502cef48cff830615fe1c6d6ab5e104.ext
+import java.io.FileInputStream
+import java.util.Properties
+
 plugins {
     id("io.github.gradle-nexus.publish-plugin")
 }
 
+rootProject.projectDir.resolve("local.properties").let {
+    if (it.exists()) {
+        Properties().apply {
+            load(FileInputStream(it))
+        }.also {
+            it.forEach { (k,v)-> rootProject.ext.set(k.toString(), v) }
+        }
+        System.getenv().forEach { (k,v) ->
+            rootProject.ext.set(k, v)
+        }
+    }
+}
+
 allprojects {
     group = findProperty("group") as String
     version = findProperty("version") as String
@@ -15,13 +32,9 @@ nexusPublishing {
             nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
             snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
 
-            if (System.getenv("OSSRH_PASSWORD") != null) {
-                username.set(System.getenv("OSSRH_USERNAME"))
-                password.set(System.getenv("OSSRH_PASSWORD"))
-            } else if (findProperty("OSSRH_PASSWORD") != null) {
-                username.set(findProperty("OSSRH_USERNAME") as String)
-                password.set(findProperty("OSSRH_PASSWORD") as String)
-            }
+
+            username.set(rootProject.ext.takeIf { it.has("OSSRH_USERNAME") }?.get("OSSRH_USERNAME") as? String? ?: return@sonatype)
+            password.set(rootProject.ext.takeIf { it.has("OSSRH_PASSWORD") }?.get("OSSRH_PASSWORD") as? String? ?: return@sonatype)
         }
     }
 }

example/shared/src/commonMain/kotlin/App.kt

@@ -129,7 +129,7 @@ public suspend fun LottieCompositionSpec.Companion.ResourceString(
 public fun App() {
 
 //    return LottieFontExample()
-//    return AllExamples()
+    return AllExamples()
 //    return LottieList()
 
     val composition = rememberLottieComposition() {

example/shared/src/iosMain/kotlin/main.ios.kt

@@ -1,5 +1,6 @@
 import androidx.compose.ui.window.ComposeUIViewController
+import platform.UIKit.UIViewController
 
-fun MainViewController()  = ComposeUIViewController {
+public fun MainViewController() : UIViewController  = ComposeUIViewController {
     App()
 }

gradle/libs.versions.toml

@@ -8,7 +8,7 @@ compose="1.6.11"
 agp = "8.1.1"
 okio = "3.9.0"
 serialization="1.6.3"
-ktor="2.3.11"
+ktor="2.3.12"
 atomicfu="0.23.2"
 coroutines="1.8.0"
 nexus-publish="2.0.0"