cordova-plugin-firebasex-firestore 2.0.4 → 2.0.5

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version 2.0.5
+- (ios) fix: apply `IOS_FIREBASE_SDK_VERSION` to both installed and generated Swift package manifests.
+	- Resolves https://github.com/dpa99c/cordova-plugin-firebasex/issues/977
+
 # Version 2.0.4
 feat: add `runTransactionOnFirestoreDocument` to atomically compare field conditions on an existing document and apply field-path updates when all conditions match.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-firebasex-firestore",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "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="2.0.4"
+        version="2.0.5"
         xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android">
 

package/scripts/ios/after_plugin_install.js

@@ -105,11 +105,19 @@ function resolvePluginVariables(context) {
 function getPackageSwiftPaths(context) {
     var paths = [
         path.resolve(__dirname, "..", "..", "Package.swift"),
-        path.join(context.opts.projectRoot, "plugins", PLUGIN_ID, "Package.swift")
+        path.join(context.opts.projectRoot, "plugins", PLUGIN_ID, "Package.swift"),
+        path.join(context.opts.projectRoot, "platforms", "ios", "packages", PLUGIN_ID, "Package.swift")
     ];
 
-    return paths.filter(function(packageSwiftPath, index) {
-        return fs.existsSync(packageSwiftPath) && paths.indexOf(packageSwiftPath) === index;
+    var seen = {};
+    return paths.filter(function(packageSwiftPath) {
+        if (seen[packageSwiftPath]) return false;
+        seen[packageSwiftPath] = true;
+        if (!fs.existsSync(packageSwiftPath)) {
+            console.warn("[FirebasexFirestore] Package.swift not found at " + packageSwiftPath + ". Cannot update the Firebase SDK version in this copy.");
+            return false;
+        }
+        return true;
     });
 }
 
@@ -150,6 +158,7 @@ module.exports = function(context) {
             var result = rewritePackageSwiftValue(packageSwiftContents, "firebaseSDKVersion", pluginVariables["IOS_FIREBASE_SDK_VERSION"]);
             if (result.modified) {
                 fs.writeFileSync(packageSwiftPath, result.contents);
+                console.log("[FirebasexFirestore] Updated Swift package manifest at " + packageSwiftPath);
             }
         });
         return;