diff --git a/BuildScripts b/BuildScripts
index cde76d7..e5aad8c 160000
--- a/BuildScripts
+++ b/BuildScripts
@@ -1 +1 @@
-Subproject commit cde76d7d189f5381e98dbd0535c4ca3c7c9c709c
+Subproject commit e5aad8c82854d55fd930ffe4eef5a6b8660161eb
diff --git a/build.gradle b/build.gradle
index 01bdb80..c0c8b9a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,11 +3,13 @@ buildscript {
     repositories {
         google()
         jcenter()
+        maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'de.aaschmid:gradle-cpd-plugin:1.0'
+        classpath 'de.aaschmid:gradle-cpd-plugin:1.1'
+        classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.0.0-RC10"
     }
 }
 
@@ -25,15 +27,15 @@ task clean(type: Delete) {
 
 ext {
     versions = [
-            compileSdk    : 28,
-            androidx      : '1.0.1',
-            material      : '1.0.0',
-            lifecycle     : '2.0.0',
-            dagger        : '2.17',
-            retrofit      : '2.4.0',
-            rxJava        : '2.2.2',
-            rxAndroid     : '2.1.0',
-            crashlytics   : '2.9.5',
-            location      : '16.0.0'
+            compileSdk : 28,
+            androidx   : '1.0.0',
+            material   : '1.0.0',
+            lifecycle  : '2.0.0',
+            dagger     : '2.17',
+            retrofit   : '2.4.0',
+            rxJava     : '2.2.2',
+            rxAndroid  : '2.1.0',
+            crashlytics: '2.9.5',
+            location   : '16.0.0'
     ]
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c9a3581..e64f00a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ 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.2-all.zip
diff --git a/lifecycle/src/main/java/ru/touchin/lifecycle/viewmodel/ViewModelFactory.kt b/lifecycle/src/main/java/ru/touchin/lifecycle/viewmodel/ViewModelFactory.kt
index 8fae879..539742f 100644
--- a/lifecycle/src/main/java/ru/touchin/lifecycle/viewmodel/ViewModelFactory.kt
+++ b/lifecycle/src/main/java/ru/touchin/lifecycle/viewmodel/ViewModelFactory.kt
@@ -12,6 +12,6 @@ class ViewModelFactory @Inject constructor(
 
     @Suppress("UNCHECKED_CAST")
     override fun <T : ViewModel> create(modelClass: Class<T>): T
-            = (creators[modelClass]?.get() as? T) ?: throw IllegalArgumentException("Unknown model class $modelClass")
+            = creators[modelClass]?.get() as? T ?: throw IllegalArgumentException("Unknown model class $modelClass")
 
 }
diff --git a/livedata-location/src/main/java/ru/touchin/livedata/location/LocationLiveData.kt b/livedata-location/src/main/java/ru/touchin/livedata/location/LocationLiveData.kt
index 4074888..913b197 100644
--- a/livedata-location/src/main/java/ru/touchin/livedata/location/LocationLiveData.kt
+++ b/livedata-location/src/main/java/ru/touchin/livedata/location/LocationLiveData.kt
@@ -58,4 +58,4 @@ class LocationLiveData(
         )
     }
 
-}
\ No newline at end of file
+}