Merge remote-tracking branch 'origin/main' into tomandersen/or_query

# Conflicts:
#	release_build_files/readme.md

Author: tom-andersen

.github/workflows/cpp-packaging.yml

@@ -759,6 +759,51 @@ jobs:
           name: firebase_cpp_sdk.zip
           path: firebase_cpp_sdk.zip
 
+  create_windows_only_package:
+    name: create-windows-only-package
+    runs-on: ubuntu-20.04
+    needs: [merge_packages]
+    steps:
+      - name: download SDK zip
+        uses: actions/download-artifact@v3
+        with:
+          name: firebase_cpp_sdk.zip
+      - name: unzip SDK and remove non-Windows files
+        run: |
+          set -x
+          unzip -q firebase_cpp_sdk.zip -d windows-sdk
+          cd windows-sdk
+          # Rename the top-level directory.
+          mv firebase_cpp_sdk firebase_cpp_sdk_windows
+          cd firebase_cpp_sdk_windows
+          # Remove all non-Windows files.
+          rm -rf xcframeworks frameworks libs/linux libs/ios libs/tvos libs/darwin libs/android Android
+          cat > readme_windows.md <<EOF
+          # Firebase C++ SDK - Windows only
+
+          This package contains only the subset of the Firebase C++ SDK needed for use on
+          Windows. For general SDK information, see the accompanying readme.md file.
+          EOF
+          cd ..
+          zip -9 -r -y ../firebase_cpp_sdk_windows.zip firebase_cpp_sdk_windows
+          cd ..
+      - name: compute Windows SDK hash
+        shell: bash
+        run: |
+          ${{ env.hashCommand }} --tag firebase_cpp_sdk_windows.zip > firebase_cpp_sdk_windows_hash.txt
+          echo "::warning ::$(cat firebase_cpp_sdk_windows_hash.txt)"
+      - name: upload Windows hash
+        uses: actions/upload-artifact@v3
+        with:
+          name: firebase_cpp_sdk_windows_hash.txt
+          path: firebase_cpp_sdk_windows_hash.txt
+      - name: upload Windows SDK zip
+        uses: actions/upload-artifact@v3
+        with:
+          name: firebase_cpp_sdk_windows.zip
+          path: firebase_cpp_sdk_windows.zip
+        
+
   cleanup_packaging_artifacts:
     # Clean up intermediate artifacts from packaging step.
     # This can happen after the final package merge is finished.
@@ -782,7 +827,7 @@ jobs:
 
   trigger_integration_tests:
     # Trigger the integration_tests workflow.
-    needs: [merge_packages, download_sdk_package, cleanup_packaging_artifacts]
+    needs: [merge_packages, download_sdk_package, create_windows_only_package, cleanup_packaging_artifacts]
     if: (github.event.inputs.skipIntegrationTests == 0 || github.event.inputs.skipIntegrationTests == '') && !cancelled() && !failure()
     runs-on: ubuntu-20.04
     steps:

Android/firebase_dependencies.gradle

@@ -27,7 +27,7 @@ def firebaseDependenciesMap = [
   'dynamic_links' : ['com.google.firebase:firebase-dynamic-links'],
   'firestore' : ['com.google.firebase:firebase-firestore'],
   'functions' : ['com.google.firebase:firebase-functions'],
-  'gma' : ['com.google.android.gms:play-services-ads:22.1.0'],
+  'gma' : ['com.google.android.gms:play-services-ads:22.2.0'],
   'installations' : ['com.google.firebase:firebase-installations'],
   'invites' : ['com.google.firebase:firebase-invites'],
   // Messaging has an additional local dependency to include.
@@ -158,7 +158,7 @@ project.afterEvaluate {
 
     // Add the bill-of-materials
     project.dependencies {
-      implementation platform('com.google.firebase:firebase-bom:32.1.1')
+      implementation platform('com.google.firebase:firebase-bom:32.2.0')
     }
     for (String lib : firebaseCpp.dependencies.libSet) {
       // Generate and include the proguard file

README.md

@@ -53,8 +53,8 @@ directories to your PATH as needed.
 Note: Once python is installed you can use the following commands to install
 required packages:
 
-* python -m ensurepip --default-pip
-* python -m pip install --user absl-py
+* python3 -m ensurepip --default-pip
+* python3 -m pip install --user absl-py
 
 ### Prerequisites for Desktop
 The following prerequisites are required when building the libraries for
@@ -203,7 +203,7 @@ deliverable for both iOS and tvOS targets in the same XCode project.
 ``` bash
 # Install prereqs (like cocoapods)
 ./build_scripts/tvos/install_prereqs.sh
-python scripts/gha/build_ios_tvos.py -s . -b ios_tvos_build
+python3 scripts/gha/build_ios_tvos.py -s . -b ios_tvos_build
 ```
 
 

analytics/integration_test/Podfile

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

analytics/integration_test/build.gradle

@@ -84,7 +84,7 @@ apply plugin: 'com.google.gms.google-services'
 task copyIntegrationTestFiles(type:Exec) {
   // If this is running form inside the SDK directory, run the setup script.
   if (project.file('../../setup_integration_tests.py').exists()) {
-    commandLine 'python', '../../setup_integration_tests.py', project.projectDir.toString()
+    commandLine 'python3', '../../setup_integration_tests.py', project.projectDir.toString()
   }
   else {
     commandLine 'echo', ''

analytics/ios_headers/FIREventNames.h

@@ -1,6 +1,6 @@
 // Copyright 2023 Google LLC
 
-// Copied from Firebase Analytics iOS SDK 10.11.0.
+// Copied from Firebase Analytics iOS SDK 10.12.0.
 
 /// @file FIREventNames.h
 ///

analytics/ios_headers/FIRParameterNames.h

@@ -1,6 +1,6 @@
 // Copyright 2023 Google LLC
 
-// Copied from Firebase Analytics iOS SDK 10.11.0.
+// Copied from Firebase Analytics iOS SDK 10.12.0.
 
 /// @file FIRParameterNames.h
 ///

analytics/ios_headers/FIRUserPropertyNames.h

@@ -1,6 +1,6 @@
 // Copyright 2023 Google LLC
 
-// Copied from Firebase Analytics iOS SDK 10.11.0.
+// Copied from Firebase Analytics iOS SDK 10.12.0.
 
 /// @file FIRUserPropertyNames.h
 ///

app/CMakeLists.txt

@@ -59,7 +59,7 @@ set(FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS
     "--no-union-value-namespacing"
     "--gen-generated"
     "--gen-object-api"
-    "--cpp-ptr-type" "flatbuffers::unique_ptr")
+    "--cpp-ptr-type" "std::unique_ptr")
 # Because of a bug in the version of Flatbuffers we are pinned to,
 # additional flags need to be set.
 set(FLATC_ARGS "${FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS}")
@@ -180,7 +180,7 @@ set(FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS
     "--no-union-value-namespacing"
     "--gen-generated"
     "--gen-object-api"
-    "--cpp-ptr-type" "flatbuffers::unique_ptr")
+    "--cpp-ptr-type" "std::unique_ptr")
 # Because of a bug in the version of Flatbuffers we are pinned to,
 # additional flags need to be set.
 # also see if app_generated_includes will conflict
@@ -351,10 +351,6 @@ add_library(firebase_app STATIC
     ${utility_HDRS}
     ${app_platform_HDRS}
     ${FIREBASE_GEN_FILE_DIR}/app/google_services_generated.h
-    memory/atomic.h
-    meta/move.h
-    memory/unique_ptr.h
-    memory/shared_ptr.h
     ${app_flatbuffers_srcs})
 
 set_property(TARGET firebase_app PROPERTY FOLDER "Firebase Cpp")

app/app_resources/build.gradle

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

app/google_api_resources/build.gradle

@@ -53,7 +53,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.1.1')
+  implementation platform('com.google.firebase:firebase-bom:32.2.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.android.gms:play-services-base:18.2.0'
   implementation project(':app:app_resources')

app/integration_test/Podfile

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

app/integration_test/build.gradle

@@ -84,7 +84,7 @@ apply plugin: 'com.google.gms.google-services'
 task copyIntegrationTestFiles(type:Exec) {
   // If this is running form inside the SDK directory, run the setup script.
   if (project.file('../../setup_integration_tests.py').exists()) {
-    commandLine 'python', '../../setup_integration_tests.py', project.projectDir.toString()
+    commandLine 'python3', '../../setup_integration_tests.py', project.projectDir.toString()
   }
   else {
     commandLine 'echo', ''

app/invites_resources/build.gradle

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