Shorten CMake Objective-C targets (#5323)

* Shorten firebase_firestore_example_app

... and:
  * Migrate to firebase_ios_add_executable
  * Use globs for specifying sources

* Migrate Example/Tests/API to new CMake primitives

* Migrate Example/Tests/Integration to new CMake primitives

* Migrate Example/Tests/SpecTests to new CMake primitives

* Migrate Example/Tests/Util to new CMake primitives

Rename firebase_firestore_objc_test_util to firestore_objc_testing.

* Migrate fuzzing to new CMake primitives

Rewrite firebase_ios_cc_fuzz_test to match the other primitives.

* Add firebase_ios_add_objc_test

* Migrate Example/Benchmarks to new CMake primitives

Author: wilhuff

Firestore/Example/App/CMakeLists.txt

@@ -17,59 +17,36 @@ if(NOT APPLE)
 endif()
 
 if(IOS)
-  add_executable(
-    firebase_firestore_example_app MACOSX_BUNDLE
-    iOS/FIRAppDelegate.h
-    iOS/FIRAppDelegate.m
-    iOS/FIRViewController.h
-    iOS/FIRViewController.m
-    iOS/main.m
-  )
-
-  target_compile_options(
-    firebase_firestore_example_app
-    PRIVATE ${FIREBASE_IOS_OBJC_FLAGS}
-  )
+  file(GLOB sources iOS/*.h iOS/*.m)
+  firebase_ios_add_executable(firestore_objc_host_app MACOSX_BUNDLE ${sources})
 
   target_link_libraries(
-    firebase_firestore_example_app
-    PRIVATE
-    "-framework UIKit"
+    firestore_objc_host_app PRIVATE
     "-framework Foundation"
+    "-framework UIKit"
   )
 
   set_target_properties(
-    firebase_firestore_example_app PROPERTIES
+    firestore_objc_host_app PROPERTIES
     MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/iOS/Firestore-Info.plist
     RESOURCE GoogleService-Info.plist
   )
 
 else()
   # Assume macOS
 
-  add_executable(
-    firebase_firestore_example_app MACOSX_BUNDLE
-    macOS/AppDelegate.h
-    macOS/AppDelegate.m
-    macOS/main.m
-  )
-
-  target_compile_options(
-    firebase_firestore_example_app
-    PRIVATE ${FIREBASE_IOS_OBJC_FLAGS}
-  )
+  file(GLOB sources macOS/*.h macOS/*.m)
+  firebase_ios_add_executable(firestore_objc_host_app MACOSX_BUNDLE ${sources})
 
   target_link_libraries(
-    firebase_firestore_example_app
-    PRIVATE
+    firestore_objc_host_app PRIVATE
     "-framework AppKit"
     "-framework Foundation"
   )
 
   set_target_properties(
-    firebase_firestore_example_app PROPERTIES
+    firestore_objc_host_app PROPERTIES
     MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/macOS/Info.plist
     RESOURCE GoogleService-Info.plist
   )
-
 endif()

Firestore/Example/Benchmarks/CMakeLists.txt

@@ -12,15 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-if(FIREBASE_IOS_BUILD_BENCHMARKS AND APPLE)
-  firebase_ios_cc_binary(
-    firebase_firestore_remote_document_cache_benchmark
-    SOURCES
-      remote_document_cache_benchmark.mm
-    DEPENDS
-      FirebaseFirestore
-      benchmark
-      benchmark_main
-      firestore_testutil
-  )
+if(NOT FIREBASE_IOS_BUILD_BENCHMARKS OR NOT APPLE)
+  return()
 endif()
+
+firebase_ios_add_executable(
+  firestore_remote_document_cache_benchmark
+  remote_document_cache_benchmark.mm
+)
+
+target_link_libraries(
+  firestore_remote_document_cache_benchmark PRIVATE
+  FirebaseFirestore
+  benchmark
+  benchmark_main
+  firestore_testutil
+)

Firestore/Example/Tests/API/CMakeLists.txt

@@ -12,27 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-if(APPLE)
-  firebase_ios_objc_test(
-    firebase_firestore_objc_api_test
-    HOST firebase_firestore_example_app
-    SOURCES
-      FIRCollectionReferenceTests.mm
-      FIRDocumentReferenceTests.mm
-      FIRDocumentSnapshotTests.mm
-      FIRFieldPathTests.mm
-      FIRFieldValueTests.mm
-      FIRFirestoreTests.mm
-      FIRGeoPointTests.mm
-      FIRQuerySnapshotTests.mm
-      FIRQueryUnitTests.mm
-      FIRSnapshotMetadataTests.mm
-      FIRTimestampTest.m
-      FSTAPIHelpers.h
-      FSTAPIHelpers.mm
-      FSTUserDataConverterTests.mm
-    DEPENDS
-      FirebaseFirestore
-      firebase_firestore_objc_test_util
-  )
-endif(APPLE)
+if(NOT FIREBASE_IOS_BUILD_TESTS OR NOT APPLE)
+  return()
+endif()
+
+file(GLOB sources *.h *.mm)
+firebase_ios_add_objc_test(
+  firestore_objc_api_test
+  firestore_objc_host_app
+  ${sources}
+)
+target_link_libraries(
+  firestore_objc_api_test PRIVATE
+  FirebaseFirestore
+  firestore_objc_testing
+)

Firestore/Example/Tests/Integration/CMakeLists.txt

@@ -12,30 +12,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-if(NOT APPLE)
+if(NOT FIREBASE_IOS_BUILD_TESTS OR NOT APPLE)
   return()
 endif()
 
-firebase_ios_objc_test(
-  firebase_firestore_objc_integration_test
-  HOST firebase_firestore_example_app
-  SOURCES
-    FSTSmokeTests.mm
-    FSTDatastoreTests.mm
-    FSTTransactionTests.mm
-    API/FIRArrayTransformTests.mm
-    API/FIRFieldsTests.mm
-    API/FIRNumericTransformTests.mm
-    API/FIRTypeTests.mm
-    API/FIRCursorTests.mm
-    API/FIRFirestoreSourceTests.mm
-    API/FIRQueryTests.mm
-    API/FIRValidationTests.mm
-    API/FIRDatabaseTests.mm
-    API/FIRListenerRegistrationTests.mm
-    API/FIRServerTimestampTests.mm
-    API/FIRWriteBatchTests.mm
-  DEPENDS
-    FirebaseFirestore
-    firebase_firestore_objc_test_util
+file(GLOB sources *.h *.mm API/*.h API/*.mm)
+
+firebase_ios_add_objc_test(
+  firestore_objc_integration_test
+  firestore_objc_host_app
+  ${sources}
+)
+
+target_link_libraries(
+  firestore_objc_integration_test PRIVATE
+  FirebaseFirestore
+  firestore_core
+  firestore_objc_testing
 )

Firestore/Example/Tests/SpecTests/CMakeLists.txt

@@ -12,26 +12,29 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-if(APPLE)
-  firebase_ios_objc_test(
-    firebase_firestore_objc_spec_test
-    HOST firebase_firestore_example_app
-    SOURCES
-      FSTLevelDBSpecTests.mm
-      FSTMemorySpecTests.mm
-      FSTMockDatastore.h
-      FSTMockDatastore.mm
-      FSTSpecTests.h
-      FSTSpecTests.mm
-      FSTSyncEngineTestDriver.h
-      FSTSyncEngineTestDriver.mm
-    DEPENDS
-      FirebaseFirestore
-      firebase_firestore_objc_test_util
-      firestore_local_testing
-      firestore_remote_testing
-    # Force this to run in the project-wide binary directory so that relative
-    # paths used during compilation are usable.
-    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-  )
-endif(APPLE)
+if(NOT FIREBASE_IOS_BUILD_TESTS OR NOT APPLE)
+  return()
+endif()
+
+file(GLOB sources *.h *.mm)
+
+firebase_ios_add_objc_test(
+  firestore_objc_spec_test
+  firestore_objc_host_app
+  ${sources}
+)
+
+target_link_libraries(
+  firestore_objc_spec_test PRIVATE
+  FirebaseFirestore
+  firestore_local_testing
+  firestore_objc_testing
+  firestore_remote_testing
+)
+
+# Force this to run in the project-wide binary directory so that relative
+# paths used during compilation are usable.
+set_property(
+  TEST firestore_objc_spec_test PROPERTY
+  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+)

Firestore/Example/Tests/Util/CMakeLists.txt

@@ -16,32 +16,15 @@ if(NOT FIREBASE_IOS_BUILD_TESTS OR NOT APPLE)
   return()
 endif()
 
-firebase_ios_cc_library(
-  firebase_firestore_objc_test_util
-  SOURCES
-    FIRFirestore+Testing.h
-    FSTEventAccumulator.h
-    FSTEventAccumulator.mm
-    FSTHelpers.h
-    FSTHelpers.mm
-    FSTIntegrationTestCase.h
-    FSTIntegrationTestCase.mm
-    XCTestCase+Await.h
-    XCTestCase+Await.mm
-  DEPENDS
-    ${XCTest_LIBRARIES}
-    FirebaseFirestore
-    GTest::GTest
-    absl_any
-    absl_strings
-    firebase_firestore_auth
-    firebase_firestore_core
-    firebase_firestore_local
-    firebase_firestore_model
-    firebase_firestore_nanopb
-    firebase_firestore_remote
-    firebase_firestore_nanopb
-    firestore_protos_nanopb
-    firestore_remote_testing
-    firestore_testutil
+file(GLOB sources *.h *.mm)
+firebase_ios_add_library(firestore_objc_testing ${sources})
+
+target_link_libraries(
+  firestore_objc_testing PUBLIC
+  ${XCTest_LIBRARIES}
+  FirebaseFirestore
+  GTest::GTest
+  absl_strings
+  firestore_remote_testing
+  firestore_testutil
 )

Firestore/fuzzing/CMakeLists.txt

@@ -12,55 +12,60 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Builds all fuzzing targets using firebase_ios_cc_fuzz_test build rule, which
+# Builds all fuzzing targets using firebase_ios_add_fuzz_test build rule, which
 # copies the provided dictionary and corpus to the destination directory. A
-# fuzzing target that tests xyz must be called 'xyz_fuzzer'. The copied
-# dictionary will be called 'xyz_fuzzer.dict' and its corpus
-# 'xyz_fuzzer_seed_corpus'. See cc_rules.cmake for more information.
+# fuzzing target that tests xyz must be called 'firestore_xyz_fuzzer'. The copied
+# dictionary will be called 'firestore_xyz_fuzzer.dict' and its corpus
+# 'firestore_xyz_fuzzer_seed_corpus'. See cc_rules.cmake for more information.
 
 if(NOT FUZZING)
   return()
 endif()
 
+# Finds the fuzzer library that is either provided by OSS Fuzz or libFuzzer that
+# is manually built from sources.
+find_package(Fuzzer REQUIRED)
+
 # Use the fuzzing resources directory from the iOS fuzz tests.
-set(fuzzing_resources ${FIREBASE_SOURCE_DIR}/Firestore/Example/FuzzTests/FuzzingResources)
+set(
+  fuzzing_resources
+  ${FIREBASE_SOURCE_DIR}/Firestore/Example/FuzzTests/FuzzingResources
+)
+
+link_libraries(firestore_core)
+
 
 # Serializer fuzzing target.
 # TODO(minafarid): Do not define a CORPUS in this target, but rather generate
 # the serializer corpus by converting the text protos from the serializer
 # corpus in the iOS FuzzingResources to binary protos. This conversion requires
 # the protoc binary that is not currently available.
-firebase_ios_cc_fuzz_test(
-  serializer_fuzzer
+firebase_ios_add_fuzz_test(
+  firestore_serializer_fuzzer
   DICTIONARY ${fuzzing_resources}/Serializer/serializer.dictionary
   CORPUS     ${fuzzing_resources}/Serializer/Corpus/BinaryProtos
-  SOURCES    serializer_fuzzer.cc
-  DEPENDS    firebase_firestore_remote
+  serializer_fuzzer.cc
 )
 
-
 # FieldPath fuzzing target.
-firebase_ios_cc_fuzz_test(
-  fieldpath_fuzzer
+firebase_ios_add_fuzz_test(
+  firestore_fieldpath_fuzzer
   DICTIONARY ${fuzzing_resources}/FieldPath/fieldpath.dictionary
   CORPUS     ${fuzzing_resources}/FieldPath/Corpus
-  SOURCES    fieldpath_fuzzer.cc
-  DEPENDS    firebase_firestore_model
+  fieldpath_fuzzer.cc
 )
 
 # ResourcePath fuzzing target. Use the same corpus and dict as FieldPath.
-firebase_ios_cc_fuzz_test(
-  resourcepath_fuzzer
+firebase_ios_add_fuzz_test(
+  firestore_resourcepath_fuzzer
   DICTIONARY ${fuzzing_resources}/FieldPath/fieldpath.dictionary
   CORPUS     ${fuzzing_resources}/FieldPath/Corpus
-  SOURCES    resourcepath_fuzzer.cc
-  DEPENDS    firebase_firestore_model
+  resourcepath_fuzzer.cc
 )
 
 # LevelDB fuzzer.
-firebase_ios_cc_fuzz_test(
-  leveldb_fuzzer
+firebase_ios_add_fuzz_test(
+  firestore_leveldb_fuzzer
   DICTIONARY ${fuzzing_resources}/LevelDb/leveldb.dictionary
-  SOURCES leveldb_fuzzer.cc
-  DEPENDS firebase_firestore_local_persistence_leveldb
+  leveldb_fuzzer.cc
 )