Skip to content
This repository was archived by the owner on Aug 2, 2024. It is now read-only.

Commit 7c21b44

Browse files
Merge branch 'master' into translation_russian
2 parents bf57f91 + 9a345fe commit 7c21b44

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

app/src/main/java/com/google/samples/apps/sunflower/viewmodels/GardenPlantingListViewModelFactory.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import com.google.samples.apps.sunflower.data.GardenPlantingRepository
2626
*/
2727
class GardenPlantingListViewModelFactory(
2828
private val repository: GardenPlantingRepository
29-
) : ViewModelProvider.NewInstanceFactory() {
29+
) : ViewModelProvider.Factory {
3030

3131
@Suppress("UNCHECKED_CAST")
3232
override fun <T : ViewModel> create(modelClass: Class<T>): T {

app/src/main/java/com/google/samples/apps/sunflower/viewmodels/PlantDetailViewModelFactory.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class PlantDetailViewModelFactory(
3131
private val plantRepository: PlantRepository,
3232
private val gardenPlantingRepository: GardenPlantingRepository,
3333
private val plantId: String
34-
) : ViewModelProvider.NewInstanceFactory() {
34+
) : ViewModelProvider.Factory {
3535

3636
@Suppress("UNCHECKED_CAST")
3737
override fun <T : ViewModel> create(modelClass: Class<T>): T {

app/src/main/java/com/google/samples/apps/sunflower/workers/SeedDatabaseWorker.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ class SeedDatabaseWorker(
5252
}
5353

5454
companion object {
55-
private val TAG = SeedDatabaseWorker::class.java.simpleName
55+
private const val TAG = "SeedDatabaseWorker"
5656
}
5757
}

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ buildscript {
3030
espressoVersion = '3.1.1'
3131
fragmentVersion = '1.1.0-alpha09'
3232
glideVersion = '4.10.0'
33-
gradleVersion = '3.6.1'
33+
gradleVersion = '3.6.3'
3434
gsonVersion = '2.8.2'
3535
junitVersion = '4.12'
36-
kotlinVersion = '1.3.70'
36+
kotlinVersion = '1.3.72'
3737
ktlintVersion = '0.33.0'
3838
ktxVersion = '1.0.2'
3939
lifecycleVersion = '2.2.0-alpha01'

0 commit comments

Comments
 (0)