Continue the clean up

Author: AustinBenoit

CMakeLists.txt

@@ -18,9 +18,6 @@ cmake_minimum_required(VERSION 3.22)
 
 set (CMAKE_CXX_STANDARD 14)
 set (CMAKE_CXX_STANDARD_REQUIRED YES)  # Don't fall back to an earlier version.
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  add_compile_definitions(_GNU_SOURCE)
-endif()
 
 # Turn on virtual folders for visual studio
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
@@ -486,7 +483,7 @@ if(DESKTOP)
         -DUSE_LIBUV=1
       )
     elseif(APPLE)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LIBCPP_DISABLE_AVAILABILITY -D_LIBCPP_HAS_NO_VERBOSE_ABORT")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LIBCPP_DISABLE_AVAILABILITY")
       set(websockets_additional_defines
         ${websockets_additional_defines}
         -DUSE_LIBUV=1

app/CMakeLists.txt

@@ -457,39 +457,35 @@ if (IOS)
     ${FIREBASE_SOURCE_DIR}/database/src/include/firebase/database/mutable_data.h
     ${FIREBASE_SOURCE_DIR}/database/src/include/firebase/database/query.h
     ${FIREBASE_SOURCE_DIR}/database/src/include/firebase/database/transaction.h)
-  if (EXISTS "${FIREBASE_POD_DIR}/Pods/FirebaseFirestoreInternal")
-    set(firestore_HDRS
-      ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore.h
-      ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/aggregate_query.h
-      ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/aggregate_query_snapshot.h
-      ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/aggregate_source.h
-      ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/collection_reference.h
-      ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/document_change.h
-      ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/document_reference.h
-      ${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
-      ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/metadata_changes.h
-      ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/query_snapshot.h
-      ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/query.h
-      ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/set_options.h
-      ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/settings.h
-      ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/snapshot_metadata.h
-      ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/source.h
-      ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/transaction.h
-      ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/transaction_options.h
-      ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/write_batch.h
-      ${FIREBASE_POD_DIR}/Pods/FirebaseFirestoreInternal/Firestore/core/include/firebase/firestore/firestore_errors.h
-      ${FIREBASE_POD_DIR}/Pods/FirebaseFirestoreInternal/Firestore/core/include/firebase/firestore/firestore_version.h
-      ${FIREBASE_POD_DIR}/Pods/FirebaseFirestoreInternal/Firestore/core/include/firebase/firestore/geo_point.h
-      ${FIREBASE_POD_DIR}/Pods/FirebaseFirestoreInternal/Firestore/core/include/firebase/firestore/timestamp.h)
-  else()
-    set(firestore_HDRS "")
-  endif()
+  set(firestore_HDRS
+    ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore.h
+    ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/aggregate_query.h
+    ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/aggregate_query_snapshot.h
+    ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/aggregate_source.h
+    ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/collection_reference.h
+    ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/document_change.h
+    ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/document_reference.h
+    ${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
+    ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/metadata_changes.h
+    ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/query_snapshot.h
+    ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/query.h
+    ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/set_options.h
+    ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/settings.h
+    ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/snapshot_metadata.h
+    ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/source.h
+    ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/transaction.h
+    ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/transaction_options.h
+    ${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/write_batch.h
+    ${FIREBASE_POD_DIR}/Pods/FirebaseFirestoreInternal/Firestore/core/include/firebase/firestore/firestore_errors.h
+    ${FIREBASE_POD_DIR}/Pods/FirebaseFirestoreInternal/Firestore/core/include/firebase/firestore/firestore_version.h
+    ${FIREBASE_POD_DIR}/Pods/FirebaseFirestoreInternal/Firestore/core/include/firebase/firestore/geo_point.h
+    ${FIREBASE_POD_DIR}/Pods/FirebaseFirestoreInternal/Firestore/core/include/firebase/firestore/timestamp.h)
   set(functions_HDRS
     ${FIREBASE_SOURCE_DIR}/functions/src/include/firebase/functions.h
     ${FIREBASE_SOURCE_DIR}/functions/src/include/firebase/functions/callable_reference.h

scripts/gha/integration_testing/xcode_tool.rb

@@ -88,16 +88,7 @@ def main
   end
 
   framework_dir = "#@xcode_project_dir/Frameworks"
-  framework_search_paths = ['${inherited}', framework_dir]
-  
-  @frameworks.each do |framework|
-    framework_name = File.basename(framework)
-    if framework_name.end_with?('.xcframework')
-      framework_search_paths << "#{framework_dir}/#{framework_name}/ios-arm64_x86_64-simulator"
-    end
-  end
-
-  set_build_setting('FRAMEWORK_SEARCH_PATHS', framework_search_paths)
+  set_build_setting('FRAMEWORK_SEARCH_PATHS', ['${inherited}', framework_dir])
 
   if !@include_path.nil?
     append_to_build_setting('HEADER_SEARCH_PATHS', @include_path)