Merge pull request #20 from tunjid/tj/agp

Bump AGP
tunjid · Jul 29, 2024 · 60b6dc2 · 60b6dc2
2 parents ce76507 + 8afb959
commit 60b6dc2
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/build-logic/gradle/wrapper/gradle-wrapper.properties b/build-logic/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Dec 05 12:14:24 EST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
-distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+=distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/feature/explore/src/main/java/com/tunjid/explore/grid/ExploreGridScreen.kt b/feature/explore/src/main/java/com/tunjid/explore/grid/ExploreGridScreen.kt
@@ -101,7 +101,9 @@ fun ExploreGridScreen(
                     // This box constraints the height of the container so the shared element does
                     // not push other items out of the way when animating in.
                     Box(
-                        modifier = Modifier.aspectRatio(9f / 16)
+                        modifier = Modifier
+                            .aspectRatio(9f / 16)
+                            .animateItem()
                     ) {
                         val video = movableSharedElementOf<VideoState>(
                             key = thumbnailSharedElementKey(item.state.url),

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ androidxWork = "2.9.0"
 coil = "2.4.0"
 espresso-core = "3.5.1"
 com-android-gradle-plugin = "8.1.4"
-com-android-application = "8.1.4"
+com-android-application = "8.5.1"
 com-android-desugar-JdkLibs = "2.0.4"
 org-jetbrains-kotlin-android = "2.0.0-RC3"
 lifecycle-runtime-ktx = "2.8.0"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/scaffold/src/main/java/com/tunjid/scaffold/adaptive/MovableSharedElement.kt b/scaffold/src/main/java/com/tunjid/scaffold/adaptive/MovableSharedElement.kt
@@ -250,12 +250,12 @@ internal class MovableSharedElementData<T>(
             this?.pane != Adaptive.Pane.TransientPrimary
 
         private val sizeSpec = spring(
-            stiffness = Spring.StiffnessMediumLow,
+            stiffness = Spring.StiffnessLow,
             visibilityThreshold = IntSize.VisibilityThreshold
         )
 
         private val offsetSpec = spring(
-            stiffness = Spring.StiffnessMediumLow,
+            stiffness = Spring.StiffnessLow,
             dampingRatio = 0.9f,
             visibilityThreshold = IntOffset.VisibilityThreshold
         )

diff --git a/scaffold/src/main/java/com/tunjid/scaffold/globalui/DragToPop.kt b/scaffold/src/main/java/com/tunjid/scaffold/globalui/DragToPop.kt
@@ -66,7 +66,7 @@ internal fun Modifier.dragToPopInternal(state: DragToPopState): Modifier = compo
     LaunchedEffect(started) {
         scaleAnimatable.animateTo(
             animationSpec = spring(
-                stiffness = Spring.StiffnessMediumLow
+                stiffness = Spring.StiffnessLow
             ),
             targetValue = if (started) 0.8f else 1f
         ) {