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 refactor: packagingOptions to packaging
GrapheneOS · Apr 14, 2023 · fd13130 · fd13130
1 parent 3d54c3e
commit fd13130
Show file tree

Hide file tree

Showing 4 changed files with 409 additions and 423 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -18,7 +18,7 @@ plugins {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
+        languageVersion.set(JavaLanguageVersion.of(17))
     }
 }
 
@@ -75,18 +75,19 @@ 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()
     }
 
-    packagingOptions {
+    packaging {
         resources.excludes.addAll(listOf(
             "org/bouncycastle/pqc/**.properties",
             "org/bouncycastle/x509/**.properties",

diff --git 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")
         classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3")
     }

diff --git 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