diff --git a/android-app/build.gradle b/android-app/build.gradle
index b2674de4..55a84ed5 100644
--- a/android-app/build.gradle
+++ b/android-app/build.gradle
@@ -48,6 +48,10 @@ android {
         abortOnError false
         warning 'MissingTranslation'
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
 }
 
 repositories {
@@ -126,13 +130,13 @@ gradle.taskGraph.afterTask { Task task ->
 
 private void cleanGoogleServicesResources(buildType) {
     ant.delete(includeEmptyDirs: 'true') {
-        fileset(dir: file('./build/intermediates/res/' + buildType), includes: '**/common_signin*')
+        fileset(dir: file('./build/intermediates/res/merged/' + buildType), includes: '**/common_signin*')
     }
     ant.delete(includeEmptyDirs: 'true') {
-        fileset(dir: file('./build/intermediates/res/' + buildType), includes: '**/ic_plusone*')
+        fileset(dir: file('./build/intermediates/res/merged/' + buildType), includes: '**/ic_plusone*')
     }
     ant.delete(includeEmptyDirs: 'true') {
-        fileset(dir: file('./build/intermediates/res/' + buildType), includes: '**/powered_by_google*')
+        fileset(dir: file('./build/intermediates/res/merged/' + buildType), includes: '**/powered_by_google*')
     }
 }
 
diff --git a/core/build.gradle b/core/build.gradle
index 4df42089..7720f4dc 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -22,4 +22,7 @@ dependencies {
 test {
     maxParallelForks = 15
     forkEvery = 1
-}
\ No newline at end of file
+}
+
+sourceCompatibility = JavaVersion.VERSION_1_7
+targetCompatibility = JavaVersion.VERSION_1_7
\ No newline at end of file