diff --git a/build.gradle b/build.gradle
index f521bb0447..3d5022c91f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -179,8 +179,12 @@ subprojects {
 	apply from: "${rootDir}/gradle/javadoc.gradle"
 	apply from: "${rootDir}/gradle/errorprone.gradle"
 
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
+
+	java {
+		toolchain {
+			languageVersion = JavaLanguageVersion.of(8)
+		}
+	}
 
 	jacoco {
 		toolVersion = '0.8.7'
@@ -217,16 +221,6 @@ subprojects {
 															 "-Xlint:rawtypes"
 	]
 
-	compileJava {
-		sourceCompatibility = 1.8
-		targetCompatibility = 1.8
-	}
-
-	compileTestJava {
-		sourceCompatibility = 1.8
-		targetCompatibility = 1.8
-	}
-
 	if (JavaVersion.current().isJava8Compatible()) {
 		compileTestJava.options.compilerArgs += "-parameters"
 		tasks.withType(Javadoc) {