Merge remote-tracking branch 'upstream/main'

.gitea/workflows/automerge-with-core.yaml

@@ -19,7 +19,7 @@ jobs:
       - name: Check out repository code
         uses: actions/checkout@v4
       - name: Sync repos
-        uses: Vova-SH/sync-upstream-repo@1.0.2
+        uses: Vova-SH/sync-upstream-repo@latest
         with:
           upstream_repo: ${{ env.CORE_REPO }}
           token: ${{ env.TOKEN }}

app/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("org.jetbrains.kotlin.android")
+    kotlinAndroid
     androidApplication
 }
 
@@ -18,15 +18,16 @@ android {
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
-    
+
     buildFeatures.viewBinding = true
 
     compileOptions {
         sourceCompatibility = Version.Kotlin.javaSource
         targetCompatibility = Version.Kotlin.javaSource
     }
+
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = Version.Kotlin.jvmTarget
     }
 }
 
@@ -39,4 +40,5 @@ dependencies {
     implementation("androidx.navigation:navigation-ui-ktx:2.7.7")
     implementation("androidx.core:core-ktx:1.13.1")
     defaultLibrary()
+
 }

build.gradle.kts

@@ -1,6 +1,6 @@
 // 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
     id("org.jetbrains.kotlin.android") version "2.0.0" apply false
 }