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
 }
 
@@ -25,6 +25,10 @@ android {
         sourceCompatibility = Version.Kotlin.javaSource
         targetCompatibility = Version.Kotlin.javaSource
     }
+
+    kotlinOptions {
+        jvmTarget = Version.Kotlin.jvmTarget
+    }
 }
 
 dependencies {
@@ -33,4 +37,5 @@ dependencies {
     implementation("androidx.activity:activity:1.9.1")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     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
 }

buildSrc

@@ -1 +1 @@
-Subproject commit e0cd40f8a1d1e53eab146f4ae489a1cd943ac154
+Subproject commit d9590600045906edeb852eaa3f0b9bf7d1875813

gradle

@@ -1 +1 @@
-Subproject commit 206bac06d8e8838d392c6f1d00dc0879ea24e5d4
+Subproject commit d11514433239954cc4fa8b336c0348daf8ff7268