Upgrade to AGP 8.0.0 (#9351)

(cherry picked from commit 97e6f1ea9a4b31d9b2cee0ffc4f032f3ba6d6bc7)

# Conflicts:
#	.github/workflows/build_pull_request.yml
This commit is contained in:
arkon 2023-04-16 18:02:24 -04:00 committed by Jobobby04
parent f9039d9a8c
commit d09471f0c4
7 changed files with 15 additions and 12 deletions

View File

@ -26,10 +26,10 @@ jobs:
- name: Clone repo - name: Clone repo
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Set up JDK 11 - name: Set up JDK
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with:
java-version: 11 java-version: 17
distribution: adopt distribution: adopt
- name: Build app - name: Build app

View File

@ -20,10 +20,10 @@ jobs:
- name: Validate Gradle Wrapper - name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v1 uses: gradle/wrapper-validation-action@v1
- name: Set up JDK 11 - name: Set up JDK
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with:
java-version: 11 java-version: 17
distribution: adopt distribution: adopt
# SY <-- # SY <--

View File

@ -99,7 +99,7 @@ android {
} }
} }
packagingOptions { packaging {
resources.excludes.addAll(listOf( resources.excludes.addAll(listOf(
"META-INF/DEPENDENCIES", "META-INF/DEPENDENCIES",
"LICENSE.txt", "LICENSE.txt",

View File

@ -1,5 +1,6 @@
-allowaccessmodification -allowaccessmodification
-dontusemixedcaseclassnames -dontusemixedcaseclassnames
-ignorewarnings
-verbose -verbose
-keepattributes *Annotation* -keepattributes *Annotation*

View File

@ -21,7 +21,7 @@ plugins {
subprojects { subprojects {
tasks.withType<KotlinJvmCompile> { tasks.withType<KotlinJvmCompile> {
kotlinOptions { kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString() jvmTarget = JavaVersion.VERSION_17.toString()
} }
} }
@ -45,8 +45,8 @@ subprojects {
} }
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_17
isCoreLibraryDesugaringEnabled = true isCoreLibraryDesugaringEnabled = true
} }

View File

@ -20,7 +20,9 @@ org.gradle.parallel=true
org.gradle.caching=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

View File

@ -1,5 +1,5 @@
[versions] [versions]
agp_version = "7.4.2" agp_version = "8.0.0"
lifecycle_version = "2.6.1" lifecycle_version = "2.6.1"
[libraries] [libraries]