Upgrade AGP to 7.2.2

build.gradle

@@ -16,7 +16,7 @@ import com.google.firebase.gradle.plugins.license.LicenseResolverPlugin
 import com.google.firebase.gradle.MultiProjectReleasePlugin
 
 buildscript {
-    ext.kotlinVersion = '1.4.32'
+    ext.kotlinVersion = '1.7.10'
     repositories {
         google()
         mavenCentral()
@@ -37,8 +37,6 @@ buildscript {
         classpath 'net.ltgt.gradle:gradle-errorprone-plugin:1.3.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.3'
-        classpath 'digital.wup:android-maven-publish:3.6.3'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath 'org.jlleitschuh.gradle:ktlint-gradle:9.2.1'
     }
 }

buildSrc/build.gradle.kts

@@ -43,8 +43,7 @@ dependencies {
 
     implementation("com.google.auto.value:auto-value-annotations:1.8.1")
     annotationProcessor("com.google.auto.value:auto-value:1.6.5")
-    implementation("digital.wup:android-maven-publish:3.6.3")
-    implementation(kotlin("gradle-plugin", "1.4.32"))
+    implementation(kotlin("gradle-plugin", "1.7.10"))
     implementation("org.json:json:20210307")
 
     implementation("org.eclipse.aether:aether-api:1.0.0.v20140518")
@@ -57,7 +56,8 @@ dependencies {
     implementation("org.apache.maven:maven-aether-provider:3.1.0")
 
     implementation("com.google.code.gson:gson:2.8.9")
-    implementation("com.android.tools.build:gradle:3.4.3")
+    implementation("com.android.tools.build:gradle:7.2.2")
+    implementation("com.android.tools.build:builder-test-api:7.2.2")
     implementation("gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.9")
 
     testImplementation("junit:junit:4.13.2")

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

@@ -25,6 +25,8 @@
 import org.gradle.api.attributes.Attribute;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.publish.PublishingExtension;
+import org.gradle.api.publish.maven.MavenPublication;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.TaskProvider;
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile;
@@ -55,6 +57,7 @@ public void apply(Project project) {
                         ImmutableList.of("-module-name", kotlinModuleName(project))));
 
     setupStaticAnalysis(project, firebaseLibrary);
+    configurePublishing(project, firebaseLibrary);
     project.getTasks().register("kotlindoc");
   }
 
@@ -178,4 +181,34 @@ private static String kotlinModuleName(Project project) {
 
     return project.getRootProject().getName() + fullyQualifiedProjectPath;
   }
+
+  private static void configurePublishing(
+      Project project, FirebaseLibraryExtension firebaseLibrary) {
+    project.apply(ImmutableMap.of("plugin", "maven-publish"));
+    PublishingExtension publishing = project.getExtensions().getByType(PublishingExtension.class);
+    publishing.repositories(
+        repos ->
+            repos.maven(
+                repo -> {
+                  String s = project.getRootProject().getBuildDir() + "/m2repository";
+                  File file = new File(s);
+                  repo.setUrl(file.toURI());
+                  repo.setName("BuildDir");
+                }));
+    publishing.publications(
+        publications ->
+            publications.create(
+                "mavenAar",
+                MavenPublication.class,
+                publication -> {
+                  publication.from(
+                      project.getComponents().findByName(firebaseLibrary.type.getComponentName()));
+                  project.afterEvaluate(
+                      p -> {
+                        publication.setArtifactId(firebaseLibrary.artifactId.get());
+                        publication.setGroupId(firebaseLibrary.groupId.get());
+                        firebaseLibrary.applyPomCustomization(publication.getPom());
+                      });
+                }));
+  }
 }

buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryExtension.java

@@ -120,6 +120,14 @@ public void releaseWith(Project releaseWithProject) {
       releaseWithLibrary.librariesToCoRelease.add(this);
       this.project.setVersion(releaseWithProject.getVersion());
 
+      LibraryExtension android = project.getExtensions().findByType(LibraryExtension.class);
+      if (android != null) {
+        android.defaultConfig(
+            cfg -> {
+              cfg.buildConfigField("String", "VERSION_NAME", "\"" + project.getVersion() + "\"");
+            });
+      }
+
       String latestRelease = "latestReleasedVersion";
       if (releaseWithProject.hasProperty(latestRelease)) {
         this.project

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

@@ -18,6 +18,8 @@
 
 import com.android.build.gradle.LibraryExtension;
 import com.android.build.gradle.api.AndroidSourceSet;
+import com.android.build.gradle.internal.dsl.BuildType;
+import com.android.build.gradle.internal.dsl.TestOptions;
 import com.github.sherter.googlejavaformatgradleplugin.GoogleJavaFormatExtension;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -26,11 +28,16 @@
 import com.google.firebase.gradle.plugins.license.LicenseResolverPlugin;
 import java.io.File;
 import java.nio.file.Paths;
+import kotlin.Unit;
 import org.gradle.api.JavaVersion;
+import org.gradle.api.NamedDomainObjectContainer;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.attributes.Attribute;
 import org.gradle.api.file.FileCollection;
+import org.gradle.api.publish.PublishingExtension;
+import org.gradle.api.publish.maven.MavenPublication;
+import org.gradle.api.publish.tasks.GenerateModuleMetadata;
 import org.gradle.api.tasks.TaskProvider;
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile;
 
@@ -60,14 +67,18 @@ public void apply(Project project) {
     // 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(
-        types ->
+        (NamedDomainObjectContainer<BuildType> types) ->
             types
                 .getByName("release")
                 .setSigningConfig(types.getByName("debug").getSigningConfig()));
+    android.defaultConfig(
+        cfg -> {
+          cfg.buildConfigField("String", "VERSION_NAME", "\"" + project.getVersion() + "\"");
+        });
 
     // see https://github.com/robolectric/robolectric/issues/5456
     android.testOptions(
-        options ->
+        (TestOptions options) ->
             options
                 .getUnitTests()
                 .all(
@@ -98,6 +109,8 @@ public void apply(Project project) {
 
     setupStaticAnalysis(project, firebaseLibrary);
 
+    configurePublishing(project, firebaseLibrary, android);
+
     // reduce the likelihood of kotlin module files colliding.
     project
         .getTasks()
@@ -182,7 +195,8 @@ private static void setupApiInformationAnalysis(Project project, LibraryExtensio
                                 config.attributes(
                                     container ->
                                         container.attribute(
-                                            Attribute.of("artifactType", String.class), "jar")))
+                                            Attribute.of("artifactType", String.class),
+                                            "android-classes")))
                         .getArtifacts()
                         .getArtifactFiles();
                 apiInfo.configure(t -> t.setClassPath(jars));
@@ -226,4 +240,53 @@ private static String kotlinModuleName(Project project) {
 
     return project.getRootProject().getName() + fullyQualifiedProjectPath;
   }
+
+  private static void configurePublishing(
+      Project project, FirebaseLibraryExtension firebaseLibrary, LibraryExtension android) {
+    android.publishing(
+        p -> {
+          p.singleVariant(
+              "release",
+              v -> {
+                v.withSourcesJar();
+                return Unit.INSTANCE;
+              });
+        });
+    project
+        .getTasks()
+        .withType(
+            GenerateModuleMetadata.class,
+            task -> {
+              task.setEnabled(false);
+            });
+    project.afterEvaluate(
+        p -> {
+          project.apply(ImmutableMap.of("plugin", "maven-publish"));
+          PublishingExtension publishing =
+              project.getExtensions().getByType(PublishingExtension.class);
+          publishing.repositories(
+              repos ->
+                  repos.maven(
+                      repo -> {
+                        String s = project.getRootProject().getBuildDir() + "/m2repository";
+                        File file = new File(s);
+                        repo.setUrl(file.toURI());
+                        repo.setName("BuildDir");
+                      }));
+          publishing.publications(
+              publications ->
+                  publications.create(
+                      "mavenAar",
+                      MavenPublication.class,
+                      publication -> {
+                        publication.from(
+                            project
+                                .getComponents()
+                                .findByName(firebaseLibrary.type.getComponentName()));
+                        publication.setArtifactId(firebaseLibrary.artifactId.get());
+                        publication.setGroupId(firebaseLibrary.groupId.get());
+                        firebaseLibrary.applyPomCustomization(publication.getPom());
+                      }));
+        });
+  }
 }

buildSrc/src/main/java/com/google/firebase/gradle/plugins/JavadocPlugin.java

@@ -302,7 +302,9 @@ private static FileCollection getJars(Configuration configuration) {
         .artifactView(
             view ->
                 view.attributes(
-                    attrs -> attrs.attribute(Attribute.of("artifactType", String.class), "jar")))
+                    attrs ->
+                        attrs.attribute(
+                            Attribute.of("artifactType", String.class), "android-classes")))
         .getArtifacts()
         .getArtifactFiles();
   }

buildSrc/src/main/java/com/google/firebase/gradle/plugins/LibraryType.java

@@ -35,7 +35,7 @@ public String getComponentName() {
     // https://github.com/wupdigital/android-maven-publish ?).
     // So we explicitly choose the "Release" variant for android libraries.
     if (this == ANDROID) {
-      return name().toLowerCase() + "Release";
+      return "release";
     }
     return name().toLowerCase();
   }

buildSrc/src/main/java/com/google/firebase/gradle/plugins/license/GenerateLicensesTask.java

@@ -43,9 +43,9 @@ abstract class GenerateLicensesTask extends DefaultTask {
   public abstract void setAdditionalLicenses(
       List<ThirdPartyLicensesExtension.CustomLicense> additionalLicenses);
 
-  @OutputDirectory
   public abstract void setOutputDir(File outputDir);
 
+  @OutputDirectory
   public abstract File getOutputDir();
 
   @Inject

buildSrc/src/main/java/com/google/firebase/gradle/plugins/publish/PublishingPlugin.java

@@ -14,9 +14,7 @@
 
 package com.google.firebase.gradle.plugins.publish;
 
-import com.google.common.collect.ImmutableMap;
 import com.google.firebase.gradle.plugins.FirebaseLibraryExtension;
-import digital.wup.android_maven_publish.AndroidMavenPublishPlugin;
 import java.io.File;
 import java.util.Arrays;
 import java.util.Set;
@@ -26,7 +24,6 @@
 import org.gradle.api.Task;
 import org.gradle.api.publish.PublishingExtension;
 import org.gradle.api.publish.maven.MavenPublication;
-import org.gradle.api.tasks.bundling.Jar;
 import org.gradle.api.tasks.bundling.Zip;
 
 /**
@@ -110,8 +107,6 @@ public void apply(Project project) {
                     if (firebaseLibrary == null) {
                       return;
                     }
-
-                    sub.apply(ImmutableMap.of("plugin", AndroidMavenPublishPlugin.class));
                     PublishingExtension publishing =
                         sub.getExtensions().getByType(PublishingExtension.class);
                     publishing.repositories(
@@ -124,30 +119,11 @@ public void apply(Project project) {
                                   repo.setName("BuildDir");
                                 }));
                     publishing.publications(
-                        publications ->
-                            publications.create(
-                                "mavenAar",
-                                MavenPublication.class,
-                                publication -> {
-                                  publication.from(
-                                      sub.getComponents()
-                                          .findByName(firebaseLibrary.type.getComponentName()));
-                                  publication.setArtifactId(firebaseLibrary.artifactId.get());
-                                  publication.setGroupId(firebaseLibrary.groupId.get());
-                                  if (firebaseLibrary.publishSources) {
-                                    publication.artifact(
-                                        sub.getTasks()
-                                            .create(
-                                                "sourceJar",
-                                                Jar.class,
-                                                jar -> {
-                                                  jar.from(firebaseLibrary.getSrcDirs());
-                                                  jar.getArchiveClassifier().set("sources");
-                                                }));
-                                  }
-                                  firebaseLibrary.applyPomCustomization(publication.getPom());
-                                  publisher.decorate(firebaseLibrary, publication);
-                                }));
+                        publications -> {
+                          MavenPublication publication =
+                              (MavenPublication) publications.getByName("mavenAar");
+                          publisher.decorate(firebaseLibrary, publication);
+                        });
                     publishAllToLocal.dependsOn(
                         sub.getPath() + ":publishMavenAarPublicationToMavenLocal");
                     publishAllToBuildDir.dependsOn(

encoders/protoc-gen-firebase-encoders/protoc-gen-firebase-encoders.gradle

@@ -17,7 +17,7 @@ plugins {
     id "java-library"
     id "com.github.johnrengelman.shadow" version "5.2.0"
     id "com.google.protobuf"
-    id "org.jetbrains.kotlin.kapt"
+    id "kotlin-kapt"
 }
 
 protobuf {
@@ -26,18 +26,22 @@ protobuf {
     }
 }
 
+kapt {
+    generateStubs = false
+    correctErrorTypes = true
+}
+
 jar {
     manifest.attributes "Main-Class": "com.google.firebase.encoders.proto.codegen.MainKt"
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
 
     implementation "com.google.protobuf:protobuf-java:3.14.0"
     implementation 'com.squareup:javapoet:1.13.0'
     implementation 'com.google.guava:guava:30.0-jre'
-    implementation 'com.google.dagger:dagger:2.39.1'
-    kapt 'com.google.dagger:dagger-compiler:2.39.1'
+    implementation 'com.google.dagger:dagger:2.43.2'
+    kapt 'com.google.dagger:dagger-compiler:2.43.2'
 
     testImplementation 'junit:junit:4.13.1'
     testImplementation "com.google.truth:truth:1.0.1"

firebase-firestore/firebase-firestore.gradle

@@ -111,16 +111,6 @@ android.libraryVariants.all { variant ->
     }
 }
 
-configurations.all {
-    if(it.name.contains('AndroidTestRuntimeClasspath')) {
-        it.resolutionStrategy {
-            force 'org.checkerframework:checker-compat-qual:2.5.5'
-            force 'com.google.guava:guava:30.1.1-android'
-        }
-    }
-    exclude group: "com.google.protobuf", module: "protobuf-java"
-}
-
 googleJavaFormat {
     exclude 'src/testUtil/java/com/google/firebase/firestore/testutil/Assert.java'
     exclude 'src/testUtil/java/com/google/firebase/firestore/testutil/ThrowingRunnable.java'

firebase-firestore/ktx/ktx.gradle

@@ -17,6 +17,8 @@ plugins {
     id 'kotlin-android'
 }
 
+group = "com.google.firebase"
+
 firebaseLibrary {
     releaseWith project(':firebase-firestore')
     publishSources = true