Add FirebaseAppCheckInterop as dep of FirebaseAuth

andrewheard · andrewheard · commit 01d3111c8e94 · 2023-09-28T17:01:32.000-04:00
diff --git a/FirebaseAppCheck/Interop/Public/FIRAppCheckInterop.h b/FirebaseAppCheck/Interop/Public/FIRAppCheckInterop.h
diff --git a/FirebaseAppCheck/Interop/Public/FIRAppCheckProtocol.h b/FirebaseAppCheck/Interop/Public/FIRAppCheckProtocol.h
diff --git a/FirebaseAppCheck/Interop/Public/FIRAppCheckTokenResultInterop.h b/FirebaseAppCheck/Interop/Public/FIRAppCheckTokenResultInterop.h
diff --git a/FirebaseAppCheck/Interop/Public/FirebaseAppCheckInterop.h b/FirebaseAppCheck/Interop/Public/FirebaseAppCheckInterop.h
diff --git a/FirebaseAppCheckInterop.podspec b/FirebaseAppCheckInterop.podspec
@@ -26,5 +26,5 @@ Pod::Spec.new do |s|
   s.watchos.deployment_target = '6.0'
 
   s.source_files = 'FirebaseAppCheck/Interop/**/*.[hm]'
-  s.public_header_files = 'FirebaseAppCheck/Interop/FirebaseAppCheckInterop/*.h'
+  s.public_header_files = 'FirebaseAppCheck/Interop/Public/*.h'
 end
diff --git a/FirebaseAuth/Sources/Auth/FIRAuth.m b/FirebaseAuth/Sources/Auth/FIRAuth.m
@@ -22,13 +22,13 @@
 #import <UIKit/UIKit.h>
 #endif
 
+@import FirebaseAppCheckInterop;
+
 #import <GoogleUtilities/GULAppDelegateSwizzler.h>
 #import <GoogleUtilities/GULAppEnvironmentUtil.h>
 #import <GoogleUtilities/GULSceneDelegateSwizzler.h>
 #import "FirebaseAuth/Sources/Public/FirebaseAuth/FirebaseAuth.h"
 #import "FirebaseCore/Extension/FirebaseCoreInternal.h"
-
-#import "FirebaseAppCheck/Interop/FIRAppCheckInterop.h"
 #import "FirebaseAuth/Sources/Auth/FIRAuthDataResult_Internal.h"
 #import "FirebaseAuth/Sources/Auth/FIRAuthDispatcher.h"
 #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h"
diff --git a/FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthProvider.m b/FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthProvider.m
@@ -15,12 +15,14 @@
  */
 
 #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIROAuthProvider.h"
+
+@import FirebaseAppCheckInterop;
+
 #include <CommonCrypto/CommonCrypto.h>
 #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRFacebookAuthProvider.h"
 #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIROAuthCredential.h"
 #import "FirebaseCore/Extension/FirebaseCoreInternal.h"
 
-#import "FirebaseAppCheck/Interop/FIRAppCheckTokenResultInterop.h"
 #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h"
 #import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h"
 #import "FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthCredential_Internal.h"
diff --git a/FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthProvider.m b/FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthProvider.m
@@ -17,12 +17,13 @@
 #import <TargetConditionals.h>
 #if TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
 
+@import FirebaseAppCheckInterop;
+
 #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuthSettings.h"
 #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRMultiFactorResolver.h"
 #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRPhoneAuthProvider.h"
 #import "FirebaseCore/Extension/FirebaseCoreInternal.h"
 
-#import "FirebaseAppCheck/Interop/FIRAppCheckTokenResultInterop.h"
 #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h"
 #import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h"
 #import "FirebaseAuth/Sources/Backend/FIRAuthBackend+MultiFactor.h"
diff --git a/FirebaseAuth/Sources/Backend/FIRAuthBackend.m b/FirebaseAuth/Sources/Backend/FIRAuthBackend.m
@@ -23,10 +23,10 @@
 #import <GTMSessionFetcher/GTMSessionFetcherService.h>
 #endif
 
+@import FirebaseAppCheckInterop;
+
 #import "FirebaseAuth/Sources/Public/FirebaseAuth/FirebaseAuth.h"
 
-#import "FirebaseAppCheck/Interop/FIRAppCheckInterop.h"
-#import "FirebaseAppCheck/Interop/FIRAppCheckTokenResultInterop.h"
 #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h"
 #import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h"
 #import "FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthCredential_Internal.h"
diff --git a/FirebaseAuth/Sources/Backend/FIRAuthRequestConfiguration.h b/FirebaseAuth/Sources/Backend/FIRAuthRequestConfiguration.h
@@ -16,7 +16,8 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FirebaseAppCheck/Interop/FIRAppCheckInterop.h"
+@import FirebaseAppCheckInterop;
+
 #import "FirebaseAuth/Sources/Backend/FIRAuthRPCRequest.h"
 #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuth.h"
 
diff --git a/FirebaseAuth/Tests/Unit/FIRFakeAppCheck.h b/FirebaseAuth/Tests/Unit/FIRFakeAppCheck.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 #import <Foundation/Foundation.h>
-#import "FirebaseAppCheck/Interop/FIRAppCheckInterop.h"
-#import "FirebaseAppCheck/Interop/FIRAppCheckTokenResultInterop.h"
+
+@import FirebaseAppCheckInterop;
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/FirebaseAuth/Tests/Unit/FIRFakeAppCheck.m b/FirebaseAuth/Tests/Unit/FIRFakeAppCheck.m
@@ -14,8 +14,10 @@
  * limitations under the License.
  */
 #import "FirebaseAuth/Tests/Unit/FIRFakeAppCheck.h"
+
 #import <Foundation/Foundation.h>
-#import "FirebaseAppCheck/Interop/FIRAppCheckTokenResultInterop.h"
+
+@import FirebaseAppCheckInterop;
 
 #pragma mark - FIRFakeAppCheckResult
 
diff --git a/Package.swift b/Package.swift
@@ -422,6 +422,7 @@ let package = Package(
     .target(
       name: "FirebaseAuth",
       dependencies: [
+        "FirebaseAppCheckInterop",
         "FirebaseCore",
         .product(name: "GULAppDelegateSwizzler", package: "GoogleUtilities"),
         .product(name: "GULEnvironment", package: "GoogleUtilities"),
@@ -1241,7 +1242,7 @@ let package = Package(
       exclude: [
         "CMakeLists.txt",
       ],
-      publicHeadersPath: ".",
+      publicHeadersPath: "Public",
       cSettings: [
         .headerSearchPath("../../"),
       ]
@@ -1312,7 +1313,7 @@ func googleAppMeasurementDependency() -> Package.Dependency {
     return .package(url: appMeasurementURL, branch: "main")
   }
 
-  return .package(url: appMeasurementURL, exact: "10.16.0")
+  return .package(url: appMeasurementURL, branch: "main")
 }
 
 func abseilDependency() -> Package.Dependency {
