add fb support

Author: morganchen12

.github/workflows/facebookauth.yml

@@ -38,16 +38,16 @@ jobs:
       - name: Build
         run: |
           ./test.sh FirebaseFacebookAuthUI
-  # spm:
-  #   name: spm
-  #   runs-on: macOS-latest
+  spm:
+    name: spm
+    runs-on: macOS-latest
 
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@master
-  #     - name: List
-  #       run: |
-  #         xcodebuild -list
-  #     - name: Build
-  #       run: |
-  #         xcodebuild -scheme FirebaseFacebookAuthUI -sdk iphonesimulator
+    steps:
+      - name: Checkout
+        uses: actions/checkout@master
+      - name: List
+        run: |
+          xcodebuild -list
+      - name: Build
+        run: |
+          xcodebuild -scheme FirebaseFacebookAuthUI -sdk iphonesimulator

FirebaseFacebookAuthUI/Sources/FUIFacebookAuth.m

@@ -16,10 +16,16 @@
 
 #import "FirebaseFacebookAuthUI/Sources/Public/FirebaseFacebookAuthUI/FUIFacebookAuth.h"
 
+#import <FirebaseAuthUI/FirebaseAuthUI.h>
 #import <FirebaseAuth/FirebaseAuth.h>
+
+#if SWIFT_PACKAGE
+@import FBSDKCoreKit;
+@import FBSDKLoginKit;
+#else
 #import <FBSDKCoreKit/FBSDKCoreKit.h>
 #import <FBSDKLoginKit/FBSDKLoginKit.h>
-#import <FirebaseAuthUI/FirebaseAuthUI.h>
+#endif // SWIFT_PACKAGE
 
 /** @var kTableName
     @brief The name of the strings table to search for localized strings.
@@ -29,7 +35,11 @@
 /** @var kBundleName
     @brief The name of the bundle to search for resources.
  */
+#if SWIFT_PACKAGE
+static NSString *const kBundleName = @"FirebaseUI_FirebaseFacebookAuthUI";
+#else
 static NSString *const kBundleName = @"FirebaseFacebookAuthUI";
+#endif // SWIFT_PACKAGE
 
 /** @var kSignInWithFacebook
     @brief The string key for localized button text.

Package.swift

@@ -20,7 +20,7 @@ import PackageDescription
 let package = Package(
   name: "FirebaseUI",
   defaultLocalization: "en",
-  platforms: [.iOS(.v10)],
+  platforms: [.iOS(.v11)],
   products: [
     .library(
       name: "FirebaseAnonymousAuthUI",
@@ -38,6 +38,10 @@ let package = Package(
       name: "FirebaseEmailAuthUI",
       targets: ["FirebaseEmailAuthUI"]
     ),
+    .library(
+      name: "FirebaseFacebookAuthUI",
+      targets: ["FirebaseFacebookAuthUI"]
+    ),
     .library(
       name: "FirebaseFirestoreUI",
       targets: ["FirebaseFirestoreUI"]
@@ -64,12 +68,12 @@ let package = Package(
     .package(
       name: "Firebase", 
       url: "https://github.com/firebase/firebase-ios-sdk.git",
-      from: "7.2.0"
+      from: "8.0.0"
     ),
     .package(
       name: "GoogleUtilities",
       url: "https://github.com/google/GoogleUtilities.git",
-      "7.2.1" ..< "8.0.0"
+      from: "7.4.1"
     ),
     .package(
       name: "GTMSessionFetcher",
@@ -146,26 +150,24 @@ let package = Package(
         .headerSearchPath("../../"),
       ]
     ),
-    // Facebook doesn't seem to vend their ObjC libraries through SPM, though their
-    // Swift libraries wrap their ObjC ones.
-//    .target(
-//      name: "FacebookAuthUI",
-//      dependencies: [
-//        "AuthUI",
-//        .product(name: "FacebookLogin", package: "Facebook"),
-//        .product(name: "FacebookCore", package: "Facebook"),
-//      ],
-//      path: "FacebookAuth/FirebaseFacebookAuthUI",
-//      exclude: ["Info.plist"],
-//      resources: [
-//        .process("Resources"),
-//        .process("Strings"),
-//      ],
-//      publicHeadersPath: ".",
-//      cSettings: [
-//        .headerSearchPath("./"),
-//      ]
-//    ),
+    .target(
+      name: "FirebaseFacebookAuthUI",
+      dependencies: [
+        "FirebaseAuthUI",
+        .product(name: "FacebookLogin", package: "Facebook"),
+        .product(name: "FacebookCore", package: "Facebook"),
+      ],
+      path: "FirebaseFacebookAuthUI/Sources",
+      exclude: ["Info.plist"],
+      resources: [
+        .process("Resources"),
+        .process("Strings"),
+      ],
+      publicHeadersPath: "Public",
+      cSettings: [
+        .headerSearchPath("../../"),
+      ]
+    ),
     .target(
       name: "FirebaseFirestoreUI",
       dependencies: [