diff --git a/app/build.gradle b/app/build.gradle
index 1db9f5a..a7c80b8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,16 +26,13 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    dataBinding {
-        enabled = true
-    }
-
-    viewBinding {
-        enabled = true
+    buildFeatures {
+        dataBinding true
+        viewBinding true
     }
 }
 
diff --git a/build.gradle b/build.gradle
index 4e4a564..f65671b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 apply from: "commonLibConfig.gradle"
 buildscript {
-    ext.kotlin_version = "1.5.21"
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.0.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/commonLib/build.gradle b/commonLib/build.gradle
index 68b6d63..c90e11a 100644
--- a/commonLib/build.gradle
+++ b/commonLib/build.gradle
@@ -30,8 +30,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     androidExtensions {
diff --git a/commonLibConfig.gradle b/commonLibConfig.gradle
index faa5d09..3ca5949 100644
--- a/commonLibConfig.gradle
+++ b/commonLibConfig.gradle
@@ -15,8 +15,8 @@ ext {
     ]
 
     compileOptions = [
-            sourceCompatibility: JavaVersion.VERSION_11,
-            targetCompatibility: JavaVersion.VERSION_11,
+            sourceCompatibility: JavaVersion.VERSION_1_8,
+            targetCompatibility: JavaVersion.VERSION_1_8,
     ]
 
     versions = [