Bump dependencies; migrate from Picasso to Coil

Gridstone · Jun 27, 2020 · 3e8d331 · 3e8d331
1 parent eba2187
commit 3e8d331
Show file tree

Hide file tree

Showing 12 changed files with 56 additions and 29 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,20 +3,20 @@ buildscript {
   ext.versions = [
       'compile_sdk'           : 29,
       'min_sdk'               : 21,
-      'android_gradle_plugin' : '3.5.3',
-      'kotlin'                : '1.3.61',
-      'maven_publish_plugin'  : '0.8.0',
-      'coroutines'            : '1.3.3',
+      'android_gradle_plugin' : '4.0.0',
+      'kotlin'                : '1.3.72',
+      'maven_publish_plugin'  : '0.11.1',
+      'coroutines'            : '1.3.7',
       'appcompat'             : '1.1.0',
-      'androidx_core'         : '1.1.0',
-      'drawerlayout'          : '1.0.0',
-      'material'              : '1.1.0-rc01',
-      'lifecycle'             : '2.1.0',
-      'leakcanary'            : '2.1',
-      'moshi'                 : '1.9.2',
-      'okhttp'                : '4.3.0',
-      'retrofit'              : '2.7.1',
-      'picasso'               : '2.71828',
+      'androidx_core'         : '1.3.0',
+      'drawerlayout'          : '1.1.0',
+      'material'              : '1.1.0',
+      'lifecycle'             : '2.2.0',
+      'leakcanary'            : '2.4',
+      'moshi'                 : '1.9.3',
+      'okhttp'                : '4.7.2',
+      'retrofit'              : '2.9.0',
+      'coil'                  : '0.11.0',
       'process_phoenix'       : '2.0.0',
       'timber'                : '4.7.1'
   ]

diff --git a/debugdrawer-leakcanary/build.gradle b/debugdrawer-leakcanary/build.gradle
@@ -18,6 +18,10 @@ android {
     targetCompatibility JavaVersion.VERSION_1_8
   }
 
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_1_8
+  }
+
   libraryVariants.all {
     it.generateBuildConfig.enabled = false
   }

diff --git a/debugdrawer-okhttp-logger/build.gradle b/debugdrawer-okhttp-logger/build.gradle
@@ -18,6 +18,10 @@ android {
     targetCompatibility JavaVersion.VERSION_1_8
   }
 
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_1_8
+  }
+
   libraryVariants.all {
     it.generateBuildConfig.enabled = false
   }

diff --git a/debugdrawer-retrofit/build.gradle b/debugdrawer-retrofit/build.gradle
@@ -18,6 +18,10 @@ android {
     targetCompatibility JavaVersion.VERSION_1_8
   }
 
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_1_8
+  }
+
   libraryVariants.all {
     it.generateBuildConfig.enabled = false
   }

diff --git a/debugdrawer-timber/build.gradle b/debugdrawer-timber/build.gradle
@@ -18,6 +18,10 @@ android {
     targetCompatibility JavaVersion.VERSION_1_8
   }
 
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_1_8
+  }
+
   libraryVariants.all {
     it.generateBuildConfig.enabled = false
   }

diff --git a/debugdrawer/build.gradle b/debugdrawer/build.gradle
@@ -18,6 +18,10 @@ android {
     targetCompatibility JavaVersion.VERSION_1_8
   }
 
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_1_8
+  }
+
   libraryVariants.all {
     it.generateBuildConfig.enabled = false
   }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Sep 12 14:59:55 AEST 2019
+#Sat Jun 27 11:13:32 AEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/sample-app/build.gradle b/sample-app/build.gradle
@@ -29,6 +29,10 @@ android {
     sourceCompatibility JavaVersion.VERSION_1_8
     targetCompatibility JavaVersion.VERSION_1_8
   }
+
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_1_8
+  }
 }
 
 dependencies {
@@ -53,6 +57,6 @@ dependencies {
   implementation "com.squareup.retrofit2:retrofit:${versions.retrofit}"
   implementation "com.squareup.retrofit2:converter-moshi:${versions.retrofit}"
   debugImplementation "com.squareup.retrofit2:retrofit-mock:${versions.retrofit}"
-  implementation "com.squareup.picasso:picasso:${versions.picasso}"
+  implementation "io.coil-kt:coil:${versions.coil}"
   implementation "com.jakewharton.timber:timber:${versions.timber}"
 }
diff --git a/sample-app/src/main/kotlin/au/com/gridstone/debugdrawer/sampleapp/GamesAdapter.kt b/sample-app/src/main/kotlin/au/com/gridstone/debugdrawer/sampleapp/GamesAdapter.kt
@@ -7,7 +7,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import au.com.gridstone.debugdrawer.sampleapp.GamesAdapter.ViewHolder
-import com.squareup.picasso.Picasso
+import coil.api.load
 
 class GamesAdapter : RecyclerView.Adapter<ViewHolder>() {
   private var games: List<Game> = emptyList()
@@ -36,13 +36,11 @@ class GamesAdapter : RecyclerView.Adapter<ViewHolder>() {
     fun bindTo(game: Game) {
       nameView.text = game.name
 
-      Picasso.get()
-          .load(game.image.small_url)
-          .fit()
-          .centerCrop()
-          .placeholder(R.drawable.gfx_controller)
-          .error(R.drawable.gfx_dead_link_small)
-          .into(imageView)
+      imageView.load(game.image.small_url) {
+        placeholder(R.drawable.gfx_controller)
+        error(R.drawable.gfx_dead_link_small)
+        crossfade(true)
+      }
     }
   }
 }
diff --git a/sample-app/src/main/kotlin/au/com/gridstone/debugdrawer/sampleapp/MainActivity.kt b/sample-app/src/main/kotlin/au/com/gridstone/debugdrawer/sampleapp/MainActivity.kt
@@ -10,14 +10,14 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.core.view.GravityCompat
 import androidx.drawerlayout.widget.DrawerLayout
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.get
 import androidx.lifecycle.observe
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import au.com.gridstone.debugdrawer.sampleapp.AppConfiguration.getRootViewContainerFor
 import au.com.gridstone.debugdrawer.sampleapp.GamesViewModel.State
-import com.squareup.picasso.Picasso
+import coil.api.load
 
 class MainActivity : AppCompatActivity() {
 
@@ -56,7 +56,7 @@ class MainActivity : AppCompatActivity() {
     recycler.updatePaddingWithInsets(left = true, right = true, bottom = true)
 
     val viewAnimator: ViewAnimator = findViewById(R.id.games_viewAnimator)
-    val viewModel: GamesViewModel = ViewModelProviders.of(this).get()
+    val viewModel: GamesViewModel = ViewModelProvider(this).get()
 
     // Observe ViewModel state and change UI accordingly.
     viewModel.states.observe(this) { state ->
@@ -66,7 +66,7 @@ class MainActivity : AppCompatActivity() {
         State.Error -> {
           viewAnimator.displayedChild = 1
           val errorImageView: ImageView = findViewById(R.id.games_error_image)
-          Picasso.get().load(R.drawable.gfx_dead_link_small).into(errorImageView)
+          errorImageView.load(R.drawable.gfx_dead_link_small)
         }
 
         is State.Success -> {
@@ -87,7 +87,7 @@ class MainActivity : AppCompatActivity() {
   override fun onStart() {
     super.onStart()
 
-    val viewModel: GamesViewModel = ViewModelProviders.of(this).get()
+    val viewModel: GamesViewModel = ViewModelProvider(this).get()
     viewModel.refreshIfNecessary()
   }
 }
diff --git a/sample-app/src/main/res/layout/list_item_game.xml b/sample-app/src/main/res/layout/list_item_game.xml
@@ -14,6 +14,7 @@
       android:id="@+id/game_image"
       android:layout_width="72dp"
       android:layout_height="72dp"
+      android:scaleType="centerCrop"
       tools:ignore="ContentDescription"
       />
 

diff --git a/simple-sample-app/build.gradle b/simple-sample-app/build.gradle
@@ -29,6 +29,10 @@ android {
     sourceCompatibility JavaVersion.VERSION_1_8
     targetCompatibility JavaVersion.VERSION_1_8
   }
+
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_1_8
+  }
 }
 
 dependencies {