From 1bcde286ddff6d81862687cd55893042065c68cd Mon Sep 17 00:00:00 2001 From: Melih Date: Mon, 6 Jul 2020 14:15:00 +0200 Subject: [PATCH] Version updates --- build.gradle | 8 ++++---- .../com/melih/detail/ui/DetailViewModel.kt | 14 +++++++------ gradle/wrapper/gradle-wrapper.properties | 4 ++-- scripts/dependencies.gradle | 20 +++++++++---------- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index 8225671..52cec02 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.71' - ext.nav_version = '2.3.0-alpha04' + ext.kotlin_version = '1.3.72' + ext.nav_version = '2.3.0' repositories { google() @@ -10,7 +10,7 @@ buildscript { maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0-alpha04' + classpath 'com.android.tools.build:gradle:4.2.0-alpha03' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "de.mannodermaus.gradle.plugins:android-junit5:1.6.0.1-SNAPSHOT" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version" @@ -20,7 +20,7 @@ buildscript { } plugins { - id 'io.gitlab.arturbosch.detekt' version '1.7.2' + id 'io.gitlab.arturbosch.detekt' version '1.10.0' id 'org.jetbrains.dokka' version '0.10.1' id 'jacoco' } diff --git a/features/detail/src/main/kotlin/com/melih/detail/ui/DetailViewModel.kt b/features/detail/src/main/kotlin/com/melih/detail/ui/DetailViewModel.kt index 9cccca4..14b2f41 100644 --- a/features/detail/src/main/kotlin/com/melih/detail/ui/DetailViewModel.kt +++ b/features/detail/src/main/kotlin/com/melih/detail/ui/DetailViewModel.kt @@ -17,14 +17,16 @@ class DetailViewModel @Inject constructor( //region Properties - val rocketName = map(successData) { - it.rocketName - } - get() { - loadData() - return field + val rocketName by lazy { + val nameData = map(successData) { + it.rocketName } + loadData() + + nameData + } + val description = map(successData) { it.missionDescription } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8663441..ca90413 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Mar 31 10:39:09 CEST 2020 +#Mon Jul 06 12:03:00 CEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-rc-1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-rc-1-all.zip diff --git a/scripts/dependencies.gradle b/scripts/dependencies.gradle index 4f19ea6..17d113a 100644 --- a/scripts/dependencies.gradle +++ b/scripts/dependencies.gradle @@ -7,28 +7,28 @@ ext { buildToolsVersion : "29.0.3", appCompatVersion : "1.1.0", lifecycleVersion : "2.2.0", - fragmentVersion : "1.3.0-alpha02", + fragmentVersion : "1.3.0-alpha06", workManagerVersion : "2.4.0-alpha01", - constraintLayoutVesion : "2.0.0-beta4", + constraintLayoutVesion : "2.0.0-beta7", cardViewVersion : "1.0.0", recyclerViewVersion : "1.2.0-alpha01", - pagingVersion : "2.1.0", + pagingVersion : "2.1.2", viewPagerVersion : "1.0.0", - materialVersion : "1.2.0-alpha05", - swipeRefreshLayoutVersion: "1.1.0-beta01", + materialVersion : "1.3.0-alpha01", + swipeRefreshLayoutVersion: "1.1.0", collectionVersion : "1.1.0", roomVersion : "2.2.5", daggerVersion : "2.27", - okHttpVersion : "4.4.0", - retrofitVersion : "2.8.1", + okHttpVersion : "4.7.2", + retrofitVersion : "2.9.0", picassoVersion : "2.71828", - moshiVersion : "1.9.2", + moshiVersion : "1.9.3", coroutinesVersion : "1.3.5", leakCanaryVersion : "2.2", timberVersion : "4.7.1", - jUnitVersion : "5.6.0", + jUnitVersion : "5.6.2", espressoVersion : "3.2.0", - mockkVersion : "1.9.3", + mockkVersion : "1.10.0", kluentVersion : "1.60", ]