From c8595df658d5a28ec63d69cf87bd6447ad01eeff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Jan 2023 10:05:54 +0000
Subject: [PATCH 1/2] Bump firebase-messaging from 23.1.0 to 23.1.1

Bumps firebase-messaging from 23.1.0 to 23.1.1.

---
updated-dependencies:
- dependency-name: com.google.firebase:firebase-messaging
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 vector-app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector-app/build.gradle b/vector-app/build.gradle
index 4e954962fc..6cadb9feef 100644
--- a/vector-app/build.gradle
+++ b/vector-app/build.gradle
@@ -364,7 +364,7 @@ dependencies {
 
     gplayImplementation "com.google.android.gms:play-services-location:21.0.1"
     // UnifiedPush gplay flavor only
-    gplayImplementation('com.google.firebase:firebase-messaging:23.1.0') {
+    gplayImplementation('com.google.firebase:firebase-messaging:23.1.1') {
         exclude group: 'com.google.firebase', module: 'firebase-core'
         exclude group: 'com.google.firebase', module: 'firebase-analytics'
         exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'

From 12ccf13171bbb54e026e9e044f23090bcf84a72e Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date: Wed, 4 Jan 2023 15:54:23 +0100
Subject: [PATCH 2/2] Use Firebase BOM

---
 dependencies.gradle     | 3 +++
 vector-app/build.gradle | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index b81c1c2017..d8a97ba0b1 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -11,6 +11,7 @@ def gradle = "7.3.1"
 def kotlin = "1.7.22"
 def kotlinCoroutines = "1.6.4"
 def dagger = "2.44.2"
+def firebaseBom = "31.1.1"
 def appDistribution = "16.0.0-beta05"
 def retrofit = "2.9.0"
 def markwon = "4.6.2"
@@ -80,6 +81,8 @@ ext.libs = [
         ],
         google      : [
                 'material'                : "com.google.android.material:material:1.7.0",
+                'firebaseBom'             : "com.google.firebase:firebase-bom:$firebaseBom",
+                'messaging'               : "com.google.firebase:firebase-messaging",
                 'appdistributionApi'      : "com.google.firebase:firebase-appdistribution-api-ktx:$appDistribution",
                 'appdistribution'         : "com.google.firebase:firebase-appdistribution:$appDistribution",
                 // Phone number https://github.com/google/libphonenumber
diff --git a/vector-app/build.gradle b/vector-app/build.gradle
index 6cadb9feef..e157f0704a 100644
--- a/vector-app/build.gradle
+++ b/vector-app/build.gradle
@@ -364,7 +364,8 @@ dependencies {
 
     gplayImplementation "com.google.android.gms:play-services-location:21.0.1"
     // UnifiedPush gplay flavor only
-    gplayImplementation('com.google.firebase:firebase-messaging:23.1.1') {
+    gplayImplementation platform(libs.google.firebaseBom)
+    gplayImplementation(libs.google.messaging) {
         exclude group: 'com.google.firebase', module: 'firebase-core'
         exclude group: 'com.google.firebase', module: 'firebase-analytics'
         exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'