Activate community support for Combine in Firebase 🔥

* Updated package naming, to highlight this is a community-supported effort
* Targets are named `Firebase<Product>CombineSwift, to allow `import Firebase<Product>CombineSwift`
* Removed umbrella package
* Packages are named `Firebase<Product>Combine-Community`
* Updated sample app to match new package structure
* Updated installation instructions
* Updated README
* Updated changelog.

Author: peterfriese

Example/CombineSample/CombineSample.xcodeproj/project.pbxproj

@@ -13,13 +13,16 @@
 		885F5FB82653BE0D00848BCF /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 885F5FB72653BE0D00848BCF /* Preview Assets.xcassets */; };
 		88B12B5B265547FF008CFF38 /* AuthenticationMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88B12B5A265547FF008CFF38 /* AuthenticationMenuView.swift */; };
 		88B12B5D26554829008CFF38 /* MenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88B12B5C26554829008CFF38 /* MenuView.swift */; };
+		88DA0515270662B300A3DDCE /* FirebaseAuthCombine-Community in Frameworks */ = {isa = PBXBuildFile; productRef = 88DA0514270662B300A3DDCE /* FirebaseAuthCombine-Community */; };
 		88DCE7432655419C003BCB65 /* UserInfoViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88DCE7422655419C003BCB65 /* UserInfoViewModel.swift */; };
 		88DCE746265541FB003BCB65 /* UserInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88DCE745265541FB003BCB65 /* UserInfoView.swift */; };
 		88DCE7482655429F003BCB65 /* AnonymousSignInViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88DCE7472655429F003BCB65 /* AnonymousSignInViewModel.swift */; };
 		88DF7E412653CE6E009794F3 /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 88DF7E402653CE6E009794F3 /* FirebaseAuth */; };
 		88DF7E472653D092009794F3 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 88DF7E462653D092009794F3 /* GoogleService-Info.plist */; };
-		88DF7E4B2653D673009794F3 /* FirebaseCombineSwift-Beta in Frameworks */ = {isa = PBXBuildFile; productRef = 88DF7E4A2653D673009794F3 /* FirebaseCombineSwift-Beta */; };
 		88DF7E512654057F009794F3 /* LabelTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88DF7E502654057F009794F3 /* LabelTextView.swift */; };
+		88E32CFB2694859700511B1B /* FirebaseFirestoreCombine-Community in Frameworks */ = {isa = PBXBuildFile; productRef = 88E32CFA2694859700511B1B /* FirebaseFirestoreCombine-Community */; };
+		88E32CFD2694859700511B1B /* FirebaseFunctionsCombine-Community in Frameworks */ = {isa = PBXBuildFile; productRef = 88E32CFC2694859700511B1B /* FirebaseFunctionsCombine-Community */; };
+		88E32CFF2694859700511B1B /* FirebaseStorageCombine-Community in Frameworks */ = {isa = PBXBuildFile; productRef = 88E32CFE2694859700511B1B /* FirebaseStorageCombine-Community */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -43,8 +46,11 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				88E32CFB2694859700511B1B /* FirebaseFirestoreCombine-Community in Frameworks */,
 				88DF7E412653CE6E009794F3 /* FirebaseAuth in Frameworks */,
-				88DF7E4B2653D673009794F3 /* FirebaseCombineSwift-Beta in Frameworks */,
+				88E32CFF2694859700511B1B /* FirebaseStorageCombine-Community in Frameworks */,
+				88E32CFD2694859700511B1B /* FirebaseFunctionsCombine-Community in Frameworks */,
+				88DA0515270662B300A3DDCE /* FirebaseAuthCombine-Community in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -160,7 +166,10 @@
 			name = CombineSample;
 			packageProductDependencies = (
 				88DF7E402653CE6E009794F3 /* FirebaseAuth */,
-				88DF7E4A2653D673009794F3 /* FirebaseCombineSwift-Beta */,
+				88E32CFA2694859700511B1B /* FirebaseFirestoreCombine-Community */,
+				88E32CFC2694859700511B1B /* FirebaseFunctionsCombine-Community */,
+				88E32CFE2694859700511B1B /* FirebaseStorageCombine-Community */,
+				88DA0514270662B300A3DDCE /* FirebaseAuthCombine-Community */,
 			);
 			productName = CombineSample;
 			productReference = 885F5FAD2653BE0D00848BCF /* CombineSample.app */;
@@ -414,13 +423,25 @@
 /* End XCConfigurationList section */
 
 /* Begin XCSwiftPackageProductDependency section */
+		88DA0514270662B300A3DDCE /* FirebaseAuthCombine-Community */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = "FirebaseAuthCombine-Community";
+		};
 		88DF7E402653CE6E009794F3 /* FirebaseAuth */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = FirebaseAuth;
 		};
-		88DF7E4A2653D673009794F3 /* FirebaseCombineSwift-Beta */ = {
+		88E32CFA2694859700511B1B /* FirebaseFirestoreCombine-Community */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = "FirebaseFirestoreCombine-Community";
+		};
+		88E32CFC2694859700511B1B /* FirebaseFunctionsCombine-Community */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = "FirebaseFunctionsCombine-Community";
+		};
+		88E32CFE2694859700511B1B /* FirebaseStorageCombine-Community */ = {
 			isa = XCSwiftPackageProductDependency;
-			productName = "FirebaseCombineSwift-Beta";
+			productName = "FirebaseStorageCombine-Community";
 		};
 /* End XCSwiftPackageProductDependency section */
 	};

Example/CombineSample/CombineSample/App/CombineSampleApp.swift

@@ -26,7 +26,7 @@ struct CombineSampleApp: App {
       NavigationView {
         MenuView()
       }
-      // see https://stackoverflow.com/questions/63740788/swiftui-displaymodebuttonitem-is-internally-managed
+      // see https://stackoverflow.com/q/63740788/281221
       .navigationViewStyle(StackNavigationViewStyle())
     }
   }

Example/CombineSample/CombineSample/ViewModels/Authentication/AnonymousSignInViewModel.swift

@@ -14,7 +14,10 @@
 
 import Foundation
 import Firebase
-import FirebaseCombineSwift
+import FirebaseAuthCombineSwift
+import FirebaseFirestoreCombineSwift
+import FirebaseFunctionsCombineSwift
+import FirebaseStorageCombineSwift
 import Combine
 
 class AnonymousSignInViewModel: UserInfoViewModel {

Example/CombineSample/CombineSample/ViewModels/Authentication/UserInfoViewModel.swift

@@ -13,7 +13,8 @@
 // limitations under the License.
 
 import Firebase
-import FirebaseCombineSwift
+import FirebaseAuth
+import FirebaseAuthCombineSwift
 import Combine
 
 class UserInfoViewModel: ObservableObject {

Example/CombineSample/CombineSample/Views/Authentication/AnonymousSignInView.swift

@@ -14,7 +14,7 @@
 
 import SwiftUI
 import Firebase
-import FirebaseCombineSwift
+import FirebaseAuthCombineSwift
 import Combine
 
 struct AnonymousSignInView: View {

FirebaseCombineSwift/CHANGELOG.md

@@ -1,5 +1,4 @@
-# Unreleased
-
+# v8.9.0
 - [feature] Added Combine support for Cloud Functions for Firebase
 - [feature] Added Combine support for Firebase Auth
 - [feature] Added Combine support for Firebase Storage

FirebaseCombineSwift/README.md

@@ -2,7 +2,8 @@
 
 This module contains Combine support for Firebase APIs.
 
-**Note**: This feature is under development and not yet supported for use in production environments. You can follow development on the [project tracker](https://github.com/firebase/firebase-ios-sdk/projects/3)
+**Note**: This feature is under development and is supported only on a community basis. You can follow
+development on the [project tracker](https://github.com/firebase/firebase-ios-sdk/projects/3)
 
 ## Installation
 
@@ -27,9 +28,17 @@ end
 <details><summary>Swift Package Manager</summary>
 
 * Follow the instructions in [Swift Package Manager for Firebase Beta
-](../SwiftPackageManager.md)
-* Make sure to import the package `FirebaseCombineSwift-Beta`
-
+](../SwiftPackageManager.md) to add Firebase to your project
+* Make sure to import all of the following packages you intend to use:
+  * FirebaseAuthCombine-Community
+  * FirebaseFirestoreCombine-Community
+  * FirebaseFunctionsCombine-Community
+  * FirebaseStorageCombine-Community
+* In your code, import the respective module:
+  * FirebaseAuthCombineSwift
+  * FirebaseFirestoreCombineSwift
+  * FirebaseFunctionsCombineSwift
+  * FirebaseStorageCombineSwift
 </details>
 
 ## Usage

Package.swift

@@ -47,27 +47,22 @@ let package = Package(
       name: "FirebaseAppDistribution-Beta",
       targets: ["FirebaseAppDistributionTarget"]
     ),
-    // TODO: Re-enable after API review passes.
-    // .library(
-    //   name: "FirebaseCombineSwift-Beta",
-    //   targets: ["FirebaseCombineSwift"]
-    // ),
-    // .library(
-    //   name: "FirebaseAuthCombineSwift-Beta",
-    //   targets: ["FirebaseAuthCombineSwift"]
-    // ),
-    // .library(
-    //   name: "FirebaseFirestoreCombineSwift-Beta",
-    //   targets: ["FirebaseFirestoreCombineSwift"]
-    // ),
-    // .library(
-    //   name: "FirebaseFunctionsCombineSwift-Beta",
-    //   targets: ["FirebaseFunctionsCombineSwift"]
-    // ),
-    // .library(
-    //   name: "FirebaseStorageCombineSwift-Beta",
-    //   targets: ["FirebaseStorageCombineSwift"]
-    // ),
+    .library(
+      name: "FirebaseAuthCombine-Community",
+      targets: ["FirebaseAuthCombineSwift"]
+    ),
+    .library(
+      name: "FirebaseFirestoreCombine-Community",
+      targets: ["FirebaseFirestoreCombineSwift"]
+    ),
+    .library(
+      name: "FirebaseFunctionsCombine-Community",
+      targets: ["FirebaseFunctionsCombineSwift"]
+    ),
+    .library(
+      name: "FirebaseStorageCombine-Community",
+      targets: ["FirebaseStorageCombineSwift"]
+    ),
     .library(
       name: "FirebaseCrashlytics",
       targets: ["FirebaseCrashlytics"]
@@ -409,24 +404,17 @@ let package = Package(
         .headerSearchPath("../../.."),
       ]
     ),
-    .target(
-      name: "FirebaseCombineSwift",
-      dependencies: [
-        "FirebaseAuthCombineSwift",
-        "FirebaseFirestoreCombineSwift",
-        "FirebaseFunctionsCombineSwift",
-        "FirebaseStorageCombineSwift",
-      ],
-      path: "FirebaseCombineSwift/Sources/Core"
-    ),
     .target(
       name: "FirebaseAuthCombineSwift",
       dependencies: ["FirebaseAuth"],
       path: "FirebaseCombineSwift/Sources/Auth"
     ),
     .target(
       name: "FirebaseFirestoreCombineSwift",
-      dependencies: ["FirebaseFirestore", "FirebaseFirestoreSwift"],
+      dependencies: [
+        "FirebaseFirestore",
+        "FirebaseFirestoreSwift",
+      ],
       path: "FirebaseCombineSwift/Sources/Firestore"
     ),
     .target(
@@ -982,7 +970,10 @@ let package = Package(
         "FirebaseABTesting",
         .target(name: "FirebaseAppDistribution",
                 condition: .when(platforms: [.iOS])),
-        "FirebaseCombineSwift",
+        "FirebaseAuthCombineSwift",
+        "FirebaseFirestoreCombineSwift",
+        "FirebaseFunctionsCombineSwift",
+        "FirebaseStorageCombineSwift",
         "FirebaseCrashlytics",
         "FirebaseCore",
         "FirebaseDatabase",

README.md

@@ -37,8 +37,6 @@ Firebase is an app development platform with tools to help you build, grow and
 monetize your app. More information about Firebase can be found on the
 [official Firebase website](https://firebase.google.com).
 
-**Note** _FirebaseCombineSwift_ contains support for Apple's Combine framework. This module is currently under development, and not yet supported for use in production environments. Fore more details, please refer to the [docs](FirebaseCombineSwift/README.md).
-
 ## Installation
 
 See the subsections below for details about the different installation methods.
@@ -257,6 +255,11 @@ We've seen an amazing amount of interest and contributions to improve the Fireba
 very grateful!  We'd like to empower as many developers as we can to be able to use Firebase and
 participate in the Firebase community.
 
+#### Combine
+Thanks to contributions from the community, _FirebaseCombineSwift_ contains support for Apple's Combine
+framework. This module is currently under development, and not yet supported for use in production
+environments. Fore more details, please refer to the [docs](FirebaseCombineSwift/README.md).
+
 #### tvOS, macOS, watchOS and Catalyst
 Thanks to contributions from the community, many of Firebase SDKs now compile, run unit tests, and
 work on tvOS, macOS, watchOS and Catalyst.