Bump Firebase SDK versions #590

Author: EddyVerbruggen

CHANGELOG.md

@@ -4,6 +4,15 @@
 [Firebase Android SDK Changelog](https://firebase.google.com/support/release-notes/android)
 
 
+## 5.1.0 (2017, December 30)
+
+### Fixes
+- [#564](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/issues/564) Firebase Auth + WebPack crashing iOS application (when createUser is triggered) - FIX
+
+### New
+- [#590](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/issues/590) Bump Firebase SDK versions
+
+
 ## 5.0.5 (2017, December 19)
 
 ### Fixes

README.md

@@ -228,9 +228,9 @@ android {
   // other stuff here
 
   project.ext {
-    googlePlayServicesVersion = "11.4.2"
+    googlePlayServicesVersion = "11.8.0"
   }
 }
 ```
 
-Where `"11.4.2"` is best set to the same value as the `firebaseVersion` value in [this file](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/blob/master/src/platforms/android/include.gradle).
+Where `"11.8.0"` is best set to the same value as the `firebaseVersion` value in [this file](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/blob/master/src/platforms/android/include.gradle).

demo/app/main-view-model.ts

@@ -258,7 +258,7 @@ export class HelloWorldModel extends Observable {
         setTimeout(() => {
           alert({
             title: "Push message!",
-            message: (message.title !== undefined ? message.title : "") + (message.data ? " Data: " + JSON.stringify(message.data) : ""),
+            message: (message.title !== undefined ? message.title : ""),
             okButtonText: "Sw33t"
           });
         }, 500);
@@ -456,7 +456,6 @@ export class HelloWorldModel extends Observable {
     );
     firebase.addOnMessageReceivedCallback(
         message => {
-          console.log("----- message received: " + JSON.stringify(message));
           alert({
             title: "Push message!",
             message: (message.title !== undefined ? message.title : ""),

demo/package.json

@@ -2,17 +2,17 @@
   "nativescript": {
     "id": "org.nativescript.firebasedemo",
     "tns-ios": {
-      "version": "3.3.0"
+      "version": "3.4.0"
     },
     "tns-android": {
-      "version": "3.3.1"
+      "version": "3.4.0"
     }
   },
   "dependencies": {
-    "nativescript-plugin-firebase": "file:../src",
+    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-5.1.0.tgz",
     "nativescript-theme-core": "^1.0.4",
     "nativescript-unit-test-runner": "^0.3.4",
-    "tns-core-modules": "^3.3.0"
+    "tns-core-modules": "~3.4.0"
   },
   "devDependencies": {
     "@types/jasmine": "^2.6.3",
@@ -33,7 +33,7 @@
     "nativescript-dev-webpack": "^0.7.3",
     "raw-loader": "~0.5.1",
     "resolve-url-loader": "~2.1.0",
-    "tns-platform-declarations": "^3.2.0",
+    "tns-platform-declarations": "~3.4.0",
     "tslint": "~5.4.3",
     "typescript": "~2.4.0",
     "webpack": "~3.2.0",

publish/scripts/installer.js

@@ -223,7 +223,7 @@ function writePodFile(result) {
     }
     try {
         fs.writeFileSync(directories.ios + '/Podfile',
-`pod 'Firebase', '~> 4.6.0'
+`pod 'Firebase', '~> 4.8.0'
 pod 'Firebase/Auth'
 
 # Uncomment if you want to enable Realtime DB
@@ -300,7 +300,7 @@ dependencies {
     compile "com.android.support:design:$supportVersion"
     compile "com.android.support:support-compat:$supportVersion"
 
-    def firebaseVersion = "11.4.2"
+    def firebaseVersion = "11.8.0"
 
     // make sure you have these versions by updating your local Android SDK's (Android Support repo and Google repo)
     compile "com.google.firebase:firebase-core:$firebaseVersion"
@@ -405,14 +405,21 @@ module.exports = function() {
     if (fs.existsSync(buildGradlePath)) {
         var buildGradleContent = fs.readFileSync(buildGradlePath).toString();
 
-        // already at 3.1.0?
+        // already at 3.1.1?
+        if (buildGradleContent.indexOf('classpath "com.google.gms:google-services:3.1.1"') != -1) {
+            return;
+        }
+
+        // upgrade 3.1.0 to 3.1.1?
         if (buildGradleContent.indexOf('classpath "com.google.gms:google-services:3.1.0"') != -1) {
+            buildGradleContent = buildGradleContent.replace('classpath "com.google.gms:google-services:3.1.0"', 'classpath "com.google.gms:google-services:3.1.1"');
+            fs.writeFileSync(buildGradlePath, buildGradleContent);
             return;
         }
 
-        // upgrade 3.0.0 to 3.1.0?
+        // upgrade 3.0.0 to 3.1.1?
         if (buildGradleContent.indexOf('classpath "com.google.gms:google-services:3.0.0"') != -1) {
-            buildGradleContent = buildGradleContent.replace('classpath "com.google.gms:google-services:3.0.0"', 'classpath "com.google.gms:google-services:3.1.0"');
+            buildGradleContent = buildGradleContent.replace('classpath "com.google.gms:google-services:3.0.0"', 'classpath "com.google.gms:google-services:3.1.1"');
             fs.writeFileSync(buildGradlePath, buildGradleContent);
             return;
         }
@@ -434,7 +441,7 @@ module.exports = function() {
             return;
         }
 
-        buildGradleContent = buildGradleContent.substr(0, search - 1) + '    classpath "com.google.gms:google-services:3.1.0"\\n    ' + buildGradleContent.substr(search - 1);
+        buildGradleContent = buildGradleContent.substr(0, search - 1) + '    classpath "com.google.gms:google-services:3.1.1"\\n    ' + buildGradleContent.substr(search - 1);
 
         fs.writeFileSync(buildGradlePath, buildGradleContent);
     }

src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-plugin-firebase",
-  "version": "5.0.5",
+  "version": "5.1.0",
   "description": "Fire. Base. Firebase!",
   "main": "firebase",
   "typings": "index.d.ts",
@@ -40,8 +40,8 @@
     "plugin.tscwatch": "npm run tsc -- -w",
     "package": "cd ../publish && rm -rf ./package && ./pack.sh",
     "demo.ios": "npm run preparedemo && cd ../demo && tns run ios --emulator",
-    "demo-ng.ios": "npm run preparedemo-ng && cd ../demo-ng && tns run ios --emulator",
     "demo.ios.device": "npm run preparedemo && cd ../demo && tns platform remove ios && tns run ios",
+    "demo-ng.ios": "npm run preparedemo-ng && cd ../demo-ng && tns run ios --emulator",
     "demo-ng.ios.device": "npm run preparedemo-ng && cd ../demo-ng && tns platform remove ios && tns run ios",
     "demo.android": "npm run preparedemo && cd ../demo && tns platform remove android && tns run android --justlaunch",
     "demo-ng.android": "npm run preparedemo-ng && cd ../demo-ng && tns platform remove android && tns run android --justlaunch",

src/platforms/android/include.gradle

@@ -24,7 +24,7 @@ dependencies {
     compile "com.android.support:design:$supportVersion"
     compile "com.android.support:support-compat:$supportVersion"
 
-    def firebaseVersion = "11.4.2"
+    def firebaseVersion = "11.8.0"
 
     // make sure you have these versions by updating your local Android SDK's (Android Support repo and Google repo)
     compile "com.google.firebase:firebase-core:$firebaseVersion"

src/platforms/ios/Podfile

@@ -1,4 +1,4 @@
-pod 'Firebase', '~> 4.6.0'
+pod 'Firebase', '~> 4.8.0'
 pod 'Firebase/Auth'
 
 # Uncomment if you want to enable the regular Database (instead of Cloud Firestore)

src/scripts/postinstall.js

@@ -3021,7 +3021,7 @@ function writePodFile(result) {
     }
     try {
         fs.writeFileSync(directories.ios + '/Podfile',
-`pod 'Firebase', '~> 4.6.0'
+`pod 'Firebase', '~> 4.8.0'
 pod 'Firebase/Auth'
 
 # Uncomment if you want to enable Realtime DB
@@ -3098,7 +3098,7 @@ dependencies {
     compile "com.android.support:design:$supportVersion"
     compile "com.android.support:support-compat:$supportVersion"
 
-    def firebaseVersion = "11.4.2"
+    def firebaseVersion = "11.8.0"
 
     // make sure you have these versions by updating your local Android SDK's (Android Support repo and Google repo)
     compile "com.google.firebase:firebase-core:$firebaseVersion"
@@ -3203,14 +3203,21 @@ module.exports = function() {
     if (fs.existsSync(buildGradlePath)) {
         var buildGradleContent = fs.readFileSync(buildGradlePath).toString();
 
-        // already at 3.1.0?
+        // already at 3.1.1?
+        if (buildGradleContent.indexOf('classpath "com.google.gms:google-services:3.1.1"') != -1) {
+            return;
+        }
+
+        // upgrade 3.1.0 to 3.1.1?
         if (buildGradleContent.indexOf('classpath "com.google.gms:google-services:3.1.0"') != -1) {
+            buildGradleContent = buildGradleContent.replace('classpath "com.google.gms:google-services:3.1.0"', 'classpath "com.google.gms:google-services:3.1.1"');
+            fs.writeFileSync(buildGradlePath, buildGradleContent);
             return;
         }
 
-        // upgrade 3.0.0 to 3.1.0?
+        // upgrade 3.0.0 to 3.1.1?
         if (buildGradleContent.indexOf('classpath "com.google.gms:google-services:3.0.0"') != -1) {
-            buildGradleContent = buildGradleContent.replace('classpath "com.google.gms:google-services:3.0.0"', 'classpath "com.google.gms:google-services:3.1.0"');
+            buildGradleContent = buildGradleContent.replace('classpath "com.google.gms:google-services:3.0.0"', 'classpath "com.google.gms:google-services:3.1.1"');
             fs.writeFileSync(buildGradlePath, buildGradleContent);
             return;
         }
@@ -3232,7 +3239,7 @@ module.exports = function() {
             return;
         }
 
-        buildGradleContent = buildGradleContent.substr(0, search - 1) + '    classpath "com.google.gms:google-services:3.1.0"\\n    ' + buildGradleContent.substr(search - 1);
+        buildGradleContent = buildGradleContent.substr(0, search - 1) + '    classpath "com.google.gms:google-services:3.1.1"\\n    ' + buildGradleContent.substr(search - 1);
 
         fs.writeFileSync(buildGradlePath, buildGradleContent);
     }