chore: ⬆️ update libs gradle & androidX migration (ffgiraldez#25)

- update Gradle up to 5.1.1 - update Kotlin up to 1.3.20 - migrated into AndroidX - update rx-java up to 2.2.6 - update mockito-kotlin up to 2.1.0 - update arrow up to 0.8.2
jrgonzalezg · Jan 25, 2019 · a00ed21 · a00ed21
1 parent e96cf4d
commit a00ed21
Show file tree

Hide file tree

Showing 19 changed files with 60 additions and 49 deletions.
diff --git a/app/src/main/java/es/ffgiraldez/comicsearch/comics/data/storage/ComicDao.kt b/app/src/main/java/es/ffgiraldez/comicsearch/comics/data/storage/ComicDao.kt
@@ -1,9 +1,10 @@
 package es.ffgiraldez.comicsearch.comics.data.storage
 
-import android.arch.persistence.room.Dao
-import android.arch.persistence.room.Insert
-import android.arch.persistence.room.Query
-import android.arch.persistence.room.Transaction
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.Query
+import androidx.room.Transaction
 import es.ffgiraldez.comicsearch.comics.domain.Volume
 import io.reactivex.Flowable
 

diff --git a/app/src/main/java/es/ffgiraldez/comicsearch/comics/data/storage/ComicDatabase.kt b/app/src/main/java/es/ffgiraldez/comicsearch/comics/data/storage/ComicDatabase.kt
@@ -1,7 +1,8 @@
 package es.ffgiraldez.comicsearch.comics.data.storage
 
-import android.arch.persistence.room.Database
-import android.arch.persistence.room.RoomDatabase
+import androidx.room.Database
+import androidx.room.RoomDatabase
+
 
 @Database(
         entities = [

diff --git a/app/src/main/java/es/ffgiraldez/comicsearch/comics/data/storage/ComicEntities.kt b/app/src/main/java/es/ffgiraldez/comicsearch/comics/data/storage/ComicEntities.kt
@@ -1,7 +1,12 @@
 package es.ffgiraldez.comicsearch.comics.data.storage
 
-import android.arch.persistence.room.*
-import android.arch.persistence.room.ForeignKey.CASCADE
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.ForeignKey.CASCADE
+import androidx.room.Index
+import androidx.room.PrimaryKey
+
 
 @Entity(
         tableName = "queries",

diff --git a/app/src/main/java/es/ffgiraldez/comicsearch/comics/di/comicModule.kt b/app/src/main/java/es/ffgiraldez/comicsearch/comics/di/comicModule.kt
@@ -1,7 +1,7 @@
 package es.ffgiraldez.comicsearch.comics.di
 
-import android.arch.persistence.room.Room
 import android.content.Context
+import androidx.room.Room
 import es.ffgiraldez.comicsearch.comics.data.network.ComicVineApi
 import es.ffgiraldez.comicsearch.comics.data.storage.ComicDatabase
 import okhttp3.OkHttpClient
@@ -27,4 +27,4 @@ val comicModule = module {
                 .create(ComicVineApi::class.java)
     }
     single { (context: Context) -> Room.databaseBuilder(context, ComicDatabase::class.java, "comics").build() }
-}
+}
diff --git a/app/src/main/java/es/ffgiraldez/comicsearch/detail/DetailActivity.kt b/app/src/main/java/es/ffgiraldez/comicsearch/detail/DetailActivity.kt
@@ -17,8 +17,7 @@
 package es.ffgiraldez.comicsearch.detail
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
-
+import androidx.appcompat.app.AppCompatActivity
 import es.ffgiraldez.comicsearch.R
 
 class DetailActivity : AppCompatActivity() {

diff --git a/app/src/main/java/es/ffgiraldez/comicsearch/platform/ImageViewBinding.kt b/app/src/main/java/es/ffgiraldez/comicsearch/platform/ImageViewBinding.kt
@@ -1,6 +1,6 @@
 package es.ffgiraldez.comicsearch.platform
 
-import android.databinding.BindingAdapter
+import androidx.databinding.BindingAdapter
 import android.widget.ImageView
 import com.squareup.picasso.Picasso
 

diff --git a/app/src/main/java/es/ffgiraldez/comicsearch/platform/LiveDataExt.kt b/app/src/main/java/es/ffgiraldez/comicsearch/platform/LiveDataExt.kt
@@ -1,7 +1,7 @@
 package es.ffgiraldez.comicsearch.platform
 
-import android.arch.lifecycle.LiveData
-import android.arch.lifecycle.Observer
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.Observer
 import io.reactivex.BackpressureStrategy
 import io.reactivex.Flowable
 import io.reactivex.android.MainThreadDisposable

diff --git a/app/src/main/java/es/ffgiraldez/comicsearch/platform/ViewBinding.kt b/app/src/main/java/es/ffgiraldez/comicsearch/platform/ViewBinding.kt
@@ -1,6 +1,6 @@
 package es.ffgiraldez.comicsearch.platform
 
-import android.databinding.BindingAdapter
+import androidx.databinding.BindingAdapter
 import android.view.View
 
 @BindingAdapter("gone")

diff --git a/app/src/main/java/es/ffgiraldez/comicsearch/query/base/presentation/QueryViewModel.kt b/app/src/main/java/es/ffgiraldez/comicsearch/query/base/presentation/QueryViewModel.kt
@@ -1,7 +1,8 @@
 package es.ffgiraldez.comicsearch.query.base.presentation
 
-import android.arch.lifecycle.MutableLiveData
-import android.arch.lifecycle.ViewModel
+
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
 import arrow.core.Option
 import arrow.core.none
 import arrow.core.some

diff --git a/app/src/main/java/es/ffgiraldez/comicsearch/query/base/ui/QueryActivity.kt b/app/src/main/java/es/ffgiraldez/comicsearch/query/base/ui/QueryActivity.kt
@@ -1,8 +1,8 @@
 package es.ffgiraldez.comicsearch.query.base.ui
 
-import android.databinding.DataBindingUtil
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
+import androidx.databinding.DataBindingUtil
 import es.ffgiraldez.comicsearch.R
 import es.ffgiraldez.comicsearch.databinding.QueryActivityBinding
 import es.ffgiraldez.comicsearch.navigation.Navigator

diff --git a/app/src/main/java/es/ffgiraldez/comicsearch/query/base/ui/QueryVolumeAdapter.kt b/app/src/main/java/es/ffgiraldez/comicsearch/query/base/ui/QueryVolumeAdapter.kt
@@ -1,10 +1,10 @@
 package es.ffgiraldez.comicsearch.query.base.ui
 
-import android.support.v7.recyclerview.extensions.ListAdapter
-import android.support.v7.util.DiffUtil
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
 import es.ffgiraldez.comicsearch.comics.domain.Volume
 import es.ffgiraldez.comicsearch.databinding.QueryItemBinding
 

diff --git a/app/src/main/java/es/ffgiraldez/comicsearch/query/search/ui/SearchBindingAdapters.kt b/app/src/main/java/es/ffgiraldez/comicsearch/query/search/ui/SearchBindingAdapters.kt
@@ -1,10 +1,10 @@
 package es.ffgiraldez.comicsearch.query.search.ui
 
-import android.databinding.BindingAdapter
-import android.support.v7.widget.RecyclerView
+import androidx.databinding.BindingAdapter
 import android.view.View
 import android.widget.FrameLayout
 import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
 import arrow.core.Option
 import com.arlib.floatingsearchview.FloatingSearchView
 import com.arlib.floatingsearchview.suggestions.model.SearchSuggestion

diff --git a/app/src/main/java/es/ffgiraldez/comicsearch/query/sugestion/ui/SuggestionBindingAdapters.kt b/app/src/main/java/es/ffgiraldez/comicsearch/query/sugestion/ui/SuggestionBindingAdapters.kt
@@ -1,6 +1,6 @@
 package es.ffgiraldez.comicsearch.query.sugestion.ui
 
-import android.databinding.BindingAdapter
+import androidx.databinding.BindingAdapter
 import arrow.core.Option
 import com.arlib.floatingsearchview.FloatingSearchView
 import es.ffgiraldez.comicsearch.comics.domain.ComicError
@@ -9,7 +9,6 @@ import es.ffgiraldez.comicsearch.query.base.ui.QuerySearchSuggestion.ErrorSugges
 import es.ffgiraldez.comicsearch.query.base.ui.QuerySearchSuggestion.ResultSuggestion
 import es.ffgiraldez.comicsearch.query.base.ui.toHumanResponse
 
-
 @BindingAdapter("on_change")
 fun bindQueryChangeListener(search: FloatingSearchView, listener: FloatingSearchView.OnQueryChangeListener) =
         search.setOnQueryChangeListener(listener)

diff --git a/app/src/main/res/layout/query_activity.xml b/app/src/main/res/layout/query_activity.xml
@@ -27,13 +27,13 @@
                 app:error='@{ delegate.search.error}' />
         </FrameLayout>
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:clipToPadding="false"
             android:paddingTop="72dp"
-            app:layoutManager="android.support.v7.widget.LinearLayoutManager"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             app:adapter="@{ delegate.adapter }"
             app:error='@{ delegate.search.error}'
             app:on_data_change="@{ delegate.search.results }"

diff --git a/app/src/test/java/es/ffgiraldez/comicsearch/di/TestContextResolution.kt b/app/src/test/java/es/ffgiraldez/comicsearch/di/TestContextResolution.kt
@@ -1,6 +1,6 @@
 package es.ffgiraldez.comicsearch.di
 
-import android.arch.core.executor.testing.InstantTaskExecutorRule
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import es.ffgiraldez.comicsearch.comics.di.comicModule
 import es.ffgiraldez.comicsearch.navigation.di.navigationModule
 import es.ffgiraldez.comicsearch.query.search.di.searchModule
@@ -26,4 +26,4 @@ class TestContextResolution : KoinTest {
                 suggestionModule
         ))
     }
-}
+}
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -7,13 +7,13 @@ ext {
     target_sdk = 28
 
     versions = [
-            architecture_components  : '1.1.1',
-            android_plugin       : '3.1.2',
-            koin                 : '1.0.2',
-            kotlin               : '1.3.10',
-            okhttp               : '3.11.0',
-            retrofit             : '2.4.0',
-            support              : '28.0.0',
+            architecture_components: '2.0.0',
+            android_plugin         : '3.3.0',
+            koin                   : '1.0.2',
+            kotlin                 : '1.3.20',
+            okhttp                 : '3.11.0',
+            retrofit               : '2.4.0',
+            support                : '1.0.0',
     ]
 
     build_plugins = [
@@ -22,14 +22,14 @@ ext {
     ]
 
     libs = [
-            arch_comp_livedata     : [group: 'android.arch.lifecycle', name: 'livedata', version: versions.architecture_components],
-            arch_comp_viewmodel    : [group: 'android.arch.lifecycle', name: 'viewmodel', version: versions.architecture_components],
-            arch_comp_room         : [group: 'android.arch.persistence.room', name: 'runtime', version: versions.architecture_components],
-            arch_comp_room_compiler: [group: 'android.arch.persistence.room', name: 'compiler', version: versions.architecture_components],
-            arch_comp_room_rxjava  : [group: 'android.arch.persistence.room', name: 'rxjava2', version: versions.architecture_components],
-            arch_comp_room_test    : [group: 'android.arch.persistence.room', name: 'testing', version: versions.architecture_components],
-            arch_comp_test         : [group: 'android.arch.core', name: 'core-testing', version: versions.architecture_components],
-            arrow                  : [group: 'io.arrow-kt', name: 'arrow-core', version: '0.8.1'],
+            arch_comp_livedata     : [group: 'android.arch.lifecycle', name: 'livedata', version: versions.arch_comp_lifecycle],
+            arch_comp_viewmodel    : [group: 'android.arch.lifecycle', name: 'viewmodel', version: versions.arch_comp_lifecycle],
+            arch_comp_room         : [group: 'android.arch.persistence.room', name: 'runtime', version: versions.arch_comp_persistence],
+            arch_comp_room_compiler: [group: 'android.arch.persistence.room', name: 'compiler', version: versions.arch_comp_persistence],
+            arch_comp_room_rxjava  : [group: 'android.arch.persistence.room', name: 'rxjava2', version: versions.arch_comp_persistence],
+            arch_comp_room_test    : [group: 'android.arch.persistence.room', name: 'testing', version: versions.arch_comp_persistence],
+            arch_comp_test         : [group: 'android.arch.core', name: 'core-testing', version: versions.arch_comp_lifecycle],
+            arrow                  : [group: 'io.arrow-kt', name: 'arrow-core', version: '0.8.2'],
             constraint             : [group: 'com.android.support.constraint', name: 'constraint-layout', version: '1.0.2'],
             databinding_compiler   : [group: 'com.android.databinding', name: 'compiler', version: versions.android_plugin],
             design                 : [group: 'com.android.support', name: 'design', version: versions.support],
@@ -42,12 +42,12 @@ ext {
             koin_architecture      : [group: 'org.koin', name: 'koin-android-viewmodel', version: versions.koin],
             koin_test              : [group: 'org.koin', name: 'koin-test', version: versions.koin],
             kotlin_stdlib          : [group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk7', version: versions.kotlin],
-            mockito_kotlin         : [group: 'com.nhaarman.mockitokotlin2', name: 'mockito-kotlin', version: '2.0.0'],
+            mockito_kotlin         : [group: 'com.nhaarman.mockitokotlin2', name: 'mockito-kotlin', version: '2.1.0'],
             picasso                : [group: 'com.squareup.picasso', name: 'picasso', version: '2.5.2'],
             retrofit               : [group: 'com.squareup.retrofit2', name: 'retrofit', version: versions.retrofit],
             retrofit_gson          : [group: 'com.squareup.retrofit2', name: 'converter-gson', version: versions.retrofit],
             retrofit_rx_java       : [group: 'com.squareup.retrofit2', name: 'adapter-rxjava2', version: versions.retrofit],
-            rx_java                : [group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.3'],
+            rx_java                : [group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.6'],
             rx_android             : [group: 'io.reactivex.rxjava2', name: 'rxandroid', version: '2.1.0'],
             steho                  : [group: 'com.facebook.stetho', name: 'stetho', version: '1.5.0']
     ]

diff --git a/gradle.properties b/gradle.properties
@@ -20,3 +20,8 @@ android.databinding.enableV2=true
 kotlin.incremental=false
 android.enableR8=true
 
+android.useAndroidX=true
+android.enableJetifier=true
+
+
+
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists