Upgrade to AGP 8.0.0 (#9351)
(cherry picked from commit 97e6f1ea9a4b31d9b2cee0ffc4f032f3ba6d6bc7) # Conflicts: # .github/workflows/build_pull_request.yml
This commit is contained in:
parent
f9039d9a8c
commit
d09471f0c4
4
.github/workflows/build_check.yml
vendored
4
.github/workflows/build_check.yml
vendored
@ -26,10 +26,10 @@ jobs:
|
||||
- name: Clone repo
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Set up JDK 11
|
||||
- name: Set up JDK
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
java-version: 11
|
||||
java-version: 17
|
||||
distribution: adopt
|
||||
|
||||
- name: Build app
|
||||
|
4
.github/workflows/build_push.yml
vendored
4
.github/workflows/build_push.yml
vendored
@ -20,10 +20,10 @@ jobs:
|
||||
- name: Validate Gradle Wrapper
|
||||
uses: gradle/wrapper-validation-action@v1
|
||||
|
||||
- name: Set up JDK 11
|
||||
- name: Set up JDK
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
java-version: 11
|
||||
java-version: 17
|
||||
distribution: adopt
|
||||
|
||||
# SY <--
|
||||
|
@ -99,7 +99,7 @@ android {
|
||||
}
|
||||
}
|
||||
|
||||
packagingOptions {
|
||||
packaging {
|
||||
resources.excludes.addAll(listOf(
|
||||
"META-INF/DEPENDENCIES",
|
||||
"LICENSE.txt",
|
||||
|
@ -1,5 +1,6 @@
|
||||
-allowaccessmodification
|
||||
-dontusemixedcaseclassnames
|
||||
-ignorewarnings
|
||||
-verbose
|
||||
|
||||
-keepattributes *Annotation*
|
||||
|
@ -21,7 +21,7 @@ plugins {
|
||||
subprojects {
|
||||
tasks.withType<KotlinJvmCompile> {
|
||||
kotlinOptions {
|
||||
jvmTarget = JavaVersion.VERSION_1_8.toString()
|
||||
jvmTarget = JavaVersion.VERSION_17.toString()
|
||||
}
|
||||
}
|
||||
|
||||
@ -45,8 +45,8 @@ subprojects {
|
||||
}
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
isCoreLibraryDesugaringEnabled = true
|
||||
}
|
||||
|
||||
|
@ -20,7 +20,9 @@ org.gradle.parallel=true
|
||||
|
||||
org.gradle.caching=true
|
||||
|
||||
# AndroidX support
|
||||
android.useAndroidX=true
|
||||
kotlin.mpp.androidSourceSetLayoutVersion=2
|
||||
|
||||
kotlin.mpp.androidSourceSetLayoutVersion=2
|
||||
android.useAndroidX=true
|
||||
android.defaults.buildfeatures.buildconfig=true
|
||||
android.nonTransitiveRClass=false
|
||||
android.nonFinalResIds=false
|
||||
|
@ -1,5 +1,5 @@
|
||||
[versions]
|
||||
agp_version = "7.4.2"
|
||||
agp_version = "8.0.0"
|
||||
lifecycle_version = "2.6.1"
|
||||
|
||||
[libraries]
|
||||
|
Loading…
x
Reference in New Issue
Block a user