v1.5.3

restartOnPlay added
ismai117 · Feb 23, 2024 · 4540ce4 · 4540ce4
1 parent 954ce59
commit 4540ce4
Show file tree

Hide file tree

Showing 38 changed files with 67 additions and 20,928 deletions.
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
@@ -1,8 +1,4 @@
 import com.vanniktech.maven.publish.SonatypeHost
-import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
-import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
-import org.jetbrains.kotlin.gradle.plugin.mpp.apple.XCFramework
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
 
@@ -20,19 +16,13 @@ kotlin {
         publishLibraryVariants("release")
     }
 
-    jvm("desktop")
+    jvm()
 
     js {
         browser()
         binaries.executable()
     }
 
-//    @OptIn(ExperimentalWasmDsl::class)
-//    wasmJs {
-//        browser()
-//        binaries.executable()
-//    }
-
     listOf(
         iosX64(),
         iosArm64(),
@@ -89,7 +79,6 @@ kotlin {
         val iosSimulatorArm64Main by getting
 
         val iosMain by creating {
-            dependsOn(commonMain)
             dependsOn(skiaMain)
             iosX64Main.dependsOn(this)
             iosArm64Main.dependsOn(this)
@@ -99,7 +88,7 @@ kotlin {
             }
         }
 
-        val desktopMain by getting {
+        val jvmMain by getting {
             dependsOn(skiaMain)
             dependencies {
                 implementation(libs.ktor.client.java)
@@ -113,11 +102,6 @@ kotlin {
             }
         }
 
-//        val wasmJsMain by getting {
-//            dependsOn(skiaMain)
-//        }
-
-
     }
 }
 

diff --git a/lib/src/androidMain/kotlin/kottieComposition/KottieComposition.android.kt b/lib/src/androidMain/kotlin/kottieComposition/KottieComposition.android.kt
@@ -1,6 +1,5 @@
 package kottieComposition
 
-import KottieCompositionSpec
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue

diff --git a/...nimateKottieCompositionAsState.android.kt → ...nimateKottieCompositionAsState.android.kt b/...nimateKottieCompositionAsState.android.kt → ...nimateKottieCompositionAsState.android.kt
@@ -1,10 +1,10 @@
+package kottieComposition
+
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.State
-import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import com.airbnb.lottie.LottieComposition
 import com.airbnb.lottie.compose.animateLottieCompositionAsState
 import kottieAnimationState.KottieAnimationState

diff --git a/...tlin/rememberkottieComposition.android.kt → ...tion/rememberkottieComposition.android.kt b/...tlin/rememberkottieComposition.android.kt → ...tion/rememberkottieComposition.android.kt
@@ -1,7 +1,8 @@
+package kottieComposition
+
 import androidx.compose.runtime.Composable
 import com.airbnb.lottie.compose.LottieCompositionSpec
 import com.airbnb.lottie.compose.rememberLottieComposition
-import kottieComposition.kottieComposition
 
 
 @Composable

diff --git a/lib/src/commonMain/kotlin/kottieComposition/KottieComposition.kt b/lib/src/commonMain/kotlin/kottieComposition/KottieComposition.kt
@@ -1,6 +1,5 @@
 package kottieComposition
 
-import KottieCompositionSpec
 import androidx.compose.runtime.Composable
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 

diff --git a/...ommonMain/kotlin/KottieCompositionSpec.kt → ...ottieComposition/KottieCompositionSpec.kt b/...ommonMain/kotlin/KottieCompositionSpec.kt → ...ottieComposition/KottieCompositionSpec.kt
@@ -1,4 +1,5 @@
-import kottie.lib.generated.resources.Res
+package kottieComposition
+
 import kotlin.jvm.JvmInline
 
 

diff --git a/...kotlin/animateKottieCompositionAsState.kt → ...sition/animateKottieCompositionAsState.kt b/...kotlin/animateKottieCompositionAsState.kt → ...sition/animateKottieCompositionAsState.kt
@@ -1,3 +1,5 @@
+package kottieComposition
+
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.State
 import kottieAnimationState.KottieAnimationState
@@ -9,5 +11,5 @@ expect fun animateKottieCompositionAsState(
     speed: Float = 1f,
     iterations: Int = 1,
     isPlaying: Boolean = true,
-    restartOnPlay: Boolean = false
+    restartOnPlay: Boolean = true
 ): State<KottieAnimationState>
diff --git a/...Main/kotlin/rememberkottieComposition(.kt → ...Composition/rememberkottieComposition(.kt b/...Main/kotlin/rememberkottieComposition(.kt → ...Composition/rememberkottieComposition(.kt
@@ -1,3 +1,5 @@
+package kottieComposition
+
 import androidx.compose.runtime.Composable
 
 

diff --git a/lib/src/commonMain/kotlin/KottieConstants.kt → ...ommonMain/kotlin/utils/KottieConstants.kt b/lib/src/commonMain/kotlin/KottieConstants.kt → ...ommonMain/kotlin/utils/KottieConstants.kt
@@ -1,3 +1,5 @@
+package utils
+
 object KottieConstants {
     val IterateForever = Int.MAX_VALUE
 }
diff --git a/lib/src/iosMain/kotlin/kottieComposition/KottieComposition.ios.kt b/lib/src/iosMain/kotlin/kottieComposition/KottieComposition.ios.kt
@@ -1,6 +1,5 @@
 package kottieComposition
 
-import KottieCompositionSpec
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue

diff --git a/...in/animateKottieCompositionAsState.ios.kt → ...on/animateKottieCompositionAsState.ios.kt b/...in/animateKottieCompositionAsState.ios.kt → ...on/animateKottieCompositionAsState.ios.kt
@@ -1,3 +1,5 @@
+package kottieComposition
+
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.State

diff --git a/...n/kotlin/rememberkottieComposition.ios.kt → ...position/rememberkottieComposition.ios.kt b/...n/kotlin/rememberkottieComposition.ios.kt → ...position/rememberkottieComposition.ios.kt
@@ -1,6 +1,7 @@
+package kottieComposition
+
 import androidx.compose.runtime.Composable
 import kotlinx.cinterop.ExperimentalForeignApi
-import kottieComposition.kottieComposition
 import lottie.lottieComposition.LottieCompositionSpec
 import lottie.lottieComposition.rememberLottieComposition
 

diff --git a/lib/src/jsMain/kotlin/kottieComposition/KottieComposition.js.kt b/lib/src/jsMain/kotlin/kottieComposition/KottieComposition.js.kt
@@ -1,6 +1,5 @@
 package kottieComposition
 
-import KottieCompositionSpec
 import skiaComposition.SkiaCompositionSpec
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect

diff --git a/...lin/animateKottieCompositionAsState.js.kt → ...ion/animateKottieCompositionAsState.js.kt b/...lin/animateKottieCompositionAsState.js.kt → ...ion/animateKottieCompositionAsState.js.kt
@@ -1,3 +1,5 @@
+package kottieComposition
+
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.State

diff --git a/...in/kotlin/rememberkottieComposition.js.kt → ...mposition/rememberkottieComposition.js.kt b/...in/kotlin/rememberkottieComposition.js.kt → ...mposition/rememberkottieComposition.js.kt
@@ -1,6 +1,7 @@
+package kottieComposition
+
 import skiaComposition.SkiaCompositionSpec
 import androidx.compose.runtime.Composable
-import kottieComposition.kottieComposition
 import skiaComposition.rememberSkiaComposition
 
 @Composable

diff --git a/...topMain/kotlin/kottieAnimation.desktop.kt → ...jvmMain/kotlin/kottieAnimation.desktop.kt b/...topMain/kotlin/kottieAnimation.desktop.kt → ...jvmMain/kotlin/kottieAnimation.desktop.kt
diff --git a/...eComposition/KottieComposition.desktop.kt → ...eComposition/KottieComposition.desktop.kt b/...eComposition/KottieComposition.desktop.kt → ...eComposition/KottieComposition.desktop.kt
@@ -1,6 +1,5 @@
 package kottieComposition
 
-import KottieCompositionSpec
 import skiaComposition.SkiaCompositionSpec
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect

diff --git a/...nimateKottieCompositionAsState.desktop.kt → ...nimateKottieCompositionAsState.desktop.kt b/...nimateKottieCompositionAsState.desktop.kt → ...nimateKottieCompositionAsState.desktop.kt
@@ -1,3 +1,5 @@
+package kottieComposition
+
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.State

diff --git a/...tlin/rememberkottieComposition.desktop.kt → ...tion/rememberkottieComposition.desktop.kt b/...tlin/rememberkottieComposition.desktop.kt → ...tion/rememberkottieComposition.desktop.kt
@@ -1,5 +1,8 @@
+package kottieComposition
+
 import skiaComposition.SkiaCompositionSpec
 import androidx.compose.runtime.Composable
+import kottieComposition.KottieCompositionSpec
 import kottieComposition.kottieComposition
 import skiaComposition.rememberSkiaComposition
 

diff --git a/lib/src/wasmJsMain/kotlin/animateKottieCompositionAsState.wasmJs.kt b/lib/src/wasmJsMain/kotlin/animateKottieCompositionAsState.wasmJs.kt
diff --git a/lib/src/wasmJsMain/kotlin/kottieAnimation.wasmJs.kt b/lib/src/wasmJsMain/kotlin/kottieAnimation.wasmJs.kt
diff --git a/lib/src/wasmJsMain/kotlin/kottieComposition/KottieComposition.wasmJs.kt b/lib/src/wasmJsMain/kotlin/kottieComposition/KottieComposition.wasmJs.kt
diff --git a/lib/src/wasmJsMain/kotlin/rememberkottieComposition.wasmJs.kt b/lib/src/wasmJsMain/kotlin/rememberkottieComposition.wasmJs.kt
diff --git a/sample/shared/build.gradle.kts b/sample/shared/build.gradle.kts
@@ -10,13 +10,7 @@ plugins {
 kotlin {
     androidTarget()
 
-    jvm("desktop")
-
-//    @OptIn(ExperimentalWasmDsl::class)
-//    wasmJs {
-//        browser()
-//        binaries.executable()
-//    }
+    jvm()
 
     js {
         browser()
@@ -69,7 +63,7 @@ kotlin {
             iosArm64Main.dependsOn(this)
             iosSimulatorArm64Main.dependsOn(this)
         }
-        val desktopMain by getting {
+        val jvmMain by getting {
             dependencies {
                 implementation(compose.desktop.common)
             }
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,5 @@
		package kottieComposition

		import androidx.compose.runtime.Composable


Expand Down