Kotlin/Send_Files
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main'
Some checks failed
Merge core/template-android-project to this repo / merge-if-needed (push) Failing after 6s
Details

Browse Source
This commit is contained in:
Владимир Шперлинг 2024-11-05 01:34:47 +07:00
commit e80165b6b4
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitea/workflows/automerge-with-core.yaml
View File

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

8
app/build.gradle.kts
View File

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

2
build.gradle.kts
View File

@ -1,6 +1,6 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins { plugins {
androidApplication version Version.gradle apply false androidApplication version Version.agp apply false
kotlinJvm version Version.Kotlin.language apply false kotlinJvm version Version.Kotlin.language apply false
id("org.jetbrains.kotlin.android") version "1.9.0" apply false id("org.jetbrains.kotlin.android") version "1.9.0" apply false
} }

2
buildSrc

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

2
gradle

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