Merge branch 'main' into ios-user-notifications-delegate-fix

Author: jonsimantov

.github/workflows/cpp-packaging.yml

@@ -314,12 +314,10 @@ jobs:
         include:
         - os: windows-latest
           vcpkg_triplet_suffix: "windows-static"
-          additional_build_flags: "--build_tests"
           sdk_platform: "windows"
         - os: windows-latest
           msvc_runtime: "dynamic"
           vcpkg_triplet_suffix: "windows-static-md"
-          additional_build_flags: "--build_tests"
           sdk_platform: "windows"
         - os: ubuntu-20.04
           vcpkg_triplet_suffix: "linux"
@@ -543,6 +541,7 @@ jobs:
           fi
           declare -a additional_flags
           tar -xvzf artifacts/packaging-tools-${tools_platform}/packaging-tools.tgz -C bin
+          rm -rf artifacts/packaging-tools-*.tgz
           chmod -R u+x bin
           # To save space, delete any artifacts that we don't need for packaging.
           for pkg in artifacts/firebase-cpp-sdk-*; do
@@ -567,7 +566,7 @@ jobs:
               # Windows x86: force input and output target format
               additional_flags+=(-f pe-i386,pe-bigobj-i386)
             fi
-            sdk-src/build_scripts/desktop/package.sh -b ${pkg} -o firebase-cpp-sdk-${{ matrix.sdk_platform }}${{ matrix.suffix }}-package -p ${{ matrix.sdk_platform }} -t bin -d ${variant} -P python3 -j ${additional_flags[*]}
+            sdk-src/build_scripts/desktop/package.sh -D -b ${pkg} -o firebase-cpp-sdk-${{ matrix.sdk_platform }}${{ matrix.suffix }}-package -p ${{ matrix.sdk_platform }} -t bin -d ${variant} -P python3 -j ${additional_flags[*]}
           done
           if [[ "${{ matrix.sdk_platform }}" == "darwin" ]]; then
             # Darwin has a final step after all the variants are done,

Android/firebase_dependencies.gradle

@@ -20,7 +20,7 @@ def firebaseDependenciesMap = [
   'app_check' : ['com.google.firebase:firebase-appcheck',
                  'com.google.firebase:firebase-appcheck-debug',
                  'com.google.firebase:firebase-appcheck-playintegrity'],
-  'play_services' : ['com.google.android.gms:play-services-base:18.4.0'],
+  'play_services' : ['com.google.android.gms:play-services-base:18.5.0'],
   'analytics' : ['com.google.firebase:firebase-analytics'],
   'auth' : ['com.google.firebase:firebase-auth'],
   'database' : ['com.google.firebase:firebase-database'],
@@ -159,7 +159,7 @@ project.afterEvaluate {
 
     // Add the bill-of-materials
     project.dependencies {
-      implementation platform('com.google.firebase:firebase-bom:33.0.0')
+      implementation platform('com.google.firebase:firebase-bom:33.1.1')
     }
     for (String lib : firebaseCpp.dependencies.libSet) {
       // Generate and include the proguard file

analytics/integration_test/Podfile

@@ -5,12 +5,12 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '13.0'
-  pod 'Firebase/Analytics', '10.25.0'
+  pod 'Firebase/Analytics', '10.28.1'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Analytics', '10.25.0'
+  pod 'Firebase/Analytics', '10.28.1'
 end
 
 post_install do |installer|

analytics/ios_headers/FIREventNames.h

@@ -1,6 +1,6 @@
 // Copyright 2024 Google LLC
 
-// Copied from Firebase Analytics iOS SDK 10.25.0.
+// Copied from Firebase Analytics iOS SDK 10.28.1.
 
 /// @file FIREventNames.h
 ///

analytics/ios_headers/FIRParameterNames.h

@@ -1,6 +1,6 @@
 // Copyright 2024 Google LLC
 
-// Copied from Firebase Analytics iOS SDK 10.25.0.
+// Copied from Firebase Analytics iOS SDK 10.28.1.
 
 /// @file FIRParameterNames.h
 ///

analytics/ios_headers/FIRUserPropertyNames.h

@@ -1,6 +1,6 @@
 // Copyright 2024 Google LLC
 
-// Copied from Firebase Analytics iOS SDK 10.25.0.
+// Copied from Firebase Analytics iOS SDK 10.28.1.
 
 /// @file FIRUserPropertyNames.h
 ///

app/app_resources/build.gradle

@@ -50,7 +50,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:33.0.0')
+  implementation platform('com.google.firebase:firebase-bom:33.1.1')
   implementation 'com.google.firebase:firebase-analytics'
 }
 

app/google_api_resources/build.gradle

@@ -53,9 +53,9 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:33.0.0')
+  implementation platform('com.google.firebase:firebase-bom:33.1.1')
   implementation 'com.google.firebase:firebase-analytics'
-  implementation 'com.google.android.gms:play-services-base:18.4.0'
+  implementation 'com.google.android.gms:play-services-base:18.5.0'
   implementation project(':app:app_resources')
 }
 

app/integration_test/Podfile

@@ -4,7 +4,7 @@ platform :ios, '13.0'
 use_frameworks! :linkage => :static
 
 target 'integration_test' do
-  pod 'Firebase/Analytics', '10.25.0'
+  pod 'Firebase/Analytics', '10.28.1'
 end
 
 post_install do |installer|

app/invites_resources/build.gradle

@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:33.0.0')
+  implementation platform('com.google.firebase:firebase-bom:33.1.1')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-dynamic-links'
   implementation project(':app:app_resources')