From 220eb9992173c1f296d897afebdfa2c1383d0755 Mon Sep 17 00:00:00 2001 From: vladimir-shperling Date: Mon, 9 Sep 2024 02:45:39 +0700 Subject: [PATCH 1/5] Add kotlin init --- app/build.gradle.kts | 7 ++++++- buildSrc | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0ab9e22..14f1585 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,4 +1,5 @@ plugins { + kotlinAndroid androidApplication } @@ -17,13 +18,17 @@ android { testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } - + buildFeatures.viewBinding = true compileOptions { sourceCompatibility = Version.Kotlin.javaSource targetCompatibility = Version.Kotlin.javaSource } + + kotlinOptions { + jvmTarget = Version.Kotlin.jvmTarget + } } dependencies { diff --git a/buildSrc b/buildSrc index e0cd40f..deb24ec 160000 --- a/buildSrc +++ b/buildSrc @@ -1 +1 @@ -Subproject commit e0cd40f8a1d1e53eab146f4ae489a1cd943ac154 +Subproject commit deb24ec7ef3d1bda80ec8d8619b7b2bc86788682 From 41f6f04fb441bd8758424efae3e3681ad69375aa Mon Sep 17 00:00:00 2001 From: vladimir-shperling Date: Tue, 29 Oct 2024 02:51:00 +0700 Subject: [PATCH 2/5] Add support AS Lady bug --- app/build.gradle.kts | 1 + build.gradle.kts | 4 ++-- buildSrc | 2 +- gradle | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 14f1585..b8eca89 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -33,4 +33,5 @@ android { dependencies { defaultLibrary() + customLibrary() } diff --git a/build.gradle.kts b/build.gradle.kts index 860f2c8..00333e0 100644 --- a/build.gradle.kts +++ b/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 -} \ No newline at end of file +} diff --git a/buildSrc b/buildSrc index deb24ec..fde8907 160000 --- a/buildSrc +++ b/buildSrc @@ -1 +1 @@ -Subproject commit deb24ec7ef3d1bda80ec8d8619b7b2bc86788682 +Subproject commit fde89075ac5d4f4156e4f2f3fba2476874aff483 diff --git a/gradle b/gradle index 206bac0..d115144 160000 --- a/gradle +++ b/gradle @@ -1 +1 @@ -Subproject commit 206bac06d8e8838d392c6f1d00dc0879ea24e5d4 +Subproject commit d11514433239954cc4fa8b336c0348daf8ff7268 From 85b54d5e0160f4074683c435e694608375f91667 Mon Sep 17 00:00:00 2001 From: vladimir-shperling Date: Tue, 29 Oct 2024 13:57:20 +0700 Subject: [PATCH 3/5] Rollback custom changes --- app/build.gradle.kts | 2 +- build.gradle.kts | 2 +- buildSrc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b8eca89..8c899db 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -33,5 +33,5 @@ android { dependencies { defaultLibrary() - customLibrary() + } diff --git a/build.gradle.kts b/build.gradle.kts index 00333e0..64d8748 100644 --- 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 -} +} \ No newline at end of file diff --git a/buildSrc b/buildSrc index fde8907..d959060 160000 --- a/buildSrc +++ b/buildSrc @@ -1 +1 @@ -Subproject commit fde89075ac5d4f4156e4f2f3fba2476874aff483 +Subproject commit d9590600045906edeb852eaa3f0b9bf7d1875813 From a43a36be4092156bfda978ce4498ae980e487b7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=D0=B8=D0=BC=D0=B8=D1=80=20=D0=A8?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=BB=D0=B8=D0=BD=D0=B3?= Date: Tue, 29 Oct 2024 11:33:52 +0000 Subject: [PATCH 4/5] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20.gitea/workflows/automerge-with-core.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/automerge-with-core.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/automerge-with-core.yaml b/.gitea/workflows/automerge-with-core.yaml index 78a7ee5..67b0c20 100644 --- 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 }} From 2f4de8efb6306444c3749e146fe4256735092dda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=D0=B8=D0=BC=D0=B8=D1=80=20=D0=A8?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=BB=D0=B8=D0=BD=D0=B3?= Date: Mon, 4 Nov 2024 14:15:28 +0000 Subject: [PATCH 5/5] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20.gitea/workflows/automerge-with-core.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/automerge-with-core.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/automerge-with-core.yaml b/.gitea/workflows/automerge-with-core.yaml index 67b0c20..700dc77 100644 --- 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.3 + uses: Vova-SH/sync-upstream-repo@latest with: upstream_repo: ${{ env.CORE_REPO }} token: ${{ env.TOKEN }}