Bump demo-ng's NativeScript, Angular, and Webpack dependencies #743

Author: EddyVerbruggen

.travis.yml

@@ -3,6 +3,7 @@ android:
     - tools
     - platform-tools
     - build-tools-26.0.2
+    - android-23
     - android-26
     - extra-android-m2repository
     - sys-img-armeabi-v7a-android-21
@@ -47,26 +48,26 @@ matrix:
       before_install:
         - gem install cocoapods
         - pod repo update
-      script: tns build ios --bundle
+      script: travis_wait travis_retry tns build ios --bundle
     - language: android
       os: linux
       env:
         - Webpack="Android"
       jdk: oraclejdk8
       before_install: nvm install 6.10.3
-      script: tns build android --bundle
+      script: travis_wait travis_retry tns build android --bundle
     - stage: "Build"
       env:
-        - BuildAndroid="25"
+        - BuildAndroid="26"
       language: android
       os: linux
       jdk: oraclejdk8
       before_install: nvm install 6.10.3
       script:
-        - tns build android
+        - travis_wait travis_retry tns build android
     - os: osx
       env:
-        - BuildiOS="10.3"
+        - BuildiOS="11"
         - Xcode="9.2"
       osx_image: xcode9.2
       language: node_js
@@ -76,4 +77,4 @@ matrix:
         - gem install cocoapods
         - pod repo update
       script:
-        - tns build ios
+        - travis_wait travis_retry tns build ios

demo-ng/app/app.css

@@ -9,7 +9,7 @@ In many cases you may want to use the NativeScript core theme instead
 of writing your own CSS rules. For a full list of class names in the theme
 refer to http://docs.nativescript.org/ui/theme.
 */
-@import 'nativescript-theme-core/css/core.light.css';
+@import '~nativescript-theme-core/css/core.light.css';
 
 .tab-content {
   margin: 8;
@@ -117,11 +117,11 @@ Label.mlkit-result {
 }
 
 @keyframes swingAnimation {
-  0% { 
-      transform: translate(0, 0); 
+  0% {
+      transform: translate(0, 0);
   }
-  50% { 
-      transform: translate(0, 300); 
+  50% {
+      transform: translate(0, 300);
   }
   100% {
       transform: translate(0, 0);

demo-ng/app/tabs/firestore/firestore.component.ts

@@ -1,6 +1,6 @@
 import { Component, NgZone } from "@angular/core";
 import { firestore } from "nativescript-plugin-firebase";
-import { Observable } from "rxjs/Observable";
+import { Observable } from "rxjs";
 import { City } from "~/model/City";
 
 const firebase = require("nativescript-plugin-firebase/app");

demo-ng/package.json

@@ -6,38 +6,54 @@
   "nativescript": {
     "id": "org.nativescript.firebasedemo.firestore",
     "tns-android": {
-      "version": "4.0.0-rc-2018.4.2.1"
+      "version": "4.1.1"
     },
     "tns-ios": {
-      "version": "4.0.1"
+      "version": "4.1.0"
     }
   },
   "dependencies": {
-    "@angular/animations": "5.2.10",
-    "@angular/common": "5.2.10",
-    "@angular/compiler": "5.2.10",
-    "@angular/core": "5.2.10",
-    "@angular/forms": "5.2.10",
-    "@angular/http": "5.2.10",
-    "@angular/platform-browser": "5.2.10",
-    "@angular/platform-browser-dynamic": "5.2.10",
-    "@angular/router": "5.2.10",
-    "nativescript-angular": "~5.3.0",
+    "@angular/animations": "~6.0.0",
+    "@angular/common": "~6.0.0",
+    "@angular/compiler": "~6.0.0",
+    "@angular/core": "~6.0.0",
+    "@angular/forms": "~6.0.0",
+    "@angular/http": "~6.0.0",
+    "@angular/platform-browser": "~6.0.0",
+    "@angular/platform-browser-dynamic": "~6.0.0",
+    "@angular/router": "~6.0.0",
+    "nativescript-angular": "^6.0.0",
     "nativescript-camera": "^4.0.2",
     "nativescript-imagepicker": "^6.0.1",
     "nativescript-plugin-firebase": "^6.0.0",
     "nativescript-theme-core": "~1.0.4",
     "reflect-metadata": "~0.1.10",
-    "rxjs": "~5.5.0",
-    "tns-core-modules": "~4.0.0",
-    "zone.js": "~0.8.18"
+    "rxjs": "~6.0.0 || >=6.1.0",
+    "tns-core-modules": "~4.1.0",
+    "zone.js": "~0.8.26"
   },
   "devDependencies": {
+    "@angular-devkit/core": "~0.6.3",
+    "@angular/compiler-cli": "~6.0.0",
+    "@ngtools/webpack": "~6.0.3",
     "babel-traverse": "6.26.0",
     "babel-types": "6.26.0",
     "babylon": "6.18.0",
+    "clean-webpack-plugin": "~0.1.19",
+    "copy-webpack-plugin": "~4.5.1",
+    "css-loader": "~0.28.11",
+    "extract-text-webpack-plugin": "~3.0.2",
     "lazy": "1.0.11",
     "nativescript-dev-typescript": "~0.7.1",
-    "typescript": "~2.8.0"
+    "nativescript-dev-webpack": "^0.12.0",
+    "nativescript-worker-loader": "~0.9.0",
+    "raw-loader": "~0.5.1",
+    "resolve-url-loader": "~2.3.0",
+    "typescript": "~2.7.2",
+    "uglifyjs-webpack-plugin": "~1.2.5",
+    "webpack": "~4.6.0",
+    "webpack-bundle-analyzer": "~2.13.0",
+    "webpack-cli": "~2.1.3",
+    "webpack-sources": "~1.1.0"
   }
 }

demo-ng/tsconfig.esm.json

@@ -0,0 +1,7 @@
+{
+    "extends": "./tsconfig",
+    "compilerOptions": {
+        "module": "es2015",
+        "moduleResolution": "node"
+    }
+}

src/firebase.android.ts

@@ -2118,6 +2118,7 @@ firebase.subscribeToTopic = topicName => {
         return;
       }
 
+      // TODO since Cloud Messaging 17.0.0 this returns a Task instead of void (so we can resolve onSuccess)
       com.google.firebase.messaging.FirebaseMessaging.getInstance().subscribeToTopic(topicName);
       resolve();
     } catch (ex) {

src/package.json

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