Merge remote-tracking branch 'upstream/main'

Обновить .gitea/workflows/automerge-with-core.yaml
Rollback custom changes
2024-10-30 00:03:18 +00:00 · 2024-10-29 11:33:52 +00:00 · 2024-10-29 13:57:20 +07:00
4 changed files with 4 additions and 4 deletions
--- a/.gitea/workflows/automerge-with-core.yaml
+++ b/.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@1.0.3
        with:
          upstream_repo: ${{ env.CORE_REPO }}
          token: ${{ env.TOKEN }}
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@ -33,5 +33,5 @@ android {

 dependencies {
    defaultLibrary()
-    customLibrary()
+
 }
--- a/build.gradle.kts
+++ b/build.gradle.kts
@ -2,4 +2,4 @@
 plugins {
    androidApplication version Version.agp apply false
    kotlinJvm version Version.Kotlin.language apply false
-}
+}
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit fde89075ac5d4f4156e4f2f3fba2476874aff483
+Subproject commit d9590600045906edeb852eaa3f0b9bf7d1875813
Author	SHA1	Message	Date
gitea-actions	3c5548fe3a	Merge remote-tracking branch 'upstream/main' Some checks failed Merge core/template-android-project to this repo / merge-if-needed (push) Failing after 15s Details	2024-10-30 00:03:18 +00:00
Владимир Шперлинг	a43a36be40	Обновить .gitea/workflows/automerge-with-core.yaml	2024-10-29 11:33:52 +00:00
vladimir-shperling	85b54d5e01	Rollback custom changes	2024-10-29 13:57:20 +07:00