fix: use string concatenation instead of format #1260

Author: EddyVerbruggen

demo-ng/package.json

@@ -6,10 +6,10 @@
   "nativescript": {
     "id": "org.nativescript.firebasedemo.firestore",
     "tns-android": {
-      "version": "5.1.0"
+      "version": "5.2.0"
     },
     "tns-ios": {
-      "version": "5.1.0"
+      "version": "5.2.0"
     }
   },
   "dependencies": {
@@ -25,11 +25,11 @@
     "nativescript-angular": "^6.1.0",
     "nativescript-camera": "~4.1.1",
     "nativescript-imagepicker": "~6.0.5",
-    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-8.3.1.tgz",
+    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-8.3.2.tgz",
     "nativescript-theme-core": "~1.0.4",
     "reflect-metadata": "~0.1.10",
     "rxjs": "~6.0.0 || >=6.1.0",
-    "tns-core-modules": "~5.1.0",
+    "tns-core-modules": "~5.2.0",
     "zone.js": "~0.8.26"
   },
   "devDependencies": {

demo-push/package.json

@@ -9,7 +9,7 @@
     }
   },
   "dependencies": {
-    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-8.3.1.tgz",
+    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-8.3.2.tgz",
     "nativescript-theme-core": "^1.0.4",
     "nativescript-unit-test-runner": "^0.3.4",
     "tns-core-modules": "~4.2.0"

demo-vue/package.json

@@ -14,7 +14,7 @@
     }
   },
   "dependencies": {
-    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-8.3.1.tgz",
+    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-8.3.2.tgz",
     "nativescript-theme-core": "^1.0.4",
     "nativescript-vue": "^2.0.0",
     "tns-core-modules": "^5.0.2"

demo/package.json

@@ -2,18 +2,18 @@
   "nativescript": {
     "id": "org.nativescript.firebasedemo",
     "tns-ios": {
-      "version": "5.2.0"
+      "version": "5.3.1"
     },
     "tns-android": {
-      "version": "5.2.0"
+      "version": "5.3.1"
     }
   },
   "dependencies": {
     "firebase-functions": "^2.0.5",
-    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-8.3.1.tgz",
+    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-8.3.2.tgz",
     "nativescript-theme-core": "^1.0.4",
     "nativescript-unit-test-runner": "^0.3.4",
-    "tns-core-modules": "~5.2.0"
+    "tns-core-modules": "~5.3.0"
   },
   "devDependencies": {
     "@types/jasmine": "~2.8.0",
@@ -29,7 +29,7 @@
     "nativescript-css-loader": "~0.26.0",
     "nativescript-dev-typescript": "~0.7.1",
     "nativescript-dev-webpack": "^0.16.2",
-    "tns-platform-declarations": "~5.2.0",
+    "tns-platform-declarations": "~5.3.0",
     "tslint": "~5.4.3",
     "typescript": "~2.8.0"
   },

publish/scripts/installer.js

@@ -1099,17 +1099,24 @@ module.exports = function($logger, $projectData) {
             appBuildGradleContent += \`
 task copyMetadata {
   doFirst {
-    android.applicationVariants.all { variant ->
-      def provider = variant.getMergeAssetsProvider()
-      if (variant.buildType.name == project.selectedBuildType) {
-        def task = provider.get();
-        for (File file : task.getOutputs().getFiles()) {
-          if (!file.getPath().contains("/incremental/")) {
-            project.ext.mergedAssetsOutputPath = file.getPath()
+      // before tns-android 5.2.0 its gradle version didn't have this method implemented, so pri
+      android.applicationVariants.all { variant ->
+          if (variant.buildType.name == project.selectedBuildType) {
+              def task
+              if (variant.metaClass.respondsTo(variant, "getMergeAssetsProvider")) {
+                  def provider = variant.getMergeAssetsProvider()
+                  task = provider.get();
+              } else {
+                  // fallback for older android gradle plugin versions
+                  task = variant.getMergeAssets()
+              }
+              for (File file : task.getOutputs().getFiles()) {
+                  if (!file.getPath().contains("/incremental/")) {
+                      project.ext.mergedAssetsOutputPath = file.getPath()
+                  }
+              }
           }
-        }
       }
-    }
   }
   doLast {
     copy {

src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-plugin-firebase",
-  "version": "8.3.1",
+  "version": "8.3.2",
   "description": "Fire. Base. Firebase!",
   "main": "firebase",
   "typings": "index.d.ts",

src/scripts/postinstall.js

@@ -2251,7 +2251,7 @@ function coerce(version) {
   if (match == null)
     return null;
 
-  return parse((match[1] || '0') + '.' + (match[2] || '0') + '.' + (match[3] || '0'));
+  return parse((match[1] || '0') + '.' + (match[2] || '0') + '.' + (match[3] || '0')); 
 }
 
 
@@ -5271,17 +5271,24 @@ module.exports = function($logger, $projectData) {
             appBuildGradleContent += \`
 task copyMetadata {
   doFirst {
-    android.applicationVariants.all { variant ->
-      def provider = variant.getMergeAssetsProvider()
-      if (variant.buildType.name == project.selectedBuildType) {
-        def task = provider.get();
-        for (File file : task.getOutputs().getFiles()) {
-          if (!file.getPath().contains("/incremental/")) {
-            project.ext.mergedAssetsOutputPath = file.getPath()
+      // before tns-android 5.2.0 its gradle version didn't have this method implemented, so pri
+      android.applicationVariants.all { variant ->
+          if (variant.buildType.name == project.selectedBuildType) {
+              def task
+              if (variant.metaClass.respondsTo(variant, "getMergeAssetsProvider")) {
+                  def provider = variant.getMergeAssetsProvider()
+                  task = provider.get();
+              } else {
+                  // fallback for older android gradle plugin versions
+                  task = variant.getMergeAssets()
+              }
+              for (File file : task.getOutputs().getFiles()) {
+                  if (!file.getPath().contains("/incremental/")) {
+                      project.ext.mergedAssetsOutputPath = file.getPath()
+                  }
+              }
           }
-        }
       }
-    }
   }
   doLast {
     copy {