From 97e6f1ea9a4b31d9b2cee0ffc4f032f3ba6d6bc7 Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 16 Apr 2023 18:02:24 -0400 Subject: [PATCH] Upgrade to AGP 8.0.0 (#9351) --- .github/workflows/build_pull_request.yml | 4 ++-- .github/workflows/build_push.yml | 4 ++-- app/build.gradle.kts | 2 +- app/proguard-android-optimize.txt | 1 + build.gradle.kts | 6 +++--- gradle.properties | 8 +++++--- gradle/androidx.versions.toml | 2 +- 7 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index 9b6ede0c31..f6cc287195 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -27,10 +27,10 @@ jobs: - name: Dependency Review uses: actions/dependency-review-action@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 and run unit tests diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 5bea25988b..ee56819d16 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -22,10 +22,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 - name: Build app and run unit tests diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c11696e3bd..febc12c5f9 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -101,7 +101,7 @@ android { } } - packagingOptions { + packaging { resources.excludes.addAll(listOf( "META-INF/DEPENDENCIES", "LICENSE.txt", diff --git a/app/proguard-android-optimize.txt b/app/proguard-android-optimize.txt index 1a85da105a..9f53403165 100644 --- a/app/proguard-android-optimize.txt +++ b/app/proguard-android-optimize.txt @@ -1,4 +1,5 @@ -dontusemixedcaseclassnames +-ignorewarnings -verbose -keepattributes *Annotation* diff --git a/build.gradle.kts b/build.gradle.kts index 2957e6aceb..1e54933773 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -19,7 +19,7 @@ plugins { subprojects { tasks.withType { kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = JavaVersion.VERSION_17.toString() } } @@ -43,8 +43,8 @@ subprojects { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 isCoreLibraryDesugaringEnabled = true } diff --git a/gradle.properties b/gradle.properties index 5eaad3635b..b12e724a7d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 \ No newline at end of file +android.useAndroidX=true +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false diff --git a/gradle/androidx.versions.toml b/gradle/androidx.versions.toml index d3fbca000d..49a956cf7f 100644 --- a/gradle/androidx.versions.toml +++ b/gradle/androidx.versions.toml @@ -1,5 +1,5 @@ [versions] -agp_version = "7.4.2" +agp_version = "8.0.0" lifecycle_version = "2.6.1" [libraries]