More clean up

Author: AustinBenoit

app/CMakeLists.txt

@@ -367,25 +367,29 @@ target_link_libraries(firebase_app
     ${app_flatbuffers_lib}
     ${LIBSECRET_LIBRARIES}
 )
+# Automatically include headers that might not be declared.
+# We use add_compile_options (instead of target_compile_options) so these
+# implicit includes apply globally to all targets in this directory,
+# including tests. Generator expressions ($<$<COMPILE_LANGUAGE:...>) are
+# used to ensure these C/C++ headers are not passed to the Swift compiler.
 if(MSVC)
-  target_compile_options(firebase_app PRIVATE
+  add_compile_options(
     $<$<COMPILE_LANGUAGE:CXX>:/FI"assert.h" /FI"string.h" /FI"stdint.h">)
 elseif(APPLE)
-  target_compile_options(firebase_app PRIVATE
+  add_compile_options(
     "$<$<COMPILE_LANGUAGE:CXX>:SHELL:-include assert.h>"
     "$<$<COMPILE_LANGUAGE:CXX>:SHELL:-include string.h>"
     "$<$<COMPILE_LANGUAGE:OBJCXX>:SHELL:-include assert.h>"
     "$<$<COMPILE_LANGUAGE:OBJCXX>:SHELL:-include string.h>")
 else()
-  target_compile_options(firebase_app PRIVATE
+  add_compile_options(
     "$<$<COMPILE_LANGUAGE:CXX>:SHELL:-include assert.h>"
     "$<$<COMPILE_LANGUAGE:CXX>:SHELL:-include string.h>")
 endif()
 
 if(ANDROID)
   firebase_cpp_proguard_file(app)
 elseif(IOS)
-  # Enable Automatic Reference Counting (ARC) and Bitcode.
   # Enable Automatic Reference Counting (ARC) for Objective-C/Swift interop
   target_compile_options(firebase_app
                          PUBLIC $<$<NOT:$<COMPILE_LANGUAGE:Swift>>:-fobjc-arc>)
@@ -429,13 +433,14 @@ if (IOS)
   if (FIREBASE_XCODE_TARGET_FORMAT STREQUAL "frameworks")
     if (FIREBASE_INCLUDE_ANALYTICS)
       set(analytics_HDRS
-      ${FIREBASE_SOURCE_DIR}/analytics/src/include/firebase/analytics.h
-      ${FIREBASE_GEN_FILE_DIR}/analytics/src/include/firebase/analytics/event_names.h
-      ${FIREBASE_GEN_FILE_DIR}/analytics/src/include/firebase/analytics/parameter_names.h
-      ${FIREBASE_GEN_FILE_DIR}/analytics/src/include/firebase/analytics/user_property_names.h)
+        ${FIREBASE_SOURCE_DIR}/analytics/src/include/firebase/analytics.h
+        ${FIREBASE_GEN_FILE_DIR}/analytics/src/include/firebase/analytics/event_names.h
+        ${FIREBASE_GEN_FILE_DIR}/analytics/src/include/firebase/analytics/parameter_names.h
+        ${FIREBASE_GEN_FILE_DIR}/analytics/src/include/firebase/analytics/user_property_names.h)
     else()
       set(analytics_HDRS "")
     endif()
+  endif()
   set(app_check_HDRS
     ${FIREBASE_SOURCE_DIR}/app_check/src/include/firebase/app_check.h
     ${FIREBASE_SOURCE_DIR}/app_check/src/include/firebase/app_check/app_attest_provider.h
@@ -550,5 +555,4 @@ if (IOS)
   # to destination dir "Headers/google_play_services/*"
   set_property(SOURCE "src/include/google_play_services/availability.h" PROPERTY 
                   MACOSX_PACKAGE_LOCATION Headers/google_play_services)
-  endif() # framework_HDRS
 endif()

scripts/gha/build_ios_tvos.py

@@ -253,7 +253,7 @@ def build_universal_framework(frameworks_path, targets):
       universal_target_path = os.path.join(framework_os_path, 'universal',
                                           target_framework)
       logging.debug('Ensuring all directories exist: ' + universal_target_path)
-      os.makedirs(universal_target_path, exist_ok=True)
+      os.makedirs(universal_target_path)
       # <build_dir>/<apple_os>/frameworks/universal/<target>.framework/<target>
       universal_target_library_path = os.path.join(universal_target_path,
                                                    target)
@@ -279,8 +279,7 @@ def build_universal_framework(frameworks_path, targets):
                                                   'Headers')
 
     shutil.copytree(firebase_framework_headers_path,
-                    universal_firebase_framework_headers_path,
-                    dirs_exist_ok=True)
+                    universal_firebase_framework_headers_path)
 
 
 def build_xcframeworks(frameworks_path, xcframeworks_path, template_info_plist,
@@ -410,7 +409,7 @@ def build_xcframeworks(frameworks_path, xcframeworks_path, template_info_plist,
                                           xcframework_key,
                                           '{0}.framework'.format(target))
         logging.debug('Ensuring all directories exist: ' + library_output_dir)
-        os.makedirs(library_output_dir, exist_ok=True)
+        os.makedirs(library_output_dir)
         cmd = ['lipo', '-create']
         cmd.extend(xcframework_libraries)
         cmd.append('-output')