cordova-plugin-firebasex-firestore 1.0.1 → 2.0.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# Version 2.0.0
+- (ios) feat - BREAKING: Use Swift Package Manager (SPM) for Firebase SDK and other dependencies with `cordova-ios@8+`; continue to use Cocoapods for `cordova-ios@7`.
+- (android) Update pinned Firebase SDK versions to BoM v34.14.0 (May 28, 2026)
+	- https://firebase.google.com/support/release-notes/android#2026-05-28
+- (ios) Update pinned Firebase SDK version to v12.14.0 (May 26, 2026)
+	- https://firebase.google.com/support/release-notes/ios#version_12140_-_may_26_2026	
+
 # Version 1.0.1
 - Fix plugin metadata
 

package/Package.swift

@@ -0,0 +1,32 @@
+// swift-tools-version:5.9
+import PackageDescription
+
+let firebaseSDKVersion: Version = "12.14.0"
+
+let package = Package(
+    name: "cordova-plugin-firebasex-firestore",
+    platforms: [.iOS(.v15)],
+    products: [
+        .library(
+            name: "cordova-plugin-firebasex-firestore",
+            targets: ["FirebasexFirestorePlugin"]
+        )
+    ],
+    dependencies: [
+        .package(path: "../cordova-plugin-firebasex-core"),
+        .package(url: "https://github.com/apache/cordova-ios.git", branch: "master"),
+        .package(url: "https://github.com/firebase/firebase-ios-sdk.git", exact: firebaseSDKVersion),
+    ],
+    targets: [
+        .target(
+            name: "FirebasexFirestorePlugin",
+            dependencies: [
+                .product(name: "cordova-plugin-firebasex-core", package: "cordova-plugin-firebasex-core"),
+                .product(name: "Cordova", package: "cordova-ios"),
+                .product(name: "FirebaseFirestore", package: "firebase-ios-sdk"),
+            ],
+            path: "src/ios",
+            publicHeadersPath: "."
+        )
+    ]
+)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-firebasex-firestore",
-  "version": "1.0.1",
+  "version": "2.0.0",
   "description": "Firestore module for cordova-plugin-firebasex",
   "cordova": {
     "id": "cordova-plugin-firebasex-firestore",

package/plugin.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <plugin id="cordova-plugin-firebasex-firestore"
-        version="1.0.1"
+        version="2.0.0"
         xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android">
 
@@ -34,9 +34,9 @@
             </feature>
         </config-file>
 
-        <preference name="ANDROID_FIREBASE_FIRESTORE_VERSION" default="26.1.0" />
-        <preference name="ANDROID_GRPC_OKHTTP" default="1.75.0" />
-        <preference name="ANDROID_GSON_VERSION" default="2.13.2" />
+        <preference name="ANDROID_FIREBASE_FIRESTORE_VERSION" default="26.3.0" />
+        <preference name="ANDROID_GRPC_OKHTTP" default="1.81.0" />
+        <preference name="ANDROID_GSON_VERSION" default="2.14.0" />
 
         <source-file src="src/android/FirebasexFirestorePlugin.java" target-dir="src/org/apache/cordova/firebasex" />
         <framework src="com.google.firebase:firebase-firestore:$ANDROID_FIREBASE_FIRESTORE_VERSION" />
@@ -45,7 +45,7 @@
     </platform>
 
     <!-- iOS -->
-    <platform name="ios">
+    <platform name="ios" package="swift">
         <config-file target="config.xml" parent="/*">
             <feature name="FirebasexFirestorePlugin">
                 <param name="ios-package" value="FirebasexFirestorePlugin" />
@@ -56,14 +56,14 @@
         <header-file src="src/ios/FirebasexFirestorePlugin.h" />
         <source-file src="src/ios/FirebasexFirestorePlugin.m" />
 
-        <preference name="IOS_FIREBASE_SDK_VERSION" default="12.9.0" />
+        <preference name="IOS_FIREBASE_SDK_VERSION" default="12.14.0" />
 
         <podspec>
             <config>
                 <source url="https://cdn.cocoapods.org/"/>
             </config>
             <pods use-frameworks="true">
-                <pod name="FirebaseFirestore" tag="12.9.0" git="https://github.com/invertase/firestore-ios-sdk-frameworks.git" />
+                <pod name="FirebaseFirestore" spec="12.14.0" nospm="true" />
             </pods>
         </podspec>
 

package/scripts/ios/after_plugin_install.js

@@ -22,6 +22,12 @@ var PLUGIN_ID = "cordova-plugin-firebasex-firestore";
 /** @constant {string} The wrapper meta-plugin identifier used as a fallback source for plugin variables. */
 var WRAPPER_PLUGIN_ID = "cordova-plugin-firebasex";
 
+function isSwiftPackageManagerEnabled(projectRoot) {
+    var iosPlatformPath = path.join(projectRoot, "platforms", "ios");
+    var appSubDirPath = path.join(iosPlatformPath, "App");
+    return fs.existsSync(appSubDirPath) && fs.statSync(appSubDirPath).isDirectory();
+}
+
 /**
  * Resolves plugin variables using the 4-layer override strategy.
  *
@@ -57,6 +63,8 @@ function resolvePluginVariables(context) {
                     }
                 }
             });
+        } else {
+            console.warn("[FirebasexFirestore] config.xml not found at " + configXmlPath + ". Cannot read plugin variables from config.xml.");
         }
     } catch (e) {
         console.warn("[FirebasexFirestore] Could not read config.xml for plugin variables: " + e.message);
@@ -77,6 +85,8 @@ function resolvePluginVariables(context) {
                     }
                 });
             }
+        } else {
+            console.warn("[FirebasexFirestore] package.json not found at " + packageJsonPath + ". Cannot read plugin variables from package.json.");
         }
     } catch (e) {
         console.warn("[FirebasexFirestore] Could not read package.json for plugin variables: " + e.message);
@@ -92,6 +102,34 @@ function resolvePluginVariables(context) {
     return pluginVariables;
 }
 
+function getPackageSwiftPaths(context) {
+    var paths = [
+        path.resolve(__dirname, "..", "..", "Package.swift"),
+        path.join(context.opts.projectRoot, "plugins", PLUGIN_ID, "Package.swift")
+    ];
+
+    return paths.filter(function(packageSwiftPath, index) {
+        return fs.existsSync(packageSwiftPath) && paths.indexOf(packageSwiftPath) === index;
+    });
+}
+
+function rewritePackageSwiftValue(packageSwiftContents, key, value) {
+    if (!value) {
+        return { contents: packageSwiftContents, modified: false };
+    }
+
+    var packageValueRegex = new RegExp("let " + key + "(?:\\s*:\\s*Version)? = \\\"[^\\\"]+\\\"");
+    if (!packageValueRegex.test(packageSwiftContents)) {
+        return { contents: packageSwiftContents, modified: false };
+    }
+
+    var updatedContents = packageSwiftContents.replace(packageValueRegex, function(match) {
+        return match.replace(/\"[^\"]+\"/, '"' + value + '"');
+    });
+
+    return { contents: updatedContents, modified: updatedContents !== packageSwiftContents };
+}
+
 /**
  * Cordova hook entry point.
  * Updates the FirebaseFirestore git pod tag in the Podfile.
@@ -100,11 +138,29 @@ function resolvePluginVariables(context) {
  */
 module.exports = function(context) {
     var pluginVariables = resolvePluginVariables(context);
-    if (!pluginVariables["IOS_FIREBASE_SDK_VERSION"]) return;
+    var useSwiftPackageManager = isSwiftPackageManagerEnabled(context.opts.projectRoot);
+    if (!pluginVariables["IOS_FIREBASE_SDK_VERSION"]) {
+        console.warn("[FirebasexFirestore] IOS_FIREBASE_SDK_VERSION variable not set. Skipping iOS dependency version update.");
+        return;
+    }
+
+    if (useSwiftPackageManager) {
+        getPackageSwiftPaths(context).forEach(function(packageSwiftPath) {
+            var packageSwiftContents = fs.readFileSync(packageSwiftPath, "utf-8");
+            var result = rewritePackageSwiftValue(packageSwiftContents, "firebaseSDKVersion", pluginVariables["IOS_FIREBASE_SDK_VERSION"]);
+            if (result.modified) {
+                fs.writeFileSync(packageSwiftPath, result.contents);
+            }
+        });
+        return;
+    }
 
     var iosPlatformPath = path.join(context.opts.projectRoot, "platforms", "ios");
     var podFilePath = path.join(iosPlatformPath, "Podfile");
-    if (!fs.existsSync(podFilePath)) return;
+    if (!fs.existsSync(podFilePath)) {
+        console.warn("[FirebasexFirestore] Podfile not found at " + podFilePath + ". Cannot update FirebaseFirestore pod version.");
+        return;
+    }
 
     try {
         var podFileContents = fs.readFileSync(podFilePath, "utf-8");

package/scripts/post_install.js

@@ -5,9 +5,10 @@
  * Modifies the plugin's `plugin.xml` to switch between the standard and precompiled
  * FirebaseFirestore iOS pods based on the `IOS_USE_PRECOMPILED_FIRESTORE_POD` plugin variable.
  *
- * When enabled, the standard `FirebaseFirestore` pod (installed from CocoaPods) is replaced
+ * When enabled, the standard `FirebaseFirestore` CocoaPods fallback dependency is replaced
  * with the precompiled version from the `invertase/firestore-ios-sdk-frameworks` GitHub
- * repository, which significantly reduces iOS build times.
+ * repository. Swift Package Manager builds ignore this setting and always use the upstream
+ * Firebase package.
  *
  * When disabled (or not set), restores the standard CocoaPods-based pod if the precompiled
  * version was previously applied.
@@ -124,14 +125,15 @@ module.exports = function (context) {
 
     // Handle IOS_USE_PRECOMPILED_FIRESTORE_POD
     /** @constant {RegExp} Matches the standard CocoaPods-based FirebaseFirestore pod entry. */
-    var standardPodRegExp = /<pod\s+name="FirebaseFirestore"\s+spec="([^"]+)"\s*\/>/;
+    var standardPodRegExp = /<pod\s+name="FirebaseFirestore"\s+spec="([^"]+)"\s+nospm="true"\s*\/>/;
     /** @constant {RegExp} Matches the precompiled FirebaseFirestore pod entry (from invertase git repo). */
-    var precompiledPodRegExp = /<pod\s+name="FirebaseFirestore"\s+tag="([^"]+)"\s+git="[^"]+"\s*\/>/;;
+    var precompiledPodRegExp = /<pod\s+name="FirebaseFirestore"\s+tag="([^"]+)"\s+git="[^"]+"\s+nospm="true"\s*\/>/;
 
     if (pluginVariables["IOS_USE_PRECOMPILED_FIRESTORE_POD"] === "true") {
+        console.warn("IOS_USE_PRECOMPILED_FIRESTORE_POD only affects CocoaPods fallback installs; Swift Package Manager builds ignore it.");
         var match = pluginXmlText.match(standardPodRegExp);
         if (match) {
-            var replacement = '<pod name="FirebaseFirestore" tag="' + match[1] + '" git="https://github.com/invertase/firestore-ios-sdk-frameworks.git" />';
+            var replacement = '<pod name="FirebaseFirestore" tag="' + match[1] + '" git="https://github.com/invertase/firestore-ios-sdk-frameworks.git" nospm="true" />';
             pluginXmlText = pluginXmlText.replace(standardPodRegExp, replacement);
             pluginXmlModified = true;
             console.log("Replaced FirebaseFirestore pod with precompiled version (tag " + match[1] + ") in " + PLUGIN_ID + "/plugin.xml");
@@ -144,7 +146,7 @@ module.exports = function (context) {
         // Restore standard pod if precompiled was previously applied
         var preMatch = pluginXmlText.match(precompiledPodRegExp);
         if (preMatch) {
-            var restored = '<pod name="FirebaseFirestore" spec="' + preMatch[1] + '"/>';
+            var restored = '<pod name="FirebaseFirestore" spec="' + preMatch[1] + '" nospm="true" />';
             pluginXmlText = pluginXmlText.replace(precompiledPodRegExp, restored);
             pluginXmlModified = true;
             console.log("Restored standard FirebaseFirestore pod (spec " + preMatch[1] + ") in " + PLUGIN_ID + "/plugin.xml");

package/src/ios/FirebasexFirestorePlugin.m

@@ -3,7 +3,13 @@
  * @brief iOS implementation of the FirebaseX Cloud Firestore Cordova plugin.
  */
 #import "FirebasexFirestorePlugin.h"
-#import "FirebasexCorePlugin.h"
+#if __has_include("FirebasexCorePlugin.h")
+    // Cordova-ios 7 / CocoaPods: Files are compiled in a flat target structure
+    #import "FirebasexCorePlugin.h"
+#else
+    // Cordova-ios 8+ / SPM: Plugins are isolated Swift Package modules
+    @import cordova_plugin_firebasex_core;
+#endif
 
 @interface FirebasexFirestorePlugin ()
 /** Cloud Firestore instance. */