upgrade kotlin, gradle, AGP (#5886)

Co-authored-by: Rodrigo Lazo Paz <[email protected]>
Co-authored-by: Rodrigo Lazo <[email protected]>
Co-authored-by: David Motsonashvili <[email protected]>

Author: 3 people

.github/workflows/api-information.yml

@@ -11,10 +11,10 @@ jobs:
         with:
           fetch-depth: 2
           submodules: true
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
           cache: gradle
       - name: Set up Python 3.10

.github/workflows/build-release-artifacts.yml

@@ -14,10 +14,10 @@ jobs:
     steps:
       - uses: actions/[email protected]
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
           cache: gradle
 

.github/workflows/build-src-check.yml

@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/[email protected]
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
           cache: gradle
       - name: buildSrc Tests

.github/workflows/ci_tests.yml

@@ -21,10 +21,10 @@ jobs:
           fetch-depth: 2
           submodules: true
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
           cache: gradle
 
@@ -49,10 +49,10 @@ jobs:
           fetch-depth: 2
           submodules: true
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
           cache: gradle
 
@@ -105,10 +105,10 @@ jobs:
           fetch-depth: 2
           submodules: true
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
           cache: gradle
 
@@ -146,10 +146,10 @@ jobs:
           fetch-depth: 2
           submodules: true
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
           cache: gradle
 
@@ -216,10 +216,10 @@ jobs:
           fetch-depth: 2
           submodules: true
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
           cache: gradle
 

.github/workflows/config-e2e.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Checkout firebase-config
         uses: actions/[email protected]
 
-      - name: set up JDK 11
+      - name: set up JDK 17
         uses: actions/setup-java@v3
         with:
           java-version: '11'

.github/workflows/diff-javadoc.yml

@@ -18,10 +18,10 @@ jobs:
           fetch-depth: 2
           submodules: true
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
           cache: gradle
 

.github/workflows/fireperf-e2e.yml

@@ -27,10 +27,10 @@ jobs:
           repository: FirebasePrivate/firebase-android-buildtools
           token: ${{ secrets.GOOGLE_OSS_BOT_TOKEN }}
           path: firebase-android-buildtools
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
           cache: gradle
       - name: Set up Python 3.10

.github/workflows/health-metrics.yml

@@ -28,10 +28,10 @@ jobs:
         with:
           fetch-depth: 2
           submodules: true
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
           cache: gradle
       - name: Set up Python 3.10
@@ -63,10 +63,10 @@ jobs:
         with:
           fetch-depth: 2
           submodules: true
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
           cache: gradle
       - name: Set up Python 3.10
@@ -99,10 +99,10 @@ jobs:
         with:
           fetch-depth: 2
           submodules: true
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
           cache: gradle
       - name: Set up Python 3.10

.github/workflows/make-bom.yml

@@ -12,10 +12,10 @@ jobs:
         with:
           python-version: '3.10'
       - uses: actions/[email protected]
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
           cache: gradle
 

.github/workflows/sessions-e2e.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Checkout firebase-sessions
         uses: actions/[email protected]
 
-      - name: set up JDK 11
+      - name: set up JDK 17
         uses: actions/setup-java@v3
         with:
           java-version: '11'

.github/workflows/smoke-tests.yml

@@ -11,10 +11,10 @@ jobs:
         with:
           fetch-depth: 2
           submodules: true
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
           cache: gradle
       - uses: google-github-actions/auth@v2

README.md

@@ -214,21 +214,8 @@ your app module's build.gradle.
 
 #### Java
 
-Java code in this repo is formatted with the google-java-format tool. You can
-enable this formatting in Android Studio by downloading and installing the
-[google-java-format plugin](https://github.com/google/google-java-format).
-The plugin is disabled by default, but the repo contains configuration information
-and links to additional plugins.
+N/A for now
 
-To run formatting on your entire project you can run
-```bash
-./gradlew :<firebase-project>:googleJavaFormat
-```
-
-To auto-format, just run
-```bash
-./gradlew :<firebase-project>:gJf
-```
 
 #### Kotlin
 

appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle

@@ -41,7 +41,6 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-
     testOptions.unitTests.includeAndroidResources = true
 }
 

appcheck/firebase-appcheck/firebase-appcheck.gradle

@@ -40,7 +40,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-
+    kotlinOptions { jvmTarget = "1.8" }
     testOptions.unitTests.includeAndroidResources = true
 }
 
@@ -67,8 +67,8 @@ dependencies {
     testImplementation "com.google.truth:truth:$googleTruthVersion"
     testImplementation 'junit:junit:4.12'
     testImplementation 'junit:junit:4.13-beta-2'
-    testImplementation 'org.mockito:mockito-core:2.25.0'
-    testImplementation 'org.mockito:mockito-inline:2.25.0'
+    testImplementation 'org.mockito:mockito-core:5.2.0'
+    testImplementation 'org.mockito:mockito-inline:5.2.0'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
 
     androidTestImplementation project(':appcheck:firebase-appcheck')

build.gradle

@@ -35,7 +35,6 @@ buildscript {
     dependencies {
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4'
         classpath 'net.ltgt.gradle:gradle-errorprone-plugin:3.1.0'
-        classpath 'gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.9'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath "com.ncorti.ktfmt.gradle:plugin:0.11.0"
         classpath 'com.google.firebase:firebase-appdistribution-gradle:3.0.2'
@@ -71,10 +70,6 @@ firebaseContinuousIntegration {
     ]
 }
 
-if(JavaVersion.current() != JavaVersion.VERSION_11){
-    throw new GradleException("This build must be run with java 11. You're using ${JavaVersion.current()}.")
-}
-
 configure(subprojects) {
     repositories {
         google()

buildSrc/build.gradle.kts

@@ -14,8 +14,7 @@
 
 plugins {
     id("com.ncorti.ktfmt.gradle") version "0.11.0"
-    id("com.github.sherter.google-java-format") version "0.9"
-    kotlin("plugin.serialization") version "1.7.10"
+    kotlin("plugin.serialization") version "1.8.22"
     `kotlin-dsl`
 }
 
@@ -32,11 +31,6 @@ repositories {
 // Refer go/fireperf-plugin-test-on-head for more details.
 val perfPluginVersion = System.getenv("FIREBASE_PERF_PLUGIN_VERSION") ?: "1.4.1"
 
-googleJavaFormat {
-    toolVersion = "1.15.0"
-    exclude(".gradle/**")
-}
-
 ktfmt {
     googleStyle()
 }
@@ -48,7 +42,7 @@ dependencies {
     implementation("com.google.firebase:perf-plugin:$perfPluginVersion")
     implementation("com.google.auto.value:auto-value-annotations:1.8.1")
     annotationProcessor("com.google.auto.value:auto-value:1.6.5")
-    implementation(kotlin("gradle-plugin", "1.7.10"))
+    implementation(kotlin("gradle-plugin", "1.8.22"))
     implementation("org.json:json:20210307")
 
     implementation("org.eclipse.aether:aether-api:1.0.0.v20140518")
@@ -65,9 +59,8 @@ dependencies {
 
     implementation(libs.kotlinx.serialization.json)
     implementation("com.google.code.gson:gson:2.8.9")
-    implementation("com.android.tools.build:gradle:7.4.2")
-    implementation("com.android.tools.build:builder-test-api:7.4.2")
-    implementation("gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.9")
+    implementation("com.android.tools.build:gradle:8.2.1")
+    implementation("com.android.tools.build:builder-test-api:8.2.1")
 
     testImplementation(libs.bundles.kotest)
     testImplementation("junit:junit:4.13.2")

buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt

@@ -16,8 +16,6 @@
 
 package com.google.firebase.gradle.plugins
 
-import com.github.sherter.googlejavaformatgradleplugin.GoogleJavaFormatExtension
-import com.github.sherter.googlejavaformatgradleplugin.GoogleJavaFormatPlugin
 import com.google.common.collect.ImmutableList
 import com.google.firebase.gradle.plugins.LibraryType.JAVA
 import com.google.firebase.gradle.plugins.semver.ApiDiffer
@@ -28,7 +26,6 @@ import org.gradle.api.plugins.JavaLibraryPlugin
 import org.gradle.api.plugins.JavaPluginConvention
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.create
-import org.gradle.kotlin.dsl.getByType
 import org.gradle.kotlin.dsl.getPlugin
 import org.gradle.kotlin.dsl.register
 import org.gradle.kotlin.dsl.withType
@@ -38,9 +35,7 @@ class FirebaseJavaLibraryPlugin : BaseFirebaseLibraryPlugin() {
 
   override fun apply(project: Project) {
     project.apply<JavaLibraryPlugin>()
-    project.apply<GoogleJavaFormatPlugin>()
     project.apply<DackkaPlugin>()
-    project.extensions.getByType<GoogleJavaFormatExtension>().toolVersion = "1.10.0"
 
     setupFirebaseLibraryExtension(project)
     registerMakeReleaseNotesTask(project)

buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.kt

@@ -18,8 +18,6 @@ package com.google.firebase.gradle.plugins
 
 import com.android.build.gradle.LibraryExtension
 import com.android.build.gradle.LibraryPlugin
-import com.github.sherter.googlejavaformatgradleplugin.GoogleJavaFormatExtension
-import com.github.sherter.googlejavaformatgradleplugin.GoogleJavaFormatPlugin
 import com.google.firebase.gradle.plugins.LibraryType.ANDROID
 import com.google.firebase.gradle.plugins.ci.device.FirebaseTestServer
 import com.google.firebase.gradle.plugins.license.LicenseResolverPlugin
@@ -43,8 +41,6 @@ class FirebaseLibraryPlugin : BaseFirebaseLibraryPlugin() {
   override fun apply(project: Project) {
     project.apply<LibraryPlugin>()
     project.apply<LicenseResolverPlugin>()
-    project.apply<GoogleJavaFormatPlugin>()
-    project.extensions.getByType<GoogleJavaFormatExtension>().toolVersion = "1.10.0"
 
     setupAndroidLibraryExtension(project)
     registerMakeReleaseNotesTask(project)
@@ -68,6 +64,8 @@ class FirebaseLibraryPlugin : BaseFirebaseLibraryPlugin() {
       targetCompatibility = JavaVersion.VERSION_1_8
     }
 
+    android.buildFeatures.buildConfig = true
+
     // In the case of and android library signing config only affects instrumentation test APK.
     // We need it signed with default debug credentials in order for FTL to accept the APK.
     android.buildTypes { getByName("release").signingConfig = getByName("debug").signingConfig }
@@ -178,7 +176,7 @@ class FirebaseLibraryPlugin : BaseFirebaseLibraryPlugin() {
   private fun configurePublishing(
     project: Project,
     firebaseLibrary: FirebaseLibraryExtension,
-    android: LibraryExtension
+    android: LibraryExtension,
   ) {
     android.publishing.singleVariant("release") { withSourcesJar() }
     project.tasks.withType<GenerateModuleMetadata> { isEnabled = false }

buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/FirebaseTestController.kt

@@ -194,8 +194,7 @@ class FirebaseTestController(val rootDirectory: TemporaryFolder) {
 
     const val ANDROID_MANIFEST =
       """<?xml version="1.0" encoding="utf-8"?>
-        <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-                  package="com.example">
+        <manifest xmlns:android="http://schemas.android.com/apk/res/android">
             <uses-sdk android:minSdkVersion="14"/>
         </manifest>
         """