diff --git a/agent/android/dispatcher/build.gradle b/agent/android/dispatcher/build.gradle
index f78b79d61..f31726146 100644
--- a/agent/android/dispatcher/build.gradle
+++ b/agent/android/dispatcher/build.gradle
@@ -26,7 +26,7 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
-}
\ No newline at end of file
+}
diff --git a/dsl/common/build.gradle b/dsl/common/build.gradle
index 9a0dbbf30..683354273 100644
--- a/dsl/common/build.gradle
+++ b/dsl/common/build.gradle
@@ -8,8 +8,8 @@ apply from: "${gradles}/common-module.gradle"
 apply from: "${gradles}/additional-archives.gradle"
 apply from: "${gradles}/upload.gradle"
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
 
 jar {
 }
diff --git a/gradle/jvm-module.gradle b/gradle/jvm-module.gradle
index 9c5f670d1..c97b52512 100644
--- a/gradle/jvm-module.gradle
+++ b/gradle/jvm-module.gradle
@@ -11,8 +11,8 @@ apply plugin: 'java'
 apply plugin: 'kotlin-platform-jvm'
 apply plugin: 'org.jetbrains.dokka'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
 
 dependencies {
 
diff --git a/matrix/android-ait-before-p.gradle b/matrix/android-ait-before-p.gradle
index 774cb977d..1900e1d9b 100644
--- a/matrix/android-ait-before-p.gradle
+++ b/matrix/android-ait-before-p.gradle
@@ -59,8 +59,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 }
 
diff --git a/matrix/android-ait.gradle b/matrix/android-ait.gradle
index f6cad8c65..54ed737cc 100644
--- a/matrix/android-ait.gradle
+++ b/matrix/android-ait.gradle
@@ -58,8 +58,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 }
 
diff --git a/matrix/android.gradle b/matrix/android.gradle
index cd024e41c..8da3de8f5 100644
--- a/matrix/android.gradle
+++ b/matrix/android.gradle
@@ -53,8 +53,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 }
 
diff --git a/mockk/android/build.gradle b/mockk/android/build.gradle
index 082dacba8..50685a1c5 100644
--- a/mockk/android/build.gradle
+++ b/mockk/android/build.gradle
@@ -35,8 +35,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
 }