diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 89a8ff21..48504c25 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -4,6 +4,9 @@ name: Check pull request
 jobs:
   test-pr:
     runs-on: macos-latest
+    strategy:
+      matrix:
+        api-level: [23, 29]
     steps:
 
     - name: Check if relevant files have changed
@@ -37,7 +40,7 @@ jobs:
       if: ${{ steps.service-changed.outputs.result == 'true' }}
       uses: reactivecircus/android-emulator-runner@v2.11.0
       with:
-        api-level: 29
+        api-level: ${{ matrix.api-level }}
         target: default
         script: ./gradlew :app:connectedDebugAndroidTest
 
diff --git a/app/build.gradle b/app/build.gradle
index 8326dec2..653b4dec 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,12 +15,12 @@ android {
         }
     }
 
-    buildFeatures {
-        compose true
-    }
+    compileOptions.coreLibraryDesugaringEnabled = true
+
+    buildFeatures.compose = true
 
     composeOptions {
-        kotlinCompilerVersion '1.4.0'
+        kotlinCompilerVersion "${kotlin_version}"
         kotlinCompilerExtensionVersion "${compose_version}"
     }
 }
@@ -49,7 +49,6 @@ dependencies {
     implementation "androidx.ui:ui-tooling:$compose_version"
     implementation 'com.google.android.material:material:1.3.0-alpha02'
     testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     androidTestImplementation "androidx.ui:ui-test:$compose_version"
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.0.10"
 }
diff --git a/build.gradle b/build.gradle
index e8fa52bc..1ba0f50b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@
 buildscript {
     ext {
         compose_version = '1.0.0-alpha02'
-        kotlin_version = '1.4.0'
+        kotlin_version = '1.4.10'
         room_version = '2.3.0-alpha02'
     }
     repositories {
@@ -10,7 +10,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.2.0-alpha09"
+        classpath "com.android.tools.build:gradle:4.2.0-alpha10"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -34,7 +34,6 @@ subprojects {
     }
     android {
         compileSdkVersion 30
-        buildToolsVersion "30.0.2"
 
         defaultConfig {
             minSdkVersion 23
diff --git a/data/build.gradle b/data/build.gradle
index 11bae882..97b4eaca 100644
--- a/data/build.gradle
+++ b/data/build.gradle
@@ -3,23 +3,8 @@ plugins {
     id 'kotlin-kapt'
 }
 
-android {
-
-    defaultConfig {
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    compileOptions {
-        coreLibraryDesugaringEnabled true
-    }
-}
-
 dependencies {
     kapt "androidx.room:room-compiler:$room_version"
     api "androidx.room:room-runtime:$room_version"
     api "androidx.room:room-ktx:$room_version"
-    testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.0.10"
 }
diff --git a/gradle.properties b/gradle.properties
index 98bed167..23fbe876 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,4 +18,6 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
\ No newline at end of file
+kotlin.code.style=official
+# Enabling filesystem watching
+org.gradle.vfs.watch=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6c9a2247..21f9f98d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-rc-1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists