Upgrade Dependencies (#1791)
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index c7fc802..d3180e7 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -41,5 +41,10 @@
<option name="name" value="MavenRepo" />
<option name="url" value="https://repo.maven.apache.org/maven2/" />
</remote-repository>
+ <remote-repository>
+ <option name="id" value="maven2" />
+ <option name="name" value="maven2" />
+ <option name="url" value="https://kotlin.bintray.com/kotlinx" />
+ </remote-repository>
</component>
</project>
\ No newline at end of file
diff --git a/issue-repro-compose/build.gradle b/issue-repro-compose/build.gradle
index 9c13724..d318cfe 100755
--- a/issue-repro-compose/build.gradle
+++ b/issue-repro-compose/build.gradle
@@ -31,7 +31,7 @@
dependencies {
implementation project(':lottie-compose')
implementation 'androidx.appcompat:appcompat:1.3.0-rc01'
- implementation 'androidx.activity:activity-compose:1.3.0-alpha05'
+ implementation 'androidx.activity:activity-compose:1.3.0-alpha06'
implementation "androidx.compose.ui:ui:$composeVersion"
implementation "androidx.compose.material:material:$composeVersion"
implementation "androidx.compose.material:material-icons-extended:$composeVersion"
diff --git a/lottie-compose/gradle.properties b/lottie-compose/gradle.properties
index 60bb021..0a7da54 100644
--- a/lottie-compose/gradle.properties
+++ b/lottie-compose/gradle.properties
@@ -4,4 +4,4 @@
POM_ARTIFACT_ID=lottie-compose
POM_PACKAGING=aar
GROUP=com.airbnb.android
-VERSION_NAME=1.0.0-beta03-2-SNAPSHOT
+VERSION_NAME=1.0.0-beta04-2-SNAPSHOT
diff --git a/sample-compose/build.gradle b/sample-compose/build.gradle
index 2b929c3..85e6e20 100644
--- a/sample-compose/build.gradle
+++ b/sample-compose/build.gradle
@@ -54,22 +54,22 @@
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.1'
- implementation 'androidx.activity:activity-compose:1.3.0-alpha04'
- implementation 'androidx.appcompat:appcompat:1.3.0-beta01'
+ 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 '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-alpha09"
- implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0'
- implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0'
+ implementation "androidx.navigation:navigation-compose:1.0.0-alpha10"
+ implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
+ implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
- implementation "androidx.navigation:navigation-ui-ktx:2.3.4"
+ 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.2'
+ implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3'
implementation "com.google.dagger:dagger:$daggerVersion"
kapt "com.google.dagger:dagger-compiler:$daggerVersion"
diff --git a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/player/PlayerPage.kt b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/player/PlayerPage.kt
index db74f52..ae7eed8 100644
--- a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/player/PlayerPage.kt
+++ b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/player/PlayerPage.kt
@@ -46,7 +46,7 @@
spec: LottieAnimationSpec,
animationBackgroundColor: Color? = null,
) {
- val backPressedDispatcher = LocalOnBackPressedDispatcherOwner.current.onBackPressedDispatcher
+ val backPressedDispatcher = LocalOnBackPressedDispatcherOwner.current?.onBackPressedDispatcher
val compositionResult = rememberLottieComposition(spec)
val animationState = rememberLottieAnimationState(autoPlay = true, repeatCount = Integer.MAX_VALUE)
val scaffoldState = rememberScaffoldState()
@@ -86,7 +86,7 @@
elevation = 0.dp,
navigationIcon = {
IconButton(
- onClick = { backPressedDispatcher.onBackPressed() },
+ onClick = { backPressedDispatcher?.onBackPressed() },
) {
Icon(
Icons.Default.Close,
diff --git a/sample/build.gradle b/sample/build.gradle
index c31ba06..28c4a75 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -72,7 +72,7 @@
implementation "androidx.fragment:fragment-ktx:1.3.2"
implementation "androidx.appcompat:appcompat:1.2.0"
- implementation "androidx.recyclerview:recyclerview:1.1.0"
+ implementation "androidx.recyclerview:recyclerview:1.2.0"
implementation "androidx.paging:paging-runtime-ktx:3.0.0-beta03"
implementation "androidx.cardview:cardview:1.0.0"
implementation 'androidx.core:core-ktx:1.3.2'
