Merge branch 'master' into translation_russian

android · May 26, 2020 · 7c21b44 · 7c21b44
2 parents bf57f91 + 9a345fe
commit 7c21b44
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/...n/java/com/google/samples/apps/sunflower/viewmodels/GardenPlantingListViewModelFactory.kt b/...n/java/com/google/samples/apps/sunflower/viewmodels/GardenPlantingListViewModelFactory.kt
@@ -26,7 +26,7 @@ import com.google.samples.apps.sunflower.data.GardenPlantingRepository
  */
 class GardenPlantingListViewModelFactory(
     private val repository: GardenPlantingRepository
-) : ViewModelProvider.NewInstanceFactory() {
+) : ViewModelProvider.Factory {
 
     @Suppress("UNCHECKED_CAST")
     override fun <T : ViewModel> create(modelClass: Class<T>): T {

diff --git a/...src/main/java/com/google/samples/apps/sunflower/viewmodels/PlantDetailViewModelFactory.kt b/...src/main/java/com/google/samples/apps/sunflower/viewmodels/PlantDetailViewModelFactory.kt
@@ -31,7 +31,7 @@ class PlantDetailViewModelFactory(
     private val plantRepository: PlantRepository,
     private val gardenPlantingRepository: GardenPlantingRepository,
     private val plantId: String
-) : ViewModelProvider.NewInstanceFactory() {
+) : ViewModelProvider.Factory {
 
     @Suppress("UNCHECKED_CAST")
     override fun <T : ViewModel> create(modelClass: Class<T>): T {

diff --git a/app/src/main/java/com/google/samples/apps/sunflower/workers/SeedDatabaseWorker.kt b/app/src/main/java/com/google/samples/apps/sunflower/workers/SeedDatabaseWorker.kt
@@ -52,6 +52,6 @@ class SeedDatabaseWorker(
     }
 
     companion object {
-        private val TAG = SeedDatabaseWorker::class.java.simpleName
+        private const val TAG = "SeedDatabaseWorker"
     }
 }
diff --git a/build.gradle b/build.gradle
@@ -30,10 +30,10 @@ buildscript {
         espressoVersion = '3.1.1'
         fragmentVersion = '1.1.0-alpha09'
         glideVersion = '4.10.0'
-        gradleVersion = '3.6.1'
+        gradleVersion = '3.6.3'
         gsonVersion = '2.8.2'
         junitVersion = '4.12'
-        kotlinVersion = '1.3.70'
+        kotlinVersion = '1.3.72'
         ktlintVersion = '0.33.0'
         ktxVersion = '1.0.2'
         lifecycleVersion = '2.2.0-alpha01'