diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6040dd47..0bb98174 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
       uses: actions/setup-java@v2
       with:
         distribution: 'zulu'
-        java-version: '8'
+        java-version: '11'
     
     - name: Make gradlew executable
       run: chmod +x ./gradlew
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8a..7e7ee626 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="13" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 686bec5b..c22de178 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="13" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 22eff8b0..076b3e47 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -12,7 +12,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_13" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 797acea5..00000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 0ab64c98..822eb9d1 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -4,13 +4,13 @@ plugins {
 }
 
 android {
-  compileSdkVersion(appConfig.compileSdkVersion)
-  buildToolsVersion(appConfig.buildToolsVersion)
+  compileSdk = appConfig.compileSdkVersion
+  buildToolsVersion = appConfig.buildToolsVersion
 
   defaultConfig {
     applicationId = appConfig.applicationId
-    minSdkVersion(appConfig.minSdkVersion)
-    targetSdkVersion(appConfig.targetSdkVersion)
+    minSdk = appConfig.minSdkVersion
+    targetSdk = appConfig.targetSdkVersion
     versionCode = appConfig.versionCode
     versionName = appConfig.versionName
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 65f4f402..a56d167c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,7 +9,7 @@ buildscript {
     gradlePluginPortal()
   }
   dependencies {
-    classpath("com.android.tools.build:gradle:4.2.2")
+    classpath("com.android.tools.build:gradle:7.0.0")
     classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
     classpath("com.diffplug.spotless:spotless-plugin-gradle:5.14.2")
     classpath("dev.ahmedmourad.nocopy:nocopy-gradle-plugin:1.4.0")
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 0770677d..f775595d 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -4,14 +4,12 @@ plugins {
 }
 
 android {
-  compileSdkVersion(appConfig.compileSdkVersion)
-  buildToolsVersion(appConfig.buildToolsVersion)
+  compileSdk = appConfig.compileSdkVersion
+  buildToolsVersion = appConfig.buildToolsVersion
 
   defaultConfig {
-    minSdkVersion(appConfig.minSdkVersion)
-    targetSdkVersion(appConfig.targetSdkVersion)
-    versionCode = appConfig.versionCode
-    versionName = appConfig.versionName
+    minSdk = appConfig.minSdkVersion
+    targetSdk = appConfig.targetSdkVersion
 
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
diff --git a/data/build.gradle.kts b/data/build.gradle.kts
index 58f18ee4..0c8c9167 100644
--- a/data/build.gradle.kts
+++ b/data/build.gradle.kts
@@ -4,14 +4,12 @@ plugins {
 }
 
 android {
-  compileSdkVersion(appConfig.compileSdkVersion)
-  buildToolsVersion(appConfig.buildToolsVersion)
+  compileSdk = appConfig.compileSdkVersion
+  buildToolsVersion = appConfig.buildToolsVersion
 
   defaultConfig {
-    minSdkVersion(appConfig.minSdkVersion)
-    targetSdkVersion(appConfig.targetSdkVersion)
-    versionCode = appConfig.versionCode
-    versionName = appConfig.versionName
+    minSdk = appConfig.minSdkVersion
+    targetSdk = appConfig.targetSdkVersion
 
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
diff --git a/feature-add/build.gradle.kts b/feature-add/build.gradle.kts
index 0dadf41f..0a59bb08 100644
--- a/feature-add/build.gradle.kts
+++ b/feature-add/build.gradle.kts
@@ -4,14 +4,12 @@ plugins {
 }
 
 android {
-  compileSdkVersion(appConfig.compileSdkVersion)
-  buildToolsVersion(appConfig.buildToolsVersion)
+  compileSdk = appConfig.compileSdkVersion
+  buildToolsVersion = appConfig.buildToolsVersion
 
   defaultConfig {
-    minSdkVersion(appConfig.minSdkVersion)
-    targetSdkVersion(appConfig.targetSdkVersion)
-    versionCode = appConfig.versionCode
-    versionName = appConfig.versionName
+    minSdk = appConfig.minSdkVersion
+    targetSdk = appConfig.targetSdkVersion
 
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
diff --git a/feature-main/build.gradle.kts b/feature-main/build.gradle.kts
index 420ab942..83ea61ed 100644
--- a/feature-main/build.gradle.kts
+++ b/feature-main/build.gradle.kts
@@ -4,14 +4,12 @@ plugins {
 }
 
 android {
-  compileSdkVersion(appConfig.compileSdkVersion)
-  buildToolsVersion(appConfig.buildToolsVersion)
+  compileSdk = appConfig.compileSdkVersion
+  buildToolsVersion = appConfig.buildToolsVersion
 
   defaultConfig {
-    minSdkVersion(appConfig.minSdkVersion)
-    targetSdkVersion(appConfig.targetSdkVersion)
-    versionCode = appConfig.versionCode
-    versionName = appConfig.versionName
+    minSdk = appConfig.minSdkVersion
+    targetSdk = appConfig.targetSdkVersion
 
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
diff --git a/feature-search/build.gradle.kts b/feature-search/build.gradle.kts
index 11cf4165..979e47f9 100644
--- a/feature-search/build.gradle.kts
+++ b/feature-search/build.gradle.kts
@@ -5,14 +5,12 @@ plugins {
 }
 
 android {
-  compileSdkVersion(appConfig.compileSdkVersion)
-  buildToolsVersion(appConfig.buildToolsVersion)
+  compileSdk = appConfig.compileSdkVersion
+  buildToolsVersion = appConfig.buildToolsVersion
 
   defaultConfig {
-    minSdkVersion(appConfig.minSdkVersion)
-    targetSdkVersion(appConfig.targetSdkVersion)
-    versionCode = appConfig.versionCode
-    versionName = appConfig.versionName
+    minSdk = appConfig.minSdkVersion
+    targetSdk = appConfig.targetSdkVersion
 
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }