Upgrade to Compose Beta 6 and other dependencies
diff --git a/build.gradle b/build.gradle index 6db606b..4f94633 100644 --- a/build.gradle +++ b/build.gradle
@@ -2,9 +2,9 @@ buildscript { ext { - composeVersion = '1.0.0-beta04' + composeVersion = '1.0.0-beta06' kotlinVersion = '1.4.32' - daggerVersion = '2.34' + daggerVersion = '2.35.1' } repositories { @@ -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-alpha15' 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/lottie/build.gradle b/lottie/build.gradle index b110340..2b0d80c 100644 --- a/lottie/build.gradle +++ b/lottie/build.gradle
@@ -38,7 +38,7 @@ } dependencies { - implementation "androidx.appcompat:appcompat:1.0.0" + implementation "androidx.appcompat:appcompat:1.2.0" // Do not upgrade to 2.0 because it will bring in Kotlin as a transitive dependency. implementation("com.squareup.okio:okio:1.17.4") @@ -47,8 +47,8 @@ errorproneJavac "com.google.errorprone:javac:9+181-r4173-1" testImplementation "org.mockito:mockito-core:3.5.13" - testImplementation 'junit:junit:4.13.1' - testImplementation "org.robolectric:robolectric:4.4" + testImplementation 'junit:junit:4.13.2' + testImplementation "org.robolectric:robolectric:4.5.1" } task sourcesJar(type: Jar) {
diff --git a/sample-compose/build.gradle b/sample-compose/build.gradle index 85e6e20..d106c52 100644 --- a/sample-compose/build.gradle +++ b/sample-compose/build.gradle
@@ -54,8 +54,8 @@ implementation project(':lottie-compose') implementation 'androidx.core:core-ktx:1.3.2' 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.activity:activity-ktx:1.2.3' + implementation 'androidx.activity:activity-compose:1.3.0-alpha07' implementation 'androidx.appcompat:appcompat:1.3.0-rc01' implementation 'com.google.android.material:material:1.3.0' implementation "androidx.compose.ui:ui:$composeVersion" @@ -68,15 +68,15 @@ implementation "androidx.navigation:navigation-ui-ktx:2.3.5" - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0-RC' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0-RC' implementation "com.google.dagger:dagger:$daggerVersion" kapt "com.google.dagger:dagger-compiler:$daggerVersion" 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.google.accompanist:accompanist-coil:0.9.1" implementation 'com.airbnb.android:mavericks:2.1.0' implementation 'com.airbnb.android:mavericks-compose:2.1.0-alpha01'
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..2ceee3d 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,13 +35,13 @@ .padding(16.dp) .fillMaxWidth() ) { - CoilImage( - data = previewUrl, + Image( + painter = rememberCoilPainter(previewUrl), + contentDescription = null, modifier = Modifier .padding(end = 16.dp) .size(40.dp) .background(color = previewBackgroundColor), - contentDescription = null ) Text( title,