Merge branch 'refs/heads/remoteConfigCustomTargeting' into tushar-khandelwal/rc-custom-targeting

# Conflicts:
#	firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfigComponent.java
#	firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigSharedPrefsClient.java
#	firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigSharedPrefsClientTest.java

Author: tusharkhandelwal8

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

@@ -1,4 +1,4 @@
-name: build-src-check
+name: Check buildSrc
 
 on:
   pull_request:

.github/workflows/changelog.yml

@@ -1,4 +1,4 @@
-name: Changelog
+name: Verify changelog update
 
 on:
   pull_request

.github/workflows/fireci.yml

@@ -1,4 +1,4 @@
-name: fireci
+name: Run fireci tests
 
 on:
   pull_request:

.github/workflows/private-mirror-sync.yml

@@ -19,6 +19,7 @@ jobs:
           fetch-depth: 0
           submodules: true
           token: ${{ secrets.GOOGLE_OSS_BOT_TOKEN }}
+          committer: google-oss-bot <[email protected]>
       - name: Force push HEAD to private repo main branch
         run: |
           git remote add mirror https://github.com/FirebasePrivate/firebase-android-sdk.git

.github/workflows/update-cpp-sdk-on-release.yml

@@ -2,7 +2,7 @@
 # *another* workflow on the Firebase C++ SDK, which will check for the Android
 # version update and create a PR updating its dependencies if any version
 # numbers changed.
-name: update-cpp-sdk-on-release
+name: Update C++ SDKs on release
 on:
   push:
     branches:

buildSrc/build.gradle.kts

@@ -52,19 +52,11 @@ dependencies {
     annotationProcessor("com.google.auto.value:auto-value:1.6.5")
     implementation(kotlin("gradle-plugin", "1.8.22"))
     implementation(libs.org.json)
+    implementation(libs.bundles.maven.resolver)
 
-    implementation("org.eclipse.aether:aether-api:1.0.0.v20140518")
-    implementation("org.eclipse.aether:aether-util:1.0.0.v20140518")
+    implementation("com.google.guava:guava:31.1-jre")
     implementation("org.ow2.asm:asm-tree:9.5")
-    implementation("org.eclipse.aether:aether-impl:1.0.0.v20140518")
-    implementation("org.eclipse.aether:aether-connector-basic:1.0.0.v20140518")
-    implementation("org.eclipse.aether:aether-transport-file:1.0.0.v20140518")
-    implementation("org.eclipse.aether:aether-transport-http:1.0.0.v20140518")
-    implementation("org.eclipse.aether:aether-transport-wagon:1.0.0.v20140518")
-    implementation("org.apache.maven:maven-aether-provider:3.3.9")
-
     implementation("org.eclipse.jgit:org.eclipse.jgit:6.3.0.202209071007-r")
-
     implementation(libs.kotlinx.serialization.json)
     implementation("com.google.code.gson:gson:2.8.9")
     implementation(libs.android.gradlePlugin.gradle)

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

@@ -16,7 +16,6 @@
 
 import static java.util.stream.Collectors.toList;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
 import com.google.firebase.gradle.bomgenerator.model.Dependency;
@@ -51,7 +50,7 @@
 
 public abstract class BomGeneratorTask extends DefaultTask {
   private static final List<String> BOM_ARTIFACTS =
-      ImmutableList.of(
+      List.of(
           "com.google.firebase:firebase-analytics",
           "com.google.firebase:firebase-analytics-ktx",
           "com.google.firebase:firebase-appcheck-debug",
@@ -94,7 +93,7 @@ public abstract class BomGeneratorTask extends DefaultTask {
           "com.google.firebase:firebase-storage-ktx",
           "com.google.firebase:firebase-vertexai");
   private static final List<String> IGNORED_ARTIFACTS =
-      ImmutableList.of(
+      List.of(
           "crash-plugin",
           "firebase-ml-vision",
           "crashlytics",
@@ -175,7 +174,7 @@ public abstract class BomGeneratorTask extends DefaultTask {
           "firebase-ml-natural-language-translate",
           "firebase-ml-natural-language-translate-model");
   private static final List<String> IMPORTANT_NON_FIREBASE_LIBRARIES =
-      ImmutableList.of(
+      List.of(
           "com.google.android.gms:play-services-ads",
           "com.google.gms:google-services",
           "com.android.tools.build:gradle",

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

@@ -23,6 +23,7 @@ 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.file.ConfigurableFileCollection
 import org.gradle.api.provider.Provider
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPom
@@ -124,7 +125,10 @@ abstract class BaseFirebaseLibraryPlugin : Plugin<Project> {
     Coverage.apply(library)
   }
 
-  protected fun getApiInfo(project: Project, srcDirs: Set<File>): TaskProvider<ApiInformationTask> {
+  protected fun getApiInfo(
+    project: Project,
+    srcDirs: ConfigurableFileCollection,
+  ): TaskProvider<ApiInformationTask> {
     val outputFile =
       project.rootProject.file(
         Paths.get(
@@ -138,7 +142,7 @@ abstract class BaseFirebaseLibraryPlugin : Plugin<Project> {
       project.file("api.txt").takeIf { it.exists() } ?: project.rootProject.file("empty-api.txt")
     val apiInfo =
       project.tasks.register<ApiInformationTask>("apiInformation") {
-        sources.value(project.provider { srcDirs })
+        sources.from(project.provider { srcDirs })
         apiTxtFile.set(apiTxt)
         baselineFile.set(project.file("baseline.txt"))
         this.outputFile.set(outputFile)
@@ -157,17 +161,17 @@ abstract class BaseFirebaseLibraryPlugin : Plugin<Project> {
     }
   }
 
-  protected fun getGenerateApiTxt(project: Project, srcDirs: Set<File>) =
+  protected fun getGenerateApiTxt(project: Project, srcDirs: ConfigurableFileCollection) =
     project.tasks.register<GenerateApiTxtTask>("generateApiTxtFile") {
-      sources.value(project.provider { srcDirs })
+      sources.from(project.provider { srcDirs })
       apiTxtFile.set(project.file("api.txt"))
       baselineFile.set(project.file("baseline.txt"))
       updateBaseline.set(project.hasProperty("updateBaseline"))
     }
 
-  protected fun getDocStubs(project: Project, srcDirs: Set<File>) =
+  protected fun getDocStubs(project: Project, srcDirs: ConfigurableFileCollection) =
     project.tasks.register<GenerateStubsTask>("docStubs") {
-      sources.value(project.provider { srcDirs })
+      sources.from(project.provider { srcDirs })
     }
 
   /**

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

@@ -20,6 +20,7 @@ import java.io.File
 import javax.inject.Inject
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.FileCollection
+import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.CacheableTask
@@ -53,7 +54,7 @@ import org.json.JSONObject
 @CacheableTask
 abstract class GenerateDocumentationTaskExtension : DefaultTask() {
   @get:[InputFile Classpath]
-  abstract val dackkaJarFile: Property<File>
+  abstract val dackkaJarFile: RegularFileProperty
 
   @get:[InputFiles Classpath]
   abstract val dependencies: Property<FileCollection>
@@ -72,7 +73,7 @@ abstract class GenerateDocumentationTaskExtension : DefaultTask() {
 
   @get:Input abstract val clientName: Property<String>
 
-  @get:OutputDirectory abstract val outputDirectory: Property<File>
+  @get:OutputDirectory abstract val outputDirectory: RegularFileProperty
 }
 
 /**
@@ -123,7 +124,7 @@ constructor(private val workerExecutor: WorkerExecutor) : GenerateDocumentationT
     val jsonMap =
       mapOf(
         "moduleName" to "",
-        "outputDir" to outputDirectory.get().absolutePath,
+        "outputDir" to outputDirectory.get().asFile.absolutePath,
         "globalLinks" to "",
         "sourceSets" to
           listOf(
@@ -215,7 +216,7 @@ constructor(private val workerExecutor: WorkerExecutor) : GenerateDocumentationT
  */
 interface DackkaParams : WorkParameters {
   val args: ListProperty<String>
-  val dackkaFile: Property<File>
+  val dackkaFile: RegularFileProperty
 }
 
 /**

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

@@ -18,9 +18,9 @@ package com.google.firebase.gradle.plugins
 
 import com.android.build.api.attributes.BuildTypeAttr
 import com.android.build.gradle.LibraryExtension
-import java.io.File
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.file.RegularFile
 import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.Copy
 import org.gradle.api.tasks.Delete
@@ -204,26 +204,26 @@ abstract class DackkaPlugin : Plugin<Project> {
   private fun GenerateDocumentationTask.applyCommonConfigurations() {
     dependsOnAndMustRunAfter("createFullJarRelease")
 
-    val dackkaFile = project.provider { project.dackkaConfig.singleFile }
+    val dackkaFile = project.layout.projectDirectory.file(project.dackkaConfig.singleFile.path)
 
-    dackkaJarFile.set(dackkaFile)
+    dackkaJarFile.convention(dackkaFile)
     clientName.set(project.firebaseLibrary.artifactId)
   }
 
   private fun registerFiresiteTransformTask(
     project: Project,
-    dackkaOutputDirectory: Provider<File>,
+    dackkaOutputDirectory: Provider<RegularFile>,
   ) =
     project.tasks.register<FiresiteTransformTask>("firesiteTransform") {
       val outputDir by tempFile("dackkaTransformedFiles")
 
-      dackkaFiles.set(dackkaOutputDirectory.childFile("docs/reference"))
+      dackkaFiles.set(dackkaOutputDirectory)
       outputDirectory.set(outputDir)
     }
 
   private fun registerCopyDocsToCommonDirectoryTask(
     project: Project,
-    transformedFilesDirectory: Provider<File>,
+    transformedFilesDirectory: Provider<RegularFile>,
   ) =
     project.tasks.register<Copy>("copyDocsToCommonDirectory") {
       from(transformedFilesDirectory)