From 66096bb81f1af2608ac0e3936b75579cd45f357f Mon Sep 17 00:00:00 2001 From: Florina Muntenescu Date: Mon, 22 Oct 2018 11:56:52 +0100 Subject: [PATCH] Migrating to Jetpack --- app/build.gradle | 28 +++++++++---------- .../android/codelabs/paging/Injection.kt | 5 ++-- .../codelabs/paging/api/GithubService.kt | 26 +++++++++-------- .../codelabs/paging/api/RepoSearchResponse.kt | 7 ++--- .../codelabs/paging/data/GithubRepository.kt | 8 +++--- .../codelabs/paging/db/GithubLocalCache.kt | 11 ++++---- .../android/codelabs/paging/db/RepoDao.kt | 13 ++++----- .../codelabs/paging/db/RepoDatabase.kt | 8 +++--- .../android/codelabs/paging/model/Repo.kt | 20 ++++++------- .../codelabs/paging/model/RepoSearchResult.kt | 8 +++--- .../codelabs/paging/ui/RepoViewHolder.kt | 4 +-- .../codelabs/paging/ui/ReposAdapter.kt | 13 ++++----- .../paging/ui/SearchRepositoriesActivity.kt | 21 ++++++-------- .../paging/ui/SearchRepositoriesViewModel.kt | 10 +++---- .../codelabs/paging/ui/ViewModelFactory.kt | 6 ++-- .../layout/activity_search_repositories.xml | 10 +++---- app/src/main/res/layout/repo_view_item.xml | 4 +-- build.gradle | 24 ++++++++-------- gradle.properties | 2 ++ gradle/wrapper/gradle-wrapper.properties | 4 +-- 20 files changed, 114 insertions(+), 118 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f56d86fe..d12a5ae4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,7 +27,7 @@ android { targetSdkVersion rootProject.targetSdkVersion versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { @@ -38,19 +38,19 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation"org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" - implementation "com.android.support:appcompat-v7:$supportLibVersion" - implementation "com.android.support.constraint:constraint-layout:$constraintLayoutVersion" - implementation "com.android.support:design:$supportLibVersion" + implementation fileTree(dir: 'libs') + implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "androidx.appcompat:appcompat:$supportLibVersion" + implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion" + implementation "com.google.android.material:material:$supportLibVersion" // architecture components - implementation "android.arch.lifecycle:extensions:$archComponentsVersion" - implementation "android.arch.lifecycle:runtime:$archComponentsVersion" - implementation "android.arch.persistence.room:runtime:$roomVersion" - implementation "android.arch.paging:runtime:$pagingVersion" - kapt "android.arch.lifecycle:compiler:$archComponentsVersion" - kapt "android.arch.persistence.room:compiler:$roomVersion" + implementation "androidx.lifecycle:lifecycle-extensions:$archComponentsVersion" + implementation "androidx.lifecycle:lifecycle-runtime:$archComponentsVersion" + implementation "androidx.room:room-runtime:$roomVersion" + implementation "androidx.paging:paging-runtime:$pagingVersion" + kapt "androidx.lifecycle:lifecycle-compiler:$archComponentsVersion" + kapt "androidx.room:room-compiler:$roomVersion" // retrofit implementation "com.squareup.retrofit2:retrofit:$retrofitVersion" @@ -60,6 +60,6 @@ dependencies { // testing testImplementation "junit:junit:$junitVersion" - androidTestImplementation "com.android.support.test:runner:$runnerVersion" - androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoVersion" + androidTestImplementation "androidx.test:runner:$runnerVersion" + androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion" } diff --git a/app/src/main/java/com/example/android/codelabs/paging/Injection.kt b/app/src/main/java/com/example/android/codelabs/paging/Injection.kt index 64eb8232..c67a1950 100644 --- a/app/src/main/java/com/example/android/codelabs/paging/Injection.kt +++ b/app/src/main/java/com/example/android/codelabs/paging/Injection.kt @@ -16,8 +16,8 @@ package com.example.android.codelabs.paging -import android.arch.lifecycle.ViewModelProvider import android.content.Context +import androidx.lifecycle.ViewModelProvider import com.example.android.codelabs.paging.api.GithubService import com.example.android.codelabs.paging.data.GithubRepository import com.example.android.codelabs.paging.db.GithubLocalCache @@ -55,5 +55,4 @@ object Injection { fun provideViewModelFactory(context: Context): ViewModelProvider.Factory { return ViewModelFactory(provideGithubRepository(context)) } - -} \ No newline at end of file +} diff --git a/app/src/main/java/com/example/android/codelabs/paging/api/GithubService.kt b/app/src/main/java/com/example/android/codelabs/paging/api/GithubService.kt index ad5646c9..91114950 100644 --- a/app/src/main/java/com/example/android/codelabs/paging/api/GithubService.kt +++ b/app/src/main/java/com/example/android/codelabs/paging/api/GithubService.kt @@ -44,12 +44,13 @@ private const val IN_QUALIFIER = "in:name,description" * @param onError function that defines how to handle request failure */ fun searchRepos( - service: GithubService, - query: String, - page: Int, - itemsPerPage: Int, - onSuccess: (repos: List) -> Unit, - onError: (error: String) -> Unit) { + service: GithubService, + query: String, + page: Int, + itemsPerPage: Int, + onSuccess: (repos: List) -> Unit, + onError: (error: String) -> Unit +) { Log.d(TAG, "query: $query, page: $page, itemsPerPage: $itemsPerPage") val apiQuery = query + IN_QUALIFIER @@ -62,8 +63,8 @@ fun searchRepos( } override fun onResponse( - call: Call?, - response: Response + call: Call?, + response: Response ) { Log.d(TAG, "got a response $response") if (response.isSuccessful) { @@ -85,10 +86,11 @@ interface GithubService { * Get repos ordered by stars. */ @GET("search/repositories?sort=stars") - fun searchRepos(@Query("q") query: String, - @Query("page") page: Int, - @Query("per_page") itemsPerPage: Int): Call - + fun searchRepos( + @Query("q") query: String, + @Query("page") page: Int, + @Query("per_page") itemsPerPage: Int + ): Call companion object { private const val BASE_URL = "https://api.github.com/" diff --git a/app/src/main/java/com/example/android/codelabs/paging/api/RepoSearchResponse.kt b/app/src/main/java/com/example/android/codelabs/paging/api/RepoSearchResponse.kt index ddbb1f0e..b48f15ab 100644 --- a/app/src/main/java/com/example/android/codelabs/paging/api/RepoSearchResponse.kt +++ b/app/src/main/java/com/example/android/codelabs/paging/api/RepoSearchResponse.kt @@ -16,7 +16,6 @@ package com.example.android.codelabs.paging.api - import com.example.android.codelabs.paging.model.Repo import com.google.gson.annotations.SerializedName @@ -24,7 +23,7 @@ import com.google.gson.annotations.SerializedName * Data class to hold repo responses from searchRepo API calls. */ data class RepoSearchResponse( - @SerializedName("total_count") val total: Int = 0, - @SerializedName("items") val items: List = emptyList(), - val nextPage: Int? = null + @SerializedName("total_count") val total: Int = 0, + @SerializedName("items") val items: List = emptyList(), + val nextPage: Int? = null ) diff --git a/app/src/main/java/com/example/android/codelabs/paging/data/GithubRepository.kt b/app/src/main/java/com/example/android/codelabs/paging/data/GithubRepository.kt index 4d1865ca..b1b9b6c4 100644 --- a/app/src/main/java/com/example/android/codelabs/paging/data/GithubRepository.kt +++ b/app/src/main/java/com/example/android/codelabs/paging/data/GithubRepository.kt @@ -16,8 +16,8 @@ package com.example.android.codelabs.paging.data -import android.arch.lifecycle.MutableLiveData import android.util.Log +import androidx.lifecycle.MutableLiveData import com.example.android.codelabs.paging.api.GithubService import com.example.android.codelabs.paging.api.searchRepos import com.example.android.codelabs.paging.db.GithubLocalCache @@ -27,8 +27,8 @@ import com.example.android.codelabs.paging.model.RepoSearchResult * Repository class that works with local and remote data sources. */ class GithubRepository( - private val service: GithubService, - private val cache: GithubLocalCache + private val service: GithubService, + private val cache: GithubLocalCache ) { // keep the last requested page. When the request is successful, increment the page number. @@ -76,4 +76,4 @@ class GithubRepository( companion object { private const val NETWORK_PAGE_SIZE = 50 } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/example/android/codelabs/paging/db/GithubLocalCache.kt b/app/src/main/java/com/example/android/codelabs/paging/db/GithubLocalCache.kt index a014fd2f..e427134f 100644 --- a/app/src/main/java/com/example/android/codelabs/paging/db/GithubLocalCache.kt +++ b/app/src/main/java/com/example/android/codelabs/paging/db/GithubLocalCache.kt @@ -16,9 +16,8 @@ package com.example.android.codelabs.paging.db -import android.arch.lifecycle.LiveData -import android.arch.paging.DataSource import android.util.Log +import androidx.lifecycle.LiveData import com.example.android.codelabs.paging.model.Repo import java.util.concurrent.Executor @@ -27,14 +26,14 @@ import java.util.concurrent.Executor * correct executor. */ class GithubLocalCache( - private val repoDao: RepoDao, - private val ioExecutor: Executor + private val repoDao: RepoDao, + private val ioExecutor: Executor ) { /** * Insert a list of repos in the database, on a background thread. */ - fun insert(repos: List, insertFinished: ()-> Unit) { + fun insert(repos: List, insertFinished: () -> Unit) { ioExecutor.execute { Log.d("GithubLocalCache", "inserting ${repos.size} repos") repoDao.insert(repos) @@ -53,4 +52,4 @@ class GithubLocalCache( val query = "%${name.replace(' ', '%')}%" return repoDao.reposByName(query) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/example/android/codelabs/paging/db/RepoDao.kt b/app/src/main/java/com/example/android/codelabs/paging/db/RepoDao.kt index f5a371f7..60665fad 100644 --- a/app/src/main/java/com/example/android/codelabs/paging/db/RepoDao.kt +++ b/app/src/main/java/com/example/android/codelabs/paging/db/RepoDao.kt @@ -16,11 +16,11 @@ package com.example.android.codelabs.paging.db -import android.arch.lifecycle.LiveData -import android.arch.persistence.room.Dao -import android.arch.persistence.room.Insert -import android.arch.persistence.room.OnConflictStrategy -import android.arch.persistence.room.Query +import androidx.lifecycle.LiveData +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.OnConflictStrategy +import androidx.room.Query import com.example.android.codelabs.paging.model.Repo /** @@ -38,5 +38,4 @@ interface RepoDao { @Query("SELECT * FROM repos WHERE (name LIKE :queryString) OR (description LIKE " + ":queryString) ORDER BY stars DESC, name ASC") fun reposByName(queryString: String): LiveData> - -} \ No newline at end of file +} diff --git a/app/src/main/java/com/example/android/codelabs/paging/db/RepoDatabase.kt b/app/src/main/java/com/example/android/codelabs/paging/db/RepoDatabase.kt index b15bf798..2c5db0c0 100644 --- a/app/src/main/java/com/example/android/codelabs/paging/db/RepoDatabase.kt +++ b/app/src/main/java/com/example/android/codelabs/paging/db/RepoDatabase.kt @@ -16,9 +16,9 @@ package com.example.android.codelabs.paging.db -import android.arch.persistence.room.Database -import android.arch.persistence.room.Room -import android.arch.persistence.room.RoomDatabase +import androidx.room.Database +import androidx.room.Room +import androidx.room.RoomDatabase import android.content.Context import com.example.android.codelabs.paging.model.Repo @@ -50,4 +50,4 @@ abstract class RepoDatabase : RoomDatabase() { RepoDatabase::class.java, "Github.db") .build() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/example/android/codelabs/paging/model/Repo.kt b/app/src/main/java/com/example/android/codelabs/paging/model/Repo.kt index 88691aa7..87fbc41a 100644 --- a/app/src/main/java/com/example/android/codelabs/paging/model/Repo.kt +++ b/app/src/main/java/com/example/android/codelabs/paging/model/Repo.kt @@ -16,8 +16,8 @@ package com.example.android.codelabs.paging.model -import android.arch.persistence.room.Entity -import android.arch.persistence.room.PrimaryKey +import androidx.room.Entity +import androidx.room.PrimaryKey import com.google.gson.annotations.SerializedName /** @@ -28,12 +28,12 @@ import com.google.gson.annotations.SerializedName */ @Entity(tableName = "repos") data class Repo( - @PrimaryKey @field:SerializedName("id") val id: Long, - @field:SerializedName("name") val name: String, - @field:SerializedName("full_name") val fullName: String, - @field:SerializedName("description") val description: String?, - @field:SerializedName("html_url") val url: String, - @field:SerializedName("stargazers_count") val stars: Int, - @field:SerializedName("forks_count") val forks: Int, - @field:SerializedName("language") val language: String? + @PrimaryKey @field:SerializedName("id") val id: Long, + @field:SerializedName("name") val name: String, + @field:SerializedName("full_name") val fullName: String, + @field:SerializedName("description") val description: String?, + @field:SerializedName("html_url") val url: String, + @field:SerializedName("stargazers_count") val stars: Int, + @field:SerializedName("forks_count") val forks: Int, + @field:SerializedName("language") val language: String? ) diff --git a/app/src/main/java/com/example/android/codelabs/paging/model/RepoSearchResult.kt b/app/src/main/java/com/example/android/codelabs/paging/model/RepoSearchResult.kt index 3654fb5e..75688b35 100644 --- a/app/src/main/java/com/example/android/codelabs/paging/model/RepoSearchResult.kt +++ b/app/src/main/java/com/example/android/codelabs/paging/model/RepoSearchResult.kt @@ -16,13 +16,13 @@ package com.example.android.codelabs.paging.model -import android.arch.lifecycle.LiveData +import androidx.lifecycle.LiveData /** * RepoSearchResult from a search, which contains LiveData> holding query data, * and a LiveData of network error state. */ data class RepoSearchResult( - val data: LiveData>, - val networkErrors: LiveData -) \ No newline at end of file + val data: LiveData>, + val networkErrors: LiveData +) diff --git a/app/src/main/java/com/example/android/codelabs/paging/ui/RepoViewHolder.kt b/app/src/main/java/com/example/android/codelabs/paging/ui/RepoViewHolder.kt index 861698c5..0be678a8 100644 --- a/app/src/main/java/com/example/android/codelabs/paging/ui/RepoViewHolder.kt +++ b/app/src/main/java/com/example/android/codelabs/paging/ui/RepoViewHolder.kt @@ -18,7 +18,7 @@ package com.example.android.codelabs.paging.ui import android.content.Intent import android.net.Uri -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -92,4 +92,4 @@ class RepoViewHolder(view: View) : RecyclerView.ViewHolder(view) { return RepoViewHolder(view) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/example/android/codelabs/paging/ui/ReposAdapter.kt b/app/src/main/java/com/example/android/codelabs/paging/ui/ReposAdapter.kt index 5c23d30b..d959d265 100644 --- a/app/src/main/java/com/example/android/codelabs/paging/ui/ReposAdapter.kt +++ b/app/src/main/java/com/example/android/codelabs/paging/ui/ReposAdapter.kt @@ -16,22 +16,21 @@ package com.example.android.codelabs.paging.ui -import android.support.v7.recyclerview.extensions.ListAdapter -import android.support.v7.util.DiffUtil -import android.support.v7.widget.RecyclerView import android.view.ViewGroup +import androidx.recyclerview.widget.DiffUtil +import androidx.recyclerview.widget.ListAdapter import com.example.android.codelabs.paging.model.Repo /** * Adapter for the list of repositories. */ -class ReposAdapter : ListAdapter(REPO_COMPARATOR) { +class ReposAdapter : ListAdapter(REPO_COMPARATOR) { - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { return RepoViewHolder.create(parent) } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { val repoItem = getItem(position) if (repoItem != null) { (holder as RepoViewHolder).bind(repoItem) @@ -47,4 +46,4 @@ class ReposAdapter : ListAdapter(REPO_COMPARATOR) oldItem == newItem } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/example/android/codelabs/paging/ui/SearchRepositoriesActivity.kt b/app/src/main/java/com/example/android/codelabs/paging/ui/SearchRepositoriesActivity.kt index e05a432f..53029c1c 100644 --- a/app/src/main/java/com/example/android/codelabs/paging/ui/SearchRepositoriesActivity.kt +++ b/app/src/main/java/com/example/android/codelabs/paging/ui/SearchRepositoriesActivity.kt @@ -16,24 +16,21 @@ package com.example.android.codelabs.paging.ui -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders import android.os.Bundle -import android.support.v7.app.AppCompatActivity -import android.support.v7.widget.DividerItemDecoration -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView import android.util.Log import android.view.KeyEvent import android.view.View import android.view.inputmethod.EditorInfo import android.widget.Toast -import com.example.android.codelabs.paging.R +import androidx.appcompat.app.AppCompatActivity +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders +import androidx.recyclerview.widget.DividerItemDecoration import com.example.android.codelabs.paging.Injection +import com.example.android.codelabs.paging.R import com.example.android.codelabs.paging.model.Repo import kotlinx.android.synthetic.main.activity_search_repositories.* - class SearchRepositoriesActivity : AppCompatActivity() { private lateinit var viewModel: SearchRepositoriesViewModel @@ -71,7 +68,7 @@ class SearchRepositoriesActivity : AppCompatActivity() { adapter.submitList(it) }) viewModel.networkErrors.observe(this, Observer { - Toast.makeText(this, "\uD83D\uDE28 Wooops ${it}", Toast.LENGTH_LONG).show() + Toast.makeText(this, "\uD83D\uDE28 Wooops $it", Toast.LENGTH_LONG).show() }) } @@ -117,9 +114,9 @@ class SearchRepositoriesActivity : AppCompatActivity() { } private fun setupScrollListener() { - val layoutManager = list.layoutManager as LinearLayoutManager - list.addOnScrollListener(object : RecyclerView.OnScrollListener() { - override fun onScrolled(recyclerView: RecyclerView?, dx: Int, dy: Int) { + val layoutManager = list.layoutManager as androidx.recyclerview.widget.LinearLayoutManager + list.addOnScrollListener(object : androidx.recyclerview.widget.RecyclerView.OnScrollListener() { + override fun onScrolled(recyclerView: androidx.recyclerview.widget.RecyclerView, dx: Int, dy: Int) { super.onScrolled(recyclerView, dx, dy) val totalItemCount = layoutManager.itemCount val visibleItemCount = layoutManager.childCount diff --git a/app/src/main/java/com/example/android/codelabs/paging/ui/SearchRepositoriesViewModel.kt b/app/src/main/java/com/example/android/codelabs/paging/ui/SearchRepositoriesViewModel.kt index 4e8be805..4034f91e 100644 --- a/app/src/main/java/com/example/android/codelabs/paging/ui/SearchRepositoriesViewModel.kt +++ b/app/src/main/java/com/example/android/codelabs/paging/ui/SearchRepositoriesViewModel.kt @@ -16,10 +16,10 @@ package com.example.android.codelabs.paging.ui -import android.arch.lifecycle.LiveData -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.Transformations -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.Transformations +import androidx.lifecycle.ViewModel import com.example.android.codelabs.paging.data.GithubRepository import com.example.android.codelabs.paging.model.Repo import com.example.android.codelabs.paging.model.RepoSearchResult @@ -64,4 +64,4 @@ class SearchRepositoriesViewModel(private val repository: GithubRepository) : Vi * Get the last query value. */ fun lastQueryValue(): String? = queryLiveData.value -} \ No newline at end of file +} diff --git a/app/src/main/java/com/example/android/codelabs/paging/ui/ViewModelFactory.kt b/app/src/main/java/com/example/android/codelabs/paging/ui/ViewModelFactory.kt index 2f94d1d3..71b4b1cf 100644 --- a/app/src/main/java/com/example/android/codelabs/paging/ui/ViewModelFactory.kt +++ b/app/src/main/java/com/example/android/codelabs/paging/ui/ViewModelFactory.kt @@ -16,8 +16,8 @@ package com.example.android.codelabs.paging.ui -import android.arch.lifecycle.ViewModel -import android.arch.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider import com.example.android.codelabs.paging.data.GithubRepository /** @@ -32,4 +32,4 @@ class ViewModelFactory(private val repository: GithubRepository) : ViewModelProv } throw IllegalArgumentException("Unknown ViewModel class") } -} \ No newline at end of file +} diff --git a/app/src/main/res/layout/activity_search_repositories.xml b/app/src/main/res/layout/activity_search_repositories.xml index 3702486e..fbeef8b2 100644 --- a/app/src/main/res/layout/activity_search_repositories.xml +++ b/app/src/main/res/layout/activity_search_repositories.xml @@ -15,14 +15,14 @@ ~ limitations under the License. --> - - - + - - \ No newline at end of file + diff --git a/app/src/main/res/layout/repo_view_item.xml b/app/src/main/res/layout/repo_view_item.xml index e1a21e4f..42d6ac3d 100644 --- a/app/src/main/res/layout/repo_view_item.xml +++ b/app/src/main/res/layout/repo_view_item.xml @@ -15,7 +15,7 @@ ~ limitations under the License. --> - - \ No newline at end of file + diff --git a/build.gradle b/build.gradle index 2436945c..af4d91fb 100644 --- a/build.gradle +++ b/build.gradle @@ -17,13 +17,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.2.70' + ext.kotlin_version = '1.2.71' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.0-beta04' + classpath 'com.android.tools.build:gradle:3.3.0-beta01' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong @@ -43,19 +43,19 @@ task clean(type: Delete) { } ext { - compileSdkVersion = 27 + compileSdkVersion = 28 minSdkVersion = 15 - targetSdkVersion = 27 - supportLibVersion = "27.1.0" - constraintLayoutVersion = "1.0.2" - archComponentsVersion = "1.1.1" - roomVersion = "1.1.1" - pagingVersion = "1.0.1" + targetSdkVersion = 28 + supportLibVersion = '1.0.0' + constraintLayoutVersion = '1.1.3' + archComponentsVersion = '2.0.0' + roomVersion = '2.1.0-alpha01' + pagingVersion = '2.1.0-alpha01' retrofitVersion = "2.3.0" okhttpLoggingInterceptorVersion = "3.9.0" - runnerVersion = "1.0.1" + runnerVersion = '1.1.0-alpha4' rulesVersion = "1.0.1" junitVersion = "4.12" - espressoVersion = "3.0.1" -} \ No newline at end of file + espressoVersion = '3.1.0-beta02' +} diff --git a/gradle.properties b/gradle.properties index 743d692c..8de50581 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,6 +6,8 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 46c2a7bf..70efbdf1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 04 14:02:03 BST 2018 +#Sat Oct 20 17:02:44 BST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip