Fixes for Auth

Author: a-maurice

auth/CMakeLists.txt

@@ -174,6 +174,7 @@ target_include_directories(firebase_auth
     ${CMAKE_CURRENT_LIST_DIR}/src/include
   PRIVATE
     ${FIREBASE_CPP_SDK_ROOT_DIR}
+    ${FIREBASE_CPP_SDK_ROOT_DIR}/ios_pod/swift_headers
     ${additional_include_DIR}
 )
 target_compile_definitions(firebase_auth
@@ -201,6 +202,7 @@ elseif(IOS)
     POD_NAMES
       FirebaseCore
       FirebaseAuth
+      FirebaseAuthInterop/FirebaseAuth/Interop
   )
   if (FIREBASE_XCODE_TARGET_FORMAT STREQUAL "frameworks")
     set_target_properties(firebase_auth PROPERTIES

auth/src/ios/auth_ios.mm

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-#import "FIRAdditionalUserInfo.h"
-#import "FIRAuthDataResult.h"
+#import <UIKit/UIKit.h>
+
 #import "FIRAuthErrors.h"
-#import "FIROAuthCredential.h"
+#import "FirebaseAuthInterop/FIRAuthInterop.h"
 #import "FIROptions.h"
+#import "FirebaseAuth-Swift.h"
 
 #include "app/src/app_ios.h"
 #include "app/src/assert.h"

auth/src/ios/common_ios.h

@@ -18,13 +18,12 @@
 #define FIREBASE_AUTH_SRC_IOS_COMMON_IOS_H_
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 #import "FIRAuth.h"
-#import "FIRAuthCredential.h"
-#import "FIROAuthProvider.h"
+#import "FirebaseAuthInterop/FIRAuthInterop.h"
 #import "FIRUser.h"
-#import "FIRUserInfo.h"
-#import "FIRUserMetadata.h"
+#import "FirebaseAuth-Swift.h"
 
 #include "app/src/log.h"
 #include "app/src/util_ios.h"

auth/src/ios/credential_ios.mm

@@ -19,14 +19,16 @@
 #include "auth/src/ios/common_ios.h"
 
 #import <GameKit/GameKit.h>
+#import <UIKit/UIKit.h>
 
+#import "FirebaseAuthInterop/FIRAuthInterop.h"
 #import "FIREmailAuthProvider.h"
 #import "FIRFacebookAuthProvider.h"
 #import "FIRFederatedAuthProvider.h"
 #import "FIRGameCenterAuthProvider.h"
 #import "FIRGitHubAuthProvider.h"
 #import "FIRGoogleAuthProvider.h"
-#import "FIROAuthProvider.h"
+#import "FirebaseAuth-Swift.h"
 
 #if FIREBASE_PLATFORM_IOS
 // PhoneAuth is not supported on non-iOS Apple platforms (eg: tvOS).

auth/src/ios/user_ios.mm

@@ -17,10 +17,6 @@
 #include "app/src/time.h"
 #include "auth/src/ios/common_ios.h"
 
-#if FIREBASE_PLATFORM_IOS
-#import "FIRPhoneAuthCredential.h"
-#endif
-
 namespace firebase {
 namespace auth {
 

cmake/toolchains/ios.cmake

@@ -35,7 +35,7 @@ set(CMAKE_OSX_ARCHITECTURES arm64 CACHE STRING "")
 set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos")
 set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
 set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "YES")
-set(CMAKE_OSX_DEPLOYMENT_TARGET "8.0" CACHE STRING "")
+set(CMAKE_OSX_DEPLOYMENT_TARGET "13.0" CACHE STRING "")
 
 # skip TRY_COMPILE checks
 set(CMAKE_CXX_COMPILER_WORKS TRUE)

cmake/toolchains/ios_simulator.cmake

@@ -17,7 +17,7 @@ set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING "")
 set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphonesimulator")
 set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
 set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "YES")
-set(CMAKE_OSX_DEPLOYMENT_TARGET "8.0" CACHE STRING "")
+set(CMAKE_OSX_DEPLOYMENT_TARGET "13.0" CACHE STRING "")
 set(IOS_PLATFORM_LOCATION "iPhoneSimulator.platform")
 
 # skip TRY_COMPILE checks