Merge branch 'master' into rl.guava.dep

Author: rlazo

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

@@ -1,2 +1,2 @@
-version=16.1.3
+version=17.0.0
 latestReleasedVersion=16.1.2

appcheck/firebase-appcheck-debug/gradle.properties

@@ -1,2 +1,2 @@
-version=16.1.3
+version=17.0.0
 latestReleasedVersion=16.1.2

appcheck/firebase-appcheck-interop/api.txt

@@ -3,7 +3,7 @@ package com.google.firebase.appcheck {
 
   public abstract class AppCheckTokenResult {
     ctor public AppCheckTokenResult();
-    method @Nullable public abstract com.google.firebase.FirebaseException getError();
+    method @Nullable public abstract Exception getError();
     method @NonNull public abstract String getToken();
   }
 

appcheck/firebase-appcheck-interop/firebase-appcheck-interop.gradle

@@ -42,8 +42,6 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.firebase:firebase-common:20.3.1'
-    implementation 'com.google.firebase:firebase-components:17.1.0'
     implementation 'com.google.android.gms:play-services-base:18.0.1'
     implementation 'com.google.android.gms:play-services-tasks:18.0.1'
 

appcheck/firebase-appcheck-interop/gradle.properties

@@ -1,2 +1,2 @@
-version=16.1.2
+version=17.0.0
 latestReleasedVersion=16.1.1

appcheck/firebase-appcheck-interop/src/main/java/com/google/firebase/appcheck/AppCheckTokenResult.java

@@ -16,13 +16,12 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import com.google.firebase.FirebaseException;
 
 /**
  * Class to hold the result emitted by a Firebase App Check service application verification
  * attempt. The result will always contain a token, which will either be a valid raw JWT attesting
- * application identity, or a dummy value. The result may optionally contain a {@link
- * FirebaseException} if application verification does not succeed.
+ * application identity, or a dummy value. The result may optionally contain an {@link Exception} if
+ * application verification does not succeed.
  */
 public abstract class AppCheckTokenResult {
 
@@ -34,9 +33,9 @@ public abstract class AppCheckTokenResult {
   public abstract String getToken();
 
   /**
-   * Returns the {@link FirebaseException} if the {@link
-   * com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider} failed to obtain a token.
+   * Returns the {@link Exception} if the {@link
+   * com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider} failed to obtain a token.
    */
   @Nullable
-  public abstract FirebaseException getError();
+  public abstract Exception getError();
 }

appcheck/firebase-appcheck-interop/src/main/java/com/google/firebase/appcheck/interop/InternalAppCheckTokenProvider.java renamed to appcheck/firebase-appcheck-interop/src/main/java/com/google/firebase/appcheck/interop/InteropAppCheckTokenProvider.java

@@ -19,7 +19,7 @@
 import com.google.firebase.appcheck.AppCheckTokenResult;
 
 /** @hide */
-public interface InternalAppCheckTokenProvider {
+public interface InteropAppCheckTokenProvider {
 
   /**
    * Requests an {@link AppCheckTokenResult} from the installed {@code AppCheckFactory}. This will

appcheck/firebase-appcheck-playintegrity/gradle.properties

@@ -1,2 +1,2 @@
-version=16.1.3
+version=17.0.0
 latestReleasedVersion=16.1.2

appcheck/firebase-appcheck/api.txt

@@ -15,7 +15,7 @@ package com.google.firebase.appcheck {
     method @NonNull public abstract String getToken();
   }
 
-  public abstract class FirebaseAppCheck implements com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider {
+  public abstract class FirebaseAppCheck implements com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider {
     ctor public FirebaseAppCheck();
     method public abstract void addAppCheckListener(@NonNull com.google.firebase.appcheck.FirebaseAppCheck.AppCheckListener);
     method @NonNull public abstract com.google.android.gms.tasks.Task<com.google.firebase.appcheck.AppCheckToken> getAppCheckToken(boolean);

appcheck/firebase-appcheck/gradle.properties

@@ -1,2 +1,2 @@
-version=16.1.3
+version=17.0.0
 latestReleasedVersion=16.1.2

appcheck/firebase-appcheck/src/androidTest/java/com/google/firebase/appcheck/StrictModeTest.java

@@ -18,7 +18,7 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.testing.integ.StrictModeRule;
 import org.junit.Rule;
 import org.junit.Test;
@@ -43,7 +43,7 @@ public void initializingFirebaseAppcheck_shouldNotViolateStrictMode() {
                       .build(),
                   "hello");
           app.get(FirebaseAppCheck.class);
-          app.get(InternalAppCheckTokenProvider.class);
+          app.get(InteropAppCheckTokenProvider.class);
         });
   }
 }

appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/FirebaseAppCheck.java

@@ -19,9 +19,9 @@
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.appcheck.interop.AppCheckTokenListener;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 
-public abstract class FirebaseAppCheck implements InternalAppCheckTokenProvider {
+public abstract class FirebaseAppCheck implements InteropAppCheckTokenProvider {
 
   /** Gets the default instance of {@code FirebaseAppCheck}. */
   @NonNull

appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/FirebaseAppCheckRegistrar.java

@@ -21,7 +21,7 @@
 import com.google.firebase.annotations.concurrent.Lightweight;
 import com.google.firebase.annotations.concurrent.UiThread;
 import com.google.firebase.appcheck.internal.DefaultFirebaseAppCheck;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.components.Dependency;
@@ -53,7 +53,7 @@ public List<Component<?>> getComponents() {
         Qualified.qualified(Blocking.class, ScheduledExecutorService.class);
 
     return Arrays.asList(
-        Component.builder(FirebaseAppCheck.class, (InternalAppCheckTokenProvider.class))
+        Component.builder(FirebaseAppCheck.class, (InteropAppCheckTokenProvider.class))
             .name(LIBRARY_NAME)
             .add(Dependency.required(FirebaseApp.class))
             .add(Dependency.required(uiExecutor))

appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/DefaultAppCheckTokenResult.java

@@ -58,7 +58,7 @@ public String getToken() {
 
   @Nullable
   @Override
-  public FirebaseException getError() {
+  public Exception getError() {
     return error;
   }
 }

buildSrc/src/main/java/com/google/firebase/gradle/MultiProjectReleasePlugin.java

@@ -49,6 +49,12 @@
  */
 public class MultiProjectReleasePlugin implements Plugin<Project> {
 
+  // TODO() - Will be removed once migrated to Kotlin
+  private static String findStringProperty(Project p, String property) {
+    Object value = p.findProperty(property);
+    return value != null ? value.toString() : null;
+  }
+
   @Override
   public void apply(Project project) {
     project.apply(ImmutableMap.of("plugin", PublishingPlugin.class));
@@ -73,10 +79,10 @@ public void apply(Project project) {
                 ReleaseGenerator.class,
                 task -> {
                   task.getCurrentRelease()
-                      .convention(project.property("currentRelease").toString());
-                  task.getPastRelease().convention(project.property("pastRelease").toString());
+                      .convention(findStringProperty(project, "currentRelease"));
+                  task.getPastRelease().convention(findStringProperty(project, "pastRelease"));
                   task.getPrintReleaseConfig()
-                      .convention(project.property("printOutput").toString());
+                      .convention(findStringProperty(project, "printOutput"));
                   task.getReleaseConfigFile()
                       .convention(project.getLayout().getBuildDirectory().file("release.cfg"));
                   task.getReleaseReportFile()

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

@@ -18,14 +18,18 @@ import java.io.File
 import java.nio.file.Paths
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.artifacts.ProjectDependency
 import org.gradle.api.publish.PublishingExtension
+import org.gradle.api.publish.maven.MavenPom
 import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.api.publish.maven.plugins.MavenPublishPlugin
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.create
+import org.gradle.kotlin.dsl.findByType
 import org.gradle.kotlin.dsl.register
+import org.w3c.dom.Element
 
 abstract class BaseFirebaseLibraryPlugin : Plugin<Project> {
 
@@ -94,22 +98,173 @@ abstract class BaseFirebaseLibraryPlugin : Plugin<Project> {
       sources.value(project.provider { srcDirs })
     }
 
+  /**
+   * Adds + configures the [MavenPublishPlugin] for the given [project].
+   *
+   * This provides the repository we publish to (a folder in the root build directory), and
+   * configures maven pom generation.
+   *
+   * @see [applyPomTransformations]
+   * @see [FirebaseLibraryExtension.applyPomCustomization]
+   */
   protected fun configurePublishing(project: Project, firebaseLibrary: FirebaseLibraryExtension) {
-    project.afterEvaluate {
-      project.apply<MavenPublishPlugin>()
-      project.extensions.configure<PublishingExtension> {
+    with(project) {
+      apply<MavenPublishPlugin>()
+      extensions.configure<PublishingExtension> {
         repositories.maven {
-          val s = project.rootProject.buildDir.toString() + "/m2repository"
-          url = File(s).toURI()
+          url = rootProject.fileFromBuildDir("m2repository").toURI()
           name = "BuildDir"
         }
         publications.create<MavenPublication>("mavenAar") {
-          from(project.components.findByName(firebaseLibrary.type.componentName))
-          artifactId = firebaseLibrary.artifactId.get()
-          groupId = firebaseLibrary.groupId.get()
-          firebaseLibrary.applyPomCustomization(pom)
+          afterEvaluate {
+            artifactId =
+              firebaseLibrary.artifactId.get() // these dont get populated until afterEvaluate :(
+            groupId = firebaseLibrary.groupId.get()
+
+            firebaseLibrary.applyPomCustomization(pom)
+            firebaseLibrary.applyPomTransformations(pom)
+            from(components.findByName(firebaseLibrary.type.componentName))
+          }
         }
       }
     }
   }
+
+  /**
+   * Performs various transformations needed to ensure the given [pom] is ready for a release.
+   *
+   * The transformations are done lazily via the [withXml][MavenPom.withXml] provider.
+   *
+   * @param pom the [MavenPom] to prepare
+   * @see [convertToCompileDependency]
+   * @see [addTypeWithAARSupport]
+   */
+  // TODO(b/270576405): Combine with applyPomCustomization when migrating FirebaseLibraryExtension
+  private fun FirebaseLibraryExtension.applyPomTransformations(pom: MavenPom) {
+    pom.withXml {
+      val dependencies = asElement().findElementsByTag("dependency")
+      val androidDependencies = resolveAndroidDependencies()
+      for (dependency in dependencies) {
+        convertToCompileDependency(dependency)
+        addTypeWithAARSupport(dependency, androidDependencies)
+      }
+    }
+  }
+
+  /**
+   * Adds + configures the `scope` element as a direct descendant of the provided [Element].
+   *
+   * Sets the [textContent][Element.getTextContent] of `scope` to "compile"- regardless of its
+   * initial value. This is needed to avoid a breaking change until the bug below is fixed.
+   *
+   * @param dependency the element to append the `scope` to
+   * @see applyPomTransformations
+   */
+  // TODO(b/277605778): Remove after configurations have been migrated to the right type
+  private fun convertToCompileDependency(dependency: Element) {
+    dependency.findOrCreate("scope").textContent = "compile"
+  }
+
+  /**
+   * Adds + configures the `type` element as a direct descendant of the provided [Element].
+   *
+   * The `type` element specifies what the given [dependency] is published as. This could be another
+   * `pom`, a `jar`, an `aar`, etc., Usually, the [MavenPublishPlugin] can infer these types; this
+   * is not the case however with `aar` artifacts.
+   *
+   * This method will check if the provided [dependency] is in the provided list of artifact strings
+   * ([androidLibraries]), and map it to an `aar` or `jar` as needed.
+   *
+   * The following is an example of a `type` element:
+   * ```
+   * <dependency>
+   *   <type>aar</type>
+   * </dependency>
+   * ```
+   *
+   * @param dependency the element to append the `type` to
+   * @param androidLibraries a list of dependencies for this given SDK that publish `aar` artifacts
+   * @see applyPomTransformations
+   */
+  // TODO(b/277607560): Remove when Gradle's MavenPublishPlugin adds functionality for aar types
+  private fun addTypeWithAARSupport(dependency: Element, androidLibraries: List<String>) {
+    dependency.findOrCreate("type").apply {
+      textContent = if (androidLibraries.contains(dependency.toArtifactString())) "aar" else "jar"
+    }
+  }
 }
+
+/**
+ * A list of _all_ dependencies that publish `aar` artifacts.
+ *
+ * This is collected via the [runtimeClasspath][FirebaseLibraryExtension.getRuntimeClasspath], and
+ * includes project level dependencies as well as external dependencies.
+ *
+ * The dependencies are mapped to their [artifactName].
+ *
+ * @see resolveProjectLevelDependencies
+ * @see resolveExternalAndroidLibraries
+ */
+// TODO(b/277607560): Remove when Gradle's MavenPublishPlugin adds functionality for aar types
+fun FirebaseLibraryExtension.resolveAndroidDependencies() =
+  resolveExternalAndroidLibraries() +
+    resolveProjectLevelDependencies()
+      .filter { it.type == LibraryType.ANDROID }
+      .map { it.artifactName }
+
+/**
+ * A list of project level dependencies.
+ *
+ * This is collected via the [runtimeClasspath][FirebaseLibraryExtension.getRuntimeClasspath].
+ *
+ * @throws RuntimeException if a project level dependency is found that doesn't have
+ * [FirebaseLibraryExtension]
+ */
+// TODO(b/277607560): Remove when Gradle's MavenPublishPlugin adds functionality for aar types
+fun FirebaseLibraryExtension.resolveProjectLevelDependencies() =
+  project.configurations
+    .getByName(runtimeClasspath)
+    .allDependencies
+    .mapNotNull { it as? ProjectDependency }
+    .map {
+      it.dependencyProject.extensions.findByType<FirebaseLibraryExtension>()
+        ?: throw RuntimeException(
+          "Project level dependencies must have the firebaseLibrary plugin. The following dependency does not: ${it.artifactName}"
+        )
+    }
+
+/**
+ * A list of _external_ dependencies that publish `aar` artifacts.
+ *
+ * This is collected via the [runtimeClasspath][FirebaseLibraryExtension.getRuntimeClasspath], using
+ * an [ArtifactView][org.gradle.api.artifacts.ArtifactView] that filters for `aar` artifactType.
+ *
+ * Artifacts are mapped to their respective display name:
+ * ```
+ * groupId:artifactId:version
+ * ```
+ */
+// TODO(b/277607560): Remove when Gradle's MavenPublishPlugin adds functionality for aar types
+fun FirebaseLibraryExtension.resolveExternalAndroidLibraries() =
+  project.configurations
+    .getByName(runtimeClasspath)
+    .incoming
+    .artifactView { attributes { attribute("artifactType", "aar") } }
+    .artifacts
+    .map { it.variant.displayName.substringBefore(" ") }
+
+/**
+ * The name provided to this artifact when published.
+ *
+ * Syntax sugar for:
+ * ```
+ * "$mavenName:$version"
+ * ```
+ *
+ * For example, the following could be an artifact name:
+ * ```
+ * "com.google.firebase:firebase-common:16.0.5"
+ * ```
+ */
+val FirebaseLibraryExtension.artifactName: String
+  get() = "$mavenName:$version"

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

@@ -16,7 +16,6 @@ package com.google.firebase.gradle.plugins
 
 import org.gradle.api.DefaultTask
 import org.gradle.api.GradleException
-import org.gradle.api.artifacts.ProjectDependency
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.TaskAction
@@ -54,12 +53,8 @@ abstract class CheckHeadDependencies : DefaultTask() {
     }
   }
 
-  fun FirebaseLibraryExtension.projectDependenciesByName(): List<String> =
-    project.configurations
-      .getByName(runtimeClasspath)
-      .allDependencies
-      .filter { it is ProjectDependency }
-      .map { it.name }
+  private fun FirebaseLibraryExtension.projectDependenciesByName() =
+    resolveProjectLevelDependencies().map { it.artifactId.get() }
 
   companion object {
     val DEPENDENCIES_TO_IGNORE: List<String> = listOf("protolite-well-known-types")