diff --git a/build.gradle.kts b/build.gradle.kts
index a1d24d277d..769e587f93 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,8 @@
+import com.android.build.gradle.BaseExtension
 import com.android.build.gradle.BasePlugin
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
 
+@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
@@ -13,85 +14,102 @@ plugins {
     alias(libs.plugins.spotless)
 }
 
-project.ext {
-    testCoverage = project.hasProperty('testCoverage')
-}
+val propertyTestCoverage: String? by extra
 
-def javaVersion = JavaVersion.VERSION_11
-def jvmTargetVersion = JvmTarget.JVM_11
+val javaVersion = JavaVersion.VERSION_11
+val jvmTargetVersion = JvmTarget.JVM_11
 
 allprojects {
+    extra.apply {
+        set("testCoverage", propertyTestCoverage != null)
+    }
+
     configurations.configureEach {
         resolutionStrategy.dependencySubstitution {
-            substitute module("androidx.core:core") using module("androidx.core:core:${libs.versions.androidxCore.get()}")
-            substitute module("androidx.activity:activity") using module("androidx.activity:activity:${libs.versions.androidxActivity.get()}")
-            substitute module("androidx.activity:activity-ktx") using module("androidx.activity:activity-ktx:${libs.versions.androidxActivity.get()}")
-            substitute module("androidx.fragment:fragment") using module("androidx.fragment:fragment:${libs.versions.androidxFragment.get()}")
-            substitute module("androidx.fragment:fragment-ktx") using module("androidx.fragment:fragment-ktx:${libs.versions.androidxFragment.get()}")
-            substitute module("androidx.appcompat:appcompat") using module("androidx.appcompat:appcompat:${libs.versions.androidxAppCompat.get()}")
-            substitute module("androidx.preference:preference") using module("androidx.preference:preference:${libs.versions.androidxPreference.get()}")
-            substitute module("androidx.recyclerview:recyclerview") using module("androidx.recyclerview:recyclerview:${libs.versions.androidxRecyclerView.get()}")
-            substitute module("androidx.constraintlayout:constraintlayout") using module("androidx.constraintlayout:constraintlayout:${libs.versions.androidxConstraintLayout.get()}")
-            substitute module("androidx.drawerlayout:drawerlayout") using module("androidx.drawerlayout:drawerlayout:${libs.versions.androidxDrawerLayout.get()}")
-            substitute module("androidx.lifecycle:lifecycle-livedata") using module("androidx.lifecycle:lifecycle-livedata:${libs.versions.androidxLifecycle.get()}")
-            substitute module("androidx.transition:transition") using module("androidx.transition:transition:${libs.versions.androidxTransition.get()}")
-            substitute module("org.jetbrains:annotations") using module("org.jetbrains:annotations:${libs.versions.jetbrainsAnnotations.get()}")
-            substitute module("org.jetbrains.kotlin:kotlin-stdlib") using module("org.jetbrains.kotlin:kotlin-stdlib:${libs.versions.kotlin.get()}")
-            substitute module("org.jetbrains.kotlin:kotlin-stdlib-jdk7") using module("org.jetbrains.kotlin:kotlin-stdlib-jdk7:${libs.versions.kotlin.get()}")
-            substitute module("org.jetbrains.kotlin:kotlin-stdlib-jdk8") using module("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${libs.versions.kotlin.get()}")
-            substitute module("org.jetbrains.kotlinx:kotlinx-coroutines-android") using module("org.jetbrains.kotlinx:kotlinx-coroutines-android:${libs.versions.kotlinCoroutines.get()}")
+            substitute(module("androidx.core:core"))
+                .using(module("androidx.core:core:${libs.versions.androidxCore.get()}"))
+            substitute(module("androidx.activity:activity"))
+                .using(module("androidx.activity:activity:${libs.versions.androidxActivity.get()}"))
+            substitute(module("androidx.activity:activity-ktx"))
+                .using(module("androidx.activity:activity-ktx:${libs.versions.androidxActivity.get()}"))
+            substitute(module("androidx.fragment:fragment"))
+                .using(module("androidx.fragment:fragment:${libs.versions.androidxFragment.get()}"))
+            substitute(module("androidx.fragment:fragment-ktx"))
+                .using(module("androidx.fragment:fragment-ktx:${libs.versions.androidxFragment.get()}"))
+            substitute(module("androidx.appcompat:appcompat"))
+                .using(module("androidx.appcompat:appcompat:${libs.versions.androidxAppCompat.get()}"))
+            substitute(module("androidx.preference:preference"))
+                .using(module("androidx.preference:preference:${libs.versions.androidxPreference.get()}"))
+            substitute(module("androidx.recyclerview:recyclerview"))
+                .using(module("androidx.recyclerview:recyclerview:${libs.versions.androidxRecyclerView.get()}"))
+            substitute(module("androidx.constraintlayout:constraintlayout"))
+                .using(module("androidx.constraintlayout:constraintlayout:${libs.versions.androidxConstraintLayout.get()}"))
+            substitute(module("androidx.drawerlayout:drawerlayout"))
+                .using(module("androidx.drawerlayout:drawerlayout:${libs.versions.androidxDrawerLayout.get()}"))
+            substitute(module("androidx.lifecycle:lifecycle-livedata"))
+                .using(module("androidx.lifecycle:lifecycle-livedata:${libs.versions.androidxLifecycle.get()}"))
+            substitute(module("androidx.transition:transition"))
+                .using(module("androidx.transition:transition:${libs.versions.androidxTransition.get()}"))
+            substitute(module("org.jetbrains:annotations"))
+                .using(module("org.jetbrains:annotations:${libs.versions.jetbrainsAnnotations.get()}"))
+            substitute(module("org.jetbrains.kotlin:kotlin-stdlib"))
+                .using(module("org.jetbrains.kotlin:kotlin-stdlib:${libs.versions.kotlin.get()}"))
+            substitute(module("org.jetbrains.kotlin:kotlin-stdlib-jdk7"))
+                .using(module("org.jetbrains.kotlin:kotlin-stdlib-jdk7:${libs.versions.kotlin.get()}"))
+            substitute(module("org.jetbrains.kotlin:kotlin-stdlib-jdk8"))
+                .using(module("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${libs.versions.kotlin.get()}"))
+            substitute(module("org.jetbrains.kotlinx:kotlinx-coroutines-android"))
+                .using(module("org.jetbrains.kotlinx:kotlinx-coroutines-android:${libs.versions.kotlinCoroutines.get()}"))
         }
     }
 
-    plugins.withType(BasePlugin).configureEach {
-        project.android {
-            compileSdk 33
+    plugins.withType<BasePlugin> {
+        configure<BaseExtension> {
+            compileSdkVersion(33)
 
             defaultConfig {
-                minSdk 21
-                targetSdk 31
+                minSdk = 21
+                targetSdk = 31
 
                 vectorDrawables.useSupportLibrary = true
-                testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+                testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
             }
 
             compileOptions {
-                sourceCompatibility javaVersion
-                targetCompatibility javaVersion
+                sourceCompatibility = javaVersion
+                targetCompatibility = javaVersion
             }
 
             lintOptions {
-                abortOnError false
-                lintConfig file("$rootProject.projectDir/config/lint/lint.xml")
+                isAbortOnError = false
+                lintConfig = file("${rootProject.projectDir}/config/lint/lint.xml")
             }
 
             testOptions {
                 unitTests {
-                    includeAndroidResources = true
+                    isIncludeAndroidResources = true
                 }
             }
         }
     }
 
-    plugins.withType(JavaPlugin).configureEach {
-        project.java {
+    plugins.withType<JavaPlugin> {
+        configure<JavaPluginExtension> {
             sourceCompatibility = javaVersion
             targetCompatibility = javaVersion
         }
     }
 
-    tasks.withType(Test).configureEach {
-        testLogging {
-            exceptionFormat "full"
-            showCauses true
-            showExceptions true
-            showStackTraces true
-        }
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+        kotlinOptions.jvmTarget = jvmTargetVersion.target
     }
 
-    tasks.withType(KotlinCompile).configureEach {
-        compilerOptions {
-            jvmTarget = jvmTargetVersion
+    tasks.withType<Test> {
+        testLogging {
+            exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
+            showCauses = true
+            showExceptions = true
+            showStackTraces = true
         }
     }
 }
@@ -118,9 +136,10 @@ spotless {
     }
 }
 
-tasks.register('testsOnCi') {
-    dependsOn getSubprojects()
-            .collect { project -> project.tasks.withType(Test) }
+tasks.register("testsOnCi") {
+    dependsOn(
+        subprojects.map { project -> project.tasks.withType(Test::class.java) }
             .flatten()
-            .findAll { task -> task.name in ['testDebugUnitTest', 'test'] }
+            .filterNot { task -> task.name in arrayOf("testDebugUnitTest", "test") }
+    )
 }