Upgraded Compose to 1.0.3 (#1913)

airbnb · Oct 3, 2021 · ca98cf2 · ca98cf2
1 parent c3dd693
commit ca98cf2
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,13 +2,13 @@ import org.ajoberstar.grgit.Grgit
 
 buildscript {
   ext {
-    coroutinesVersion = '1.5.1'
+    coroutinesVersion = '1.5.2'
     coreVersion = '1.6.0'
     appcompatVersion = '1.3.1'
     activityVersion = '1.3.1'
     lifecycleVersion = '2.3.1'
-    composeVersion = '1.0.2'
-    kotlinVersion = '1.5.21'
+    composeVersion = '1.0.3'
+    kotlinVersion = '1.5.30'
     daggerVersion = '2.38.1'
     awsVersion = '2.8.3'
     mockitoVersion = '3.12.4'

diff --git a/issue-repro-compose/build.gradle b/issue-repro-compose/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-    compileSdk 30
+    compileSdk 31
     defaultConfig {
         applicationId "com.airbnb.lottie.issues.compose"
         minSdk 21

diff --git a/issue-repro/build.gradle b/issue-repro/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 android {
-    compileSdk 30
+    compileSdk 31
     defaultConfig {
         applicationId "com.airbnb.lottie.issues"
         minSdk 16

diff --git a/lottie-compose/build.gradle b/lottie-compose/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 android {
-  compileSdk 30
+  compileSdk 31
   defaultConfig {
     minSdk 21
     targetSdk 30

diff --git a/lottie/build.gradle b/lottie/build.gradle
@@ -8,7 +8,7 @@ plugins {
 
 android {
   resourcePrefix 'lottie_'
-  compileSdk 30
+  compileSdk 31
   defaultConfig {
     minSdk 16
     targetSdk 30

diff --git a/sample-compose/build.gradle b/sample-compose/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 android {
-  compileSdk 30
+  compileSdk 31
   defaultConfig {
     applicationId "com.airbnb.lottie.sample.compose"
     minSdk 21
@@ -50,13 +50,13 @@ dependencies {
   implementation project(':lottie-compose')
   implementation "androidx.core:core-ktx:$coreVersion"
   implementation "androidx.activity:activity-compose:$activityVersion"
-  implementation 'androidx.appcompat:appcompat:1.4.0-alpha03'
+  implementation 'androidx.appcompat:appcompat:1.4.0-beta01'
   implementation "com.google.android.material:material:$materialVersion"
   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:2.4.0-alpha04"
+  implementation "androidx.navigation:navigation-compose:2.4.0-alpha10"
   implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion"
 
   implementation "androidx.navigation:navigation-ui-ktx:2.3.5"

diff --git a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/Route.kt b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/Route.kt
@@ -1,9 +1,9 @@
 package com.airbnb.lottie.sample.compose
 
 import android.util.Base64
+import androidx.navigation.NamedNavArgument
 import androidx.navigation.NavController
-import androidx.navigation.compose.NamedNavArgument
-import androidx.navigation.compose.navArgument
+import androidx.navigation.navArgument
 
 fun NavController.navigate(route: Route) = navigate(route.route)
 

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 android {
-  compileSdk 30
+  compileSdk 31
   defaultConfig {
     applicationId "com.airbnb.lottie"
     minSdk 16