Merge branch 'main' into dependabot/npm_and_yarn/smoke-tests/src/androidTest/backend/functions/functions/multi-9f37c16f8f

Author: rlazo

.github/workflows/api-information.yml

@@ -18,7 +18,7 @@ jobs:
           distribution: temurin
           cache: gradle
       - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
         with:
           python-version: '3.10'
       - name: Set up fireci

.github/workflows/copyright-check.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/[email protected]
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
         with:
           python-version: '3.9'
       - run: |

.github/workflows/fireci.yml

@@ -16,12 +16,12 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/[email protected]
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
         with:
           python-version: '3.8'
       - run: |
           pip install -e "ci/fireci[test]"
       - run: |
           pytest ci/fireci
       - run: |
-          mypy --config-file ci/fireci/setup.cfg ci/fireci/ 
+          mypy --config-file ci/fireci/setup.cfg ci/fireci/

.github/workflows/fireperf-e2e.yml

@@ -34,7 +34,7 @@ jobs:
           distribution: temurin
           cache: gradle
       - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
         with:
           python-version: '3.10'
       - name: Set up fireci

.github/workflows/health-metrics.yml

@@ -35,7 +35,7 @@ jobs:
           distribution: temurin
           cache: gradle
       - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
         with:
           python-version: '3.10'
       - uses: google-github-actions/auth@v2
@@ -70,7 +70,7 @@ jobs:
           distribution: temurin
           cache: gradle
       - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
         with:
           python-version: '3.10'
       - uses: google-github-actions/auth@v2
@@ -106,7 +106,7 @@ jobs:
           distribution: temurin
           cache: gradle
       - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
         with:
           python-version: '3.10'
       - uses: google-github-actions/auth@v2

.github/workflows/make-bom.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
         with:
           python-version: '3.10'
       - uses: actions/[email protected]

.github/workflows/release-note-changes.yml

@@ -33,7 +33,7 @@ jobs:
         cache: gradle
 
     - name: Set up Python 3.10
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
       if: ${{ steps.changed-files.outputs.any_changed == 'true' }}
       with:
         python-version: '3.10'

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

@@ -51,7 +51,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
         with:
           python-version: 3.7
 

build.gradle

@@ -94,6 +94,10 @@ configure(subprojects) {
             target 'src/**/*.kt'
             ktfmt('0.41').googleStyle()
         }
+        kotlinGradle {
+            target('*.gradle.kts') // default target for kotlinGradle
+            ktfmt('0.41').googleStyle()
+        }
     }
 }
 

firebase-annotations/firebase-annotations.gradle.kts

@@ -12,26 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-plugins {
-  id("firebase-java-library")
-}
+plugins { id("firebase-java-library") }
 
 firebaseLibrary {
   publishSources = true
   publishJavadoc = false
-  releaseNotes { 
-    enabled.set(false)
-}
+  releaseNotes { enabled.set(false) }
 }
 
 java {
   sourceCompatibility = JavaVersion.VERSION_1_8
   targetCompatibility = JavaVersion.VERSION_1_8
 }
-tasks.withType<JavaCompile> {
-  options.compilerArgs.add("-Werror")
-}
 
-dependencies {
-  implementation(libs.javax.inject)
-}
+tasks.withType<JavaCompile> { options.compilerArgs.add("-Werror") }
+
+dependencies { implementation(libs.javax.inject) }

firebase-common/data-collection-tests/data-collection-tests.gradle.kts

@@ -12,14 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-plugins {
-    id("com.android.application")
-}
+plugins { id("com.android.application") }
 
 android {
-  val compileSdkVersion : Int by rootProject
-  val targetSdkVersion : Int by rootProject
-  val minSdkVersion : Int by rootProject
+  val compileSdkVersion: Int by rootProject
+  val targetSdkVersion: Int by rootProject
+  val minSdkVersion: Int by rootProject
   compileSdk = compileSdkVersion
   namespace = "com.google.firebase.datacollectiontests"
   defaultConfig {
@@ -36,15 +34,15 @@ android {
 }
 
 dependencies {
-    implementation("com.google.firebase:firebase-common:21.0.0")
-    implementation("com.google.firebase:firebase-components:18.0.0")
+  implementation("com.google.firebase:firebase-common:21.0.0")
+  implementation("com.google.firebase:firebase-components:18.0.0")
 
-    testImplementation(libs.androidx.core)
-    testImplementation(libs.androidx.test.junit)
-    testImplementation(libs.androidx.test.runner)
-    testImplementation(libs.autovalue.annotations)
-    testImplementation(libs.junit)
-    testImplementation(libs.mockito.core)
-    testImplementation(libs.robolectric)
-    testImplementation(libs.truth)
+  testImplementation(libs.androidx.core)
+  testImplementation(libs.androidx.test.junit)
+  testImplementation(libs.androidx.test.runner)
+  testImplementation(libs.autovalue.annotations)
+  testImplementation(libs.junit)
+  testImplementation(libs.mockito.core)
+  testImplementation(libs.robolectric)
+  testImplementation(libs.truth)
 }

firebase-common/firebase-common.gradle.kts

@@ -13,23 +13,21 @@
 // limitations under the License.
 
 plugins {
-    id("firebase-library")
-    id("kotlin-android")
+  id("firebase-library")
+  id("kotlin-android")
 }
 
 firebaseLibrary {
-    libraryGroup("common")
-    testLab.enabled = true
-    publishSources = true
-    releaseNotes {
-        enabled = false
-    }
+  libraryGroup("common")
+  testLab.enabled = true
+  publishSources = true
+  releaseNotes { enabled = false }
 }
 
 android {
-  val compileSdkVersion : Int by rootProject
-  val targetSdkVersion : Int by rootProject
-  val minSdkVersion : Int by rootProject
+  val compileSdkVersion: Int by rootProject
+  val targetSdkVersion: Int by rootProject
+  val minSdkVersion: Int by rootProject
 
   compileSdk = compileSdkVersion
   namespace = "com.google.firebase"
@@ -41,62 +39,56 @@ android {
     consumerProguardFiles("proguard.txt")
   }
   sourceSets {
-    getByName("androidTest") {
-      java.srcDirs("src/testUtil")
-    }
-    getByName("test") {
-      java.srcDirs("src/testUtil")
-    }
+    getByName("androidTest") { java.srcDirs("src/testUtil") }
+    getByName("test") { java.srcDirs("src/testUtil") }
   }
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
   }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
+  kotlinOptions { jvmTarget = "1.8" }
   testOptions.unitTests.isIncludeAndroidResources = true
 }
 
 dependencies {
-    api(libs.kotlin.coroutines.tasks)
+  api(libs.kotlin.coroutines.tasks)
 
-    api("com.google.firebase:firebase-components:18.0.0")
-    api("com.google.firebase:firebase-annotations:16.2.0")
-    implementation(libs.androidx.annotation)
-    implementation(libs.androidx.futures)
-    implementation(libs.kotlin.stdlib)
-    implementation(libs.playservices.basement)
-    implementation(libs.playservices.tasks)
+  api("com.google.firebase:firebase-components:18.0.0")
+  api("com.google.firebase:firebase-annotations:16.2.0")
+  implementation(libs.androidx.annotation)
+  implementation(libs.androidx.futures)
+  implementation(libs.kotlin.stdlib)
+  implementation(libs.playservices.basement)
+  implementation(libs.playservices.tasks)
 
-    compileOnly(libs.autovalue.annotations)
-    compileOnly(libs.findbugs.jsr305)
-    compileOnly(libs.kotlin.stdlib)
+  compileOnly(libs.autovalue.annotations)
+  compileOnly(libs.findbugs.jsr305)
+  compileOnly(libs.kotlin.stdlib)
 
-    annotationProcessor(libs.autovalue)
+  annotationProcessor(libs.autovalue)
 
-    testImplementation("com.google.guava:guava-testlib:12.0-rc2")
-    testImplementation(libs.androidx.test.core)
-    testImplementation(libs.androidx.test.junit)
-    testImplementation(libs.androidx.test.runner)
-    testImplementation(libs.junit)
-    testImplementation(libs.kotlin.coroutines.test)
-    testImplementation(libs.mockito.core)
-    testImplementation(libs.org.json)
-    testImplementation(libs.robolectric)
-    testImplementation(libs.truth)
+  testImplementation("com.google.guava:guava-testlib:12.0-rc2")
+  testImplementation(libs.androidx.test.core)
+  testImplementation(libs.androidx.test.junit)
+  testImplementation(libs.androidx.test.runner)
+  testImplementation(libs.junit)
+  testImplementation(libs.kotlin.coroutines.test)
+  testImplementation(libs.mockito.core)
+  testImplementation(libs.org.json)
+  testImplementation(libs.robolectric)
+  testImplementation(libs.truth)
 
-    androidTestImplementation(project(":integ-testing")) {
-        exclude("com.google.firebase","firebase-common")
-        exclude("com.google.firebase","firebase-common-ktx")
-    }
+  androidTestImplementation(project(":integ-testing")) {
+    exclude("com.google.firebase", "firebase-common")
+    exclude("com.google.firebase", "firebase-common-ktx")
+  }
 
-    // TODO(Remove when FirbaseAppTest has been modernized to use LiveData)
-    androidTestImplementation("androidx.localbroadcastmanager:localbroadcastmanager:1.1.0")
-    androidTestImplementation(libs.androidx.test.junit)
-    androidTestImplementation(libs.androidx.test.runner)
-    androidTestImplementation(libs.junit)
-    androidTestImplementation(libs.mockito.core)
-    androidTestImplementation(libs.mockito.dexmaker)
-    androidTestImplementation(libs.truth)
+  // TODO(Remove when FirbaseAppTest has been modernized to use LiveData)
+  androidTestImplementation("androidx.localbroadcastmanager:localbroadcastmanager:1.1.0")
+  androidTestImplementation(libs.androidx.test.junit)
+  androidTestImplementation(libs.androidx.test.runner)
+  androidTestImplementation(libs.junit)
+  androidTestImplementation(libs.mockito.core)
+  androidTestImplementation(libs.mockito.dexmaker)
+  androidTestImplementation(libs.truth)
 }

firebase-common/ktx/ktx.gradle.kts

@@ -13,49 +13,41 @@
 // limitations under the License.
 
 plugins {
-    id("firebase-library")
-    id("kotlin-android")
+  id("firebase-library")
+  id("kotlin-android")
 }
 
 firebaseLibrary {
-    libraryGroup("common")
-    publishJavadoc = false
-    releaseNotes { 
-        enabled.set(false)
-    }
+  libraryGroup("common")
+  publishJavadoc = false
+  releaseNotes { enabled.set(false) }
 }
 
 android {
-    val compileSdkVersion : Int by rootProject
-    val targetSdkVersion : Int by rootProject
-    val minSdkVersion : Int by rootProject
-    compileSdk = compileSdkVersion
-    namespace = "com.google.firebase.ktx"
-    defaultConfig {
-        minSdk = minSdkVersion
-        targetSdk = targetSdkVersion
-    }
-    sourceSets {
-        getByName("main") {
-            java.srcDirs("src/main/kotlin")
-        }
-        getByName("test") {
-            java.srcDirs("src/test/kotlin")
-        }
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    testOptions.unitTests.isIncludeAndroidResources = true
+  val compileSdkVersion: Int by rootProject
+  val targetSdkVersion: Int by rootProject
+  val minSdkVersion: Int by rootProject
+  compileSdk = compileSdkVersion
+  namespace = "com.google.firebase.ktx"
+  defaultConfig {
+    minSdk = minSdkVersion
+    targetSdk = targetSdkVersion
+  }
+  sourceSets {
+    getByName("main") { java.srcDirs("src/main/kotlin") }
+    getByName("test") { java.srcDirs("src/test/kotlin") }
+  }
+  kotlinOptions { jvmTarget = "1.8" }
+  testOptions.unitTests.isIncludeAndroidResources = true
 }
 
 dependencies {
-    api(project(":firebase-common"))
-    implementation("com.google.firebase:firebase-components:18.0.0")
-    implementation("com.google.firebase:firebase-annotations:16.2.0")
-    testImplementation(libs.androidx.test.core)
-    testImplementation(libs.junit)
-    testImplementation(libs.kotlin.coroutines.test)
-    testImplementation(libs.robolectric)
-    testImplementation(libs.truth)
+  api(project(":firebase-common"))
+  implementation("com.google.firebase:firebase-components:18.0.0")
+  implementation("com.google.firebase:firebase-annotations:16.2.0")
+  testImplementation(libs.androidx.test.core)
+  testImplementation(libs.junit)
+  testImplementation(libs.kotlin.coroutines.test)
+  testImplementation(libs.robolectric)
+  testImplementation(libs.truth)
 }