refactor(core): Refactor Java and Objc to Kotlin and Swift

Package.swift

@@ -36,13 +36,7 @@ let package = Package(
       dependencies: [
         .product(name: "FirebaseInstallations", package: "firebase-ios-sdk"),
       ],
-      path: "Sources/firebase_core_shared",
-      publicHeadersPath: "include",
-      cSettings: [
-        .headerSearchPath("include/firebase_core"),
-        .define("LIBRARY_VERSION", to: "\"\(firebase_core_version)\""),
-        .define("LIBRARY_NAME", to: "\"flutter-fire-core\""),
-      ]
+      path: "packages/firebase_core/firebase_core/ios/firebase_core/Sources/firebase_core"
     ),
   ]
 )

packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTDocumentSnapshotStreamHandler.m

@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 @import FirebaseFirestore;
-#if __has_include(<firebase_core/FLTFirebasePluginRegistry.h>)
-#import <firebase_core/FLTFirebasePluginRegistry.h>
+#ifdef SWIFT_PACKAGE
+@import firebase_core_shared;
 #else
-#import <FLTFirebasePluginRegistry.h>
+@import firebase_core;
 #endif
 
 #import "include/cloud_firestore/Private/FLTDocumentSnapshotStreamHandler.h"
@@ -48,10 +48,10 @@ - (FlutterError *_Nullable)onListenWithArguments:(id _Nullable)arguments
         @"message" : message,
       };
       dispatch_async(dispatch_get_main_queue(), ^{
-        events([FLTFirebasePlugin createFlutterErrorFromCode:code
-                                                     message:message
-                                             optionalDetails:details
-                                          andOptionalNSError:error]);
+        events([FLTFirebasePluginHelper createFlutterErrorWithCode:code
+                                                           message:message
+                                                   optionalDetails:details
+                                                  andOptionalError:error]);
       });
     } else {
       dispatch_async(dispatch_get_main_queue(), ^{

packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTFirebaseFirestorePlugin.m

@@ -3,12 +3,14 @@
 // found in the LICENSE file.
 
 @import FirebaseFirestore;
-#if __has_include(<firebase_core/FLTFirebasePluginRegistry.h>)
-#import <firebase_core/FLTFirebasePluginRegistry.h>
+#ifdef SWIFT_PACKAGE
+@import firebase_core_shared;
 #else
-#import <FLTFirebasePluginRegistry.h>
+@import firebase_core;
 #endif
+@import FirebaseCore;
 
+#import "include/cloud_firestore/Public/FLTFirebaseFirestorePlugin.h"
 #import <TargetConditionals.h>
 #import "FirebaseFirestoreInternal/FIRPersistentCacheIndexManager.h"
 #import "include/cloud_firestore/Private/FLTDocumentSnapshotStreamHandler.h"
@@ -19,7 +21,6 @@
 #import "include/cloud_firestore/Private/FLTSnapshotsInSyncStreamHandler.h"
 #import "include/cloud_firestore/Private/FLTTransactionStreamHandler.h"
 #import "include/cloud_firestore/Private/FirestorePigeonParser.h"
-#import "include/cloud_firestore/Public/FLTFirebaseFirestorePlugin.h"
 
 NSString *const kFLTFirebaseFirestoreChannelName = @"plugins.flutter.io/firebase_firestore";
 NSString *const kFLTFirebaseFirestoreQuerySnapshotEventChannelName =
@@ -220,7 +221,8 @@ - (FIRFirestore *_Nullable)getFIRFirestoreFromAppNameFromPigeon:
     NSString *appNameDart = pigeonApp.appName;
     NSString *databaseUrl = pigeonApp.databaseURL;
 
-    FIRApp *app = [FLTFirebasePlugin firebaseAppNamed:appNameDart];
+    FIRApp *app =
+        [FIRApp appNamed:[FLTFirebasePluginHelper firebaseAppNameFromDartName:appNameDart]];
 
     if ([FLTFirebaseFirestoreUtils getFirestoreInstanceByName:app.name
                                                   databaseURL:databaseUrl] != nil) {

packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTFirebaseFirestoreReader.m

@@ -4,12 +4,12 @@
 
 @import FirebaseFirestore;
 @import FirebaseCore;
-
-#if __has_include(<firebase_core/FLTFirebasePlugin.h>)
-#import <firebase_core/FLTFirebasePlugin.h>
+#ifdef SWIFT_PACKAGE
+@import firebase_core_shared;
 #else
-#import <FLTFirebasePlugin.h>
+@import firebase_core;
 #endif
+
 #import "include/cloud_firestore/Private/FLTFirebaseFirestoreReader.h"
 #import "include/cloud_firestore/Private/FLTFirebaseFirestoreUtils.h"
 
@@ -297,7 +297,8 @@ - (FIRFirestore *)FIRFirestore {
     NSString *appNameDart = [self readValue];
     NSString *databaseUrl = [self readValue];
     FIRFirestoreSettings *settings = [self readValue];
-    FIRApp *app = [FLTFirebasePlugin firebaseAppNamed:appNameDart];
+    FIRApp *app =
+        [FIRApp appNamed:[FLTFirebasePluginHelper firebaseAppNameFromDartName:appNameDart]];
 
     if ([FLTFirebaseFirestoreUtils getFirestoreInstanceByName:app.name
                                                   databaseURL:databaseUrl] != nil) {

packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTFirebaseFirestoreWriter.m

@@ -4,6 +4,11 @@
 
 @import FirebaseFirestore;
 @import FirebaseCore;
+#ifdef SWIFT_PACKAGE
+@import firebase_core_shared;
+#else
+@import firebase_core;
+#endif
 
 #import "include/cloud_firestore/Private/FLTFirebaseFirestoreWriter.h"
 #import "include/cloud_firestore/Private/FLTFirebaseFirestoreUtils.h"
@@ -39,7 +44,8 @@ - (void)writeValue:(id)value {
   } else if ([value isKindOfClass:[FIRDocumentReference class]]) {
     FIRDocumentReference *document = value;
     NSString *documentPath = [document path];
-    NSString *appName = [FLTFirebasePlugin firebaseAppNameFromIosName:document.firestore.app.name];
+    NSString *appName =
+        [FLTFirebasePluginHelper firebaseAppNameFromIosName:document.firestore.app.name];
     [self writeByte:FirestoreDataTypeDocumentReference];
     [self writeValue:appName];
     [self writeValue:documentPath];

packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTLoadBundleStreamHandler.m

@@ -10,14 +10,14 @@
 //
 
 @import FirebaseFirestore;
-#if __has_include(<firebase_core/FLTFirebasePluginRegistry.h>)
-#import <firebase_core/FLTFirebasePluginRegistry.h>
+#ifdef SWIFT_PACKAGE
+@import firebase_core_shared;
 #else
-#import <FLTFirebasePluginRegistry.h>
+@import firebase_core;
 #endif
 
-#import "include/cloud_firestore/Private/FLTFirebaseFirestoreUtils.h"
 #import "include/cloud_firestore/Private/FLTLoadBundleStreamHandler.h"
+#import "include/cloud_firestore/Private/FLTFirebaseFirestoreUtils.h"
 
 @interface FLTLoadBundleStreamHandler ()
 @property(readwrite, strong) FIRLoadBundleTask *task;
@@ -52,10 +52,10 @@ - (FlutterError *_Nullable)onListenWithArguments:(id _Nullable)arguments
           };
 
           dispatch_async(dispatch_get_main_queue(), ^{
-            events([FLTFirebasePlugin createFlutterErrorFromCode:code
-                                                         message:message
-                                                 optionalDetails:details
-                                              andOptionalNSError:error]);
+            events([FLTFirebasePluginHelper createFlutterErrorWithCode:code
+                                                               message:message
+                                                       optionalDetails:details
+                                                      andOptionalError:error]);
           });
         }
       }];

packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTQuerySnapshotStreamHandler.m

@@ -3,14 +3,14 @@
 // found in the LICENSE file.
 
 @import FirebaseFirestore;
-#if __has_include(<firebase_core/FLTFirebasePluginRegistry.h>)
-#import <firebase_core/FLTFirebasePluginRegistry.h>
+#ifdef SWIFT_PACKAGE
+@import firebase_core_shared;
 #else
-#import <FLTFirebasePluginRegistry.h>
+@import firebase_core;
 #endif
 
-#import "include/cloud_firestore/Private/FLTFirebaseFirestoreUtils.h"
 #import "include/cloud_firestore/Private/FLTQuerySnapshotStreamHandler.h"
+#import "include/cloud_firestore/Private/FLTFirebaseFirestoreUtils.h"
 #import "include/cloud_firestore/Private/FirestorePigeonParser.h"
 #import "include/cloud_firestore/Public/CustomPigeonHeaderFirestore.h"
 
@@ -58,10 +58,10 @@ - (FlutterError *_Nullable)onListenWithArguments:(id _Nullable)arguments
         @"message" : message,
       };
       dispatch_async(dispatch_get_main_queue(), ^{
-        events([FLTFirebasePlugin createFlutterErrorFromCode:code
-                                                     message:message
-                                             optionalDetails:details
-                                          andOptionalNSError:error]);
+        events([FLTFirebasePluginHelper createFlutterErrorWithCode:code
+                                                           message:message
+                                                   optionalDetails:details
+                                                  andOptionalError:error]);
       });
     } else {
       dispatch_async(dispatch_get_main_queue(), ^{

packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTTransactionStreamHandler.m

@@ -3,14 +3,15 @@
 // found in the LICENSE file.
 
 @import FirebaseFirestore;
-#if __has_include(<firebase_core/FLTFirebasePluginRegistry.h>)
-#import <firebase_core/FLTFirebasePluginRegistry.h>
+#ifdef SWIFT_PACKAGE
+@import firebase_core_shared;
 #else
-#import <FLTFirebasePluginRegistry.h>
+@import firebase_core;
 #endif
+@import FirebaseCore;
 
-#import "include/cloud_firestore/Private/FLTFirebaseFirestoreUtils.h"
 #import "include/cloud_firestore/Private/FLTTransactionStreamHandler.h"
+#import "include/cloud_firestore/Private/FLTFirebaseFirestoreUtils.h"
 #import "include/cloud_firestore/Private/FirestorePigeonParser.h"
 
 @interface FLTTransactionStreamHandler ()
@@ -55,8 +56,9 @@ - (FlutterError *_Nullable)onListenWithArguments:(id _Nullable)arguments
     strongSelf.started(transaction);
 
     dispatch_async(dispatch_get_main_queue(), ^{
-      events(
-          @{@"appName" : [FLTFirebasePlugin firebaseAppNameFromIosName:self.firestore.app.name]});
+      events(@{
+        @"appName" : [FLTFirebasePluginHelper firebaseAppNameFromIosName:self.firestore.app.name]
+      });
     });
 
     long timedOut = dispatch_semaphore_wait(

packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/include/cloud_firestore/Public/FLTFirebaseFirestorePlugin.h

@@ -10,14 +10,14 @@
 #endif
 
 #import <Foundation/Foundation.h>
-#if __has_include(<firebase_core/FLTFirebasePlugin.h>)
-#import <firebase_core/FLTFirebasePlugin.h>
+#ifdef SWIFT_PACKAGE
+@import firebase_core_shared;
 #else
-#import <FLTFirebasePlugin.h>
+@import firebase_core;
 #endif
 #import "FirestoreMessages.g.h"
 
 @interface FLTFirebaseFirestorePlugin
-    : FLTFirebasePlugin <FlutterPlugin, FLTFirebasePlugin, FirebaseFirestoreHostApi>
+    : NSObject <FlutterPlugin, FLTFirebasePlugin, FirebaseFirestoreHostApi>
 + (NSMutableDictionary<NSNumber *, NSString *> *)serverTimestampMap;
 @end

packages/cloud_functions/cloud_functions/android/src/main/kotlin/io/flutter/plugins/firebase/functions/FlutterFirebaseFunctionsPlugin.kt

@@ -159,8 +159,8 @@ class FlutterFirebaseFunctionsPlugin
     return taskCompletionSource.task
   }
 
-  override fun didReinitializeFirebaseCore(): Task<Void> {
-    val taskCompletionSource = TaskCompletionSource<Void>()
+  override fun didReinitializeFirebaseCore(): Task<Void?> {
+    val taskCompletionSource = TaskCompletionSource<Void?>()
 
     FlutterFirebasePlugin.cachedThreadPool.execute { taskCompletionSource.setResult(null) }
 

packages/cloud_functions/cloud_functions/ios/cloud_functions/Sources/cloud_functions/FirebaseFunctionsPlugin.swift

@@ -13,13 +13,14 @@
 #else
   import firebase_core_shared
 #endif
+import FirebaseCore
 import FirebaseFunctions
 
 extension FlutterError: Error {}
 
 let kFLTFirebaseFunctionsChannelName = "plugins.flutter.io/firebase_functions"
 
-public class FirebaseFunctionsPlugin: NSObject, FLTFirebasePluginProtocol, FlutterPlugin,
+public class FirebaseFunctionsPlugin: NSObject, FLTFirebasePlugin, FlutterPlugin,
   CloudFunctionsHostApi {
   func call(arguments: [String: Any?], completion: @escaping (Result<Any?, any Error>) -> Void) {
     httpsFunctionCall(arguments: arguments) { result, error in
@@ -48,23 +49,23 @@ public class FirebaseFunctionsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt
     self.binaryMessenger = binaryMessenger
   }
 
-  public func firebaseLibraryVersion() -> String {
+  public var firebaseLibraryVersion: String {
     versionNumber
   }
 
-  public func didReinitializeFirebaseCore(_ completion: @escaping () -> Void) {
+  public func didReinitializeFirebaseCore(completion: @escaping () -> Void) {
     completion()
   }
 
-  public func pluginConstants(for firebaseApp: FirebaseApp) -> [AnyHashable: Any] {
+  public func pluginConstants(for firebaseApp: FirebaseApp) -> [String: Any] {
     [:]
   }
 
-  @objc public func firebaseLibraryName() -> String {
+  public var firebaseLibraryName: String {
     "flutter-fire-fn"
   }
 
-  @objc public func flutterChannelName() -> String {
+  public var flutterChannelName: String {
     kFLTFirebaseFunctionsChannelName
   }
 
@@ -91,7 +92,7 @@ public class FirebaseFunctionsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt
     let parameters = arguments["parameters"]
     let limitedUseAppCheckToken = arguments["limitedUseAppCheckToken"] as? Bool ?? false
 
-    let app = FLTFirebasePlugin.firebaseAppNamed(appName)!
+    let app = FLTFirebasePluginHelper.firebaseApp(named: appName)!
 
     let functions = Functions.functions(app: app, region: region ?? "")
 
@@ -138,7 +139,7 @@ public class FirebaseFunctionsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt
   private func getFunctions(arguments: [String: Any]) -> Functions {
     let appName = arguments["appName"] as? String ?? ""
     let region = arguments["region"] as? String
-    let app = FLTFirebasePlugin.firebaseAppNamed(appName)!
+    let app = FLTFirebasePluginHelper.firebaseApp(named: appName)!
     return Functions.functions(app: app, region: region ?? "")
   }
 

packages/cloud_functions/cloud_functions/macos/cloud_functions.podspec

@@ -42,7 +42,6 @@ Pod::Spec.new do |s|
   s.authors          = 'The Chromium Authors'
   s.source           = { :path => '.' }
   s.source_files = 'cloud_functions/Sources/**/*.swift'
-  s.public_header_files = 'cloud_functions/Sources/cloud_functions/include/*.h'
   s.platform = :osx, '10.15'
 
   s.swift_version = '5.0'