Merge remote-tracking branch 'upstream/main'
Some checks failed
Merge core/template-android-project to this repo / merge-if-needed (push) Failing after 5s
Some checks failed
Merge core/template-android-project to this repo / merge-if-needed (push) Failing after 5s
This commit is contained in:
commit
7627c0e14e
@ -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 }}
|
||||
|
@ -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()
|
||||
|
||||
}
|
||||
|
@ -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
|
||||
}
|
2
buildSrc
2
buildSrc
@ -1 +1 @@
|
||||
Subproject commit e0cd40f8a1d1e53eab146f4ae489a1cd943ac154
|
||||
Subproject commit d9590600045906edeb852eaa3f0b9bf7d1875813
|
2
gradle
2
gradle
@ -1 +1 @@
|
||||
Subproject commit 206bac06d8e8838d392c6f1d00dc0879ea24e5d4
|
||||
Subproject commit d11514433239954cc4fa8b336c0348daf8ff7268
|
Loading…
x
Reference in New Issue
Block a user