Merge pull request #935 from dtopuzov/master

chore: bump io.fabric.tools:gradle to 1.25.4

Author: EddyVerbruggen

.travis.yml

@@ -24,6 +24,7 @@ install:
     - cd src
     - npm i --ignore-scripts
     - npm run tsc
+    - npm run package
     - cd ../demo
     - npm i
 
@@ -35,15 +36,15 @@ matrix:
     - stage: "Lint"
       language: node_js
       os: linux
-      node_js: "6"
+      node_js: "8"
       script: "npm run ci.tslint"
     - stage: "WebPack"
       os: osx
       env:
         - Webpack="iOS"
       osx_image: xcode9.2
       language: node_js
-      node_js: "6"
+      node_js: "8"
       jdk: oraclejdk8
       before_install:
         - gem install cocoapods
@@ -54,15 +55,15 @@ matrix:
       env:
         - Webpack="Android"
       jdk: oraclejdk8
-      before_install: nvm install 6.10.3
+      before_install: nvm install 8.9.1
       script: travis_wait travis_retry tns build android --bundle
     - stage: "Build"
       env:
         - BuildAndroid="26"
       language: android
       os: linux
       jdk: oraclejdk8
-      before_install: nvm install 6.10.3
+      before_install: nvm install 8.9.1
       script:
         - travis_wait travis_retry tns build android
     - os: osx
@@ -71,7 +72,7 @@ matrix:
         - Xcode="9.2"
       osx_image: xcode9.2
       language: node_js
-      node_js: "6"
+      node_js: "8"
       jdk: oraclejdk8
       before_install:
         - gem install cocoapods

demo/package.json

@@ -9,20 +9,17 @@
     }
   },
   "dependencies": {
+    "firebase-functions": "^2.0.5",
     "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.1.1.tgz",
     "nativescript-theme-core": "^1.0.4",
     "nativescript-unit-test-runner": "^0.3.4",
     "tns-core-modules": "^4.2.1"
   },
   "devDependencies": {
     "@types/jasmine": "~2.8.0",
-    "awesome-typescript-loader": "~3.1.3",
     "babel-traverse": "6.12.0",
     "babel-types": "6.11.1",
     "babylon": "6.8.4",
-    "copy-webpack-plugin": "~4.0.1",
-    "css-loader": "~0.28.7",
-    "extract-text-webpack-plugin": "~3.0.0",
     "filewalker": "0.1.2",
     "jasmine-core": "~2.8.0",
     "karma": "^1.7.1",
@@ -31,21 +28,13 @@
     "lazy": "1.0.11",
     "nativescript-css-loader": "~0.26.0",
     "nativescript-dev-typescript": "~0.7.1",
-    "nativescript-dev-webpack": "~0.10.0",
-    "nativescript-worker-loader": "~0.8.1",
-    "raw-loader": "~0.5.1",
-    "resolve-url-loader": "~2.1.0",
+    "nativescript-dev-webpack": "^0.16.2",
     "tns-platform-declarations": "~4.2.0",
     "tslint": "~5.4.3",
-    "typescript": "~2.8.0",
-    "webpack": "~3.8.1",
-    "webpack-bundle-analyzer": "^2.8.2",
-    "webpack-sources": "~1.0.1",
-    "uglifyjs-webpack-plugin": "~1.1.6",
-    "clean-webpack-plugin": "~0.1.19"
+    "typescript": "~2.8.0"
   },
   "scripts": {
     "build.plugin": "cd ../src && npm run build",
     "ci.tslint": "npm i && tslint --config '../tslint.json' 'app/**/*.ts' --exclude '**/node_modules/**' --exclude '**/typings/**'"
   }
-}
+}

demo/tsconfig.tns.json

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

publish/scripts/installer.js

@@ -897,7 +897,7 @@ module.exports = function($logger, $projectData) {
                 let dependenciesNode = buildGradleContent.indexOf("dependencies", 0);
                 if (dependenciesNode > -1) {
                     dependenciesNode = buildGradleContent.indexOf("}", dependenciesNode);
-                    buildGradleContent = buildGradleContent.substr(0, dependenciesNode - 1) + '	    classpath "io.fabric.tools:gradle:1.25.1"\\n' + buildGradleContent.substr(dependenciesNode - 1);
+                    buildGradleContent = buildGradleContent.substr(0, dependenciesNode - 1) + '	    classpath "io.fabric.tools:gradle:1.25.4"\\n' + buildGradleContent.substr(dependenciesNode - 1);
                 }
             }
 

src/scripts/postinstall.js

@@ -3695,7 +3695,7 @@ module.exports = function($logger, $projectData) {
                 let dependenciesNode = buildGradleContent.indexOf("dependencies", 0);
                 if (dependenciesNode > -1) {
                     dependenciesNode = buildGradleContent.indexOf("}", dependenciesNode);
-                    buildGradleContent = buildGradleContent.substr(0, dependenciesNode - 1) + '	    classpath "io.fabric.tools:gradle:1.25.1"\\n' + buildGradleContent.substr(dependenciesNode - 1);
+                    buildGradleContent = buildGradleContent.substr(0, dependenciesNode - 1) + '	    classpath "io.fabric.tools:gradle:1.25.4"\\n' + buildGradleContent.substr(dependenciesNode - 1);
                 }
             }