Merge remote-tracking branch 'upstream/main'

app/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("org.jetbrains.kotlin.android")
+    kotlinAndroid
     androidApplication
 }
 
@@ -18,19 +18,19 @@ android {
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
-    
+
     buildFeatures.viewBinding = true
 
     compileOptions {
         sourceCompatibility = Version.Kotlin.javaSource
         targetCompatibility = Version.Kotlin.javaSource
     }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = Version.Kotlin.jvmTarget
     }
 }
 
 dependencies {
-    implementation("androidx.core:core-ktx:+")
     defaultLibrary()
 }