FIAM Consolidation (#4705)

* Move display SDK source and resources into FIAM SDK

* Change files prefixed with FID to be prefixed FIRIAM

* Restructure example apps in firebase-ios-sdk directory

* Fix directory structure for FIAM

* Move proto files into base directory

* Fix up proto files

* Move unit test files to Firebase/InAppMessaging/Tests

* Move FIRIAMSDKModeManagerTests and require app host in podspec

* Move sample apps to tests folder

* Add empty repo for FIAMDisplay that generates a warning

* Fix up functional tests app

* Fix up default UI test app

* Re-generate protos

* Add warning to remove display pod

* Remove display podspec from .travis.yml

* Remove trailing whitespace

* Fix import in test app

* Add changes to point to the default test app

* Wrap iOS version conditionals

* Add line in podspec about deprecation

* Delete whitespace in podspec

* Delete pods section in project file

* Update changelog with consolidation info

* Fix indentation in podspecs

* Fix some import issues

* Fix indent on FirebaseInAppMessaging.podspec

* Delete FirebaseInAppMessagingDisplay, update podfile for external test app

* Update podfiles, bump iOS min version to 9, remove iOS 9 checks in FIRIAMActionUrlFollowerTests

*  Add line in CHANGELOG referencing deletion of display sdk pod

* Remove unused podfile

* Update min version on Podfiles to iOS 9

* Add back FirebaseInAppMessagingDisplay.h

* Add iOS support message to CHANGELOG.md

* Wrap necessary deprecated iOS 9 call

Author: christibbs

.travis.yml

@@ -461,7 +461,6 @@ jobs:
         - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseAuthInterop.podspec
         - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCoreDiagnosticsInterop.podspec
         - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseInAppMessaging.podspec
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseInAppMessagingDisplay.podspec
 
     - stage: test
       env:
@@ -480,8 +479,6 @@ jobs:
       script:
         - travis_retry ./scripts/pod_lib_lint.rb FirebaseInAppMessaging.podspec --use-libraries
         - travis_retry ./scripts/pod_lib_lint.rb FirebaseInAppMessaging.podspec --use-modular-headers
-        - travis_retry ./scripts/pod_lib_lint.rb FirebaseInAppMessagingDisplay.podspec --use-libraries
-        - travis_retry ./scripts/pod_lib_lint.rb FirebaseInAppMessagingDisplay.podspec --use-modular-headers
 
     - stage: test
       if: type = cron

Dangerfile

@@ -80,11 +80,7 @@ has_license_changes = didModify(["LICENSE"])
 @has_dynamiclinks_changes = hasChangesIn("Firebase/DynamicLinks/")
 @has_firestore_changes = hasChangesIn("Firestore/")
 @has_functions_changes = hasChangesIn("Functions/")
-@has_inappmessaging_changes = hasChangesIn([
-  "Firebase/InAppMessaging/",
-  "Firebase/InAppMessagingDisplay/",
-  "InAppMessaging/Example/",
-  "InAppMessagingDisplay/"])
+@has_inappmessaging_changes = hasChangesIn(["FirebaseInAppMessaging/"])
 @has_installations_changes = hasChangesIn("FirebaseInstallations/Source/")
 @has_instanceid_changes = hasChangesIn("Firebase/InstanceID/")
 @has_messaging_changes = hasChangesIn("Firebase/Messaging/")

FirebaseInAppMessaging.podspec

@@ -17,15 +17,22 @@ See more product details at https://firebase.google.com/products/in-app-messagin
     :tag => 'InAppMessaging-' + s.version.to_s
   }
   s.social_media_url = 'https://twitter.com/Firebase'
-  s.ios.deployment_target = '8.0'
+  s.ios.deployment_target = '9.0'
 
   s.cocoapods_version = '>= 1.4.0'
   s.static_framework = true
   s.prefix_header_file = false
 
-  base_dir = "Firebase/InAppMessaging/"
-  s.source_files = base_dir + '**/*.[cmh]'
-  s.public_header_files = base_dir + 'Public/*.h'
+  base_dir = "FirebaseInAppMessaging/"
+  s.source_files = base_dir + "Sources/**/*.[cmh]"
+  s.public_header_files = base_dir + 'Sources/Public/*.h'
+  s.private_header_files = base_dir + 'Sources/Private/**/*.h'
+
+  s.resource_bundles = {
+    'InAppMessagingDisplayResources' => [ base_dir + 'Resources/*.xib',
+                                   base_dir + 'Resources/*.storyboard',
+                                   base_dir + 'Resources/*.png']
+  }
 
   s.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' =>
       '$(inherited) ' +
@@ -37,5 +44,12 @@ See more product details at https://firebase.google.com/products/in-app-messagin
   s.ios.dependency 'FirebaseAnalyticsInterop', '~> 1.3'
   s.dependency 'FirebaseInstanceID', '~> 4.0'
   s.dependency 'GoogleDataTransportCCTSupport', '~> 1.0'
+	
+  s.test_spec 'unit' do |unit_tests|
+      unit_tests.source_files = 'FirebaseInAppMessaging/Tests/Unit/*.[mh]'
+      unit_tests.resources = 'FirebaseInAppMessaging/Tests/Unit/*.txt'
+      unit_tests.requires_app_host = true
+      unit_tests.dependency 'OCMock'
+   end
 
 end

Firebase/InAppMessaging/Analytics/Protogen/nanopb/fiam.nanopb.c renamed to FirebaseInAppMessaging/Analytics/Protogen/nanopb/fiam.nanopb.c

@@ -54,7 +54,7 @@ const pb_field_t logs_proto_firebase_inappmessaging_ClientAppInfo_fields[3] = {
 #if !defined(PB_FIELD_32BIT)
 /* If you get an error here, it means that you need to define PB_FIELD_32BIT
  * compile-time option. You can do that in pb.h or on compiler command line.
- * 
+ *
  * The reason you need to do this is that some of your messages contain tag
  * numbers or field sizes that are larger than what can fit in 8 or 16 bit
  * field descriptors.
@@ -65,7 +65,7 @@ PB_STATIC_ASSERT((pb_membersize(logs_proto_firebase_inappmessaging_CampaignAnaly
 #if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT)
 /* If you get an error here, it means that you need to define PB_FIELD_16BIT
  * compile-time option. You can do that in pb.h or on compiler command line.
- * 
+ *
  * The reason you need to do this is that some of your messages contain tag
  * numbers or field sizes that are larger than what can fit in the default
  * 8 bit descriptors.

Firebase/InAppMessaging/Analytics/Protogen/nanopb/fiam.nanopb.h renamed to FirebaseInAppMessaging/Analytics/Protogen/nanopb/fiam.nanopb.h

@@ -1,3 +1,9 @@
+# 2020-01-28 -- v0.16.0
+- [changed] Consolidated backend and UI SDKs under `FirebaseInAppMessaging`. Developers should now use `pod Firebase/InAppMessaging` in their Podfile.
+- [changed] `FIRIAMDefaultDisplayImpl` is no longer public.
+- [changed] `FirebaseInAppMessagingDisplay` is now deprecated and should be removed from developers' Podfiles.
+- [changed] Minimum iOS version is now 9.0.
+
 # 2019-12-17 -- v0.15.6
 - [fixed] Issues with nullability in card message (#4435).
 - [fixed] Unit test failure with OCMock 3.5.0 (#4420).

Firebase/InAppMessaging/CHANGELOG.md renamed to FirebaseInAppMessaging/CHANGELOG.md

@@ -26,8 +26,8 @@ readonly REPO_DIR="$( git rev-parse --show-toplevel )"
 readonly NANOPB_VERSION="0.3.9.3"
 readonly NANOPB_TEMPDIR="$(mktemp -d)"
 
-readonly PROTO_DIR="${REPO_DIR}/Firebase/InAppMessaging/ProtoSupport/Protos"
-readonly PROTOGEN_DIR="${REPO_DIR}/Firebase/InAppMessaging/Analytics/Protogen"
+readonly PROTO_DIR="${REPO_DIR}/FirebaseInAppMessaging/ProtoSupport/Protos"
+readonly PROTOGEN_DIR="${REPO_DIR}/FirebaseInAppMessaging/Analytics/Protogen"
 
 rm -rf "${NANOPB_TEMPDIR}"
 
@@ -45,11 +45,11 @@ echo "Removing existing generated protos..."
 rm -rf "${PROTOGEN_DIR}/*"
 
 echo "Generating nanopb protos..."
-python "${REPO_DIR}/Firebase/InAppMessaging/ProtoSupport/nanopb_build_protos.py" \
+python "${REPO_DIR}/FirebaseInAppMessaging/ProtoSupport/nanopb_build_protos.py" \
   --nanopb \
   --protos_dir="${PROTO_DIR}" \
   --pythonpath="${NANOPB_TEMPDIR}/${NANOPB_BIN_DIR}/generator" \
   --output_dir="${PROTOGEN_DIR}" \
   --include="${PROTO_DIR}"
 
-rm -rf "${NANOPB_TEMPDIR}"
+rm -rf "${NANOPB_TEMPDIR}"