Updated dependencies and lowered min sdk version

Author: AllanHasegawa

build.gradle.kts

@@ -1,14 +1,16 @@
 import java.net.URI
 
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
+plugins {
+    id("com.github.ben-manes.versions") version "0.27.0"
+}
 
 buildscript {
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.3.0")
+        classpath("com.android.tools.build:gradle:3.5.3")
         classpath(kotlin("gradle-plugin", version = Versions.kotlin))
         classpath("com.github.dcendents:android-maven-gradle-plugin:2.1")
 

buildSrc/src/main/java/AndroidConfig.kt

@@ -1,5 +1,5 @@
 object AndroidConfig {
-    const val compileSdkVersion = 28
+    const val compileSdkVersion = 29
     const val targetSdkVersion = compileSdkVersion
-    const val minSdkVersion = 23
+    const val minSdkVersion = 21
 }

buildSrc/src/main/java/Dep.kt

@@ -25,19 +25,19 @@ object Dep {
 object Versions {
     // Kotlin
 
-    const val kotlin = "1.3.20"
+    const val kotlin = "1.3.61"
     const val junit = "4.12"
-    const val retrofit = "2.5.0"
+    const val retrofit = "2.7.1"
 
     // Android
 
-    const val appCompat = "1.0.2"
-    const val material = "1.0.0"
+    const val appCompat = "1.2.0-alpha01"
+    const val material = "1.2.0-alpha03"
     const val testRunner = "1.1.1"
     const val espresso = "3.1.1"
-    const val constraintLayout = "2.0.0-alpha3"
+    const val constraintLayout = "2.0.0-beta4"
     const val picasso = "2.71828"
-    const val groupie = "2.3.0"
+    const val groupie = "2.7.2"
     const val rebound = "0.3.8"
     const val rvAnimators = "3.0.0"
 }

buildSrc/src/main/java/versioning.kt

@@ -1,8 +1,8 @@
 object Versioning {
     private val semantic = Semantic(
-        major = 0,
+        major = 1,
         minor = 0,
-        patch = 1
+        patch = 0
     )
 
     val version = semantic.toVersion()

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,3 @@
-import org.jetbrains.kotlin.gradle.internal.AndroidExtensionsExtension
 import java.util.*
 
 plugins {
@@ -59,9 +58,12 @@ android {
     // IMPORTANT!  Enables view caching in viewholders.
     // See: https://github.com/Kotlin/KEEP/blob/master/proposals/android-extensions-entity-caching.md
     androidExtensions {
-        configure(delegateClosureOf<AndroidExtensionsExtension> {
-            isExperimental = true
-        })
+        isExperimental = true
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 }
 

showcase/build.gradle.kts

@@ -8,20 +8,20 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityOptionsCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.xwray.groupie.GroupAdapter
-import com.xwray.groupie.kotlinandroidextensions.ViewHolder
+import com.xwray.groupie.kotlinandroidextensions.GroupieViewHolder
 import jp.wasabeef.recyclerview.animators.LandingAnimator
 import kotlinx.android.synthetic.main.activity_main.*
 import tomo.Tomo
-import tomo.showcase.data.MovieId
 import tomo.showcase.R
 import tomo.showcase.app
 import tomo.showcase.common.handleCommonMenuClick
 import tomo.showcase.common.inflateCommonMenu
-import tomo.showcase.detailsScreen.DetailsActivity
 import tomo.showcase.common.post
+import tomo.showcase.data.MovieId
+import tomo.showcase.detailsScreen.DetailsActivity
 
 class MainActivity : AppCompatActivity() {
-    private val adapter = GroupAdapter<ViewHolder>()
+    private val adapter = GroupAdapter<GroupieViewHolder>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

showcase/src/main/java/tomo/showcase/mainScreen/MainActivity.kt

@@ -7,8 +7,8 @@ import android.view.animation.AccelerateDecelerateInterpolator
 import android.view.animation.OvershootInterpolator
 import android.widget.ImageView
 import com.squareup.picasso.Picasso
+import com.xwray.groupie.kotlinandroidextensions.GroupieViewHolder
 import com.xwray.groupie.kotlinandroidextensions.Item
-import com.xwray.groupie.kotlinandroidextensions.ViewHolder
 import kotlinx.android.synthetic.main.item_hi.*
 import kotlinx.android.synthetic.main.item_poster.*
 import tomo.showcase.R
@@ -19,7 +19,7 @@ import tomo.showcase.data.MovieId
 import kotlin.math.roundToInt
 
 class HiItem : Item(0) {
-    override fun bind(viewHolder: ViewHolder, position: Int) {
+    override fun bind(viewHolder: GroupieViewHolder, position: Int) {
         with(viewHolder) {
             hiPopcornView.scaleViewUp()
                 .setStartDelay(2_000L)
@@ -53,7 +53,7 @@ class PosterItem(private val movie: Movie, private val onClick: (MovieId, View)
         private const val MAX_GENRE_ICONS = 5
     }
 
-    override fun bind(viewHolder: ViewHolder, position: Int) = with(viewHolder) {
+    override fun bind(viewHolder: GroupieViewHolder, position: Int) = with(viewHolder) {
         posterCard.setOnClickListener { onClick(movie.movieId, posterIv) }
 
         posterTitleTv.text = movie.title.value
@@ -70,7 +70,7 @@ class PosterItem(private val movie: Movie, private val onClick: (MovieId, View)
         revealInfoWithAnimation()
     }
 
-    override fun unbind(holder: ViewHolder) {
+    override fun unbind(holder: GroupieViewHolder) {
         super.unbind(holder)
         holder.posterBackground.clearAnimation()
     }
@@ -81,7 +81,7 @@ class PosterItem(private val movie: Movie, private val onClick: (MovieId, View)
             .fetch()
     }
 
-    private fun ViewHolder.revealInfoWithAnimation() {
+    private fun GroupieViewHolder.revealInfoWithAnimation() {
         posterBackground.post {
             posterBackground.translationX = -(posterBackground.width).toFloat()
 
@@ -93,7 +93,7 @@ class PosterItem(private val movie: Movie, private val onClick: (MovieId, View)
         }
     }
 
-    private fun ViewHolder.renderPoster() {
+    private fun GroupieViewHolder.renderPoster() {
         val screenWidthPx = itemView.windowSize().x
         val posterWidthPx = screenWidthPx * POSTER_WIDTH_PERCENT
         val posterHeightPx = posterWidthPx / POSTER_ASPECT_RATIO
@@ -110,7 +110,7 @@ class PosterItem(private val movie: Movie, private val onClick: (MovieId, View)
             .into(posterIv)
     }
 
-    private fun ViewHolder.renderGenreIcons(inflater: LayoutInflater): LayoutInflater {
+    private fun GroupieViewHolder.renderGenreIcons(inflater: LayoutInflater): LayoutInflater {
         posterGenreLl.removeAllViews()
         movie.genres.map(::genreToDrawableId).take(MAX_GENRE_ICONS).forEach { drawableId ->
             val view = inflater.inflate(R.layout.layout_poster_genre_icon, posterGenreLl, false)
@@ -123,7 +123,7 @@ class PosterItem(private val movie: Movie, private val onClick: (MovieId, View)
         return inflater
     }
 
-    private fun ViewHolder.renderScore(
+    private fun GroupieViewHolder.renderScore(
         inflater: LayoutInflater,
         numberOfFullStars: Int,
         showAHalfStar: Boolean
@@ -147,7 +147,7 @@ class PosterItem(private val movie: Movie, private val onClick: (MovieId, View)
 
     override fun getLayout(): Int = R.layout.item_poster
 
-    override fun isSameAs(other: com.xwray.groupie.Item<*>?): Boolean =
+    override fun isSameAs(other: com.xwray.groupie.Item<*>): Boolean =
         (other as? PosterItem)?.movie?.movieId == movie.movieId
 
     override fun equals(other: Any?): Boolean = isSameAs(other as com.xwray.groupie.Item<*>)
@@ -156,7 +156,7 @@ class PosterItem(private val movie: Movie, private val onClick: (MovieId, View)
 }
 
 class SpaceItem : Item(1) {
-    override fun bind(viewHolder: ViewHolder, position: Int) = Unit
+    override fun bind(viewHolder: GroupieViewHolder, position: Int) = Unit
     override fun getLayout(): Int = R.layout.item_space
 }