From 9d35567cb5ac6cc37e17753130f67f6d2d416269 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Fri, 9 Sep 2016 14:45:24 -0500
Subject: [PATCH] Fix import to use @reactivex/rxjs

---
 src/plugins/3dtouch.ts           | 2 +-
 src/plugins/admob.ts             | 2 +-
 src/plugins/batterystatus.ts     | 2 +-
 src/plugins/ble.ts               | 2 +-
 src/plugins/bluetoothserial.ts   | 2 +-
 src/plugins/camera-preview.ts    | 2 +-
 src/plugins/code-push.ts         | 2 +-
 src/plugins/dbmeter.ts           | 2 +-
 src/plugins/deeplinks.ts         | 2 +-
 src/plugins/devicemotion.ts      | 2 +-
 src/plugins/deviceorientation.ts | 2 +-
 src/plugins/estimote-beacons.ts  | 2 +-
 src/plugins/geofence.ts          | 2 +-
 src/plugins/geolocation.ts       | 2 +-
 src/plugins/googlemaps.ts        | 2 +-
 src/plugins/httpd.ts             | 2 +-
 src/plugins/ibeacon.ts           | 2 +-
 src/plugins/inappbrowser.ts      | 2 +-
 src/plugins/keyboard.ts          | 2 +-
 src/plugins/media-capture.ts     | 2 +-
 src/plugins/media.ts             | 2 +-
 src/plugins/music-controls.ts    | 2 +-
 src/plugins/network.ts           | 2 +-
 src/plugins/nfc.ts               | 2 +-
 src/plugins/onesignal.ts         | 2 +-
 src/plugins/plugin.ts            | 2 +-
 src/plugins/shake.ts             | 2 +-
 src/plugins/toast.ts             | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/plugins/3dtouch.ts b/src/plugins/3dtouch.ts
index 0288a28df..3147d1809 100644
--- a/src/plugins/3dtouch.ts
+++ b/src/plugins/3dtouch.ts
@@ -1,5 +1,5 @@
 import { Cordova, Plugin } from './plugin';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from '@reactivex/rxjs';
 
 
 declare var window: any;
diff --git a/src/plugins/admob.ts b/src/plugins/admob.ts
index 1c825b305..a8c748d84 100644
--- a/src/plugins/admob.ts
+++ b/src/plugins/admob.ts
@@ -1,5 +1,5 @@
 import { Cordova, Plugin } from './plugin';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from '@reactivex/rxjs';
 
 /**
  * @name AdMob
diff --git a/src/plugins/batterystatus.ts b/src/plugins/batterystatus.ts
index c70beae60..caaf8467c 100644
--- a/src/plugins/batterystatus.ts
+++ b/src/plugins/batterystatus.ts
@@ -1,5 +1,5 @@
 import { Cordova, Plugin } from './plugin';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from '@reactivex/rxjs';
 
 /**
  * @name Battery Status
diff --git a/src/plugins/ble.ts b/src/plugins/ble.ts
index 6df9f2f6d..641dc6965 100644
--- a/src/plugins/ble.ts
+++ b/src/plugins/ble.ts
@@ -1,5 +1,5 @@
 import { Cordova, Plugin } from './plugin';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from '@reactivex/rxjs';
 
 /**
  * @name BLE
diff --git a/src/plugins/bluetoothserial.ts b/src/plugins/bluetoothserial.ts
index 069fed3f3..475437571 100644
--- a/src/plugins/bluetoothserial.ts
+++ b/src/plugins/bluetoothserial.ts
@@ -1,5 +1,5 @@
 import { Cordova, Plugin } from './plugin';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from '@reactivex/rxjs';
 
 /**
  * @name Bluetooth Serial
diff --git a/src/plugins/camera-preview.ts b/src/plugins/camera-preview.ts
index a9edfc5bc..1f06c991a 100644
--- a/src/plugins/camera-preview.ts
+++ b/src/plugins/camera-preview.ts
@@ -1,5 +1,5 @@
 import { Cordova, Plugin } from './plugin';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from '@reactivex/rxjs';
 
 
 export interface CameraPreviewRect {
diff --git a/src/plugins/code-push.ts b/src/plugins/code-push.ts
index 29f253d26..d656581cb 100644
--- a/src/plugins/code-push.ts
+++ b/src/plugins/code-push.ts
@@ -1,5 +1,5 @@
 import { Cordova, Plugin } from './plugin';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from '@reactivex/rxjs';
 
 // below are taken from
 // https://raw.githubusercontent.com/Microsoft/cordova-plugin-code-push/master/typings/codePush.d.ts
diff --git a/src/plugins/dbmeter.ts b/src/plugins/dbmeter.ts
index 138ee643a..fa3e9659d 100644
--- a/src/plugins/dbmeter.ts
+++ b/src/plugins/dbmeter.ts
@@ -1,5 +1,5 @@
 import { Cordova, Plugin } from './plugin';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from '@reactivex/rxjs';
 
 
 /**
diff --git a/src/plugins/deeplinks.ts b/src/plugins/deeplinks.ts
index 9cc043016..8b581e285 100644
--- a/src/plugins/deeplinks.ts
+++ b/src/plugins/deeplinks.ts
@@ -1,5 +1,5 @@
 import { Cordova, Plugin } from './plugin';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from '@reactivex/rxjs';
 
 
 export interface DeeplinkMatch {
diff --git a/src/plugins/devicemotion.ts b/src/plugins/devicemotion.ts
index b3a67bcfd..14f90f277 100644
--- a/src/plugins/devicemotion.ts
+++ b/src/plugins/devicemotion.ts
@@ -1,5 +1,5 @@
 import { Cordova, Plugin } from './plugin';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from '@reactivex/rxjs';
 
 
 export interface AccelerationData {
diff --git a/src/plugins/deviceorientation.ts b/src/plugins/deviceorientation.ts
index 431b9aa20..f9f987dc9 100644
--- a/src/plugins/deviceorientation.ts
+++ b/src/plugins/deviceorientation.ts
@@ -1,5 +1,5 @@
 import { Cordova, Plugin } from './plugin';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from '@reactivex/rxjs';
 
 
 export interface CompassHeading {
diff --git a/src/plugins/estimote-beacons.ts b/src/plugins/estimote-beacons.ts
index 2896120c1..58b7fd496 100644
--- a/src/plugins/estimote-beacons.ts
+++ b/src/plugins/estimote-beacons.ts
@@ -1,5 +1,5 @@
 import { Cordova, Plugin } from './plugin';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from '@reactivex/rxjs';
 
 /**
  * @name EstimoteBeacons
diff --git a/src/plugins/geofence.ts b/src/plugins/geofence.ts
index e7f2fa15e..605166fa8 100644
--- a/src/plugins/geofence.ts
+++ b/src/plugins/geofence.ts
@@ -1,5 +1,5 @@
 import { Cordova, Plugin } from './plugin';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from '@reactivex/rxjs';
 /**
  * @name Geofence
  * @description Monitors circular geofences around latitude/longitude coordinates, and sends a notification to the user when the boundary of a geofence is crossed. Notifications can be sent when the user enters and/or exits a geofence.
diff --git a/src/plugins/geolocation.ts b/src/plugins/geolocation.ts
index 289a1caec..fd4136eb4 100644
--- a/src/plugins/geolocation.ts
+++ b/src/plugins/geolocation.ts
@@ -1,5 +1,5 @@
 import { Cordova, Plugin } from './plugin';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from '@reactivex/rxjs';
 
 
 declare var navigator: any;
diff --git a/src/plugins/googlemaps.ts b/src/plugins/googlemaps.ts
index 8cf306326..764478b91 100644
--- a/src/plugins/googlemaps.ts
+++ b/src/plugins/googlemaps.ts
@@ -1,5 +1,5 @@
 import { Cordova, CordovaInstance, Plugin } from './plugin';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from '@reactivex/rxjs';
 
 
 /**
diff --git a/src/plugins/httpd.ts b/src/plugins/httpd.ts
index 5d11b3941..8716de391 100644
--- a/src/plugins/httpd.ts
+++ b/src/plugins/httpd.ts
@@ -1,5 +1,5 @@
 import { Cordova, Plugin } from './plugin';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from '@reactivex/rxjs';
 
 
 /**
diff --git a/src/plugins/ibeacon.ts b/src/plugins/ibeacon.ts
index c310f603e..d37d9aa02 100644
--- a/src/plugins/ibeacon.ts
+++ b/src/plugins/ibeacon.ts
@@ -1,5 +1,5 @@
 import { Cordova, Plugin } from './plugin';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from '@reactivex/rxjs';
 
 
 declare var cordova: any;
diff --git a/src/plugins/inappbrowser.ts b/src/plugins/inappbrowser.ts
index b088c9b58..a7f0590cd 100644
--- a/src/plugins/inappbrowser.ts
+++ b/src/plugins/inappbrowser.ts
@@ -1,5 +1,5 @@
 import { Plugin, CordovaInstance } from './plugin';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from '@reactivex/rxjs';
 
 declare var cordova: any;
 
diff --git a/src/plugins/keyboard.ts b/src/plugins/keyboard.ts
index 07ecad051..afa07a0a7 100644
--- a/src/plugins/keyboard.ts
+++ b/src/plugins/keyboard.ts
@@ -1,5 +1,5 @@
 import { Cordova, Plugin } from './plugin';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from '@reactivex/rxjs';
 
 
 /**
diff --git a/src/plugins/media-capture.ts b/src/plugins/media-capture.ts
index 8366a7c93..2b1ddcd49 100644
--- a/src/plugins/media-capture.ts
+++ b/src/plugins/media-capture.ts
@@ -1,5 +1,5 @@
 import { Cordova, CordovaProperty, Plugin } from './plugin';
-import { Observable } from 'rxjs/Rx';
+import { Observable } from '@reactivex/rxjs';
 
 
 declare var navigator: any;
diff --git a/src/plugins/media.ts b/src/plugins/media.ts
index 5ef39307d..b662f4d6a 100644
--- a/src/plugins/media.ts
+++ b/src/plugins/media.ts
@@ -1,5 +1,5 @@
 import { CordovaInstance, Plugin } from './plugin';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from '@reactivex/rxjs';
 
 
 declare var Media: any;
diff --git a/src/plugins/music-controls.ts b/src/plugins/music-controls.ts
index c091af332..0564fea62 100644
--- a/src/plugins/music-controls.ts
+++ b/src/plugins/music-controls.ts
@@ -1,5 +1,5 @@
 import { Plugin, Cordova } from './plugin';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from '@reactivex/rxjs';
 /**
  * @name MusicControls
  * @description
diff --git a/src/plugins/network.ts b/src/plugins/network.ts
index 4b238ca11..d1903a119 100644
--- a/src/plugins/network.ts
+++ b/src/plugins/network.ts
@@ -1,5 +1,5 @@
 import { Cordova, CordovaProperty, Plugin } from './plugin';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from '@reactivex/rxjs';
 
 
 declare var navigator: any;
diff --git a/src/plugins/nfc.ts b/src/plugins/nfc.ts
index 1159b97a9..f7ad96c11 100644
--- a/src/plugins/nfc.ts
+++ b/src/plugins/nfc.ts
@@ -1,5 +1,5 @@
 import { Plugin, Cordova } from './plugin';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from '@reactivex/rxjs';
 /**
  * @name NFC
  * @description
diff --git a/src/plugins/onesignal.ts b/src/plugins/onesignal.ts
index cf6f14674..4ad724098 100644
--- a/src/plugins/onesignal.ts
+++ b/src/plugins/onesignal.ts
@@ -1,5 +1,5 @@
 import { Cordova, Plugin } from './plugin';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from '@reactivex/rxjs';
 
 
 /**
diff --git a/src/plugins/plugin.ts b/src/plugins/plugin.ts
index 55b3ff0c1..f0460fbce 100644
--- a/src/plugins/plugin.ts
+++ b/src/plugins/plugin.ts
@@ -1,5 +1,5 @@
 import { get } from '../util';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from '@reactivex/rxjs';
 
 declare var window;
 declare var Promise;
diff --git a/src/plugins/shake.ts b/src/plugins/shake.ts
index 4e5208f03..26a5e0fac 100644
--- a/src/plugins/shake.ts
+++ b/src/plugins/shake.ts
@@ -1,5 +1,5 @@
 import { Plugin, Cordova } from './plugin';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from '@reactivex/rxjs';
 /**
  * @name Shake
  * @description Handles shake gesture
diff --git a/src/plugins/toast.ts b/src/plugins/toast.ts
index 0b0ccc16c..d5b279a58 100644
--- a/src/plugins/toast.ts
+++ b/src/plugins/toast.ts
@@ -1,5 +1,5 @@
 import { Cordova, Plugin } from './plugin';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from '@reactivex/rxjs';
 
 
 export interface ToastOptions {