Merge main into UMP feature branch and update readme (#1458)

* iOS: Remove Analytics dependency from GMA integration test (#1386)

* Try using CoreOnly instead of Analytics cocoapod for tests.

* Update readme.

* Add stub workflow for updating feature branches.

* Add script to merge main into all active feature branches on a regular schedule. (#1394)

* Add workflow for automatically updating feature branches weekly.

* Corrected filename, and added inputs.

* Remove trailing spaces.

* Fix workflow.

* Fix workflow name.

* Fix syntax.

* Fix syntax.

* List remote branches instead.

* Clean up script.

* Untab.

* Add branch list for debugging.

* Untab.

* Specify remote branches.

* Skip second stage if no first.

* Typo

* Error.

* List all branches.

* Fix logic.

* Fix spacing.

* Fix output

* Fix parameters.

* Fix merge to use origin.

* Remove debug echos.

* Add git config.

* Fix PR creation.

* Fix PR creation.

* Fix automatic push.

* Increase retry. (#1402)

* Add Firestore test history report (#1403)

* Add --firestore flag to report Firestore history.

* Add Firestore report to nightly cron job.

* Remove multiline commands.

* Revert "Remove multiline commands."

This reverts commit 6393ae9.

* Fix tabbing.

* Fix packaging test detection for Firestore.

* Revert "OR Query Implementation (#1335)" (#1399)

This reverts commit 11332d4.

* Wrap the real-time RemoteConfig test in flaky-block to automatically retry. (#1406)

* Only use flaky_test on android

* Update the iOS version used by FTL (#1408)

* Kick off nightly packaging an hour earlier (#1409)

* Fix crash on gma::Initialize without a Firebase App (#1320)

Initialize Util before using Util::FIndClass. Also add an integration test for initializing gma without a firebase app.

* build: pass along the CMake path (#1410)

When building the subproject, we would invoke `cmake` directly, relying on the path lookup of the tool, which may or may not match the currently executing CMake.  Use `CMAKE_COMMAND` which gives us the path to the current CMake executable ensuring that we use the same CMake for building the dependencies.

* Add log to gsutil fetch. (#1411)

* Update mobile dependencies - Thu Aug 03 2023 (#1413)

* Update mobile dependencies - Thu Aug 03 2023

### Android

- com.google.firebase.firebase_bom → 32.2.2

### iOS

- Firebase/Analytics → 10.13.0
- Firebase/AppCheck → 10.13.0
- Firebase/Auth → 10.13.0
- Firebase/Core → 10.13.0
- Firebase/CoreOnly → 10.13.0
- Firebase/Crashlytics → 10.13.0
- Firebase/Database → 10.13.0
- Firebase/DynamicLinks → 10.13.0
- Firebase/Firestore → 10.13.0
- Firebase/Functions → 10.13.0
- Firebase/Installations → 10.13.0
- Firebase/Messaging → 10.13.0
- Firebase/RemoteConfig → 10.13.0
- Firebase/Storage → 10.13.0
- Google-Mobile-Ads-SDK → 10.9.0

> Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/5755777170).

* Ensure using a Swift bridging header that supports both arm64 and x86_64.

* Add release note about i386 no longer being supported.

* Remove armv7 as well.

---------

Co-authored-by: firebase-workflow-trigger-bot <firebase-workflow-trigger-bot@google.com>
Co-authored-by: Jon Simantov <jsimantov@google.com>
Co-authored-by: almostmatt@google.com <almostmatt@google.com>

* feat(auth): Add emulator support (#1400)

* add auth emulator support

* fix ios number parse

* update the documentation part

* reduce lint warning

* more lint warnings

* code format

* use environment to decide using emulator or not

* fix a typo

* add readme entry for FirebaseApp.GetApps()

* update for review comment

* add missing `

---------

Co-authored-by: Cynthia Jiang <cynthiajiang@google.com>

* Update merge-to-main script (#1420)

* Before creating the merge-main PR, branch it off main, so merge conflicts can be addressed in the branch rather than by committing to main.

* Format.

* Update release version number for M135, 11.4.0 (#1421)

* feat(auth): enable emulator support on desktop (#1423)

* add auth emulator support

* fix ios number parse

* update the documentation part

* reduce lint warning

* more lint warnings

* code format

* use environment to decide using emulator or not

* fix a typo

* add readme entry for FirebaseApp.GetApps()

* update for review comment

* add missing `

* make json request always do restrict json

* add readme info

* prepare for review

* some minor tweak

* code format

* update review comments

* update the unit test after request json change

---------

Co-authored-by: Cynthia Jiang <cynthiajiang@google.com>

* Internal Updates. (#1422)

* Add logic to trim webp parameter from native image urls

* Add Analytics function for on-device conversion (#1429)

* Add Analytics function for phone number conversion

* Formatting

* Update analytics.h

* Update analytics_test.cc

* Update mobile dependencies - Tue Aug 29 2023 (#1436)

* Update mobile dependencies - Tue Aug 29 2023

### Android

- com.google.android.gms.play_services_ads → 22.3.0
- com.google.firebase.firebase_bom → 32.2.3

### iOS

- Firebase/Analytics → 10.14.0
- Firebase/AppCheck → 10.14.0
- Firebase/Auth → 10.14.0
- Firebase/Core → 10.14.0
- Firebase/CoreOnly → 10.14.0
- Firebase/Crashlytics → 10.14.0
- Firebase/Database → 10.14.0
- Firebase/DynamicLinks → 10.14.0
- Firebase/Firestore → 10.14.0
- Firebase/Functions → 10.14.0
- Firebase/Installations → 10.14.0
- Firebase/Messaging → 10.14.0
- Firebase/RemoteConfig → 10.14.0
- Firebase/Storage → 10.14.0

> Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/6016988287).

* Update query_main to use normalized_order_bys

* Update query_main.cc

---------

Co-authored-by: firebase-workflow-trigger-bot <firebase-workflow-trigger-bot@google.com>
Co-authored-by: a-maurice <amaurice@google.com>

* add UseEmulator api to auth (#1437)

* add auth emulator support

* fix ios number parse

* update the documentation part

* reduce lint warning

* more lint warnings

* code format

* use environment to decide using emulator or not

* fix a typo

* add readme entry for FirebaseApp.GetApps()

* update for review comment

* add missing `

* make json request always do restrict json

* add readme info

* prepare for review

* some minor tweak

* code format

* update review comments

* update the unit test after request json change

* remove platform logging v1 code

* add useEmulator api

* test with emulator

* clean up for review

* tweak for review

* update with comments

* put back necessary heartbeat blocks

---------

Co-authored-by: Cynthia Jiang <cynthiajiang@google.com>

* On Android, set dynamic code files to readonly (#1430)

* To address an Android 14 security issue, set dex files to readonly.

This follows the advice on dynamic code loading here:
https://developer.android.com/about/versions/14/behavior-changes-14#safer-dynamic-code-loading

* Format code.

* Reorder exception check so that we cover all the spots.

* Add release note.

* Update iOS dependencies - Tue Sep 12 2023 (#1443)

### iOS

- Firebase/Analytics → 10.15.0
- Firebase/AppCheck → 10.15.0
- Firebase/Auth → 10.15.0
- Firebase/Core → 10.15.0
- Firebase/CoreOnly → 10.15.0
- Firebase/Crashlytics → 10.15.0
- Firebase/Database → 10.15.0
- Firebase/DynamicLinks → 10.15.0
- Firebase/Firestore → 10.15.0
- Firebase/Functions → 10.15.0
- Firebase/Installations → 10.15.0
- Firebase/Messaging → 10.15.0
- Firebase/RemoteConfig → 10.15.0
- Firebase/Storage → 10.15.0
- Google-Mobile-Ads-SDK → 10.10.0

> Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/6164028143).

Co-authored-by: firebase-workflow-trigger-bot <firebase-workflow-trigger-bot@google.com>

* Apply unused variables patch to Flatbuffers on Android as well. (#1444)

Already applied on desktop elsewhere.

* Fix iOS test version from deprecate 16.5 to 16.6. (#1449)

* Update Android dependencies - Mon Sep 18 2023 (#1448)

* Update release version to 11.5.0.

* Update readme.

* Update Android dependencies - Mon Sep 18 2023

### Android

- com.google.android.gms.play_services_ads → 22.4.0
- com.google.firebase.firebase_bom → 32.3.1

> Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/6226059256).

* Add note about GMA Android.

* Revert play-services-ads to 22.3.0.

---------

Co-authored-by: Jon Simantov <jsimantov@google.com>
Co-authored-by: firebase-workflow-trigger-bot <firebase-workflow-trigger-bot@google.com>

* Add a matrix label to FTL test runs, to make sorting them easier. (#1452)

* Add a matrix label to FTL test runs, to make sorting them easier.

* Fix label for iOS

* OR Query Implementation (#1453)

* OR Query Implementation

* Pretty

* Add includes

* Fix from PR feedback

* Fix variadic parameters

* Add and fix tests

* Add/fix method descriptions.

* Add/fix constructor and class descriptions.

* Add method description to disjunction/conjunction.

* Add tests. Revealed bugs to be fixed.

* Fix type

* Add test

* Android implementation

* Pretty

* Pretty

* Pretty

* Remove const

* Pretty

* Fixes from code review

* Release notes

* Release notes

* Fix Android OR Query

* Release notes.

* Fix release notes.

* Format

* Internal Updates (#1439)

* Internal Updates

* Revert firestore to main.

* Add additional release note.

* Fix bad merge output.

---------

Co-authored-by: Tom Andersen <tom-andersen@users.noreply.github.com>
Co-authored-by: Matthew Hyndman <almostmatt@google.com>
Co-authored-by: a-maurice <amaurice@google.com>
Co-authored-by: Saleem Abdulrasool <compnerd@compnerd.org>
Co-authored-by: firebase-workflow-trigger[bot] <80733318+firebase-workflow-trigger[bot]@users.noreply.github.com>
Co-authored-by: firebase-workflow-trigger-bot <firebase-workflow-trigger-bot@google.com>
Co-authored-by: Cynthia J <cynthiajoan@users.noreply.github.com>
Co-authored-by: Cynthia Jiang <cynthiajiang@google.com>
Co-authored-by: nakirekommula <126601200+nakirekommula@users.noreply.github.com>

Author: 10 people

app/CMakeLists.txt

@@ -518,6 +518,7 @@ if (IOS)
     ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/document_snapshot.h
     ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/field_path.h
     ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/field_value.h
+    ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/filter.h
     ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/listener_registration.h
     ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/load_bundle_task_progress.h
     ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/map_field_value.h

firestore/CMakeLists.txt

@@ -31,6 +31,7 @@ set(common_SRCS
     src/common/document_snapshot.cc
     src/common/exception_common.cc
     src/common/exception_common.h
+    src/common/filter.cc
     src/common/field_path.cc
     src/common/field_value.cc
     src/common/firestore.cc
@@ -97,6 +98,8 @@ set(android_SRCS
     src/android/field_path_portable.h
     src/android/field_value_android.cc
     src/android/field_value_android.h
+    src/android/filter_android.cc
+    src/android/filter_android.h
     src/android/firestore_android.cc
     src/android/firestore_android.h
     src/android/firestore_exceptions_android.h
@@ -201,13 +204,17 @@ set(main_SRCS
     src/main/aggregate_query_snapshot_main.h
     src/main/collection_reference_main.cc
     src/main/collection_reference_main.h
+    src/main/composite_filter_main.cc
+    src/main/composite_filter_main.h
     src/main/converter_main.h
     src/main/document_change_main.cc
     src/main/document_change_main.h
     src/main/document_reference_main.cc
     src/main/document_reference_main.h
     src/main/document_snapshot_main.cc
     src/main/document_snapshot_main.h
+    src/main/filter_main.cc
+    src/main/filter_main.h
     src/main/field_value_main.cc
     src/main/field_value_main.h
     src/main/firestore_main.cc
@@ -227,6 +234,8 @@ set(main_SRCS
     src/main/transaction_main.h
     src/main/user_data_converter_main.cc
     src/main/user_data_converter_main.h
+    src/main/unary_filter_main.cc
+    src/main/unary_filter_main.h
     src/main/util_main.h
     src/main/write_batch_main.cc
     src/main/write_batch_main.h)

firestore/integration_test_internal/CMakeLists.txt

@@ -91,6 +91,7 @@ set(FIREBASE_INTEGRATION_TEST_PORTABLE_TEST_SRCS
     # public API are performed.
     src/integration_test.cc
     # Internal tests below.
+    src/aggregate_count_test.cc
     src/aggregate_query_snapshot_test.cc
     src/aggregate_query_test.cc
     src/bundle_test.cc
@@ -99,6 +100,7 @@ set(FIREBASE_INTEGRATION_TEST_PORTABLE_TEST_SRCS
     src/document_change_test.cc
     src/document_reference_test.cc
     src/document_snapshot_test.cc
+    src/filter_test.cc
     src/field_value_test.cc
     src/fields_test.cc
     src/firestore_test.cc

firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj

@@ -21,6 +21,14 @@
 		12CCF1E928FDBD9F00C24941 /* set_options_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 12CCF1DF28FDBD9F00C24941 /* set_options_test.cc */; };
 		12D513142684C8C200A83FAA /* bundle_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 12D513132684C8C200A83FAA /* bundle_test.cc */; };
 		12D5131A2684C8D100A83FAA /* bundle_builder.cc in Sources */ = {isa = PBXBuildFile; fileRef = 12D513182684C8D100A83FAA /* bundle_builder.cc */; };
+		1BAFACA32A449C2B00834979 /* aggregate_query_snapshot_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1BAFACA02A449C2B00834979 /* aggregate_query_snapshot_test.cc */; };
+		1BAFACA42A449C2B00834979 /* aggregate_query_snapshot_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1BAFACA02A449C2B00834979 /* aggregate_query_snapshot_test.cc */; };
+		1BAFACA52A449C2B00834979 /* aggregate_count_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1BAFACA12A449C2B00834979 /* aggregate_count_test.cc */; };
+		1BAFACA62A449C2B00834979 /* aggregate_count_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1BAFACA12A449C2B00834979 /* aggregate_count_test.cc */; };
+		1BAFACA72A449C2B00834979 /* aggregate_query_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1BAFACA22A449C2B00834979 /* aggregate_query_test.cc */; };
+		1BAFACA82A449C2B00834979 /* aggregate_query_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1BAFACA22A449C2B00834979 /* aggregate_query_test.cc */; };
+		1BAFACAA2A449CBD00834979 /* filter_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1BAFACA92A449CBD00834979 /* filter_test.cc */; };
+		1BAFACAB2A449CBD00834979 /* filter_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1BAFACA92A449CBD00834979 /* filter_test.cc */; };
 		520BC0391C869159008CFBC3 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 520BC0381C869159008CFBC3 /* GoogleService-Info.plist */; };
 		5270BB448DF5ECE860FDD68B /* firebase_firestore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EAFAF9474EC412ADCC65F2CC /* firebase_firestore.framework */; };
 		529226D61C85F68000C89379 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 529226D51C85F68000C89379 /* Foundation.framework */; };
@@ -123,6 +131,10 @@
 		12D513182684C8D100A83FAA /* bundle_builder.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bundle_builder.cc; path = src/util/bundle_builder.cc; sourceTree = "<group>"; };
 		12D513192684C8D100A83FAA /* bundle_builder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bundle_builder.h; path = src/util/bundle_builder.h; sourceTree = "<group>"; };
 		1B3D64B35A22073C76B376D5 /* libPods-integration_test_tvos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-integration_test_tvos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		1BAFACA02A449C2B00834979 /* aggregate_query_snapshot_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = aggregate_query_snapshot_test.cc; path = src/aggregate_query_snapshot_test.cc; sourceTree = "<group>"; };
+		1BAFACA12A449C2B00834979 /* aggregate_count_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = aggregate_count_test.cc; path = src/aggregate_count_test.cc; sourceTree = "<group>"; };
+		1BAFACA22A449C2B00834979 /* aggregate_query_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = aggregate_query_test.cc; path = src/aggregate_query_test.cc; sourceTree = "<group>"; };
+		1BAFACA92A449CBD00834979 /* filter_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = filter_test.cc; path = src/filter_test.cc; sourceTree = "<group>"; };
 		3DE393E827F88B06CD3C39CD /* Pods-integration_test_tvos.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-integration_test_tvos.release.xcconfig"; path = "Target Support Files/Pods-integration_test_tvos/Pods-integration_test_tvos.release.xcconfig"; sourceTree = "<group>"; };
 		4AAFA3E3DA9641C2E3C46C9D /* Pods_integration_test.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_integration_test.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		520BC0381C869159008CFBC3 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
@@ -281,6 +293,10 @@
 		5292271D1C85FB5500C89379 /* src */ = {
 			isa = PBXGroup;
 			children = (
+				1BAFACA92A449CBD00834979 /* filter_test.cc */,
+				1BAFACA12A449C2B00834979 /* aggregate_count_test.cc */,
+				1BAFACA02A449C2B00834979 /* aggregate_query_snapshot_test.cc */,
+				1BAFACA22A449C2B00834979 /* aggregate_query_test.cc */,
 				12CCF1DF28FDBD9F00C24941 /* set_options_test.cc */,
 				12CCF1DB28FDBD9E00C24941 /* settings_test.cc */,
 				12CCF1DC28FDBD9F00C24941 /* source_test.cc */,
@@ -576,12 +592,14 @@
 				D62CCBC022F367140099BE9F /* gmock-all.cc in Sources */,
 				D61CFBC126091C3B0035CB2A /* integration_test.cc in Sources */,
 				D6AAAD532606C22D0025C53B /* includes_test.cc in Sources */,
+				1BAFACA52A449C2B00834979 /* aggregate_count_test.cc in Sources */,
 				D6AAAD502606C22D0025C53B /* numeric_transforms_test.cc in Sources */,
 				D6ED33BE2606CD890058CBF9 /* integration_test_util.cc in Sources */,
 				D6C179EA22CB322900C2651A /* ios_firebase_test_framework.mm in Sources */,
 				12CCF1E228FDBD9F00C24941 /* source_test.cc in Sources */,
 				D6AAAD4C2606C22D0025C53B /* server_timestamp_test.cc in Sources */,
 				D6AAAD4E2606C22D0025C53B /* firestore_test.cc in Sources */,
+				1BAFACAA2A449CBD00834979 /* filter_test.cc in Sources */,
 				D6AAAD452606C22D0025C53B /* document_change_test.cc in Sources */,
 				D6AAAD472606C22D0025C53B /* document_snapshot_test.cc in Sources */,
 				D6C179E922CB322900C2651A /* ios_app_framework.mm in Sources */,
@@ -591,7 +609,9 @@
 				EDEEC7632800CD0000EFBAAF /* leveldb_snappy_test.cc in Sources */,
 				12CCF1E828FDBD9F00C24941 /* set_options_test.cc in Sources */,
 				D6AAAD562606C22D0025C53B /* query_network_test.cc in Sources */,
+				1BAFACA72A449C2B00834979 /* aggregate_query_test.cc in Sources */,
 				D6AAAD552606C22D0025C53B /* listener_registration_test.cc in Sources */,
+				1BAFACA32A449C2B00834979 /* aggregate_query_snapshot_test.cc in Sources */,
 				12D5131A2684C8D100A83FAA /* bundle_builder.cc in Sources */,
 				D6AAAD4A2606C22D0025C53B /* fields_test.cc in Sources */,
 				D6AAAD462606C22D0025C53B /* query_test.cc in Sources */,
@@ -610,6 +630,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				1BAFACAB2A449CBD00834979 /* filter_test.cc in Sources */,
+				1BAFACA62A449C2B00834979 /* aggregate_count_test.cc in Sources */,
 				BC1D6850267B00EB005DC2DA /* app_framework.cc in Sources */,
 				BC1D6853267B00EB005DC2DA /* transaction_extra_test.cc in Sources */,
 				BC1D683E267B00EB005DC2DA /* integration_test_util.cc in Sources */,
@@ -623,6 +645,7 @@
 				BC1D6848267B00EB005DC2DA /* sanity_test.cc in Sources */,
 				12CCF1E728FDBD9F00C24941 /* write_batch_test.cc in Sources */,
 				12CCF1E128FDBD9F00C24941 /* settings_test.cc in Sources */,
+				1BAFACA82A449C2B00834979 /* aggregate_query_test.cc in Sources */,
 				BC1D6856267B00EE005DC2DA /* ios_app_framework.mm in Sources */,
 				BC1D6843267B00EB005DC2DA /* numeric_transforms_test.cc in Sources */,
 				BC1D6844267B00EB005DC2DA /* array_transform_test.cc in Sources */,
@@ -632,6 +655,7 @@
 				BC1D684E267B00EB005DC2DA /* includes_test.cc in Sources */,
 				BC1D684C267B00EB005DC2DA /* document_change_test.cc in Sources */,
 				BC1D6851267B00EB005DC2DA /* firestore_integration_test.cc in Sources */,
+				1BAFACA42A449C2B00834979 /* aggregate_query_snapshot_test.cc in Sources */,
 				BC1D6838267B00EB005DC2DA /* future_test_util.cc in Sources */,
 				12CCF1E528FDBD9F00C24941 /* validation_test.cc in Sources */,
 				BC1D6839267B00EB005DC2DA /* type_test.cc in Sources */,

firestore/integration_test_internal/src/aggregate_count_test.cc

@@ -28,15 +28,9 @@
 #include "firestore_integration_test.h"
 #include "util/event_accumulator.h"
 
-#if defined(__ANDROID__)
-#include "firestore/src/android/query_android.h"
-#include "firestore/src/common/wrapper_assertions.h"
-#endif  // defined(__ANDROID__)
-
 #include "Firestore/core/src/util/firestore_exceptions.h"
 #include "firebase/firestore/firestore_errors.h"
 #include "firebase_test_framework.h"
-#include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
 namespace firebase {
@@ -757,15 +751,5 @@ TEST_F(AggregateCountTest,
   EXPECT_EQ(aggregate_query2, aggregate_snapshot2.query());
 }
 
-#if defined(__ANDROID__)
-TEST(QueryTestAndroidStub, Construction) {
-  testutil::AssertWrapperConstructionContract<Query>();
-}
-
-TEST(QueryTestAndroidStub, Assignment) {
-  testutil::AssertWrapperAssignmentContract<Query>();
-}
-#endif  // defined(__ANDROID__)
-
 }  // namespace firestore
 }  // namespace firebase

firestore/integration_test_internal/src/aggregate_query_test.cc

@@ -17,6 +17,11 @@
 #include "firebase/firestore.h"
 #include "firestore_integration_test.h"
 
+#if defined(__ANDROID__)
+#include "firestore/src/android/aggregate_query_android.h"
+#include "firestore/src/common/wrapper_assertions.h"
+#endif  // defined(__ANDROID__)
+
 #include "gtest/gtest.h"
 
 namespace firebase {
@@ -332,6 +337,16 @@ TEST_F(AggregateQueryTest, TestHashCode) {
             AggregateQueryHash(query1.Count()));
 }
 
+#if defined(__ANDROID__)
+TEST(QueryTestAndroidStub, Construction) {
+  testutil::AssertWrapperConstructionContract<AggregateQuery>();
+}
+
+TEST(QueryTestAndroidStub, Assignment) {
+  testutil::AssertWrapperAssignmentContract<AggregateQuery>();
+}
+#endif  // defined(__ANDROID__)
+
 }  // namespace
 }  // namespace firestore
 }  // namespace firebase