From d3c87fd95adc00a4e10fd237f2b66dabf007de71 Mon Sep 17 00:00:00 2001
From: Ibby <ibby93@gmail.com>
Date: Thu, 16 Feb 2017 20:38:13 -0500
Subject: [PATCH] fix build

---
 package.json                                   | 4 +++-
 scripts/build/build.js                         | 1 +
 src/@ionic-native/plugins/camera/index.ts      | 2 +-
 src/@ionic-native/plugins/google-maps/index.ts | 6 +++---
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 8a597a9f1..b67a92d04 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,7 @@
     "node-html-encoder": "0.0.2",
     "q": "1.4.1",
     "queue": "^4.2.1",
+    "rimraf": "^2.5.4",
     "semver": "^5.3.0",
     "tsify": "~3.0.0",
     "tslint": "^3.15.1",
@@ -52,10 +53,11 @@
     "test:watch": "npm test -- --watch",
     "start": "npm run test:watch",
     "lint": "gulp lint",
-    "build": "npm run lint && npm run build:core && npm run build:modules",
+    "build": "npm run clean && npm run lint && npm run build:core && npm run build:modules",
     "build:core": "ngc -p scripts/build/tsconfig-core.json",
     "build:utils": "tsc -p scripts/build/tsconfig-utils.json",
     "build:modules": "node scripts/build/build.js",
+    "clean": "rimraf dist",
     "shipit": "npm run build && gulp readmes && npm run npmpub",
     "npmpub": "sh scripts/build/publish.sh",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
diff --git a/scripts/build/build.js b/scripts/build/build.js
index 7f195367e..57b9078a7 100644
--- a/scripts/build/build.js
+++ b/scripts/build/build.js
@@ -34,6 +34,7 @@ fs.mkdirpSync(BUILD_TMP);
 // Prepare and copy the core module's package.json
 console.log('Preparing core module package.json');
 CORE_PACKAGE_JSON.version = VERSION;
+CORE_PACKAGE_JSON.dependencies = { "@ionic-native/utils": VERSION };
 fs.writeJsonSync(path.resolve(BUILD_CORE_DIST, 'package.json'), CORE_PACKAGE_JSON);
 
 console.log('Preparing utils module package.json');
diff --git a/src/@ionic-native/plugins/camera/index.ts b/src/@ionic-native/plugins/camera/index.ts
index aa6ee8f70..95f617c5b 100644
--- a/src/@ionic-native/plugins/camera/index.ts
+++ b/src/@ionic-native/plugins/camera/index.ts
@@ -109,6 +109,7 @@ export interface CameraPopoverOptions {
  * CameraOptions
  * CameraPopoverOptions
  */
+@Injectable()
 @Plugin({
   pluginName: 'Camera',
   plugin: 'cordova-plugin-camera',
@@ -116,7 +117,6 @@ export interface CameraPopoverOptions {
   repo: 'https://github.com/apache/cordova-plugin-camera',
   platforms: ['Android', 'BlackBerry', 'Browser', 'Firefox', 'FireOS', 'iOS', 'Windows', 'Windows Phone 8', 'Ubuntu']
 })
-@Injectable()
 export class Camera {
 
   /**
diff --git a/src/@ionic-native/plugins/google-maps/index.ts b/src/@ionic-native/plugins/google-maps/index.ts
index daac3de64..3c8e1eeb1 100644
--- a/src/@ionic-native/plugins/google-maps/index.ts
+++ b/src/@ionic-native/plugins/google-maps/index.ts
@@ -886,7 +886,7 @@ export class GoogleMapsMarker {
    * @return {GoogleMap}
    */
   @CordovaInstance({ sync: true })
-  getMap(): GoogleMap { return; }
+  getMap(): GoogleMapsObject { return; }
 
   /**
    * Specify the animation either `DROP` or `BOUNCE`
@@ -1036,7 +1036,7 @@ export class GoogleMapsCircle {
   setRadius(radius: number): void { }
 
   @CordovaInstance({ sync: true })
-  getMap(): GoogleMap { return; }
+  getMap(): GoogleMapsObject { return; }
 }
 
 /**
@@ -1173,7 +1173,7 @@ export class GoogleMapsPolyline {
   setGeoDesic(geoDesic: boolean): void { }
 
   @CordovaInstance({ sync: true })
-  getMap(): GoogleMap { return; }
+  getMap(): GoogleMapsObject { return; }
 
 }