[Compose] Upgrade to Beta07
diff --git a/build.gradle b/build.gradle
index 6db606b..f5805a0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@
buildscript {
ext {
- composeVersion = '1.0.0-beta04'
+ composeVersion = '1.0.0-beta07'
kotlinVersion = '1.4.32'
daggerVersion = '2.34'
}
@@ -15,7 +15,7 @@
}
dependencies {
classpath 'org.ajoberstar:grgit:1.9.3'
- classpath 'com.android.tools.build:gradle:7.0.0-alpha14'
+ classpath 'com.android.tools.build:gradle:7.0.0-beta01'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath 'org.ajoberstar:grgit:1.9.3'
classpath "net.ltgt.gradle:gradle-errorprone-plugin:2.0.1"
diff --git a/sample-compose/build.gradle b/sample-compose/build.gradle
index 85e6e20..39e0903 100644
--- a/sample-compose/build.gradle
+++ b/sample-compose/build.gradle
@@ -52,17 +52,17 @@
dependencies {
implementation project(':lottie-compose')
- implementation 'androidx.core:core-ktx:1.3.2'
+ implementation 'androidx.core:core-ktx:1.5.0'
implementation 'androidx.multidex:multidex:2.0.1'
- implementation 'androidx.activity:activity-ktx:1.2.2'
- implementation 'androidx.activity:activity-compose:1.3.0-alpha06'
- implementation 'androidx.appcompat:appcompat:1.3.0-rc01'
+ implementation 'androidx.activity:activity-ktx:1.2.3'
+ implementation 'androidx.activity:activity-compose:1.3.0-alpha08'
+ implementation 'androidx.appcompat:appcompat:1.4.0-alpha01'
implementation 'com.google.android.material:material:1.3.0'
implementation "androidx.compose.ui:ui:$composeVersion"
implementation "androidx.compose.material:material:$composeVersion"
implementation "androidx.compose.material:material-icons-extended:$composeVersion"
implementation "androidx.compose.ui:ui-tooling:$composeVersion"
- implementation "androidx.navigation:navigation-compose:1.0.0-alpha10"
+ implementation "androidx.navigation:navigation-compose:2.4.0-alpha01"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
@@ -76,9 +76,9 @@
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'com.squareup.retrofit2:converter-moshi:2.9.0'
- implementation "dev.chrisbanes.accompanist:accompanist-coil:0.6.1"
- implementation 'com.airbnb.android:mavericks:2.1.0'
- implementation 'com.airbnb.android:mavericks-compose:2.1.0-alpha01'
+ implementation "com.google.accompanist:accompanist-coil:0.10.0"
+ implementation 'com.airbnb.android:mavericks:2.2.0'
+ implementation 'com.airbnb.android:mavericks-compose:2.1.0-alpha02'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
diff --git a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/composables/AnimationRow.kt b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/composables/AnimationRow.kt
index ac410ce..531538b 100644
--- a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/composables/AnimationRow.kt
+++ b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/composables/AnimationRow.kt
@@ -1,5 +1,6 @@
package com.airbnb.lottie.sample.compose.composables
+import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Row
@@ -15,7 +16,7 @@
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
-import dev.chrisbanes.accompanist.coil.CoilImage
+import com.google.accompanist.coil.rememberCoilPainter
@Composable
fun AnimationRow(
@@ -34,8 +35,8 @@
.padding(16.dp)
.fillMaxWidth()
) {
- CoilImage(
- data = previewUrl,
+ Image(
+ painter = rememberCoilPainter(previewUrl),
modifier = Modifier
.padding(end = 16.dp)
.size(40.dp)