From 1a9e8873ed0ad2f68ed3f203b0155a773db3d026 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 2 Aug 2018 17:57:45 -0400 Subject: [PATCH] Update Gradle, Kotlin, Conductor --- build.gradle | 7 +++---- gradle/wrapper/gradle-wrapper.properties | 4 ++-- presentation/build.gradle | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 182ed51f..f1af59e9 100644 --- a/build.gradle +++ b/build.gradle @@ -4,8 +4,7 @@ buildscript { ext.androidx_version = '1.0.0-beta01' ext.androidx_testrunner_version = '1.1.0-alpha3' ext.autodispose_version = '0.5.1' - ext.conductor_version = '2.1.5-20180719.190656-29' - ext.conductor_autodispose_version = '2.1.5-20180719.190706-29' + ext.conductor_version = '2.1.5' ext.constraintlayout_version = '1.1.0' ext.dagger_version = "2.16" ext.espresso_version = '3.1.0-alpha3' @@ -13,7 +12,7 @@ buildscript { ext.glide_version = "4.8.0-20180619.011009-9" ext.glide_compiler_version = "4.8.0-20180619.011013-9" ext.junit_version = '4.12' - ext.kotlin_version = '1.2.50' + ext.kotlin_version = '1.2.51' ext.ktx_version = "1.0.0-alpha1" ext.lifecycle_version = '2.0.0-alpha1' ext.mockito_version = '2.18.3' @@ -35,7 +34,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.0-beta05' + classpath 'com.android.tools.build:gradle:3.3.0-alpha03' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "io.realm:realm-gradle-plugin:4.3.1" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3c233b25..334f310b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Jun 11 23:33:26 EDT 2018 +#Thu Aug 02 17:41:14 EDT 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.9-rc-1-all.zip diff --git a/presentation/build.gradle b/presentation/build.gradle index 4938c20f..10c20504 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -117,7 +117,7 @@ dependencies { // conductor implementation "com.bluelinelabs:conductor:$conductor_version" - implementation "com.bluelinelabs:conductor-autodispose:$conductor_autodispose_version" + implementation "com.bluelinelabs:conductor-autodispose:$conductor_version" // glide implementation "com.github.bumptech.glide:glide:$glide_version"