Merge branch 'main' into tomandersen/refactorTransaction

firebase · Sep 11, 2024 · 5f0586c · 5f0586c
2 parents 71c4d53 + 8ad9ef5
commit 5f0586c
Show file tree

Hide file tree

Showing 167 changed files with 6,578 additions and 3,866 deletions.
diff --git a/.github/workflows/build-release-artifacts.yml b/.github/workflows/build-release-artifacts.yml
@@ -25,9 +25,23 @@ jobs:
         run: |
           ./gradlew firebasePublish
 
-      - name: Upload generated artifacts
+      - name: Upload m2 repo
         uses: actions/[email protected]
         with:
-          name: release_artifacts
-          path: build/*.zip
+          name: m2repository
+          path: build/m2repository/
+          retention-days: 15
+
+      - name: Upload release notes
+        uses: actions/[email protected]
+        with:
+          name: release_notes
+          path: build/release-notes/
+          retention-days: 15
+
+      - name: Upload kotlindocs
+        uses: actions/[email protected]
+        with:
+          name: kotlindocs
+          path: build/firebase-kotlindoc/
           retention-days: 15
diff --git a/.github/workflows/post_release_cleanup.yml b/.github/workflows/post_release_cleanup.yml
@@ -29,7 +29,7 @@ jobs:
         uses: peter-evans/create-pull-request@v4
         with:
           token: ${{ secrets.GOOGLE_OSS_BOT_TOKEN }}
-          committer: google-oss-bot <google[email protected]>
+          committer: google-oss-bot <firebase[email protected]>
           assignees: ${{ github.actor }}
           base: 'main'
           branch: 'releases/${{ inputs.name }}.mergeback'

diff --git a/build.gradle b/build.gradle
@@ -41,6 +41,7 @@ buildscript {
         classpath 'com.google.firebase:firebase-appdistribution-gradle:5.0.0'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
         classpath "com.diffplug.spotless:spotless-plugin-gradle:7.0.0.BETA1"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:1.8.22"
     }
 }
 
@@ -90,6 +91,7 @@ configure(subprojects) {
     spotless {
         java {
             target 'src/**/*.java'
+            targetExclude '**/test/resources/**'
             googleJavaFormat('1.22.0').reorderImports(false).skipJavadocFormatting()
         }
         kotlin {

diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/RecipeVersionWriter.java b/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/RecipeVersionWriter.java
@@ -68,7 +68,7 @@ public String generateVersionUpdate() {
     outputBuilder.append(
         generateVersionVariable(
             depsByArtifactId,
-            "Vertex AI for Firebase",
+            "Vertex AI in Firebase",
             "vertex-dependency",
             "com.google.firebase:firebase-vertexai"));
     outputBuilder.append(

diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/DeltaType.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/DeltaType.kt
@@ -594,6 +594,10 @@ enum class DeltaType {
   },
   CHANGED_FROM_STATIC {
     override fun getViolations(before: ClassInfo?, after: ClassInfo?): List<Delta> {
+      // Safe to ignore: if `after` is null, then it has been removed and another check will
+      // report this.
+      if (after == null) return emptyList()
+
       val allBeforeMethods = getAllMethods(before)
       val allAfterMethods = getAllMethods(after)
       val afterStaticMethods =

diff --git a/encoders/firebase-encoders-processor/src/test/resources/ExpectedAtEmptyAnnotation.java b/encoders/firebase-encoders-processor/src/test/resources/ExpectedAtEmptyAnnotation.java
@@ -14,6 +14,10 @@
 
 package com.example;
 
+import java.lang.Class;
+import java.lang.Object;
+import java.lang.Override;
+import java.lang.String;
 import java.lang.annotation.Annotation;
 
 public final class AtEmptyAnnotation {

diff --git a/encoders/firebase-encoders-processor/src/test/resources/ExpectedAtMyAnnotation.java b/encoders/firebase-encoders-processor/src/test/resources/ExpectedAtMyAnnotation.java
@@ -14,6 +14,10 @@
 
 package com.example;
 
+import java.lang.Class;
+import java.lang.Object;
+import java.lang.Override;
+import java.lang.String;
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
 

diff --git a/encoders/firebase-encoders-processor/src/test/resources/ExpectedGenericsEncoder.java b/encoders/firebase-encoders-processor/src/test/resources/ExpectedGenericsEncoder.java
@@ -18,6 +18,8 @@
 import com.google.firebase.encoders.config.Configurator;
 import com.google.firebase.encoders.config.EncoderConfig;
 import java.io.IOException;
+import java.lang.Override;
+import java.lang.SuppressWarnings;
 
 /**
  * @hide */

diff --git a/...irebase-encoders-processor/src/test/resources/ExpectedGenericsEncoderWithUnknownType.java b/...irebase-encoders-processor/src/test/resources/ExpectedGenericsEncoderWithUnknownType.java
@@ -18,6 +18,8 @@
 import com.google.firebase.encoders.config.Configurator;
 import com.google.firebase.encoders.config.EncoderConfig;
 import java.io.IOException;
+import java.lang.Override;
+import java.lang.SuppressWarnings;
 
 /**
  * @hide */

diff --git a/...rebase-encoders-processor/src/test/resources/ExpectedMyClassEncoderWithExtraProperty.java b/...rebase-encoders-processor/src/test/resources/ExpectedMyClassEncoderWithExtraProperty.java
@@ -19,6 +19,8 @@
 import com.google.firebase.encoders.config.Configurator;
 import com.google.firebase.encoders.config.EncoderConfig;
 import java.io.IOException;
+import java.lang.Override;
+import java.lang.SuppressWarnings;
 
 /**
  * @hide */

diff --git a/encoders/firebase-encoders-processor/src/test/resources/ExpectedRecursiveGenericEncoder.java b/encoders/firebase-encoders-processor/src/test/resources/ExpectedRecursiveGenericEncoder.java
@@ -20,6 +20,8 @@
 import com.google.firebase.encoders.config.Configurator;
 import com.google.firebase.encoders.config.EncoderConfig;
 import java.io.IOException;
+import java.lang.Override;
+import java.lang.SuppressWarnings;
 
 /**
  * @hide */

diff --git a/encoders/firebase-encoders-processor/src/test/resources/ExpectedSimpleClassEncoder.java b/encoders/firebase-encoders-processor/src/test/resources/ExpectedSimpleClassEncoder.java
@@ -18,6 +18,8 @@
 import com.google.firebase.encoders.config.Configurator;
 import com.google.firebase.encoders.config.EncoderConfig;
 import java.io.IOException;
+import java.lang.Override;
+import java.lang.SuppressWarnings;
 
 /**
  * @hide */

diff --git a/encoders/firebase-encoders-processor/src/test/resources/ExpectedTypeWithListEncoder.java b/encoders/firebase-encoders-processor/src/test/resources/ExpectedTypeWithListEncoder.java
@@ -18,6 +18,8 @@
 import com.google.firebase.encoders.config.Configurator;
 import com.google.firebase.encoders.config.EncoderConfig;
 import java.io.IOException;
+import java.lang.Override;
+import java.lang.SuppressWarnings;
 
 /**
  * @hide */

diff --git a/firebase-appdistribution-api/CHANGELOG.md b/firebase-appdistribution-api/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
-
+* [unchanged] Updated to accommodate the release of the updated
+  [appdistro] library.
 
 # 16.0.0-beta13
 * [changed] Bump internal dependencies

diff --git a/firebase-appdistribution/CHANGELOG.md b/firebase-appdistribution/CHANGELOG.md
@@ -1,5 +1,5 @@
 # Unreleased
-
+* [changed] Internal improvements to testing on Android 14
 
 # 16.0.0-beta13
 * [changed] Bump internal dependencies

diff --git a/firebase-appdistribution/test-app/src/main/AndroidManifest.xml b/firebase-appdistribution/test-app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.googletest.firebase.appdistribution.testapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
   <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
   <application

diff --git a/...main/kotlin/com/googletest/firebase/appdistribution/testapp/CustomNotificationActivity.kt b/...main/kotlin/com/googletest/firebase/appdistribution/testapp/CustomNotificationActivity.kt
@@ -24,6 +24,7 @@ import android.util.Log
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
+import com.google.firebase.appdistribution.testapp.R
 import java.util.*
 
 class CustomNotificationActivity : AppCompatActivity() {

diff --git a/...tlin/com/googletest/firebase/appdistribution/testapp/CustomNotificationFeedbackTrigger.kt b/...tlin/com/googletest/firebase/appdistribution/testapp/CustomNotificationFeedbackTrigger.kt
@@ -34,6 +34,7 @@ import androidx.core.content.ContextCompat
 import com.google.firebase.appdistribution.ktx.appDistribution
 import com.google.firebase.ktx.Firebase
 import java.io.IOException
+import com.google.firebase.appdistribution.testapp.R
 
 /**
  * Shows an ongoing notification that the user can tap to take a screenshot and send feedback to the

diff --git a/.../test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/MainActivity.kt b/.../test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/MainActivity.kt
@@ -43,9 +43,11 @@ import com.google.firebase.appdistribution.AppDistributionRelease
 import com.google.firebase.appdistribution.InterruptionLevel
 import com.google.firebase.appdistribution.UpdateProgress
 import com.google.firebase.appdistribution.ktx.appDistribution
+import com.google.firebase.appdistribution.testapp.BuildConfig
 import com.google.firebase.ktx.Firebase
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
+import com.google.firebase.appdistribution.testapp.R
 
 class MainActivity : AppCompatActivity() {
 

diff --git a/...ain/kotlin/com/googletest/firebase/appdistribution/testapp/ScreenshotDetectionActivity.kt b/...ain/kotlin/com/googletest/firebase/appdistribution/testapp/ScreenshotDetectionActivity.kt
@@ -27,6 +27,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import com.googletest.firebase.appdistribution.testapp.ScreenshotDetectionFeedbackTrigger.Companion.screenshotReadPermission
 import java.util.*
+import com.google.firebase.appdistribution.testapp.R
 
 class ScreenshotDetectionActivity : AppCompatActivity() {
   private val handlerThread = HandlerThread("AppDistroFeedbackTrigger").also { it.start() }

diff --git a/...est-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/SecondActivity.kt b/...est-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/SecondActivity.kt
@@ -25,6 +25,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.AppCompatButton
 import com.google.firebase.appdistribution.ktx.appDistribution
 import com.google.firebase.ktx.Firebase
+import com.google.firebase.appdistribution.testapp.R
 
 class SecondActivity : AppCompatActivity() {
 

diff --git a/...n/kotlin/com/googletest/firebase/appdistribution/testapp/ShakeDetectionFeedbackTrigger.kt b/...n/kotlin/com/googletest/firebase/appdistribution/testapp/ShakeDetectionFeedbackTrigger.kt
@@ -24,6 +24,7 @@ import android.util.Log
 import com.google.firebase.appdistribution.ktx.appDistribution
 import com.google.firebase.ktx.Firebase
 import com.squareup.seismic.ShakeDetector
+import com.google.firebase.appdistribution.testapp.R
 
 /**
  * Listens to the device accelerometer, and starts App Distribution in-app feedback when the user

diff --git a/firebase-appdistribution/test-app/test-app.gradle b/firebase-appdistribution/test-app/test-app.gradle
@@ -25,14 +25,18 @@ android {
 
     defaultConfig {
         applicationId "com.googletest.firebase.appdistribution.testapp"
-        minSdkVersion 23
-        targetSdkVersion 33
-        versionName "3.2"
-        versionCode 7
+        minSdk 23
+        targetSdk 34
+        versionName "3.3"
+        versionCode 8
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    buildFeatures {
+        buildConfig = true
+    }
+
     buildTypes {
         release {
             // This is so we can build the "release" variant for the "test-app" (and the SDK) without
@@ -54,8 +58,8 @@ android {
             versionNameSuffix "-beta"
 
             firebaseAppDistribution {
-                releaseNotes "Beta variant of Android SDK test app"
-                // testers "your email here"
+                releaseNotes = "Beta variant of Android SDK test app"
+                // testers = "your email here"
             }
         }
     }

diff --git a/firebase-components/CHANGELOG.md b/firebase-components/CHANGELOG.md
@@ -1,7 +1,17 @@
 # Unreleased
+
+
+# 18.0.1
 * [fixed] updated proguard rules to keep component registrar working with newer proguard versions.
 
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-components` library. The Kotlin extensions library has no additional
+updates.
+
 # 17.1.2
 * [changed] Internal changes to ensure only one interface is provided for
   kotlinx.coroutines.CoroutineDispatcher interfaces when both firebase-common and
   firebase-common-ktx provide them.
+
diff --git a/firebase-components/gradle.properties b/firebase-components/gradle.properties
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=18.0.1
-latestReleasedVersion=18.0.0
+version=18.0.2
+latestReleasedVersion=18.0.1
diff --git a/firebase-crashlytics-ndk/CHANGELOG.md b/firebase-crashlytics-ndk/CHANGELOG.md
@@ -1,5 +1,5 @@
 # Unreleased
-
+* [changed] Updated `firebase-crashlytics` dependency to v19.0.4
 
 # 19.0.3
 * [changed] Updated `firebase-crashlytics` dependency to v19.0.3
@@ -232,4 +232,3 @@ change. The following release notes describe changes in the new SDK.
  uploading symbol files to [crashlytics] servers. See the
  [[crashlytics] Gradle plugin documentation](/docs/crashlytics/ndk-reports-new-sdk)
  for more information.
-
diff --git a/firebase-crashlytics/CHANGELOG.md b/firebase-crashlytics/CHANGELOG.md
@@ -1,7 +1,9 @@
 # Unreleased
-* [feature] Added the `isCrashlyticsCollectionEnabled` API to check if Crashlytics collection is enabled.
-  ([Github #5919](//github.com/firebase/firebase-android-sdk/issues/5919))
+* [feature] Added the `isCrashlyticsCollectionEnabled` API to check if Crashlytics collection is
+  enabled.
+  (GitHub [#5919](https://github.com/firebase/firebase-android-sdk/issues/5919){: .external})
 * [fixed] Ensure that on-demand fatal events are never processed on the main thread.
+  (GitHub [#4345](https://github.com/firebase/firebase-android-sdk/issues/4345){: .external})
 * [changed] Internal changes to the way session IDs are generated.
 
 

diff --git a/firebase-crashlytics/firebase-crashlytics.gradle b/firebase-crashlytics/firebase-crashlytics.gradle
@@ -98,7 +98,6 @@ dependencies {
     testImplementation(libs.mockito.core)
     testImplementation(libs.robolectric)
     testImplementation(libs.truth)
-    testImplementation(project(":integ-testing"))
 
     androidTestImplementation(libs.androidx.test.core)
     androidTestImplementation(libs.androidx.test.runner)