diff --git a/build.gradle b/build.gradle
index 641be4627..d3ef50861 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,7 +40,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.4.2'
         classpath 'com.google.gms:google-services:4.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'io.fabric.tools:gradle:1.29.0'
diff --git a/data/build.gradle b/data/build.gradle
index fa088a553..915ed1792 100644
--- a/data/build.gradle
+++ b/data/build.gradle
@@ -25,6 +25,11 @@ android {
     publishNonDefault true
     flavorDimensions "analytics"
 
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
+
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 28
diff --git a/domain/build.gradle b/domain/build.gradle
index 301d4f0ff..9c0378159 100644
--- a/domain/build.gradle
+++ b/domain/build.gradle
@@ -24,6 +24,11 @@ apply plugin: 'kotlin-kapt'
 android {
     compileSdkVersion 28
 
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
+
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 28
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index df55b7141..6914a81f7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Aug 21 23:12:11 CEST 2019
+#Thu Jun 06 19:27:58 EDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/presentation/build.gradle b/presentation/build.gradle
index bb4210c40..39380109d 100644
--- a/presentation/build.gradle
+++ b/presentation/build.gradle
@@ -52,8 +52,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
     }
 
     kotlinOptions {