From df33b126c57873f2fb8551aa81cf9efad3993903 Mon Sep 17 00:00:00 2001
From: crisbeto <crisbeto@abv.bg>
Date: Sat, 10 Jun 2017 09:56:42 +0200
Subject: [PATCH] build: missing import in payload script

* Adds the missing `firebase-admin` import to the payload script. This was breaking the local dev script.
* Makes the naming for the `firebase-admin` imports more consistent in the `payload.ts` and `screenshots.ts`.
---
 tools/gulp/tasks/payload.ts     | 10 +++++++---
 tools/gulp/tasks/screenshots.ts |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/tools/gulp/tasks/payload.ts b/tools/gulp/tasks/payload.ts
index 0f12e90c0073..de2089bca045 100644
--- a/tools/gulp/tasks/payload.ts
+++ b/tools/gulp/tasks/payload.ts
@@ -4,6 +4,8 @@ import {statSync} from 'fs';
 import {isTravisBuild, isTravisMasterBuild} from '../util/travis-ci';
 import {buildConfig} from '../packaging/build-config';
 import {openFirebaseDashboardApp, openFirebaseDashboardAppAsGuest} from '../util/firebase';
+import * as firebaseAdmin from 'firebase-admin';
+
 
 // These imports lack of type definitions.
 const request = require('request');
@@ -66,7 +68,8 @@ function getFilesize(filePath: string) {
  * Calculates the difference between the last and current library payload.
  * The results will be published as a commit status on Github.
  */
-async function calculatePayloadDiff(database: any, currentSha: string, currentPayload: any) {
+async function calculatePayloadDiff(database: firebaseAdmin.database.Database, currentSha: string,
+                                    currentPayload: any) {
   const authToken = process.env['FIREBASE_ACCESS_TOKEN'];
 
   if (!authToken) {
@@ -121,14 +124,15 @@ async function updateGithubStatus(commitSha: string, payloadDiff: number, authTo
 }
 
 /** Uploads the current payload results to the Dashboard database. */
-async function uploadPayloadResults(database: any, currentSha: string, currentPayload: any) {
+async function uploadPayloadResults(database: firebaseAdmin.database.Database, currentSha: string,
+                                    currentPayload: any) {
   if (isTravisMasterBuild()) {
     await database.ref('payloads').child(currentSha).set(currentPayload);
   }
 }
 
 /** Gets the last payload uploaded from previous Travis builds. */
-async function getLastPayloadResults(database: admin.database.Database) {
+async function getLastPayloadResults(database: firebaseAdmin.database.Database) {
   const snapshot = await database.ref('payloads')
     .orderByChild('timestamp')
     .limitToLast(1)
diff --git a/tools/gulp/tasks/screenshots.ts b/tools/gulp/tasks/screenshots.ts
index 8f9f1f5db6d9..e6823545f2f9 100644
--- a/tools/gulp/tasks/screenshots.ts
+++ b/tools/gulp/tasks/screenshots.ts
@@ -1,7 +1,7 @@
 import {task} from 'gulp';
 import {readdirSync, statSync, existsSync, mkdirp, readFileSync, writeFileSync} from 'fs-extra';
 import * as path from 'path';
-import * as admin from 'firebase-admin';
+import * as firebaseAdmin from 'firebase-admin';
 import * as firebase from 'firebase';
 import {
   openScreenshotsBucket,
@@ -55,7 +55,7 @@ function updateResult(database: firebase.database.Database, prNumber: string, re
     .child(process.env['TRAVIS_PULL_REQUEST_SHA']).set(result).then(() => result);
 }
 
-function getPullRequestRef(database: firebase.database.Database | admin.database.Database,
+function getPullRequestRef(database: firebase.database.Database | firebaseAdmin.database.Database,
                            prNumber: string) {
   let secureToken = getSecureToken();
   return database.ref(FIREBASE_REPORT).child(prNumber).child(secureToken);