From fb59568765db2a650b9e277ad18a9600d9aa44bd Mon Sep 17 00:00:00 2001 From: octocorvus Date: Fri, 14 Apr 2023 10:15:17 +0000 Subject: [PATCH] update Android Gradle Plugin to 8.0.0 fix: update JDK to 17 for AGP 8.0 fix: enable buildConfig build feature refactor: remove unnecessary android.enableR8.fullMode --- app/build.gradle.kts | 9 +- build.gradle.kts | 2 +- gradle.properties | 1 - gradle/verification-metadata.xml | 818 +++++++++++++++---------------- 4 files changed, 408 insertions(+), 422 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index dc8e902..5e6d365 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -15,7 +15,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(11)) + languageVersion.set(JavaLanguageVersion.of(17)) } } @@ -76,16 +76,17 @@ android { buildFeatures { viewBinding = true + buildConfig = true } } compileOptions { - sourceCompatibility(JavaVersion.VERSION_11) - targetCompatibility(JavaVersion.VERSION_11) + sourceCompatibility(JavaVersion.VERSION_17) + targetCompatibility(JavaVersion.VERSION_17) } kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + jvmTarget = JavaVersion.VERSION_17.toString() } } diff --git a/build.gradle.kts b/build.gradle.kts index 7625ec1..a8851e9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:7.4.2") + classpath("com.android.tools.build:gradle:8.0.0") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20") } } diff --git a/gradle.properties b/gradle.properties index e6948d1..e696167 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,3 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 android.useAndroidX=true -android.enableR8.fullMode=true kotlin.code.style=official diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 7635961..fa2aa55 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -180,28 +180,28 @@ - - + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -466,220 +466,220 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -706,140 +706,148 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + + + + + + + + + @@ -915,12 +923,12 @@ - - - + + + - - + + @@ -931,6 +939,14 @@ + + + + + + + + @@ -944,20 +960,22 @@ - - - - - - + + + - - - + + + - - + + + + + + + @@ -970,14 +988,14 @@ - - - + + + - - - + + + @@ -996,12 +1014,12 @@ - - - + + + - - + + @@ -1009,9 +1027,9 @@ - - - + + + @@ -1051,30 +1069,30 @@ - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + @@ -1205,145 +1223,158 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - + + + + + + + + + + + + + + + @@ -1517,9 +1548,9 @@ - - - + + + @@ -1532,12 +1563,12 @@ - - - + + + - - + + @@ -1577,12 +1608,12 @@ - - - + + + - - + + @@ -1642,43 +1673,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2071,14 +2065,6 @@ - - - - - - - -