Fix include files and paths to be compatible with C++ build.

Author: jonsimantov

CMakeLists.txt

@@ -27,8 +27,8 @@ option(FIREBASE_INCLUDE_LIBRARY_DEFAULT
        "Should each library be included by default." ON)
 # Different options to enable/disable each library being included during
 # configuration.
-option(FIREBASE_INCLUDE_ADMOB "Include the AdMob library."
-       ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
+option(FIREBASE_INCLUDE_ADMOB "Include the AdMob library." OFF)
+#       ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
 option(FIREBASE_INCLUDE_ANALYTICS
        "Include the Google Analytics for Firebase library."
        ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})

cmake/external/firestore.cmake

@@ -28,18 +28,16 @@ function(GetReleasedDep)
   ExternalProject_Add(
     firestore
 
-  DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
-  GIT_REPOSITORY https://github.com/firebase/firebase-ios-sdk
-  GIT_TAG 70aa8b82a2ed36dd14448174bea0fd7e575d4d49
-  GIT_SHALLOW ON
+    DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
+    URL https://github.com/firebase/firebase-ios-sdk/archive/${version}.tar.gz
 
     PREFIX ${PROJECT_BINARY_DIR}
 
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ""
     INSTALL_COMMAND ""
     TEST_COMMAND ""
-    PATCH_COMMAND patch -Np1 -i ${CMAKE_CURRENT_LIST_DIR}/firestore_snappy.patch.txt
+    PATCH_COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/firestore_patch.py --leveldb-version-from ${CMAKE_CURRENT_LIST_DIR}/leveldb.cmake
     HTTP_HEADER "${EXTERNAL_PROJECT_HTTP_HEADER}"
     )
 endfunction()
@@ -60,7 +58,7 @@ function(GetTag t)
     BUILD_COMMAND ""
     INSTALL_COMMAND ""
     TEST_COMMAND ""
-    PATCH_COMMAND patch -Np1 -i ${CMAKE_CURRENT_LIST_DIR}/firestore_snappy.patch.txt
+    PATCH_COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/firestore_patch.py --leveldb-version-from ${CMAKE_CURRENT_LIST_DIR}/leveldb.cmake
     HTTP_HEADER "${EXTERNAL_PROJECT_HTTP_HEADER}"
     )
 endfunction()
@@ -76,10 +74,3 @@ else()
   endif()
 endif()
 
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ""
-  INSTALL_COMMAND ""
-  TEST_COMMAND ""
-  PATCH_COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/firestore_patch.py --leveldb-version-from ${CMAKE_CURRENT_LIST_DIR}/leveldb.cmake
-  HTTP_HEADER "${EXTERNAL_PROJECT_HTTP_HEADER}"
-)

firestore/CMakeLists.txt

@@ -392,7 +392,8 @@ elseif(IOS)
       nanopb
       gRPC-C++
       gRPC-Core
-      FirebaseAuth/Interop
+      FirebaseAuthInterop/FirebaseAuth/Interop
+      FirebaseCoreExtension/FirebaseCore/Extension
 )
 
   if (FIREBASE_XCODE_TARGET_FORMAT STREQUAL "frameworks")

firestore/src/main/create_credentials_provider_ios.mm

@@ -17,7 +17,11 @@
 #include "firestore/src/main/create_credentials_provider.h"
 
 #import "FIRAuthInterop.h"
-#import "FirebaseCoreInternal.h"
+#import "FirebaseCore.h"
+#import "FIRAppInternal.h"
+#import "FIRComponent.h"
+#import "FIRComponentContainer.h"
+#import "FIRComponentType.h"
 
 #include "Firestore/core/src/credentials/firebase_auth_credentials_provider_apple.h"
 #include "absl/memory/memory.h"