Merge remote-tracking branch 'upstream/main'

app/build.gradle.kts

@@ -33,5 +33,5 @@ android {
 
 dependencies {
     defaultLibrary()
-    androidTestImplementation(project(path = ":testLib"))
+    customLibrary()
 }

build.gradle.kts

@@ -1,5 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    androidApplication version Version.gradle apply false
+    androidApplication version Version.agp apply false
     kotlinJvm version Version.Kotlin.language apply false
 }