App won't launch due to version mismatch between Google Analytics and…

… Google App Measurement #1061
EddyVerbruggen · Dec 8, 2018 · f782266 · f782266
1 parent 9a4b732
commit f782266
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@
 - [Firebase iOS SDK Changelog](https://firebase.google.com/support/release-notes/ios)
 - [Firebase Android SDK Changelog](https://firebase.google.com/support/release-notes/android)
 
+## 7.4.4 (2018, December 8)
+[Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/85?closed=1)
+
+
 ## 7.4.3 (2018, December 3)
 [Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/84?closed=1)
 

diff --git a/demo-ng/package.json b/demo-ng/package.json
@@ -25,7 +25,7 @@
     "nativescript-angular": "^6.1.0",
     "nativescript-camera": "^4.0.2",
     "nativescript-imagepicker": "~6.0.4",
-    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.4.3.tgz",
+    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.4.4.tgz",
     "nativescript-theme-core": "~1.0.4",
     "reflect-metadata": "~0.1.10",
     "rxjs": "~6.0.0 || >=6.1.0",

diff --git a/demo-push/package.json b/demo-push/package.json
@@ -43,4 +43,4 @@
     "build.plugin": "cd ../src && npm run build",
     "ci.tslint": "npm i && tslint --config '../tslint.json' 'app/**/*.ts' --exclude '**/node_modules/**' --exclude '**/typings/**'"
   }
-}
+}
diff --git a/demo/package.json b/demo/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "firebase-functions": "^2.0.5",
-    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.4.3.tgz",
+    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.4.4.tgz",
     "nativescript-theme-core": "^1.0.4",
     "nativescript-unit-test-runner": "^0.3.4",
     "tns-core-modules": "~5.0.5"

diff --git a/publish/scripts/installer.js b/publish/scripts/installer.js
@@ -333,6 +333,7 @@ function writePodFile(result) {
 (isPresent(result.ml_kit) ? `` : `#`) + `platform :ios, '9.0'
 
 pod 'Firebase/Core', '~> 5.12.0'
+pod 'GoogleAppMeasurement', '5.3' # temp fix for https://github.com/firebase/firebase-ios-sdk/issues/2151 (remove when bumping 'Firebase/Core')
 
 # Authentication
 ` + (!isPresent(result.authentication) || isSelected(result.authentication) ? `` : `#`) + `pod 'Firebase/Auth'

diff --git a/src/package.json b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript-plugin-firebase",
-  "version": "7.4.3",
+  "version": "7.4.4",
   "description": "Fire. Base. Firebase!",
   "main": "firebase",
   "typings": "index.d.ts",

diff --git a/src/scripts/postinstall.js b/src/scripts/postinstall.js
@@ -2730,28 +2730,28 @@ function read (opts, cb) {
   \***********************************/
 /***/ (function(module, exports) {
 
-module.exports = function(module) {
-	if(!module.webpackPolyfill) {
-		module.deprecate = function() {};
-		module.paths = [];
-		// module.parent = undefined by default
-		if(!module.children) module.children = [];
-		Object.defineProperty(module, "loaded", {
-			enumerable: true,
-			get: function() {
-				return module.l;
-			}
-		});
-		Object.defineProperty(module, "id", {
-			enumerable: true,
-			get: function() {
-				return module.i;
-			}
-		});
-		module.webpackPolyfill = 1;
-	}
-	return module;
-};
+module.exports = function(module) {
+	if(!module.webpackPolyfill) {
+		module.deprecate = function() {};
+		module.paths = [];
+		// module.parent = undefined by default
+		if(!module.children) module.children = [];
+		Object.defineProperty(module, "loaded", {
+			enumerable: true,
+			get: function() {
+				return module.l;
+			}
+		});
+		Object.defineProperty(module, "id", {
+			enumerable: true,
+			get: function() {
+				return module.i;
+			}
+		});
+		module.webpackPolyfill = 1;
+	}
+	return module;
+};
 
 
 /***/ }),
@@ -3131,6 +3131,7 @@ function writePodFile(result) {
 (isPresent(result.ml_kit) ? `` : `#`) + `platform :ios, '9.0'
 
 pod 'Firebase/Core', '~> 5.12.0'
+pod 'GoogleAppMeasurement', '5.3' # temp fix for https://github.com/firebase/firebase-ios-sdk/issues/2151 (remove when bumping 'Firebase/Core')
 
 # Authentication
 ` + (!isPresent(result.authentication) || isSelected(result.authentication) ? `` : `#`) + `pod 'Firebase/Auth'
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,4 +43,4 @@ @@
         "build.plugin": "cd ../src && npm run build",
         "ci.tslint": "npm i && tslint --config '../tslint.json' 'app/**/*.ts' --exclude '**/node_modules/**' --exclude '**/typings/**'"
       }
-    }
+    }