Integrate App Check with Firebase umbrella pod

.github/workflows/app_check.yml

@@ -48,8 +48,8 @@ jobs:
     strategy:
       matrix:
         flags: [
-          '--use-modular-headers',
-          '--use-libraries'
+          '--skip-tests --use-modular-headers',
+          '--skip-tests --use-libraries'
         ]
     needs: pod_lib_lint
     steps:

CoreOnly/Sources/Firebase.h

@@ -22,6 +22,10 @@
     #import <FirebaseAnalytics/FirebaseAnalytics.h>
   #endif
 
+  #if __has_include(<FirebaseAppCheck/FirebaseAppCheck.h>)
+    #import <FirebaseAppCheck/FirebaseAppCheck.h>
+  #endif
+
   #if __has_include(<FirebaseAppDistribution/FirebaseAppDistribution.h>)
     #import <FirebaseAppDistribution/FirebaseAppDistribution.h>
   #endif

Dangerfile

@@ -36,6 +36,7 @@ end
 def labelsForModifiedFiles()
   labels = []
   labels.push("api: abtesting") if @has_abtesting_changes
+  labels.push("api: appcheck") if @has_appcheck_changes
   labels.push("api: appdistribution") if @has_appdistribution_changes
   labels.push("api: auth") if @has_auth_changes
   labels.push("api: core") if @has_core_changes
@@ -73,6 +74,8 @@ has_license_changes = didModify(["LICENSE"])
 ## Product directories
 @has_abtesting_changes = hasChangesIn("FirebaseABTesting/")
 @has_abtesting_api_changes = hasChangesIn("FirebaseABTesting/Sources/Public/")
+@has_appcheck_changes = hasChangesIn("FirebaseAppCheck/")
+@has_appcheck_api_changes = hasChangesIn("FirebaseAppCheck/Sources/Public/")
 @has_appdistribution_changes = hasChangesIn("FirebaseAppDistribution/")
 @has_appdistribution_api_changes = hasChangesIn("FirebaseAppDistribution/Sources/Public")
 @has_auth_changes = hasChangesIn("FirebaseAuth")
@@ -113,6 +116,7 @@ has_license_changes = didModify(["LICENSE"])
 
 # Convenient flag for all API changes.
 @has_api_changes = @has_abtesting_api_changes ||
+                     @has_appcheck_api_changes ||
                      @has_auth_api_changes ||
                      @has_appdistribution_api_changes ||
                      @has_core_api_changes ||

Firebase.podspec

@@ -88,6 +88,11 @@ Simplify your app development, grow your user base, and monetize more effectivel
     ss.ios.dependency 'FirebaseAppDistribution', '~> 7.11.0-beta'
   end
 
+  s.subspec 'AppCheck' do |ss|
+    ss.dependency 'Firebase/CoreOnly'
+    ss.ios.dependency 'FirebaseAppCheck', '~> 7.11.0-beta'
+  end
+
   s.subspec 'Auth' do |ss|
     ss.dependency 'Firebase/CoreOnly'
     ss.dependency 'FirebaseAuth', '~> 7.11.0'

FirebaseAppCheck.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseAppCheck'
-  s.version          = '7.6.0-beta'
+  s.version          = '7.11.0-beta'
   s.summary          = 'Firebase App Check SDK.'
 
   s.description      = <<-DESC
@@ -42,15 +42,17 @@ Pod::Spec.new do |s|
   s.dependency 'PromisesObjC', '~> 1.2'
   s.dependency 'GoogleUtilities/Environment', '~> 7.2'
 
-  preprocessor_definitions = 'FIRAppCheck_LIB_VERSION=' + String(s.version)
   s.pod_target_xcconfig = {
     'GCC_C_LANGUAGE_STANDARD' => 'c99',
-    'GCC_PREPROCESSOR_DEFINITIONS' => preprocessor_definitions,
     'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"'
   }
 
   s.test_spec 'unit' do |unit_tests|
-    unit_tests.platforms = {:ios => ios_deployment_target, :osx => osx_deployment_target, :tvos => tvos_deployment_target}
+    unit_tests.platforms = {
+      :ios => ios_deployment_target,
+      :osx => osx_deployment_target,
+      :tvos => tvos_deployment_target
+    }
     unit_tests.source_files = [
       base_dir + 'Tests/Unit/**/*.[mh]',
       base_dir + 'Tests/Utils/**/*.[mh]',
@@ -65,17 +67,29 @@ Pod::Spec.new do |s|
   end
 
   s.test_spec 'integration' do |integration_tests|
-    integration_tests.platforms = {:ios => ios_deployment_target, :osx => osx_deployment_target, :tvos => tvos_deployment_target}
-    integration_tests.source_files = base_dir + 'Tests/Integration/**/*.[mh]',
-                              base_dir + 'Tests/Integration/**/*.[mh]',
-                              integration_tests.resources = base_dir + 'Tests/Fixture/**/*'
-                              integration_tests.requires_app_host = true
+    integration_tests.platforms = {
+      :ios => ios_deployment_target,
+      :osx => osx_deployment_target,
+      :tvos => tvos_deployment_target
+    }
+    integration_tests.source_files = [
+      base_dir + 'Tests/Integration/**/*.[mh]',
+      base_dir + 'Tests/Integration/**/*.[mh]',
+    ]
+    integration_tests.resources = base_dir + 'Tests/Fixture/**/*'
+    integration_tests.requires_app_host = true
   end
 
   s.test_spec 'swift-unit' do |swift_unit_tests|
-    swift_unit_tests.platforms = {:ios => ios_deployment_target, :osx => osx_deployment_target, :tvos => tvos_deployment_target}
-    swift_unit_tests.source_files = base_dir + 'Tests/Unit/Swift/**/*.swift',
-                                    base_dir + 'Tests/Unit/Swift/**/*.h'
+    swift_unit_tests.platforms = {
+      :ios => ios_deployment_target,
+      :osx => osx_deployment_target,
+      :tvos => tvos_deployment_target
+    }
+    swift_unit_tests.source_files = [
+      base_dir + 'Tests/Unit/Swift/**/*.swift',
+      base_dir + 'Tests/Unit/Swift/**/*.h',
+    ]
   end
 
 end

FirebaseAppCheck/Sources/Core/APIService/FIRAppCheckAPIService.m

@@ -24,7 +24,6 @@
 #import "FirebaseAppCheck/Sources/Core/APIService/FIRAppCheckToken+APIResponse.h"
 #import "FirebaseAppCheck/Sources/Core/Errors/FIRAppCheckErrorUtil.h"
 #import "FirebaseAppCheck/Sources/Core/FIRAppCheckLogger.h"
-#import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckVersion.h"
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
@@ -113,7 +112,7 @@ - (instancetype)initWithURLSession:(NSURLSession *)session
              [request setValue:self.APIKey forHTTPHeaderField:kAPIKeyHeaderKey];
 
              NSString *versionHeader =
-                 [NSString stringWithFormat:@"fire-app-check/%s", FIRAppCheckVersionStr];
+                 [NSString stringWithFormat:@"fire-app-check/%@", FIRFirebaseVersion()];
              [request setValue:versionHeader forHTTPHeaderField:kUserAgentKey];
              // TODO: Uncomment to re-enable platform logging once approved.
              // User agent header.

FirebaseAppCheck/Sources/Core/FIRAppCheck.m

@@ -25,7 +25,6 @@
 #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckProvider.h"
 #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckProviderFactory.h"
 #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckToken.h"
-#import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckVersion.h"
 
 #import "FirebaseAppCheck/Sources/Core/Errors/FIRAppCheckErrorUtil.h"
 #import "FirebaseAppCheck/Sources/Core/FIRAppCheckLogger.h"

FirebaseAppCheck/Sources/DeviceCheckProvider/FIRDeviceCheckProvider.m

@@ -24,7 +24,6 @@
 #import "FBLPromises.h"
 #endif
 
-#import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckVersion.h"
 #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRDeviceCheckProvider.h"
 
 #import "FirebaseAppCheck/Sources/Core/APIService/FIRAppCheckAPIService.h"

FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FirebaseAppCheck.h

@@ -18,7 +18,6 @@
 #import "FIRAppCheckProvider.h"
 #import "FIRAppCheckProviderFactory.h"
 #import "FIRAppCheckToken.h"
-#import "FIRAppCheckVersion.h"
 
 // Debug provider
 #import "FIRAppCheckDebugProvider.h"

FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckAPIServiceTests.m

@@ -19,8 +19,6 @@
 #import "FBLPromise+Testing.h"
 #import "OCMock.h"
 
-#import <FirebaseAppCheck/FIRAppCheckVersion.h>
-
 #import <GoogleUtilities/GULURLSessionDataResponse.h>
 #import <GoogleUtilities/NSURLSession+GULPromises.h>
 
@@ -93,7 +91,7 @@ - (void)testDataRequestSuccess {
 
     // TODO: Replace the assertions by the commented below once platform logging approved.
     NSString *appCheckVersionHeader =
-        [NSString stringWithFormat:@"fire-app-check/%s", FIRAppCheckVersionStr];
+        [NSString stringWithFormat:@"fire-app-check/%@", FIRFirebaseVersion()];
     XCTAssertEqualObjects(request.allHTTPHeaderFields[@"x-firebase-client"], appCheckVersionHeader);
     XCTAssertNil(request.allHTTPHeaderFields[@"X-firebase-client-log-type"]);
     //    XCTAssertEqualObjects(request.allHTTPHeaderFields[@"x-firebase-client"],

FirebaseAppCheck/Tests/Unit/Swift/AppCheckTests.swift

@@ -15,6 +15,7 @@
  */
 
 import XCTest
+
 import FirebaseCore
 import FirebaseAppCheck
 

ReleaseTooling/Sources/FirebaseManifest/FirebaseManifest.swift

@@ -31,6 +31,7 @@ public let shared = Manifest(
     Pod("FirebaseAnalytics", isClosedSource: true, platforms: ["ios"], zip: true),
     Pod("FirebaseAnalyticsSwift", isBeta: true, platforms: ["ios"]),
     Pod("FirebaseABTesting", zip: true),
+    Pod("FirebaseAppCheck", isBeta: true, zip: true),
     Pod("FirebaseRemoteConfig", zip: true),
     Pod("FirebaseAppDistribution", isBeta: true, platforms: ["ios"], zip: true),
     Pod("FirebaseAuth", zip: true),