Merge branch 'master' into mila/multiple-inequality-support

Author: milaGGL

README.md

@@ -225,30 +225,21 @@ strategy](https://docs.gradle.org/current/dsl/org.gradle.api.artifacts.Resolutio
 
 ### Commands
 
-The simplest way to publish a project and all its associated dependencies is to
-just publish all projects. The following command builds SNAPSHOT dependencies of
-all projects. All pom level dependencies within the published artifacts will
-also point to SNAPSHOT versions that are co-published.
+For more advanced use cases where developers wish to make changes to a project,
+but have transitive dependencies point to publicly released versions, individual
+projects may be published as follows.
 
 ```bash
-./gradlew publishAllToLocal
+# e.g. to publish Firestore and Functions
+./gradlew -PprojectsToPublish="firebase-firestore,firebase-functions" \
+    publishReleasingLibrariesToMavenLocal
 ```
 
 Developers may take a dependency on these locally published versions by adding
 the `mavenLocal()` repository to your [repositories
 block](https://docs.gradle.org/current/userguide/declaring_repositories.html) in
 your app module's build.gradle.
 
-For more advanced use cases where developers wish to make changes to a project,
-but have transitive dependencies point to publicly released versions, individual
-projects may be published as follows.
-
-```bash
-# e.g. to publish Firestore and Functions
-./gradlew -PprojectsToPublish=":firebase-firestore,:firebase-functions" \
-    publishProjectsToMavenLocal
-```
-
 ### Code Formatting
 
 #### Java

buildSrc/README.md

@@ -1,5 +1,8 @@
 ## Build Source
 
+> [!NOTE]
+> Eventually, this will be merged with our [contributor documentation](https://firebase.github.io/firebase-android-sdk/).
+
 This file will be more organized as time progresses. Because a lot of our
 plugins and systems require a moderate amount of cognitive overhead to understand,
 I thought it best to provide documentation for such systems. You can find the

buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/RecipeVersionWriter.java

@@ -173,18 +173,6 @@ public String generateVersionUpdate() {
             "Firebase Functions KTX",
             "functions-ktx-dependency",
             "com.google.firebase:firebase-functions-ktx"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Firebase Dynamic Links",
-            "fdl-dependency",
-            "com.google.firebase:firebase-dynamic-links"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Firebase Dynamic Links KTX",
-            "fdl-ktx-dependency",
-            "com.google.firebase:firebase-dynamic-links-ktx"));
     outputBuilder.append(
         generateVersionVariable(
             depsByArtifactId,

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

@@ -91,6 +91,7 @@ class FirebaseLibraryPlugin : BaseFirebaseLibraryPlugin() {
 
   private fun getSemverTaskAar(project: Project, firebaseLibrary: FirebaseLibraryExtension) {
     project.mkdir("semver")
+    project.mkdir("semver/previous-version")
     project.tasks.register<GmavenCopier>("copyPreviousArtifacts") {
       dependsOn("bundleReleaseAar")
       project.file("semver/previous.aar").delete()
@@ -111,7 +112,10 @@ class FirebaseLibraryPlugin : BaseFirebaseLibraryPlugin() {
 
     project.tasks.register<Copy>("extractPreviousClasses") {
       dependsOn("copyPreviousArtifacts")
-      if (project.file("semver/previous.aar").exists()) {
+      if (
+        GmavenHelper(firebaseLibrary.groupId.get(), firebaseLibrary.artifactId.get())
+          .isPresentInGmaven()
+      ) {
         from(project.zipTree("semver/previous.aar"))
         into(project.file("semver/previous-version"))
       }
@@ -121,15 +125,15 @@ class FirebaseLibraryPlugin : BaseFirebaseLibraryPlugin() {
 
     val previousJarFile = project.file("semver/previous-version/classes.jar").absolutePath
     project.tasks.register<ApiDiffer>("semverCheck") {
+      dependsOn("extractCurrentClasses")
+      dependsOn("extractPreviousClasses")
       currentJar.value(currentJarFile)
       previousJar.value(previousJarFile)
       version.value(firebaseLibrary.version)
       previousVersionString.value(
         GmavenHelper(firebaseLibrary.groupId.get(), firebaseLibrary.artifactId.get())
           .getLatestReleasedVersion()
       )
-      dependsOn("extractCurrentClasses")
-      dependsOn("extractPreviousClasses")
     }
   }
 

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

@@ -15,6 +15,7 @@
 package com.google.firebase.gradle.plugins
 
 import java.io.FileNotFoundException
+import java.net.HttpURLConnection
 import java.net.URL
 import javax.xml.parsers.DocumentBuilder
 import javax.xml.parsers.DocumentBuilderFactory
@@ -30,6 +31,16 @@ class GmavenHelper(val groupId: String, val artifactId: String) {
     return "${GMAVEN_ROOT}/${groupIdAsPath}/${artifactId}/${version}/${pomFileName}"
   }
 
+  fun isPresentInGmaven(): Boolean {
+    val groupIdAsPath = groupId.replace(".", "/")
+    val u = URL("${GMAVEN_ROOT}/${groupIdAsPath}/${artifactId}/maven-metadata.xml")
+    val huc: HttpURLConnection = u.openConnection() as HttpURLConnection
+    huc.setRequestMethod("GET") // OR  huc.setRequestMethod ("HEAD");
+    huc.connect()
+    val code: Int = huc.getResponseCode()
+    return code == HttpURLConnection.HTTP_OK
+  }
+
   fun getArtifactForVersion(version: String, isJar: Boolean): String {
     val fileName =
       if (isJar == true) "${artifactId}-${version}.jar" else "${artifactId}-${version}.aar"

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

@@ -191,9 +191,9 @@ abstract class PublishingPlugin : Plugin<Project> {
     allFirebaseLibraries: List<FirebaseLibraryExtension>
   ): ReleaseMetadata? {
     val projectsToPublish = project.provideProperty<String>("projectsToPublish").orNull
-    val releaseName = project.provideProperty<String>("releaseName").orNull
+    val releaseName = project.provideProperty<String>("releaseName").orNull ?: "NO_NAME"
 
-    if (projectsToPublish == null || releaseName == null) return null
+    if (projectsToPublish == null) return null
 
     val projectNames = projectsToPublish.split(",")
     val librariesToRelease =
@@ -450,7 +450,6 @@ abstract class PublishingPlugin : Plugin<Project> {
     project.tasks.register(SEMVER_CHECK_TASK) {
       for (releasingProject in releasingProjects) {
         val semverCheckTask = releasingProject.tasks.named("semverCheck")
-
         dependsOn(semverCheckTask)
       }
     }

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

@@ -36,16 +36,14 @@ abstract class GmavenCopier : DefaultTask() {
   @TaskAction
   fun run() {
     val mavenHelper = GmavenHelper(groupId.get(), artifactId.get())
+    if (!mavenHelper.isPresentInGmaven()) {
+      return
+    }
     val gMavenPath =
       mavenHelper.getArtifactForVersion(
         mavenHelper.getLatestReleasedVersion(),
         !aarAndroidFile.get()
       )
-    try {
-      URL(gMavenPath).openStream().use { Files.copy(it, Paths.get(filePath.get())) }
-    } catch (_: java.io.FileNotFoundException) {
-      // Gmaven Artifact doesn't exist.
-      return
-    }
+    URL(gMavenPath).openStream().use { Files.copy(it, Paths.get(filePath.get())) }
   }
 }

firebase-crashlytics/CHANGELOG.md

@@ -1,4 +1,5 @@
 # Unreleased
+* [changed] Updated `firebase-sessions` dependency to v1.0.2
 
 # 18.4.0
 * [feature] Integrated with Firebase sessions library to enable upcoming features related to
@@ -477,4 +478,3 @@ The following release notes describe changes in the new SDK.
  from your `AndroidManifest.xml` file.
  * [removed] The `fabric.properties` and `crashlytics.properties` files are no
  longer supported. Remove them from your app.
-

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/DataCollectionArbiter.java

@@ -75,11 +75,24 @@ public synchronized boolean isAutomaticDataCollectionEnabled() {
     final boolean dataCollectionEnabled =
         crashlyticsDataCollectionEnabled != null
             ? crashlyticsDataCollectionEnabled
-            : firebaseApp.isDataCollectionDefaultEnabled();
+            : isFirebaseDataCollectionDefaultEnabled();
     logDataCollectionState(dataCollectionEnabled);
     return dataCollectionEnabled;
   }
 
+  /**
+   * Determine whether automatic data collection is enabled or disabled by default in all SDKs.
+   *
+   * <p>If the FirebaseApp has been deleted, returns false.
+   */
+  private boolean isFirebaseDataCollectionDefaultEnabled() {
+    try {
+      return firebaseApp.isDataCollectionDefaultEnabled();
+    } catch (IllegalStateException ignored) {
+      return false;
+    }
+  }
+
   public synchronized void setCrashlyticsDataCollectionEnabled(@Nullable Boolean enabled) {
     if (enabled != null) {
       setInManifest = false;

firebase-datatransport/CHANGELOG.md

@@ -1,3 +1,2 @@
 # Unreleased
-
-
+* [feature] Expose the transport factory as a qualified dependency based on the endpoint connected.

firebase-datatransport/firebase-datatransport.gradle

@@ -46,11 +46,11 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.firebase:firebase-common:20.3.1'
+    implementation 'com.google.firebase:firebase-common:20.3.3'
     implementation 'com.google.firebase:firebase-components:17.1.0'
     implementation 'com.google.android.datatransport:transport-api:3.0.0'
-    implementation 'com.google.android.datatransport:transport-runtime:3.1.8'
-    implementation 'com.google.android.datatransport:transport-backend-cct:3.1.8'
+    implementation 'com.google.android.datatransport:transport-runtime:3.1.9'
+    implementation 'com.google.android.datatransport:transport-backend-cct:3.1.9'
     implementation 'androidx.annotation:annotation:1.1.0'
 
     testImplementation 'androidx.test:runner:1.2.0'

firebase-datatransport/gradle.properties

@@ -1,4 +1,3 @@
-version=18.1.9
+version=18.2.0
 latestReleasedVersion=18.1.8
 android.enableUnitTestBinaryResources=true
-

firebase-datatransport/src/main/java/com/google/firebase/datatransport/LegacyTransportBackend.java

@@ -0,0 +1,23 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.firebase.datatransport;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+import javax.inject.Qualifier;
+
+@Qualifier
+@Target({ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD})
+public @interface LegacyTransportBackend {}

firebase-datatransport/src/main/java/com/google/firebase/datatransport/package-info.java renamed to firebase-datatransport/src/main/java/com/google/firebase/datatransport/TransportBackend.java

@@ -1,4 +1,4 @@
-// Copyright 2019 Google LLC
+// Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,5 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-/** @hide */
 package com.google.firebase.datatransport;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+import javax.inject.Qualifier;
+
+@Qualifier
+@Target({ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD})
+public @interface TransportBackend {}

firebase-datatransport/src/main/java/com/google/firebase/datatransport/TransportRegistrar.java

@@ -16,12 +16,14 @@
 
 import android.content.Context;
 import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
 import com.google.android.datatransport.TransportFactory;
 import com.google.android.datatransport.cct.CCTDestination;
 import com.google.android.datatransport.runtime.TransportRuntime;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.components.Dependency;
+import com.google.firebase.components.Qualified;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.util.Arrays;
 import java.util.List;
@@ -31,6 +33,7 @@ public class TransportRegistrar implements ComponentRegistrar {
   private static final String LIBRARY_NAME = "fire-transport";
 
   @Override
+  @NonNull
   public List<Component<?>> getComponents() {
     return Arrays.asList(
         Component.builder(TransportFactory.class)
@@ -42,6 +45,22 @@ public List<Component<?>> getComponents() {
                   return TransportRuntime.getInstance().newFactory(CCTDestination.LEGACY_INSTANCE);
                 })
             .build(),
+        Component.builder(Qualified.qualified(LegacyTransportBackend.class, TransportFactory.class))
+            .add(Dependency.required(Context.class))
+            .factory(
+                c -> {
+                  TransportRuntime.initialize(c.get(Context.class));
+                  return TransportRuntime.getInstance().newFactory(CCTDestination.LEGACY_INSTANCE);
+                })
+            .build(),
+        Component.builder(Qualified.qualified(TransportBackend.class, TransportFactory.class))
+            .add(Dependency.required(Context.class))
+            .factory(
+                c -> {
+                  TransportRuntime.initialize(c.get(Context.class));
+                  return TransportRuntime.getInstance().newFactory(CCTDestination.INSTANCE);
+                })
+            .build(),
         LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
   }
 }

firebase-firestore/README.md

@@ -99,15 +99,10 @@ from within Android Studio.
 
 ## Build Local Jar of Firestore SDK
 
-Run:
 ```bash
-./gradlew publishAllToLocal
+./gradlew -PprojectsToPublish="firebase-firestore" publishReleasingLibrariesToMavenLocal
 ```
 
-This will publish firebase SDK at SNAPSHOT versions. All pom level dependencies
-within the published artifacts will also point to SNAPSHOT versions that are
-co-published. The results will be built into your local maven repo.
-
 Developers may then take a dependency on these locally published versions by adding
 the `mavenLocal()` repository to your [repositories
 block](https://docs.gradle.org/current/userguide/declaring_repositories.html) in

firebase-inappmessaging-display/CHANGELOG.md

@@ -1,4 +1,5 @@
 # Unreleased
+* [changed] Firelog to clearcut migration.
 
 # 20.3.3
 * [unchanged] Updated internal Dagger dependency.

firebase-inappmessaging/CHANGELOG.md

@@ -1,4 +1,5 @@
 # Unreleased
+* [changed] Firelog to clearcut migration.
 
 # 20.3.3
 * [unchanged] Updated internal Dagger dependency.

firebase-inappmessaging/firebase-inappmessaging.gradle

@@ -106,7 +106,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-components:17.1.0'
     implementation project(':protolite-well-known-types')
     implementation 'com.google.android.datatransport:transport-api:3.0.0'
-    implementation 'com.google.firebase:firebase-datatransport:18.1.7'
+    implementation project(':firebase-datatransport')
     implementation 'com.google.firebase:firebase-installations-interop:17.1.0'
     runtimeOnly project(':firebase-installations')
     implementation 'javax.inject:javax.inject:1'

firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/FirebaseInAppMessagingRegistrar.java

@@ -30,6 +30,7 @@
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.components.Dependency;
 import com.google.firebase.components.Qualified;
+import com.google.firebase.datatransport.LegacyTransportBackend;
 import com.google.firebase.events.Subscriber;
 import com.google.firebase.inappmessaging.internal.AbtIntegrationHelper;
 import com.google.firebase.inappmessaging.internal.ProgramaticContextualTriggers;
@@ -66,6 +67,9 @@ public class FirebaseInAppMessagingRegistrar implements ComponentRegistrar {
   private Qualified<Executor> lightWeightExecutor =
       Qualified.qualified(Lightweight.class, Executor.class);
 
+  private Qualified<TransportFactory> legacyTransportFactory =
+      Qualified.qualified(LegacyTransportBackend.class, TransportFactory.class);
+
   @Override
   @Keep
   public List<Component<?>> getComponents() {
@@ -77,7 +81,7 @@ public List<Component<?>> getComponents() {
             .add(Dependency.required(FirebaseApp.class))
             .add(Dependency.required(AbtComponent.class))
             .add(Dependency.deferred(AnalyticsConnector.class))
-            .add(Dependency.required(TransportFactory.class))
+            .add(Dependency.required(legacyTransportFactory))
             .add(Dependency.required(Subscriber.class))
             .add(Dependency.required(backgroundExecutor))
             .add(Dependency.required(blockingExecutor))
@@ -125,7 +129,7 @@ private FirebaseInAppMessaging providesFirebaseInAppMessaging(ComponentContainer
                 new ApiClientModule(firebaseApp, firebaseInstallations, universalComponent.clock()))
             .grpcClientModule(new GrpcClientModule(firebaseApp))
             .universalComponent(universalComponent)
-            .transportFactory(container.get(TransportFactory.class))
+            .transportFactory(container.get(legacyTransportFactory))
             .build();
 
     return instance.providesFirebaseInAppMessaging();