Ver Fonte

Upgrade to AGP 8.0.0 (#9351)

arkon há 1 ano atrás
pai
commit
97e6f1ea9a

+ 2 - 2
.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

+ 2 - 2
.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

+ 1 - 1
app/build.gradle.kts

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

+ 1 - 0
app/proguard-android-optimize.txt

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

+ 3 - 3
build.gradle.kts

@@ -19,7 +19,7 @@ plugins {
 subprojects {
     tasks.withType<KotlinJvmCompile> {
         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
             }
 

+ 5 - 3
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
+android.useAndroidX=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

+ 1 - 1
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]