[InAppMessaging] Consolidate FIAM and FIAMSwift

.github/workflows/inappmessaging.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: macos-12
     strategy:
       matrix:
-        podspec: [FirebaseInAppMessaging.podspec, FirebaseInAppMessagingSwift.podspec]
+        podspec: [FirebaseInAppMessaging.podspec, FirebaseInAppMessagingSwift.podspec --allow-warnings]
     steps:
     - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1

FirebaseInAppMessaging.podspec

@@ -28,16 +28,17 @@ See more product details at https://firebase.google.com/products/in-app-messagin
   base_dir = "FirebaseInAppMessaging/"
   s.ios.source_files = [
     base_dir + "Sources/*.[cmh]",
-	base_dir + "Sources/Analytics/**/*.[cmh]",
-	base_dir + "Sources/Data/**/*.[cmh]",
-	base_dir + "Sources/DefaultUI/**/*.[cmh]",
-	base_dir + "Sources/DisplayTrigger/**/*.[cmh]",
-	base_dir + "Sources/Flows/**/*.[cmh]",
-	base_dir + "Sources/Private/**/*.[cmh]",
-	base_dir + "Sources/Public/**/*.[cmh]",
-	base_dir + "Sources/RenderingObjects/**/*.[cmh]",
-	base_dir + "Sources/Runtime/**/*.[cmh]",
-	base_dir + "Sources/Util/**/*.[cmh]",
+	  base_dir + "Sources/Analytics/**/*.[cmh]",
+	  base_dir + "Sources/Data/**/*.[cmh]",
+	  base_dir + "Sources/DefaultUI/**/*.[cmh]",
+	  base_dir + "Sources/DisplayTrigger/**/*.[cmh]",
+	  base_dir + "Sources/Flows/**/*.[cmh]",
+	  base_dir + "Sources/Private/**/*.[cmh]",
+	  base_dir + "Sources/Public/**/*.[cmh]",
+	  base_dir + "Sources/RenderingObjects/**/*.[cmh]",
+	  base_dir + "Sources/Runtime/**/*.[cmh]",
+	  base_dir + "Sources/Util/**/*.[cmh]",
+    base_dir + "Swift/Source/**/*.swift",
     'Interop/Analytics/Public/*.h',
     'FirebaseABTesting/Sources/Private/*.h',
     'FirebaseCore/Extension/*.h',
@@ -46,15 +47,16 @@ See more product details at https://firebase.google.com/products/in-app-messagin
 
   s.tvos.source_files = [
     base_dir + "Sources/*.[cmh]",
-	base_dir + "Sources/Analytics/**/*.[cmh]",
-	base_dir + "Sources/Data/**/*.[cmh]",
-	base_dir + "Sources/DisplayTrigger/**/*.[cmh]",
-	base_dir + "Sources/Flows/**/*.[cmh]",
-	base_dir + "Sources/Private/**/*.[cmh]",
-	base_dir + "Sources/Public/**/*.[cmh]",
-	base_dir + "Sources/RenderingObjects/**/*.[cmh]",
-	base_dir + "Sources/Runtime/**/*.[cmh]",
-	base_dir + "Sources/Util/**/*.[cmh]",
+	  base_dir + "Sources/Analytics/**/*.[cmh]",
+	  base_dir + "Sources/Data/**/*.[cmh]",
+	  base_dir + "Sources/DisplayTrigger/**/*.[cmh]",
+	  base_dir + "Sources/Flows/**/*.[cmh]",
+	  base_dir + "Sources/Private/**/*.[cmh]",
+	  base_dir + "Sources/Public/**/*.[cmh]",
+	  base_dir + "Sources/RenderingObjects/**/*.[cmh]",
+	  base_dir + "Sources/Runtime/**/*.[cmh]",
+	  base_dir + "Sources/Util/**/*.[cmh]",
+    base_dir + "Swift/Source/**/*.swift",
     'Interop/Analytics/Public/*.h',
     'FirebaseABTesting/Sources/Private/*.h',
     'FirebaseCore/Extension/*.h',

FirebaseInAppMessaging/CHANGELOG.md

@@ -1,3 +1,10 @@
+# Unreleased
+- [deprecated] All of the public API from `FirebaseInAppMessagingSwift` can now
+  be accessed through the `FirebaseInAppMessaging` module. Therefore,
+  `FirebaseInAppMessagingSwift` has been deprecated, and will be removed in a
+  future release. See https://firebase.google.com/docs/ios/swift-migration for
+  migration instructions.
+
 # 10.13.0
 - [fixed] Fix Firebase tvOS podspec dependency for In App Messaging. (#11569)
 

FirebaseInAppMessaging/Swift/Source/CustomInAppMessageDisplayViewModifier.swift

@@ -12,9 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import FirebaseInAppMessaging
 import SwiftUI
 
+#if SWIFT_PACKAGE
+  @_exported import FirebaseInAppMessagingInternal
+#endif // SWIFT_PACKAGE
+
 // MARK: Image-only messages.
 
 @available(iOS 13, tvOS 13, *)

FirebaseInAppMessaging/Swift/Source/SPMSwiftHeaderWorkaround.swift

@@ -0,0 +1,30 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#if SWIFT_PACKAGE
+  @_exported import FirebaseInAppMessagingInternal
+
+  // This is a trick to force generate a `FirebaseInAppMessaging-Swift.h`
+  // header that re-exports `FirebaseInAppMessagingInternal` for Objective-C
+  // clients. It is important for the below code to reference a Remote
+  // Config symbol defined in Objective-C as that will import the symbol's
+  // module (`FirebaseInAppMessagingInternal`) in the generated header. This
+  // allows Objective-C clients to import Remote Config's Objective-C API
+  // using `@import FirebaseInAppMessaging;`. This API is not needed for Swift
+  // clients and is therefore unavailable in a Swift context.
+  @available(*, unavailable)
+  @objc public extension InAppMessaging {
+    static var __no_op: () -> Void { {} }
+  }
+#endif // SWIFT_PACKAGE

FirebaseInAppMessaging/Swift/Source/SwiftUIPreviewHelpers.swift

@@ -14,7 +14,9 @@
 
 import UIKit
 
-import FirebaseInAppMessaging
+#if SWIFT_PACKAGE
+  @_exported import FirebaseInAppMessagingInternal
+#endif // SWIFT_PACKAGE
 
 @available(iOS 13.0, tvOS 13.0, *)
 @available(iOSApplicationExtension, unavailable)

FirebaseInAppMessagingSwift.podspec

@@ -24,7 +24,7 @@ See more product details at https://firebase.google.com/products/in-app-messagin
   s.prefix_header_file      = false
 
   s.source_files = [
-    'FirebaseInAppMessaging/Swift/Source/**/*.swift',
+    'FirebaseInAppMessagingSwift/Sources/**/*.swift',
   ]
 
   s.test_spec 'unit' do |unit_tests|
@@ -35,5 +35,5 @@ See more product details at https://firebase.google.com/products/in-app-messagin
 
   s.framework = 'UIKit'
 
-  s.dependency 'FirebaseInAppMessaging', '~> 10.0-beta'
+  s.dependency 'FirebaseInAppMessaging', '~> 10.17-beta'
 end

FirebaseInAppMessagingSwift/Sources/FirebaseInAppMessagingSwift.swift

@@ -0,0 +1,21 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#warning(
+  "All of the public API from `FirebaseInAppMessagingSwift` can now be accessed through the `FirebaseInAppMessaging` module. Therefore, the `FirebaseInAppMessagingSwift` module is deprecated and will be removed in the future. See https://firebase.google.com/docs/ios/swift-migration for migration instructions."
+)
+
+// The `@_exported` is needed to prevent breaking clients that are using
+// types prefixed with the `FirebaseInAppMessaging` namespace.
+@_exported import enum FirebaseInAppMessaging.InAppMessagingPreviewHelpers

Package.swift

@@ -758,7 +758,7 @@ let package = Package(
     ),
 
     .target(
-      name: "FirebaseInAppMessaging",
+      name: "FirebaseInAppMessagingInternal",
       dependencies: [
         "FirebaseCore",
         "FirebaseInstallations",
@@ -787,10 +787,16 @@ let package = Package(
       resources: [.process("Resources")]
     ),
 
+    .target(
+      name: "FirebaseInAppMessaging",
+      dependencies: ["FirebaseInAppMessagingInternal"],
+      path: "FirebaseInAppMessaging/Swift/Source"
+    ),
+
     .target(
       name: "FirebaseInAppMessagingSwift",
       dependencies: ["FirebaseInAppMessaging"],
-      path: "FirebaseInAppMessaging/Swift/Source"
+      path: "FirebaseInAppMessagingSwift/Sources"
     ),
 
     .target(
@@ -1156,7 +1162,8 @@ let package = Package(
         "FirebaseFirestoreTarget",
         "FirebaseFirestoreSwift",
         "FirebaseFunctions",
-        "FirebaseInAppMessaging",
+        .target(name: "FirebaseInAppMessaging",
+                condition: .when(platforms: [.iOS, .tvOS])),
         .target(name: "FirebaseInAppMessagingSwift",
                 condition: .when(platforms: [.iOS, .tvOS])),
         "FirebaseInstallations",
@@ -1194,7 +1201,8 @@ let package = Package(
         "FirebaseDynamicLinks",
         "FirebaseFirestoreTarget",
         "FirebaseFunctions",
-        "FirebaseInAppMessaging",
+        .target(name: "FirebaseInAppMessaging",
+                condition: .when(platforms: [.iOS, .tvOS])),
         "FirebaseInstallations",
         "FirebaseMessaging",
         .target(name: "FirebasePerformance",

ReleaseTooling/Sources/FirebaseManifest/FirebaseManifest.swift

@@ -51,7 +51,13 @@ public let shared = Manifest(
     Pod("FirebaseFirestoreSwift", zip: true),
     Pod("FirebaseFunctions", zip: true),
     Pod("FirebaseInAppMessaging", isBeta: true, platforms: ["ios"]),
-    Pod("FirebaseInAppMessagingSwift", isBeta: true, platforms: ["ios"], zip: true),
+    Pod(
+      "FirebaseInAppMessagingSwift",
+      isBeta: true,
+      allowWarnings: true,
+      platforms: ["ios"],
+      zip: true
+    ),
     Pod("FirebaseMessaging", zip: true),
     Pod("FirebasePerformance", platforms: ["ios", "tvos"], zip: true),
     Pod("FirebaseStorage", zip: true),

SwiftPMTests/swift-test/all-imports.swift

@@ -32,8 +32,8 @@ import FirebaseMessaging
 #if (os(iOS) && !targetEnvironment(macCatalyst)) || os(tvOS)
   import FirebasePerformance
 
-  import FirebaseInAppMessaging
-  @testable import FirebaseInAppMessagingSwift
+  @testable import FirebaseInAppMessaging
+  import FirebaseInAppMessagingSwift
   import SwiftUI
 #endif
 import FirebaseRemoteConfig