Remove deprecated FIAMDisplay from repo (#4899)

Author: paulb777

Carthage.md

@@ -40,7 +40,6 @@ binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFirestoreBinary.j
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFunctionsBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseGoogleSignInBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseInAppMessagingBinary.json"
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseInAppMessagingDisplayBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseMessagingBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseMLModelInterpreterBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseMLNLLanguageIDBinary.json"

CoreOnly/README.md

@@ -60,7 +60,6 @@ CocoaPods is used to install and manage dependencies in existing Xcode projects.
     pod 'Firebase/Firestore'
     pod 'Firebase/Functions'
     pod 'Firebase/InAppMessaging'
-    pod 'Firebase/InAppMessagingDisplay'
     pod 'Firebase/Messaging'
     pod 'Firebase/MLCommon'
     pod 'Firebase/MLModelInterpreter'

CoreOnly/Tests/FirebasePodTest/Podfile

@@ -19,7 +19,6 @@ target 'FirebasePodTest' do
   pod 'FirebaseFirestore', :path => '../../../'
   pod 'FirebaseFunctions', :path => '../../../'
   pod 'FirebaseInAppMessaging', :path => '../../../'
-  pod 'FirebaseInAppMessagingDisplay', :path => '../../../'
   pod 'FirebaseInstallations', :path => '../../../'
   pod 'FirebaseInstanceID', :path => '../../../'
   pod 'FirebaseMessaging', :path => '../../../'

FirebaseInAppMessagingDisplay.podspec

@@ -6,11 +6,8 @@
  [![Actions Status][gh-zip-badge]][gh-actions]
  [![Travis](https://travis-ci.org/firebase/firebase-ios-sdk.svg?branch=master)](https://travis-ci.org/firebase/firebase-ios-sdk)
 
-This repository contains a subset of the Firebase iOS SDK source. It currently
-includes FirebaseCore, FirebaseABTesting, FirebaseAuth, FirebaseDatabase,
-FirebaseFirestore, FirebaseFunctions, FirebaseInstanceID, FirebaseInAppMessaging,
-FirebaseInAppMessagingDisplay, FirebaseMessaging, FirebaseRemoteConfig, and
-FirebaseStorage.
+This repository contains all Firebase iOS SDK source except FirebaseAnalytics,
+FirebasePerformance, and FirebaseML.
 
 The repository also includes GoogleUtilities source. The
 [GoogleUtilities](GoogleUtilities/README.md) pod is

FirebaseInAppMessagingDisplay/Sources/FirebaseInAppMessagingDisplay.h

@@ -83,8 +83,8 @@ Then do the following steps:
     `Copy Bundle Resources` Build Phase :
     - For Firestore:
         - ./Rome/GRPCClient.framework/gRPCCertificates.bundle
-    - For InAppMessagingDisplay:
-        - ./Rome/FirebaseInAppMessagingDisplay.framework/InAppMessagingDisplayResources.bundle
+    - For InAppMessaging:
+        - ./Rome/FirebaseInAppMessaging.framework/InAppMessagingDisplayResources.bundle
     - For FirebaseMLVisionFaceModel:
         - ./Pods/GoogleMobileVision/FaceDetector/Resources/GoogleMVFaceDetectorResources
     - For FirebaseMLVisionTextModel:

README.md

@@ -18,7 +18,6 @@ target 'SymbolCollisionTest' do
     pod 'FirebaseFirestore', :path => '../'
     pod 'FirebaseFunctions', :path => '../'
     pod 'FirebaseInAppMessaging', :path => '../'
-    pod 'FirebaseInAppMessagingDisplay', :path => '../'
     pod 'FirebaseInstanceID', :path => '../'
     pod 'FirebaseInstallations', :path => '../'
     pod 'FirebaseMessaging', :path => '../'

Rome.md

@@ -399,8 +399,7 @@ struct ZipBuilder {
       // Skip the Firebase pod, any Interop pods, and specifically ignored frameworks.
       guard podName != "Firebase",
         !podName.contains("Interop"),
-        !podsToIgnore.contains(podName),
-        podName != "FirebaseInAppMessagingDisplay" else {
+        !podsToIgnore.contains(podName) else {
         continue
       }
 
@@ -579,7 +578,7 @@ struct ZipBuilder {
     // Get the expected versions based on the release manifests, if there are any. We'll use this to
     // validate the versions pulled from CocoaPods. Expected versions could be empty, in which case
     // validation succeeds.
-    let expected = expectedVersions().filter { $0.key != "FirebaseInAppMessagingDisplay" }
+    let expected = expectedVersions()
     if !expected.isEmpty {
       // Loop through the expected versions and verify the actual versions match.
       for podName in expected.keys {
@@ -695,11 +694,9 @@ struct ZipBuilder {
     var toInstall: [String: [URL]] = [:]
     for (podName, podInfo) in pods {
       var frameworks: [URL] = []
-      // Ignore any Interop pods or the Firebase umbrella pod. Also ignore the InAppMessagingDisplay
-      // pod since it doesn't have any source files to compile, only an empty header.
+      // Ignore any Interop pods or the Firebase umbrella pod.
       guard !podName.contains("Interop"),
-        podName != "Firebase",
-        podName != "FirebaseInAppMessagingDisplay" else {
+        podName != "Firebase" else {
         continue
       }
 

SymbolCollisionTest/Podfile

@@ -51,9 +51,9 @@ else
 'FirebaseAnalyticsInterop.podspec|FirebaseAuth.podspec|FirebaseAuthInterop.podspec|'\
 'FirebaseCoreDiagnostics.podspec|FirebaseCoreDiagnosticsInterop.podspec|'\
 'FirebaseDatabase.podspec|FirebaseDynamicLinks.podspec|FirebaseMessaging.podspec|'\
-'FirebaseStorage.podspec|Firebase/InAppMessagingDisplay|'\
-'InAppMessagingDisplay|InAppMessaging|Firebase/InAppMessaging|'\
-'FirebaseInAppMessaging.podspec|FirebaseInAppMessagingDisplay.podspec|'\
+'FirebaseStorage.podspec|'\
+'InAppMessaging|Firebase/InAppMessaging|'\
+'FirebaseInAppMessaging.podspec|'\
 'Firebase/InstanceID|FirebaseInstanceID.podspec|'\
 'FirebaseInstallations'\
 'FirebaseCrashlytics.podspec)'\
@@ -103,8 +103,8 @@ else
       ;;
 
     InAppMessaging-*)
-      check_changes '^(FirebaseInAppMessaging|FirebaseInAppMessagingDisplay|'\
-'FirebaseInAppMessaging.podspec|FirebaseInAppMessagingDisplay.podspec|Firebase/InstanceID|FirebaseInstanceID.podspec|'\
+      check_changes '^(FirebaseInAppMessaging|'\
+'FirebaseInAppMessaging.podspec|Firebase/InstanceID|FirebaseInstanceID.podspec|'\
 'FirebaseInstallations)'
       ;;