diff --git a/build.gradle b/build.gradle
index 5ba84c4688e..a26de4bad67 100644
--- a/build.gradle
+++ b/build.gradle
@@ -72,6 +72,8 @@ allprojects {
 
     gradle.projectsEvaluated {
         tasks.withType(JavaCompile) {
+            sourceCompatibility = "8"
+            targetCompatibility = "8"
             options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
         }
     }
diff --git a/gradle/java.gradle b/gradle/java.gradle
index a1b3b2bebef..03680c417f4 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -16,8 +16,6 @@ plugins.withId('java') {
     apply plugin: 'maven'
 
     compileJava {
-        sourceCompatibility = "8"
-        targetCompatibility = "8"
         
         options.compilerArgs.addAll([
                 "-Xlint:deprecation",