fix build

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",

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');

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 {
 
   /**

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; }
 
 }