chore: upgrade to AGP 8.0 (#1476)

* chore: upgrade to AGP 8.0 * chore: update gh actions to jdk 17 * add jvm args for ktlint * chore: compile with jvmTarget 1.8 * chore(config): compile with jvmTarget 1.8 * chore: use Java 17 for lint * chore(*): update android build tools version to 8.0
firebase · Apr 20, 2023 · ab037a0 · ab037a0
1 parent 47520d7
commit ab037a0
Show file tree

Hide file tree

Showing 33 changed files with 123 additions and 28 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -9,10 +9,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: set up JDK 11
+    - name: set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 17
     - name: Check Snippets
       run: python scripts/checksnippets.py
     - name: Copy mock google_services.json

diff --git a/admob/app/build.gradle b/admob/app/build.gradle
@@ -32,8 +32,13 @@ android {
             excludes += ['LICENSE.txt']
         }
     }
-
-
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = '11'
+    }
     buildFeatures {
         viewBinding = true
     }

diff --git a/admob/build.gradle b/admob/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.0'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20'
     }

diff --git a/analytics/app/build.gradle b/analytics/app/build.gradle
@@ -27,6 +27,14 @@ android {
         }
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = '11'
+    }
+
     buildFeatures {
         viewBinding = true
     }

diff --git a/analytics/build.gradle b/analytics/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.0'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20'
     }

diff --git a/appdistribution/app/build.gradle b/appdistribution/app/build.gradle
@@ -24,7 +24,13 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = '11'
+    }
 
     buildFeatures {
         viewBinding = true

diff --git a/appdistribution/build.gradle b/appdistribution/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.google.gms:google-services:4.3.15'
-        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/auth/app/build.gradle b/auth/app/build.gradle
@@ -29,8 +29,11 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = '11'
     }
 
     buildFeatures {

diff --git a/auth/build.gradle b/auth/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.0'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20'
     }

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenLocal()
     }
     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 'com.google.gms:google-services:4.3.15'
@@ -84,6 +84,7 @@ task("ktlint", type: JavaExec, group: "verification") {
         "--reporter=checkstyle,output=${outputFile}",
         "**/*.kt",
     ]
+    jvmArgs "--add-opens=java.base/java.lang=ALL-UNNAMED"
 }
 
 task clean(type: Delete) {

diff --git a/config/app/build.gradle b/config/app/build.gradle
@@ -26,6 +26,13 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = '11'
+    }
 
     buildFeatures {
         viewBinding = true

diff --git a/config/build.gradle b/config/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.0'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20'
     }

diff --git a/crash/app/build.gradle b/crash/app/build.gradle
@@ -31,6 +31,13 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = '11'
+    }
 
     buildFeatures {
         viewBinding = true

diff --git a/crash/build.gradle b/crash/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.0'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.4'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20'

diff --git a/database/app/build.gradle b/database/app/build.gradle
@@ -27,6 +27,13 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = '11'
+    }
 
     buildFeatures {
         viewBinding = true

diff --git a/database/build.gradle b/database/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.0'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20'
     }

diff --git a/dynamiclinks/app/build.gradle b/dynamiclinks/app/build.gradle
@@ -39,6 +39,13 @@ android {
             resValue "string", "dynamic_links_uri_prefix", "https://YOUR_APP.page.link"
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = '11'
+    }
 
     buildFeatures {
         viewBinding = true

diff --git a/dynamiclinks/build.gradle b/dynamiclinks/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.0'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20'
     }

diff --git a/firestore/app/build.gradle b/firestore/app/build.gradle
@@ -34,6 +34,13 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = '11'
+    }
 
     buildFeatures {
         viewBinding = true

diff --git a/firestore/build.gradle b/firestore/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.0'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20'
         classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3'

diff --git a/functions/app/build.gradle b/functions/app/build.gradle
@@ -28,6 +28,13 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = '11'
+    }
 
     buildFeatures {
         viewBinding = true

diff --git a/functions/build.gradle b/functions/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.0'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20'
     }

diff --git a/gradle.properties b/gradle.properties
@@ -1,8 +1,11 @@
-org.gradle.jvmargs=-Xmx6g -XX:MaxPermSize=6g -XX:ReservedCodeCacheSize=2g -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx6g -XX:MaxMetaspaceSize=6g -XX:ReservedCodeCacheSize=2g -Dfile.encoding=UTF-8
 # TODO there's a bug when using parallel modules: https://issuetracker.google.com/issues/62805436
 org.gradle.parallel=true
 org.gradle.configureondemand=true
 org.gradle.caching=true
 
 ## Play and Firebase moving to AndroidX
 android.useAndroidX=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/inappmessaging/app/build.gradle b/inappmessaging/app/build.gradle
@@ -24,7 +24,13 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = '11'
+    }
 
     buildFeatures {
         viewBinding = true

diff --git a/inappmessaging/build.gradle b/inappmessaging/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.google.gms:google-services:4.3.15'
-        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/internal/lint/build.gradle b/internal/lint/build.gradle
@@ -8,12 +8,12 @@ repositories {
 }
 
 java {
-    targetCompatibility = JavaVersion.VERSION_11
-    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_17
 }
 
 compileKotlin {
-    kotlinOptions.jvmTarget = "11"
+    kotlinOptions.jvmTarget = "17"
 }
 
 dependencies {

diff --git a/messaging/app/build.gradle b/messaging/app/build.gradle
@@ -32,6 +32,13 @@ android {
             excludes += ['LICENSE.txt']
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = '11'
+    }
 
 
     buildFeatures {

diff --git a/messaging/build.gradle b/messaging/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.0'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20'
     }

diff --git a/perf/app/build.gradle b/perf/app/build.gradle
@@ -33,6 +33,13 @@ android {
             }
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = '11'
+    }
     buildFeatures {
         viewBinding = true
     }

diff --git a/perf/build.gradle b/perf/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.0'
         classpath 'com.google.firebase:perf-plugin:1.4.2'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20'

diff --git a/storage/app/build.gradle b/storage/app/build.gradle
@@ -25,6 +25,13 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = '11'
+    }
 
     buildFeatures {
         viewBinding = true

diff --git a/storage/build.gradle b/storage/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.0'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20'
     }