Upgraded a bunch of dependencies (#2382)

airbnb · Sep 3, 2023 · 34aa06b · 34aa06b
1 parent 3b6bab2
commit 34aa06b
Show file tree

Hide file tree

Showing 25 changed files with 177 additions and 175 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/build.gradle b/build.gradle
@@ -2,18 +2,18 @@ import org.ajoberstar.grgit.Grgit
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
+  id "com.android.tools.build" apply false
   id 'net.ltgt.errorprone' apply false
   id "com.google.devtools.ksp" apply false
   id "org.ajoberstar.grgit" apply false
-  id "com.android.library" apply false
   id "org.jetbrains.kotlin.jvm" apply false
   id "com.vanniktech.maven.publish" apply false
   id "org.jetbrains.dokka" apply false
 }
 
 allprojects {
   def compileJavaVersion = JavaVersion.VERSION_17
-  def targetJavaVersion = JavaVersion.VERSION_1_8
+  def targetJavaVersion = JavaVersion.VERSION_17
   pluginManager.withPlugin("java") {
     java {
       toolchain {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,6 +4,7 @@
 
 androidx-activity-compose = "androidx.activity:activity-compose:_"
 androidx-appcompat = "androidx.appcompat:appcompat:_"
+androidx-fragment = "androidx.fragment:fragment-ktx:_"
 androidx-browser = "androidx.browser:browser:_"
 androidx-cardview = "androidx.cardview:cardview:_"
 androidx-collection-ktx = "androidx.collection:collection:_"

diff --git a/issue-repro-compose/build.gradle b/issue-repro-compose/build.gradle
@@ -7,11 +7,11 @@ plugins {
 
 android {
     namespace 'com.airbnb.lottie.issues.compose'
-    compileSdk 33
+    compileSdk 34
     defaultConfig {
         applicationId "com.airbnb.lottie.issues.compose"
         minSdk 21
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
     }

diff --git a/issue-repro/build.gradle b/issue-repro/build.gradle
@@ -5,11 +5,11 @@ plugins {
 
 android {
     namespace 'com.airbnb.lottie.issues'
-    compileSdk 33
+    compileSdk 34
     defaultConfig {
         applicationId "com.airbnb.lottie.issues"
         minSdk 16
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
     }

diff --git a/lottie-compose/build.gradle b/lottie-compose/build.gradle
@@ -9,10 +9,10 @@ plugins {
 
 android {
   namespace 'com.airbnb.lottie.compose'
-  compileSdk 33
+  compileSdk 34
   defaultConfig {
     minSdk 21
-    targetSdk 33
+    targetSdk 34
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
   buildTypes {
@@ -50,4 +50,4 @@ dependencies {
   testImplementation libs.junit4
   androidTestImplementation libs.androidx.test.junit
   androidTestImplementation libs.androidx.test.espresso
-}
+}
diff --git a/lottie/build.gradle b/lottie/build.gradle
@@ -10,10 +10,10 @@ plugins {
 android {
   namespace 'com.airbnb.lottie'
   resourcePrefix 'lottie_'
-  compileSdk 33
+  compileSdk 34
   defaultConfig {
     minSdk 16
-    targetSdk 33
+    targetSdk 34
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
   lintOptions {

diff --git a/lottie/src/main/java/com/airbnb/lottie/LottieDrawable.java b/lottie/src/main/java/com/airbnb/lottie/LottieDrawable.java
@@ -33,7 +33,6 @@
 import androidx.annotation.RestrictTo;
 
 import com.airbnb.lottie.animation.LPaint;
-import com.airbnb.lottie.animation.keyframe.PathKeyframe;
 import com.airbnb.lottie.manager.FontAssetManager;
 import com.airbnb.lottie.manager.ImageAssetManager;
 import com.airbnb.lottie.model.Font;
@@ -336,7 +335,7 @@ public boolean getClipToCompositionBounds() {
    * Be wary if you are using many images, however. Lottie is designed to work with vector shapes
    * from After Effects. If your images look like they could be represented with vector shapes,
    * see if it is possible to convert them to shape layers and re-export your animation. Check
-   * the documentation at http://airbnb.io/lottie for more information about importing shapes from
+   * the documentation at <a href="http://airbnb.io/lottie">airbnb.io/lottie</a> for more information about importing shapes from
    * Sketch or Illustrator to avoid this.
    */
   public void setImagesAssetsFolder(@Nullable String imageAssetsFolder) {
@@ -460,7 +459,7 @@ public boolean getAsyncUpdatesEnabled() {
    * <p/>
    * Sets the current value for {@link AsyncUpdates}. Refer to the docs for {@link AsyncUpdates} for more info.
    */
-  public void setAsyncUpdates(AsyncUpdates asyncUpdates) {
+  public void setAsyncUpdates(@Nullable AsyncUpdates asyncUpdates) {
     this.asyncUpdates = asyncUpdates;
   }
 
@@ -1318,7 +1317,7 @@ public List<KeyPath> resolveKeyPath(KeyPath keyPath) {
    * <p>
    * Internally, this will check if the {@link KeyPath} has already been resolved with
    * {@link #resolveKeyPath(KeyPath)} and will resolve it if it hasn't.
-   *
+   * <p>
    * Set the callback to null to clear it.
    */
   public <T> void addValueCallback(

diff --git a/sample-compose-benchmark/build.gradle b/sample-compose-benchmark/build.gradle
@@ -5,15 +5,15 @@ plugins {
 
 android {
   namespace 'com.airbnb.lottie.sample.compose.benchmark'
-  compileSdk 33
+  compileSdk 34
 
   kotlinOptions {
     freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
   }
 
   defaultConfig {
     minSdk 30
-    targetSdk 33
+    targetSdk 34
 
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }

diff --git a/sample-compose/build.gradle b/sample-compose/build.gradle
@@ -8,11 +8,11 @@ plugins {
 
 android {
   namespace 'com.airbnb.lottie.sample.compose'
-  compileSdk 33
+  compileSdk 34
   defaultConfig {
     applicationId "com.airbnb.lottie.sample.compose"
     minSdk 21
-    targetSdk 33
+    targetSdk 34
     versionCode 1
     versionName VERSION_NAME
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/examples/ViewPagerExample.kt b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/examples/ViewPagerExample.kt
@@ -20,19 +20,16 @@ import com.airbnb.lottie.sample.compose.R
 @Composable
 fun ViewPagerExamplePage() {
     val colors = listOf(Color.Red, Color.Green, Color.Blue, Color.Magenta)
-    val pagerState = rememberPagerState()
+    val pagerState = rememberPagerState { colors.size }
     Box(
         modifier = Modifier
-            .fillMaxSize()
+            .fillMaxSize(),
     ) {
-        HorizontalPager(
-            colors.size,
-            state = pagerState
-        ) { page ->
+        HorizontalPager(pagerState) { page ->
             Box(
                 modifier = Modifier
                     .fillMaxSize()
-                    .background(colors[page])
+                    .background(colors[page]),
             )
         }
         WalkthroughAnimation(pagerState, colors.size)
@@ -47,6 +44,6 @@ private fun WalkthroughAnimation(pagerState: PagerState, size: Int) {
         composition,
         { progress },
         modifier = Modifier
-            .fillMaxSize()
+            .fillMaxSize(),
     )
-}
+}
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -9,11 +9,11 @@ plugins {
 
 android {
   namespace 'com.airbnb.lottie.samples'
-  compileSdk 33
+  compileSdk 34
   defaultConfig {
     applicationId "com.airbnb.lottie"
     minSdk 16
-    targetSdk 33
+    targetSdk 34
     versionCode 70
     versionName VERSION_NAME
     multiDexEnabled true
@@ -58,6 +58,7 @@ dependencies {
   implementation libs.androidx.multidex
 
   implementation libs.androidx.appcompat
+  implementation libs.androidx.fragment
   implementation libs.androidx.recyclerview
   implementation libs.androidx.paging.runtime.ktx
   implementation libs.androidx.viewmodel.ktx
@@ -69,7 +70,7 @@ dependencies {
 
   implementation libs.epoxy
   ksp libs.epoxy.processor
-  implementation libs.mvrx
+  implementation libs.mavericks
 
   implementation libs.kotlinx.coroutines.android
   implementation libs.qrcodereaderview

diff --git a/sample/src/main/assets/fonts/Comic Neue.ttf b/sample/src/main/assets/fonts/Comic Neue.ttf
diff --git a/sample/src/main/kotlin/com/airbnb/lottie/samples/LottieApplication.kt b/sample/src/main/kotlin/com/airbnb/lottie/samples/LottieApplication.kt
@@ -3,6 +3,7 @@ package com.airbnb.lottie.samples
 import androidx.multidex.MultiDexApplication
 import com.airbnb.lottie.L
 import com.airbnb.lottie.samples.api.LottiefilesApi
+import com.airbnb.mvrx.Mavericks
 import com.google.gson.FieldNamingPolicy
 import com.google.gson.GsonBuilder
 import okhttp3.OkHttpClient
@@ -37,6 +38,7 @@ class LottieApplication : MultiDexApplication() {
 
     override fun onCreate() {
         super.onCreate()
+        Mavericks.initialize(this)
         L.DBG = true
     }
-}
+}
diff --git a/sample/src/main/kotlin/com/airbnb/lottie/samples/LottiefilesFragment.kt b/sample/src/main/kotlin/com/airbnb/lottie/samples/LottiefilesFragment.kt
@@ -5,8 +5,8 @@ import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.viewModelScope
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingDataAdapter
@@ -20,13 +20,14 @@ import com.airbnb.lottie.samples.databinding.LottiefilesFragmentBinding
 import com.airbnb.lottie.samples.model.AnimationData
 import com.airbnb.lottie.samples.model.AnimationResponse
 import com.airbnb.lottie.samples.model.CompositionArgs
-import com.airbnb.lottie.samples.utils.MvRxViewModel
+import com.airbnb.lottie.samples.utils.BaseFragment
 import com.airbnb.lottie.samples.utils.hideKeyboard
 import com.airbnb.lottie.samples.utils.viewBinding
 import com.airbnb.lottie.samples.views.AnimationItemView
-import com.airbnb.mvrx.BaseMvRxFragment
-import com.airbnb.mvrx.MvRxState
-import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.MavericksState
+import com.airbnb.mvrx.MavericksView
+import com.airbnb.mvrx.MavericksViewModel
+import com.airbnb.mvrx.MavericksViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
@@ -38,9 +39,9 @@ import kotlinx.coroutines.launch
 data class LottiefilesState(
     val mode: LottiefilesMode = LottiefilesMode.Recent,
     val query: String = ""
-) : MvRxState
+) : MavericksState
 
-class LottiefilesViewModel(initialState: LottiefilesState, private val api: LottiefilesApi) : MvRxViewModel<LottiefilesState>(initialState) {
+class LottiefilesViewModel(initialState: LottiefilesState, private val api: LottiefilesApi) : MavericksViewModel<LottiefilesState>(initialState) {
 
     private var mode = initialState.mode
     private var query = initialState.query
@@ -51,7 +52,7 @@ class LottiefilesViewModel(initialState: LottiefilesState, private val api: Lott
     }.flow.cachedIn(viewModelScope)
 
     init {
-        selectSubscribe(LottiefilesState::mode, LottiefilesState::query) { mode, query ->
+        onEach(LottiefilesState::mode, LottiefilesState::query) { mode, query ->
             this.mode = mode
             this.query = query
             dataSource?.invalidate()
@@ -62,7 +63,7 @@ class LottiefilesViewModel(initialState: LottiefilesState, private val api: Lott
 
     fun setQuery(query: String) = setState { copy(query = query) }
 
-    companion object : MvRxViewModelFactory<LottiefilesViewModel, LottiefilesState> {
+    companion object : MavericksViewModelFactory<LottiefilesViewModel, LottiefilesState> {
         override fun create(viewModelContext: ViewModelContext, state: LottiefilesState): LottiefilesViewModel {
             val service = viewModelContext.app<LottieApplication>().lottiefilesService
             return LottiefilesViewModel(state, service)
@@ -109,7 +110,7 @@ class LottiefilesDataSource(
     }
 }
 
-class LottiefilesFragment : BaseMvRxFragment(R.layout.lottiefiles_fragment) {
+class LottiefilesFragment : BaseFragment(R.layout.lottiefiles_fragment) {
     private val binding: LottiefilesFragmentBinding by viewBinding()
     private val viewModel: LottiefilesViewModel by fragmentViewModel()