diff --git a/app/build.gradle b/app/build.gradle
index f6e5d49b..2f1869b7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -95,12 +95,12 @@ android {
 
     // Fixing crash in androidTest
     // java.lang.NoClassDefFoundError: Failed resolution of: Landroidx/databinding/DataBinderMapperImpl;java.lang.NoClassDefFoundError: Failed resolution of: Landroidx/databinding/DataBinderMapperImpl;
-    dataBinding {
-        enabled = true
+    buildFeatures {
+        dataBinding true
     }
 
     kotlinOptions {
-        jvmTarget = Config.javaVersion.toString()
+        jvmTarget = Config.KotlinOptions.jvmTarget
     }
 }
 
diff --git a/build.gradle b/build.gradle
index f82c47a2..eab9b098 100644
--- a/build.gradle
+++ b/build.gradle
@@ -102,7 +102,6 @@ subprojects {
                 testOptions {
                     unitTests {
                         all {
-                            includeAndroidResources = true
                             jvmArgs '-noverify'
                             testLogging {
                                 events 'passed', 'skipped', 'failed', 'standardOut', 'standardError'
diff --git a/buildSrc/src/main/kotlin/teamcityapp/buildsrc/Dependencies.kt b/buildSrc/src/main/kotlin/teamcityapp/buildsrc/Dependencies.kt
index b94c4737..da4d09ef 100644
--- a/buildSrc/src/main/kotlin/teamcityapp/buildsrc/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/teamcityapp/buildsrc/Dependencies.kt
@@ -27,6 +27,10 @@ object Config {
     const val versionName = "1.52.3"
     const val applicationId = "com.github.vase4kin.teamcityapp"
     val javaVersion = JavaVersion.VERSION_1_8
+
+    object KotlinOptions {
+        const val jvmTarget = "1.8"
+    }
 }
 
 object Libs {
@@ -162,7 +166,7 @@ object Libs {
     }
 
     object Tools {
-        const val gradleAndroid = "com.android.tools.build:gradle:4.0.1"
+        const val gradleAndroid = "com.android.tools.build:gradle:4.1.0"
         const val gradleversions = "com.github.ben-manes:gradle-versions-plugin:0.33.0"
         const val androidAapt = "com.neenbedankt.gradle.plugins:android-apt:1.8"
         const val googleServices = "com.google.gms:google-services:4.3.0"
diff --git a/features/about/feature/build.gradle b/features/about/feature/build.gradle
index 379fc582..ac45d8ec 100644
--- a/features/about/feature/build.gradle
+++ b/features/about/feature/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Andrey Tolpeev
+ * Copyright 2020 Andrey Tolpeev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ apply from: '../../../scripts/jacoco.gradle'
 
 android {
     defaultConfig {
-        versionName Config.versionName
+        buildConfigField 'String', 'VERSION', "\"$Config.versionName\""
     }
 }
 
diff --git a/features/about/feature/src/main/java/teamcityapp/features/about/AboutFragment.kt b/features/about/feature/src/main/java/teamcityapp/features/about/AboutFragment.kt
index cc76e585..2d00c094 100644
--- a/features/about/feature/src/main/java/teamcityapp/features/about/AboutFragment.kt
+++ b/features/about/feature/src/main/java/teamcityapp/features/about/AboutFragment.kt
@@ -150,7 +150,7 @@ class AboutFragment : MaterialAboutFragment() {
                         R.color.material_on_surface_emphasis_medium
                     )
                 )
-                .subText(BuildConfig.VERSION_NAME)
+                .subText(BuildConfig.VERSION)
                 .build()
         )
             .addItem(
diff --git a/features/change-details/build.gradle b/features/change-details/build.gradle
index eafeb3f7..f14faa76 100644
--- a/features/change-details/build.gradle
+++ b/features/change-details/build.gradle
@@ -25,8 +25,8 @@ apply plugin: 'org.jmailen.kotlinter'
 apply from: '../../scripts/jacoco.gradle'
 
 android {
-    dataBinding {
-        enabled = true
+    buildFeatures {
+        dataBinding true
     }
 }
 
diff --git a/features/drawer/build.gradle b/features/drawer/build.gradle
index e6beb1a0..bf5bafd7 100644
--- a/features/drawer/build.gradle
+++ b/features/drawer/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Andrey Tolpeev
+ * Copyright 2020 Andrey Tolpeev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@ apply plugin: 'org.jmailen.kotlinter'
 apply from: '../../scripts/jacoco.gradle'
 
 android {
-    dataBinding {
-        enabled = true
+    buildFeatures {
+        dataBinding true
     }
 }
 
diff --git a/features/manage-accounts/build.gradle b/features/manage-accounts/build.gradle
index 3c0d1fa0..064959b8 100644
--- a/features/manage-accounts/build.gradle
+++ b/features/manage-accounts/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Andrey Tolpeev
+ * Copyright 2020 Andrey Tolpeev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@ apply plugin: 'org.jmailen.kotlinter'
 apply from: '../../scripts/jacoco.gradle'
 
 android {
-    dataBinding {
-        enabled = true
+    buildFeatures {
+        dataBinding true
     }
 }
 
diff --git a/features/properties/feature/build.gradle b/features/properties/feature/build.gradle
index d8bd97fa..cc7b1dc5 100644
--- a/features/properties/feature/build.gradle
+++ b/features/properties/feature/build.gradle
@@ -26,12 +26,12 @@ apply plugin: 'org.jmailen.kotlinter'
 apply from: '../../../scripts/jacoco.gradle'
 
 android {
-    dataBinding {
-        enabled = true
+    buildFeatures {
+        dataBinding true
     }
 
     kotlinOptions {
-        jvmTarget = Config.javaVersion.toString()
+        jvmTarget = Config.KotlinOptions.jvmTarget
     }
 }
 
diff --git a/features/test-details/feature/build.gradle b/features/test-details/feature/build.gradle
index 6ed1989b..11d4bc3e 100644
--- a/features/test-details/feature/build.gradle
+++ b/features/test-details/feature/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Andrey Tolpeev
+ * Copyright 2020 Andrey Tolpeev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@ apply plugin: 'org.jmailen.kotlinter'
 apply from: '../../../scripts/jacoco.gradle'
 
 android {
-    dataBinding {
-        enabled = true
+    buildFeatures {
+        dataBinding true
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b6bbfd65..67f1713f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/libraries/utils/build.gradle b/libraries/utils/build.gradle
index 8c0266fa..539ef212 100644
--- a/libraries/utils/build.gradle
+++ b/libraries/utils/build.gradle
@@ -25,8 +25,8 @@ apply plugin: 'org.jmailen.kotlinter'
 apply from: '../../scripts/jacoco.gradle'
 
 android {
-    dataBinding {
-        enabled = true
+    buildFeatures {
+        dataBinding true
     }
 }