improve: Adapted to jetbrains lifecycle 2.8.3

panpf · Nov 7, 2024 · 43e59a7 · 43e59a7
1 parent 9b32bc7
commit 43e59a7
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 5 deletions.
diff --git a/...-compose/src/commonMain/kotlin/com/github/panpf/sketch/test/utils/compose_utils.common.kt b/...-compose/src/commonMain/kotlin/com/github/panpf/sketch/test/utils/compose_utils.common.kt
@@ -5,9 +5,9 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalInspectionMode
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import com.github.panpf.sketch.Bitmap
 import com.github.panpf.sketch.request.GlobalLifecycle
 

diff --git a/libs.versions.toml b/libs.versions.toml
@@ -107,6 +107,7 @@ google-material = { module = "com.google.android.material:material", version.ref
 google-flexbox = { module = "com.google.android.flexbox:flexbox", version.ref = "google-flexbox" }
 
 jetbrains-lifecycle-common = { module = "org.jetbrains.androidx.lifecycle:lifecycle-common", version.ref = "jetbrains-lifecycle" }
+jetbrains-lifecycle-runtime-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "jetbrains-lifecycle" }
 
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }

diff --git a/sketch-compose-core/build.gradle.kts b/sketch-compose-core/build.gradle.kts
@@ -17,6 +17,7 @@ kotlin {
             api(compose.foundation)
             api(compose.runtime)
             api(compose.ui)
+            api(libs.jetbrains.lifecycle.runtime.compose)
         }
 
         commonTest.dependencies {

diff --git a/sketch-compose-core/src/commonMain/kotlin/com/github/panpf/sketch/AsyncImageState.kt b/sketch-compose-core/src/commonMain/kotlin/com/github/panpf/sketch/AsyncImageState.kt
@@ -28,9 +28,9 @@ import androidx.compose.ui.graphics.FilterQuality
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalInspectionMode
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.unit.IntSize
 import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import com.github.panpf.sketch.request.GlobalLifecycle
 import com.github.panpf.sketch.request.ImageOptions
 import com.github.panpf.sketch.request.ImageRequest

diff --git a/...h-compose-core/src/commonMain/kotlin/com/github/panpf/sketch/painter/AnimatablePainter.kt b/...h-compose-core/src/commonMain/kotlin/com/github/panpf/sketch/painter/AnimatablePainter.kt
@@ -19,9 +19,9 @@ package com.github.panpf.sketch.painter
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.remember
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.compose.LocalLifecycleOwner
 
 /**
  * Interface that painters supporting animations should implement.

diff --git a/...commonTest/kotlin/com/github/panpf/sketch/compose/core/common/test/AsyncImageStateTest.kt b/...commonTest/kotlin/com/github/panpf/sketch/compose/core/common/test/AsyncImageStateTest.kt
@@ -14,10 +14,10 @@ import androidx.compose.ui.graphics.painter.ColorPainter
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalInspectionMode
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.runComposeUiTest
 import androidx.compose.ui.unit.IntSize
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import com.github.panpf.sketch.AsyncImageState
 import com.github.panpf.sketch.BitmapImage
 import com.github.panpf.sketch.PainterImage

diff --git a/.../kotlin/com/github/panpf/sketch/compose/core/common/test/painter/AnimatablePainterTest.kt b/.../kotlin/com/github/panpf/sketch/compose/core/common/test/painter/AnimatablePainterTest.kt
@@ -5,10 +5,10 @@ package com.github.panpf.sketch.compose.core.common.test.painter
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.painter.ColorPainter
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.runComposeUiTest
 import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import com.github.panpf.sketch.painter.startWithLifecycle
 import com.github.panpf.sketch.test.utils.TestAnimatablePainter
 import com.github.panpf.sketch.test.utils.TestLifecycle