diff --git a/.idea/encodings.xml b/.idea/encodings.xml index c3b9830..ac780a9 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,7 +1,9 @@ + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 65449aa..cfb8b2a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -21,70 +21,20 @@ - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - + @@ -92,10 +42,7 @@ - - - - + @@ -105,6 +52,9 @@ + + + @@ -117,10 +67,13 @@ @@ -166,11 +119,6 @@ - - - - - @@ -221,6 +169,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + @@ -445,8 +446,8 @@ - - + + @@ -488,10 +489,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + @@ -500,15 +546,13 @@ - - - + @@ -524,85 +568,140 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - - - - - - - - + + + - + + + - + + + + + + + + + + + + + + @@ -610,35 +709,40 @@ - - + - + + + + + + + + - + - - + - + - - + + - + @@ -646,18 +750,40 @@ - + - + + + + + + + + + + + + + + + - - + + + + + + + + + + diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties b/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties index 7f09ea5..303d9d1 100644 --- a/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties +++ b/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties @@ -1 +1 @@ -#Thu Feb 25 19:52:25 EST 2016 +#Sat Mar 05 11:28:56 EST 2016 diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock index d3ec72d..f27dc13 100644 Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock and b/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock differ diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin index fa24ab7..b6ffeaf 100644 Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin and b/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin differ diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin index d2b6539..e4b8e25 100644 Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin and b/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin differ diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin index 82c9b16..7cc1e15 100644 Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin and b/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin differ diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin index a07a418..3853faa 100644 Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin and b/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin differ diff --git a/platforms/android/AndroidManifest.xml b/platforms/android/AndroidManifest.xml index 4281371..d3e2f81 100644 --- a/platforms/android/AndroidManifest.xml +++ b/platforms/android/AndroidManifest.xml @@ -11,4 +11,7 @@ + + + diff --git a/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar b/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar index 44923ea..162b4f3 100644 Binary files a/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar and b/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar differ diff --git a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaActivity.class b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaActivity.class index a83b757..1e5cea5 100644 Binary files a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaActivity.class and b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaActivity.class differ diff --git a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaInterfaceImpl$ActivityResultHolder.class b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaInterfaceImpl$ActivityResultHolder.class index a060b1a..8562638 100644 Binary files a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaInterfaceImpl$ActivityResultHolder.class and b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaInterfaceImpl$ActivityResultHolder.class differ diff --git a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaInterfaceImpl.class b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaInterfaceImpl.class index 799def2..2f56fe5 100644 Binary files a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaInterfaceImpl.class and b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaInterfaceImpl.class differ diff --git a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaWebView.class b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaWebView.class index 4994e66..feaba8c 100644 Binary files a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaWebView.class and b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaWebView.class differ diff --git a/platforms/android/CordovaLib/build/intermediates/incremental/mergeDebugAssets/merger.xml b/platforms/android/CordovaLib/build/intermediates/incremental/mergeDebugAssets/merger.xml index f79bd31..36574d4 100644 --- a/platforms/android/CordovaLib/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/platforms/android/CordovaLib/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/platforms/android/CordovaLib/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/platforms/android/CordovaLib/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index 35922c7..a3dc757 100644 --- a/platforms/android/CordovaLib/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/platforms/android/CordovaLib/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/platforms/android/CordovaLib/build/intermediates/incremental/packageDebugResources/merger.xml b/platforms/android/CordovaLib/build/intermediates/incremental/packageDebugResources/merger.xml index ed0b778..9974a85 100644 --- a/platforms/android/CordovaLib/build/intermediates/incremental/packageDebugResources/merger.xml +++ b/platforms/android/CordovaLib/build/intermediates/incremental/packageDebugResources/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar b/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar index 77b2905..8f0718b 100644 Binary files a/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar and b/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar differ diff --git a/platforms/android/CordovaLib/src/org/apache/cordova/CordovaInterfaceImpl.java b/platforms/android/CordovaLib/src/org/apache/cordova/CordovaInterfaceImpl.java index 65e2a90..d1420b6 100644 --- a/platforms/android/CordovaLib/src/org/apache/cordova/CordovaInterfaceImpl.java +++ b/platforms/android/CordovaLib/src/org/apache/cordova/CordovaInterfaceImpl.java @@ -108,17 +108,20 @@ public void onCordovaInit(PluginManager pluginManager) { // If there was no Activity result, we still need to send out the resume event if the // Activity was destroyed by the OS activityWasDestroyed = false; - - CoreAndroid appPlugin = (CoreAndroid) pluginManager.getPlugin(CoreAndroid.PLUGIN_NAME); - if(appPlugin != null) { - JSONObject obj = new JSONObject(); - try { - obj.put("action", "resume"); - } catch (JSONException e) { - LOG.e(TAG, "Failed to create event message", e); + if(pluginManager != null) + { + CoreAndroid appPlugin = (CoreAndroid) pluginManager.getPlugin(CoreAndroid.PLUGIN_NAME); + if(appPlugin != null) { + JSONObject obj = new JSONObject(); + try { + obj.put("action", "resume"); + } catch (JSONException e) { + LOG.e(TAG, "Failed to create event message", e); + } + appPlugin.sendResumeEvent(new PluginResult(PluginResult.Status.OK, obj)); } - appPlugin.sendResumeEvent(new PluginResult(PluginResult.Status.OK, obj)); } + } } @@ -169,8 +172,10 @@ public void onSaveInstanceState(Bundle outState) { String serviceName = activityResultCallback.getServiceName(); outState.putString("callbackService", serviceName); } + if(pluginManager != null){ + outState.putBundle("plugin", pluginManager.onSaveInstanceState()); + } - outState.putBundle("plugin", pluginManager.onSaveInstanceState()); } /** diff --git a/platforms/android/CordovaLib/src/org/apache/cordova/CordovaWebView.java b/platforms/android/CordovaLib/src/org/apache/cordova/CordovaWebView.java index 096f063..6b0abca 100644 --- a/platforms/android/CordovaLib/src/org/apache/cordova/CordovaWebView.java +++ b/platforms/android/CordovaLib/src/org/apache/cordova/CordovaWebView.java @@ -31,7 +31,7 @@ Licensed to the Apache Software Foundation (ASF) under one * are not expected to implement it. */ public interface CordovaWebView { - public static final String CORDOVA_VERSION = "5.1.0"; + public static final String CORDOVA_VERSION = "5.1.1"; void init(CordovaInterface cordova, List pluginEntries, CordovaPreferences preferences); diff --git a/platforms/android/android.json b/platforms/android/android.json index aaf5a83..e92e704 100644 --- a/platforms/android/android.json +++ b/platforms/android/android.json @@ -11,13 +11,30 @@ { "xml": "", "count": 1 + }, + { + "xml": "", + "count": 1 } ] } }, "AndroidManifest.xml": { "parents": { - "/manifest": [] + "/manifest": [ + { + "xml": "", + "count": 2 + }, + { + "xml": "", + "count": 2 + }, + { + "xml": "", + "count": 1 + } + ] } } } @@ -25,6 +42,9 @@ "installed_plugins": { "cordova-plugin-bluetooth-serial": { "PACKAGE_NAME": "com.ionicframework.testtabs509143" + }, + "cordova-plugin-rfduino": { + "PACKAGE_NAME": "com.ionicframework.testtabs509143" } }, "dependent_plugins": {}, @@ -35,6 +55,17 @@ "clobbers": [ "window.bluetoothSerial" ] + }, + { + "file": "plugins/cordova-plugin-rfduino/www/rfduino.js", + "id": "cordova-plugin-rfduino.rfduino", + "clobbers": [ + "rfduino" + ] } - ] + ], + "plugin_metadata": { + "cordova-plugin-bluetooth-serial": "0.4.5", + "cordova-plugin-rfduino": "0.1.4" + } } \ No newline at end of file diff --git a/platforms/android/assets/www/app/app.js b/platforms/android/assets/www/app/app.js index 9228bbb..f46f320 100644 --- a/platforms/android/assets/www/app/app.js +++ b/platforms/android/assets/www/app/app.js @@ -2,23 +2,23 @@ // 'openbarbell' is the name of this angular module (also set in a attribute in index.html) // the 2nd parameter is an array of 'required' modules angular.module('openbarbell', [ - 'ngMaterial', - 'ionic', - 'appConfig', - 'appRoutes', + 'ngMaterial', + 'ionic', + 'appConfig', + 'appRoutes', 'shell', 'workout', 'history', 'settings', /* Services */ - 'bluetooth-service', 'settings-service' + 'bluetooth-service', 'rfduino-service', 'settings-service' ]); //.run(function($ionicPlatform) { // $ionicPlatform.ready(function() { // // Hide the accessory bar by default (remove this to show the accessory bar above the keyboard // // for form inputs) -// +// // // This is where we could setup initial plug-in settings // if (window.cordova && window.cordova.plugins && window.cordova.plugins.Keyboard) { // cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true); @@ -29,4 +29,4 @@ angular.module('openbarbell', [ // StatusBar.styleDefault(); // } // }); -//}); \ No newline at end of file +//}); diff --git a/platforms/android/assets/www/app/services/bluetooth.service.js b/platforms/android/assets/www/app/services/bluetooth.service.js index a064d15..68440f6 100644 --- a/platforms/android/assets/www/app/services/bluetooth.service.js +++ b/platforms/android/assets/www/app/services/bluetooth.service.js @@ -1,21 +1,22 @@ (function(angular){ angular.module('bluetooth-service', []) .service('bluetoothService', bluetoothService); - - bluetoothService.$inject = ['$q', '$timeout', '$window', 'settingsService']; - function bluetoothService($q, $timeout, $window, settingsService) { - var connectedDevice = {}; + + /******************************* + * DEPRECATED * + * Could possible be used for: * + *--------ANDROID ONLY---------* + * function @isEnabled * + * function @enable * + *******************************/ + + bluetoothService.$inject = ['$q', '$window']; + function bluetoothService($q, $window) { var enabled = false; var service = { - getConnectedDevice : getConnectedDevice, isEnabled : isEnabled, - isConnected : isConnected, - enable : enable, - scanDevices : scanDevices, - connect : function(device) { - return connect(device); - } + enable : enable }; return service; @@ -47,27 +48,6 @@ return deferred.promise; } - function isConnected() { - var deferred = $q.defer(); - - if ($window.bluetoothSerial && enabled) { - bluetoothSerial.isConnected(function() { - deferred.resolve("Device is connected."); - }, - function() { - deferred.reject("Device is not connected."); - }); - } - else if (!enabled) { - deferred.reject("Bluetooth is not enabled!"); - } - else { - deferred.reject("BluetoothSerial plug-in not loaded."); - } - - return deferred.promise; - } - function enable() { var deferred = $q.defer(); @@ -89,65 +69,5 @@ return deferred.promise; } - - function scanDevices() { - var deferred = $q.defer(); - - if ($window.bluetoothSerial && enabled) { - bluetoothSerial.discoverUnpaired(function(devices) { - deferred.resolve(devices); - }, - function() { - deferred.reject("Could not find any devices."); - }); - } - else if (!enabled) { - deferred.reject("Bluetooth is not enabled!"); - } - else { - deferred.reject("BluetoothSerial plug-in not loaded."); - } - - return deferred.promise; - } - - function connect(device) { - var deferred = $q.defer(); - - if ($window.bluetoothSerial && enabled) { - bluetoothSerial.connect(device.address, function() { - deferred.resolve("Connected to " + device.name + "!"); - connectedDevice = device; - connected = true; - - /* Store MAC Address of connected device */ - settingsService.setSetting("mac_address", device.address); - - //bluetoothSerial.subscribe('\n', onReceive, onSubscribeFail); - }, - function(error) { - deferred.resolve("Failed to connected to " + device.name + "!"); - connectedDevice = {}; - connected = false; - }); - } - else if (!enabled) { - deferred.reject("Bluetooth is not enabled!"); - } - else { - deferred.reject("BluetoothSerial plug-in not loaded."); - } - - return deferred.promise; - } - - function onReceive(data) { - //TODO: Do something with the data - } - - //TODO: Test subscribing with the device, otherwise may need read/timeouts - function onSubscribeFail() { - console.log("Failed to subscribe."); - } }; })(angular); diff --git a/platforms/android/assets/www/app/services/rfduino.service.js b/platforms/android/assets/www/app/services/rfduino.service.js index 6d7f064..ba7edaa 100644 --- a/platforms/android/assets/www/app/services/rfduino.service.js +++ b/platforms/android/assets/www/app/services/rfduino.service.js @@ -12,11 +12,11 @@ isEnabled : isEnabled, isConnected : isConnected, discoverDevices : discoverDevices, - listDevices : listDevices, + // listDevices : listDevices, connect : function(device) { return connect(device); - }, - disconnect : disconnect + }//, + //disconnect : disconnect }; return service; @@ -71,7 +71,7 @@ /** * Some REGEX for OpenBarbell Device detection "^(OB){1}\s{1}\d+$" - * + * * rfduino will call success callback each time a peripheral is discovered. * @sampleDevice { * "name": "RFduino", @@ -81,62 +81,66 @@ * } */ function discoverDevices() { - var deferred = $q.defer(); - - if ($window.rfduino && enabled) { - // cannot resolve on first device! Resolve when timer is done - rfduino.discover(3, function(device) { - deferred.resolve(devices); - }, - function() { - deferred.reject("Could not find any devices."); - }); - } - else if (!enabled) { - deferred.reject("Bluetooth is not enabled!"); - } - else { - deferred.reject("rfduino plug-in not loaded."); - } - - return deferred.promise; - } - - function connect(device) { - var deferred = $q.defer(); - - if ($window.rfduino && enabled) { - rfduino.connect(device.uuid, function() { - deferred.resolve("Connected to " + device.name + "!"); - connectedDevice = device; - - /* Store MAC Address of connected device */ - settingsService.setSetting("mac_address", device.address); - - //rfduino.subscribe('\n', onReceive, onSubscribeFail); - }, - function(error) { - deferred.resolve("Failed to connected to " + device.name + "!"); - connectedDevice = {}; - }); - } - else if (!enabled) { - deferred.reject("Bluetooth is not enabled!"); - } - else { - deferred.reject("rfduino plug-in not loaded."); - } - - return deferred.promise; - } - - function onReceive(data) { - //TODO: Do something with the data - } - - //TODO: Test subscribing with the device, otherwise may need read/timeouts - function onSubscribeFail() { - console.log("Failed to subscribe."); - } + var deferred = $q.defer(); + + if ($window.rfduino) { + // cannot resolve on first device! Resolve when timer is done + rfduino.discover(3, function(device) { + deferred.resolve(device); + if (device.name === "OB 48") {connect(device); } + }, + function() { + deferred.reject("Could not find any devices."); + }); + } + else if (!enabled) { + deferred.reject("Bluetooth is not enabled!"); + } + else { + deferred.reject("rfduino plug-in not loaded."); + } + + return deferred.promise; + } + + function connect(device) { + var deferred = $q.defer(); + + if ($window.rfduino) { + rfduino.connect(device.uuid, function() { + deferred.resolve("Connected to " + device.name + "!"); + connectedDevice = device; + + /* Store MAC Address of connected device */ + settingsService.setSetting("mac_address", device.address); + + rfduino.onData(onReceive, onSubscribeFail); + + //rfduino.subscribe('\n', onReceive, onSubscribeFail); + }, + function(error) { + deferred.resolve("Failed to connected to " + device.name + "!"); + connectedDevice = {}; + }); + } + else if (!enabled) { + deferred.reject("Bluetooth is not enabled!"); + } + else { + deferred.reject("rfduino plug-in not loaded."); + } + + return deferred.promise; + } + + function onReceive(data) { + //TODO: Do something with the data + console.log(data); + } + + //TODO: Test subscribing with the device, otherwise may need read/timeouts + function onSubscribeFail() { + console.log("Failed to subscribe."); + } }; })(angular); diff --git a/platforms/android/assets/www/app/settings/settings.controller.js b/platforms/android/assets/www/app/settings/settings.controller.js index c3bc348..a979428 100644 --- a/platforms/android/assets/www/app/settings/settings.controller.js +++ b/platforms/android/assets/www/app/settings/settings.controller.js @@ -3,8 +3,8 @@ .module('settings') .controller('SettingsController', SettingsController); - SettingsController.$inject = ['$scope', '$timeout', 'settingsService', 'bluetoothService']; - function SettingsController($scope, $timeout, settingsService, bluetoothService) { + SettingsController.$inject = ['$scope', '$timeout', 'settingsService', 'bluetoothService', 'rfduinoService']; + function SettingsController($scope, $timeout, settingsService, bluetoothService, rfduinoService) { var vm = this; vm.bluetoothBtnText = "Enable Bluetooth"; @@ -63,7 +63,7 @@ vm.scanning = true; $timeout(function() { - bluetoothService.scanDevices() + rfduinoService.discoverDevices() .then(function(devices) { vm.scanBtnText = "Scan Devices"; vm.disableScanBtn = false; @@ -87,7 +87,7 @@ vm.pairing = "indeterminate"; $timeout(function() { - bluetoothService.connect(device) + rfduinoService.connect(device) .then(function(response) { vm.deviceConnected = true; delete vm.pairing; @@ -100,7 +100,7 @@ } function getDeviceInfo(property) { - return bluetoothService.getConnectedDevice()[property]; + return rfduinoService.getConnectedDevice()[property]; } $scope.$on('syncSettings', function(params) { diff --git a/platforms/android/assets/www/app/shell/tab.controller.js b/platforms/android/assets/www/app/shell/tab.controller.js index 883de56..2bc9c61 100644 --- a/platforms/android/assets/www/app/shell/tab.controller.js +++ b/platforms/android/assets/www/app/shell/tab.controller.js @@ -3,8 +3,8 @@ .module('shell') .controller('TabController', TabController); - TabController.$inject = ['$scope', '$window', 'bluetoothService']; - function TabController($scope, $window, bluetoothService) { + TabController.$inject = ['$scope', '$window', '$document', 'bluetoothService']; + function TabController($scope, $window, $document, bluetoothService) { var vm = this; vm.selectedIndex = 0; @@ -27,17 +27,35 @@ $scope.$broadcast('syncSettings', {}); }; - /* - * Check status of bluetooth once plug-in is detected - */ - var unbindWatcher = $scope.$watch(function() { - return $window.bluetoothSerial; - }, + /****************** Cordova Events ******************/ + + // Check status of bluetooth once plug-in is detected + var unbindWatcher = $scope.$watch(function() { + return $window.rfduino; + }, function(newValue, oldValue) { if (newValue !== undefined) { $scope.$broadcast('checkConnectionStatus', {}); unbindWatcher(); } }); + + // Check status of bluetooth when app resumed + $document[0].addEventListener("deviceready", onDeviceReady, false); + + function onDeviceReady() { + $document[0].addEventListener("pause", onPause, false); + $document[0].addEventListener("resume", onResume, false); + } + + // Handle the pause event + function onPause() { + + } + + // Handle the resume event + function onResume() { + $scope.$broadcast('checkConnectionStatus', {}); + } }; })(angular); diff --git a/platforms/android/assets/www/app/shell/tabs.html b/platforms/android/assets/www/app/shell/tabs.html index bd0d8da..90ce8a3 100644 --- a/platforms/android/assets/www/app/shell/tabs.html +++ b/platforms/android/assets/www/app/shell/tabs.html @@ -1,4 +1,4 @@ - + diff --git a/platforms/android/assets/www/app/workout/tab-workout.html b/platforms/android/assets/www/app/workout/tab-workout.html index ba1def9..9b74005 100644 --- a/platforms/android/assets/www/app/workout/tab-workout.html +++ b/platforms/android/assets/www/app/workout/tab-workout.html @@ -1,33 +1,39 @@ - - - -
-
+ + + + + + + +
+
- - -
-
+ + +
+
- - -
-
+ + +
+
- - - - + + + + diff --git a/platforms/android/assets/www/app/workout/workout.controller.js b/platforms/android/assets/www/app/workout/workout.controller.js index ec67f29..dc04f8f 100644 --- a/platforms/android/assets/www/app/workout/workout.controller.js +++ b/platforms/android/assets/www/app/workout/workout.controller.js @@ -18,6 +18,12 @@ vm.enterSetInfo = enterSetInformation; + vm.doRefresh = function() { + console.log("Refreshing..."); + // Stop the ion-refresher from spinning + $scope.$broadcast('scroll.refreshComplete'); + }; + /* * Internal Methods */ @@ -61,13 +67,13 @@ function checkDeviceConnected() { // vm.ready = false; - bluetoothService.isConnected() - .then(function(response) { - vm.ready = true; - }, - function(reason) { - console.log(reason); - }); +// bluetoothService.isConnected() +// .then(function(response) { +// vm.ready = true; +// }, +// function(reason) { +// console.log(reason); +// }); } function getUnits() { diff --git a/platforms/android/assets/www/cordova-js-src/platform.js b/platforms/android/assets/www/cordova-js-src/platform.js index 0706a34..2bfd024 100644 --- a/platforms/android/assets/www/cordova-js-src/platform.js +++ b/platforms/android/assets/www/cordova-js-src/platform.js @@ -19,6 +19,9 @@ * */ +// The last resume event that was received that had the result of a plugin call. +var lastResumeEvent = null; + module.exports = { id: 'android', bootstrap: function() { @@ -58,6 +61,19 @@ module.exports = { bindButtonChannel('volumeup'); bindButtonChannel('volumedown'); + // The resume event is not "sticky", but it is possible that the event + // will contain the result of a plugin call. We need to ensure that the + // plugin result is delivered even after the event is fired (CB-10498) + var cordovaAddEventListener = document.addEventListener; + + document.addEventListener = function(evt, handler, capture) { + cordovaAddEventListener(evt, handler, capture); + + if (evt === 'resume' && lastResumeEvent) { + handler(lastResumeEvent); + } + }; + // Let native code know we are all done on the JS side. // Native code will then un-hide the WebView. channel.onCordovaReady.subscribe(function() { @@ -96,6 +112,10 @@ function onMessageFromNative(msg) { } msg.pendingResult.result = res; } + + // Save the plugin result so that it can be delivered to the js + // even if they miss the initial firing of the event + lastResumeEvent = msg; } cordova.fireDocumentEvent(action, msg); break; diff --git a/platforms/android/assets/www/cordova.js b/platforms/android/assets/www/cordova.js index ece529c..e94e0f7 100644 --- a/platforms/android/assets/www/cordova.js +++ b/platforms/android/assets/www/cordova.js @@ -1,5 +1,5 @@ // Platform: android -// ded62dda172755defaf75378ed007dc05730ec22 +// c517ca811b4948b630e0b74dbae6c9637939da24 /* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -19,7 +19,7 @@ under the License. */ ;(function() { -var PLATFORM_VERSION_BUILD_LABEL = '5.1.0'; +var PLATFORM_VERSION_BUILD_LABEL = '5.1.1'; // file: src/scripts/require.js /*jshint -W079 */ @@ -1614,6 +1614,9 @@ exports.reset(); // file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/platform.js define("cordova/platform", function(require, exports, module) { +// The last resume event that was received that had the result of a plugin call. +var lastResumeEvent = null; + module.exports = { id: 'android', bootstrap: function() { @@ -1653,6 +1656,19 @@ module.exports = { bindButtonChannel('volumeup'); bindButtonChannel('volumedown'); + // The resume event is not "sticky", but it is possible that the event + // will contain the result of a plugin call. We need to ensure that the + // plugin result is delivered even after the event is fired (CB-10498) + var cordovaAddEventListener = document.addEventListener; + + document.addEventListener = function(evt, handler, capture) { + cordovaAddEventListener(evt, handler, capture); + + if (evt === 'resume' && lastResumeEvent) { + handler(lastResumeEvent); + } + }; + // Let native code know we are all done on the JS side. // Native code will then un-hide the WebView. channel.onCordovaReady.subscribe(function() { @@ -1691,6 +1707,10 @@ function onMessageFromNative(msg) { } msg.pendingResult.result = res; } + + // Save the plugin result so that it can be delivered to the js + // even if they miss the initial firing of the event + lastResumeEvent = msg; } cordova.fireDocumentEvent(action, msg); break; diff --git a/platforms/android/assets/www/cordova_plugins.js b/platforms/android/assets/www/cordova_plugins.js index 412ba08..a70214c 100644 --- a/platforms/android/assets/www/cordova_plugins.js +++ b/platforms/android/assets/www/cordova_plugins.js @@ -6,10 +6,20 @@ module.exports = [ "clobbers": [ "window.bluetoothSerial" ] + }, + { + "file": "plugins/cordova-plugin-rfduino/www/rfduino.js", + "id": "cordova-plugin-rfduino.rfduino", + "clobbers": [ + "rfduino" + ] } ]; module.exports.metadata = // TOP OF METADATA -{} +{ + "cordova-plugin-bluetooth-serial": "0.4.5", + "cordova-plugin-rfduino": "0.1.4" +}; // BOTTOM OF METADATA }); \ No newline at end of file diff --git a/platforms/android/assets/www/index.html b/platforms/android/assets/www/index.html index 2830c27..e0920b7 100644 --- a/platforms/android/assets/www/index.html +++ b/platforms/android/assets/www/index.html @@ -3,70 +3,83 @@ - + Open Barbell - + - + + + + - + - + - + - + - + - + + + + + + + + + + - + - + - + - + - + - + - + + - + - - + +
diff --git a/platforms/android/cordova/Api.js b/platforms/android/cordova/Api.js index 7b7731f..ad6f71c 100644 --- a/platforms/android/cordova/Api.js +++ b/platforms/android/cordova/Api.js @@ -219,6 +219,11 @@ Api.prototype.addPlugin = function (plugin, installOptions) { .add_plugin_changes(plugin, installOptions.variables, /*is_top_level=*/true, /*should_increment=*/true) .save_all(); + if (plugin.getFrameworks(self.platform).length > 0) { + self.events.emit('verbose', 'Updating build files since android plugin contained '); + require('./lib/builders/builders').getBuilder('gradle').prepBuildFiles(); + } + var targetDir = installOptions.usePlatformWww ? self.locations.platformWww : self.locations.www; @@ -272,6 +277,11 @@ Api.prototype.removePlugin = function (plugin, uninstallOptions) { .remove_plugin_changes(plugin, /*is_top_level=*/true) .save_all(); + if (plugin.getFrameworks(self.platform).length > 0) { + self.events.emit('verbose', 'Updating build files since android plugin contained '); + require('./lib/builders/builders').getBuilder('gradle').prepBuildFiles(); + } + var targetDir = uninstallOptions.usePlatformWww ? self.locations.platformWww : self.locations.www; @@ -431,6 +441,11 @@ Api.prototype._addModulesInfo = function(plugin, targetDir) { }); this._platformJson.root.modules = installedModules.concat(modulesToInstall); + if (!this._platformJson.root.plugin_metadata) { + this._platformJson.root.plugin_metadata = {}; + } + this._platformJson.root.plugin_metadata[plugin.id] = plugin.version; + this._writePluginModules(targetDir); this._platformJson.save(); }; @@ -457,6 +472,10 @@ Api.prototype._removeModulesInfo = function(plugin, targetDir) { }); this._platformJson.root.modules = updatedModules; + if (this._platformJson.root.plugin_metadata) { + delete this._platformJson.root.plugin_metadata[plugin.id]; + } + this._writePluginModules(targetDir); this._platformJson.save(); }; @@ -470,20 +489,13 @@ Api.prototype._removeModulesInfo = function(plugin, targetDir) { * directories. */ Api.prototype._writePluginModules = function (targetDir) { - var self = this; // Write out moduleObjects as JSON wrapped in a cordova module to cordova_plugins.js var final_contents = 'cordova.define(\'cordova/plugin_list\', function(require, exports, module) {\n'; final_contents += 'module.exports = ' + JSON.stringify(this._platformJson.root.modules, null, ' ') + ';\n'; final_contents += 'module.exports.metadata = \n'; final_contents += '// TOP OF METADATA\n'; - var pluginMetadata = Object.keys(this._platformJson.root.installed_plugins) - .reduce(function (metadata, plugin) { - metadata[plugin] = self._platformJson.root.installed_plugins[plugin].version; - return metadata; - }, {}); - - final_contents += JSON.stringify(pluginMetadata, null, 4) + '\n'; + final_contents += JSON.stringify(this._platformJson.root.plugin_metadata, null, 4) + ';\n'; final_contents += '// BOTTOM OF METADATA\n'; final_contents += '});'; // Close cordova.define. diff --git a/platforms/android/cordova/build b/platforms/android/cordova/build index da44783..de86a36 100644 --- a/platforms/android/cordova/build +++ b/platforms/android/cordova/build @@ -39,7 +39,7 @@ var buildOpts = nopt({ }, { 'd' : '--verbose' }); // Make buildOptions compatible with PlatformApi build method spec -buildOpts.argv = buildOpts.argv.remain; +buildOpts.argv = buildOpts.argv.original; new Api().build(buildOpts) .catch(function(err) { diff --git a/platforms/android/cordova/lib/build.js b/platforms/android/cordova/lib/build.js index 47aaa16..e1263ef 100644 --- a/platforms/android/cordova/lib/build.js +++ b/platforms/android/cordova/lib/build.js @@ -31,7 +31,7 @@ var events = require('cordova-common').events; var spawn = require('cordova-common').superspawn.spawn; var CordovaError = require('cordova-common').CordovaError; -function parseOpts(options, resolvedTarget) { +function parseOpts(options, resolvedTarget, projectRoot) { options = options || {}; options.argv = nopt({ gradle: Boolean, @@ -72,7 +72,7 @@ function parseOpts(options, resolvedTarget) { var packageArgs = {}; if (options.argv.keystore) - packageArgs.keystore = path.relative(this.root, path.resolve(options.argv.keystore)); + packageArgs.keystore = path.relative(projectRoot, path.resolve(options.argv.keystore)); ['alias','storePassword','password','keystoreType'].forEach(function (flagName) { if (options.argv[flagName]) @@ -126,7 +126,7 @@ function parseOpts(options, resolvedTarget) { * Returns a promise. */ module.exports.runClean = function(options) { - var opts = parseOpts(options); + var opts = parseOpts(options, null, this.root); var builder = builders.getBuilder(opts.buildMethod); return builder.prepEnv(opts) .then(function() { @@ -147,7 +147,7 @@ module.exports.runClean = function(options) { * information. */ module.exports.run = function(options, optResolvedTarget) { - var opts = parseOpts(options, optResolvedTarget); + var opts = parseOpts(options, optResolvedTarget, this.root); var builder = builders.getBuilder(opts.buildMethod); var self = this; return builder.prepEnv(opts) @@ -169,11 +169,6 @@ module.exports.run = function(options, optResolvedTarget) { }); }; -// Called by plugman after installing plugins, and by create script after creating project. -module.exports.prepBuildFiles = function() { - return builders.getBuilder('gradle').prepBuildFiles(); -}; - /* * Detects the architecture of a device/emulator * Returns "arm" or "x86". diff --git a/platforms/android/cordova/lib/builders/AntBuilder.js b/platforms/android/cordova/lib/builders/AntBuilder.js index d214f48..7094fe5 100644 --- a/platforms/android/cordova/lib/builders/AntBuilder.js +++ b/platforms/android/cordova/lib/builders/AntBuilder.js @@ -45,7 +45,7 @@ util.inherits(AntBuilder, GenericBuilder); AntBuilder.prototype.getArgs = function(cmd, opts) { var args = [cmd, '-f', path.join(this.root, 'build.xml')]; // custom_rules.xml is required for incremental builds. - if (hasCustomRules()) { + if (hasCustomRules(this.root)) { args.push('-Dout.dir=ant-build', '-Dgen.absolute.dir=ant-gen'); } if(opts.packageInfo) { @@ -99,7 +99,7 @@ AntBuilder.prototype.prepEnv = function(opts) { AntBuilder.prototype.build = function(opts) { // Without our custom_rules.xml, we need to clean before building. var ret = Q(); - if (!hasCustomRules()) { + if (!hasCustomRules(this.root)) { // clean will call check_ant() for us. ret = this.clean(opts); } diff --git a/platforms/android/cordova/lib/device.js b/platforms/android/cordova/lib/device.js index e62e3db..4f9acc8 100644 --- a/platforms/android/cordova/lib/device.js +++ b/platforms/android/cordova/lib/device.js @@ -89,12 +89,25 @@ module.exports.install = function(target, buildResults) { var pkgName = manifest.getPackageId(); var launchName = pkgName + '/.' + manifest.getActivity().getName(); events.emit('log', 'Using apk: ' + apk_path); - // This promise is always resolved, even if 'adb uninstall' fails to uninstall app - // or the app doesn't installed at all, so no error catching needed. - return Adb.uninstall(resolvedTarget.target, pkgName) + + return Adb.install(resolvedTarget.target, apk_path, {replace: true}) + .catch(function (error) { + // CB-9557 CB-10157 only uninstall and reinstall app if the one that + // is already installed on device was signed w/different certificate + if (!/INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES/.test(error.toString())) + throw error; + + events.emit('warn', 'Uninstalling app from device and reinstalling it again because the ' + + 'installed app already signed with different key'); + + // This promise is always resolved, even if 'adb uninstall' fails to uninstall app + // or the app doesn't installed at all, so no error catching needed. + return Adb.uninstall(resolvedTarget.target, pkgName) + .then(function() { + return Adb.install(resolvedTarget.target, apk_path, {replace: true}); + }); + }) .then(function() { - return Adb.install(resolvedTarget.target, apk_path, {replace: true}); - }).then(function() { //unlock screen return Adb.shell(resolvedTarget.target, 'input keyevent 82'); }).then(function() { diff --git a/platforms/android/cordova/lib/emulator.js b/platforms/android/cordova/lib/emulator.js index 9e214b1..96bb5c9 100644 --- a/platforms/android/cordova/lib/emulator.js +++ b/platforms/android/cordova/lib/emulator.js @@ -23,7 +23,6 @@ var retry = require('./retry'); var build = require('./build'); -var check_reqs = require('./check_reqs'); var path = require('path'); var Adb = require('./Adb'); var AndroidManifest = require('./AndroidManifest'); @@ -40,6 +39,7 @@ var ONE_SECOND = 1000; // in milliseconds var ONE_MINUTE = 60 * ONE_SECOND; // in milliseconds var INSTALL_COMMAND_TIMEOUT = 5 * ONE_MINUTE; // in milliseconds var NUM_INSTALL_RETRIES = 3; +var CHECK_BOOTED_INTERVAL = 3 * ONE_SECOND; // in milliseconds var EXEC_KILL_SIGNAL = 'SIGKILL'; /** @@ -104,7 +104,8 @@ module.exports.best_image = function() { var closest = 9999; var best = images[0]; - var project_target = check_reqs.get_target().replace('android-', ''); + // Loading check_reqs at run-time to avoid test-time vs run-time directory structure difference issue + var project_target = require('./check_reqs').get_target().replace('android-', ''); for (var i in images) { var target = images[i].target; if(target) { @@ -146,10 +147,12 @@ module.exports.list_targets = function() { * and returns the started ID of that emulator. * If no ID is given it will use the first image available, * if no image is available it will error out (maybe create one?). + * If no boot timeout is given or the value is negative it will wait forever for + * the emulator to boot * * Returns a promise. */ -module.exports.start = function(emulator_ID) { +module.exports.start = function(emulator_ID, boot_timeout) { var self = this; return Q().then(function() { @@ -162,7 +165,8 @@ module.exports.start = function(emulator_ID) { return best.name; } - var androidCmd = check_reqs.getAbsoluteAndroidCmd(); + // Loading check_reqs at run-time to avoid test-time vs run-time directory structure difference issue + var androidCmd = require('./check_reqs').getAbsoluteAndroidCmd(); return Q.reject(new CordovaError('No emulator images (avds) found.\n' + '1. Download desired System Image by running: ' + androidCmd + ' sdk\n' + '2. Create an AVD by running: ' + androidCmd + ' avd\n' + @@ -186,14 +190,20 @@ module.exports.start = function(emulator_ID) { //wait for emulator to boot up process.stdout.write('Booting up emulator (this may take a while)...'); - return self.wait_for_boot(emulatorId) - .then(function() { - events.emit('log','BOOT COMPLETE'); - //unlock screen - return Adb.shell(emulatorId, 'input keyevent 82'); - }).then(function() { - //return the new emulator id for the started emulators - return emulatorId; + return self.wait_for_boot(emulatorId, boot_timeout) + .then(function(success) { + if (success) { + events.emit('log','BOOT COMPLETE'); + //unlock screen + return Adb.shell(emulatorId, 'input keyevent 82') + .then(function() { + //return the new emulator id for the started emulators + return emulatorId; + }); + } else { + // We timed out waiting for the boot to happen + return null; + } }); }); }; @@ -227,18 +237,25 @@ module.exports.wait_for_emulator = function(uuid) { }; /* - * Waits for the core android process of the emulator to start + * Waits for the core android process of the emulator to start. Returns a + * promise that resolves to a boolean indicating success. Not specifying a + * time_remaining or passing a negative value will cause it to wait forever */ -module.exports.wait_for_boot = function(emulator_id) { +module.exports.wait_for_boot = function(emulator_id, time_remaining) { var self = this; return Adb.shell(emulator_id, 'ps') .then(function(output) { if (output.match(/android\.process\.acore/)) { - return; + return true; + } else if (time_remaining === 0) { + return false; } else { process.stdout.write('.'); - return Q.delay(3000).then(function() { - return self.wait_for_boot(emulator_id); + + // Check at regular intervals + return Q.delay(time_remaining < CHECK_BOOTED_INTERVAL ? time_remaining : CHECK_BOOTED_INTERVAL).then(function() { + var updated_time = time_remaining >= 0 ? Math.max(time_remaining - CHECK_BOOTED_INTERVAL, 0) : time_remaining; + return self.wait_for_boot(emulator_id, updated_time); }); } }); @@ -321,7 +338,7 @@ module.exports.install = function(givenTarget, buildResults) { }).then(function () { // This promise is always resolved, even if 'adb uninstall' fails to uninstall app // or the app doesn't installed at all, so no error catching needed. - return Adb.uninstall(target.target, pkgName) + return Q.when() .then(function() { var apk_path = build.findBestApkForArchitecture(buildResults, target.arch); @@ -334,28 +351,47 @@ module.exports.install = function(givenTarget, buildResults) { events.emit('log', 'Using apk: ' + apk_path); events.emit('verbose', 'Installing app on emulator...'); - function exec(command, opts) { + // A special function to call adb install in specific environment w/ specific options. + // Introduced as a part of fix for http://issues.apache.org/jira/browse/CB-9119 + // to workaround sporadic emulator hangs + function adbInstallWithOptions(target, apk, opts) { + events.emit('verbose', 'Installing apk ' + apk + ' on ' + target + '...'); + + var command = 'adb -s ' + target + ' install -r "' + apk + '"'; return Q.promise(function (resolve, reject) { child_process.exec(command, opts, function(err, stdout, stderr) { if (err) reject(new CordovaError('Error executing "' + command + '": ' + stderr)); + // adb does not return an error code even if installation fails. Instead it puts a specific + // message to stdout, so we have to use RegExp matching to detect installation failure. + else if (/Failure/.test(stdout)) reject(new CordovaError('Failed to install apk to emulator: ' + stdout)); else resolve(stdout); }); }); } - var retriedInstall = retry.retryPromise( - NUM_INSTALL_RETRIES, - exec, 'adb -s ' + target.target + ' install -r "' + apk_path + '"', execOptions - ); + function installPromise () { + return adbInstallWithOptions(target.target, apk_path, execOptions) + .catch(function (error) { + // CB-9557 CB-10157 only uninstall and reinstall app if the one that + // is already installed on device was signed w/different certificate + if (!/INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES/.test(error.toString())) + throw error; + + events.emit('warn', 'Uninstalling app from device and reinstalling it again because the ' + + 'installed app already signed with different key'); + + // This promise is always resolved, even if 'adb uninstall' fails to uninstall app + // or the app doesn't installed at all, so no error catching needed. + return Adb.uninstall(target.target, pkgName) + .then(function() { + return adbInstallWithOptions(target.target, apk_path, execOptions); + }); + }); + } - return retriedInstall.then(function (output) { - if (output.match(/Failure/)) { - return Q.reject(new CordovaError('Failed to install apk to emulator: ' + output)); - } else { - events.emit('log', 'INSTALL SUCCESS'); - } - }, function (err) { - return Q.reject(new CordovaError('Failed to install apk to emulator: ' + err)); + return retry.retryPromise(NUM_INSTALL_RETRIES, installPromise) + .then(function (output) { + events.emit('log', 'INSTALL SUCCESS'); }); }); // unlock screen diff --git a/platforms/android/cordova/lib/run.js b/platforms/android/cordova/lib/run.js index b001f47..3cc5c0d 100644 --- a/platforms/android/cordova/lib/run.js +++ b/platforms/android/cordova/lib/run.js @@ -27,6 +27,19 @@ var path = require('path'), device = require('./device'), Q = require('q'); +function getInstallTarget(runOptions) { + var install_target; + if (runOptions.target) { + install_target = runOptions.target; + } else if (runOptions.device) { + install_target = '--device'; + } else if (runOptions.emulator) { + install_target = '--emulator'; + } + + return install_target; +} + /** * Runs the application on a device if available. If no device is found, it will * use a started emulator. If no started emulators are found it will attempt @@ -40,10 +53,7 @@ var path = require('path'), module.exports.run = function(runOptions) { var self = this; - - var install_target = runOptions.device ? '--device' : - runOptions.emulator ? '--emulator' : - runOptions.target; + var install_target = getInstallTarget(runOptions); return Q() .then(function() { @@ -116,8 +126,8 @@ var path = require('path'), }); }; -module.exports.help = function(args) { - console.log('Usage: ' + path.relative(process.cwd(), args[1]) + ' [options]'); +module.exports.help = function() { + console.log('Usage: ' + path.relative(process.cwd(), process.argv[1]) + ' [options]'); console.log('Build options :'); console.log(' --debug : Builds project in debug mode'); console.log(' --release : Builds project in release mode'); diff --git a/platforms/android/cordova/node_modules/nopt/node_modules/abbrev/.npmignore b/platforms/android/cordova/node_modules/abbrev/.npmignore similarity index 100% rename from platforms/android/cordova/node_modules/nopt/node_modules/abbrev/.npmignore rename to platforms/android/cordova/node_modules/abbrev/.npmignore diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/semver/.travis.yml b/platforms/android/cordova/node_modules/abbrev/.travis.yml similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/semver/.travis.yml rename to platforms/android/cordova/node_modules/abbrev/.travis.yml diff --git a/platforms/android/cordova/node_modules/nopt/node_modules/abbrev/CONTRIBUTING.md b/platforms/android/cordova/node_modules/abbrev/CONTRIBUTING.md similarity index 100% rename from platforms/android/cordova/node_modules/nopt/node_modules/abbrev/CONTRIBUTING.md rename to platforms/android/cordova/node_modules/abbrev/CONTRIBUTING.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/LICENSE b/platforms/android/cordova/node_modules/abbrev/LICENSE similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/LICENSE rename to platforms/android/cordova/node_modules/abbrev/LICENSE diff --git a/platforms/android/cordova/node_modules/nopt/node_modules/abbrev/README.md b/platforms/android/cordova/node_modules/abbrev/README.md similarity index 100% rename from platforms/android/cordova/node_modules/nopt/node_modules/abbrev/README.md rename to platforms/android/cordova/node_modules/abbrev/README.md diff --git a/platforms/android/cordova/node_modules/nopt/node_modules/abbrev/abbrev.js b/platforms/android/cordova/node_modules/abbrev/abbrev.js similarity index 100% rename from platforms/android/cordova/node_modules/nopt/node_modules/abbrev/abbrev.js rename to platforms/android/cordova/node_modules/abbrev/abbrev.js diff --git a/platforms/android/cordova/node_modules/nopt/node_modules/abbrev/package.json b/platforms/android/cordova/node_modules/abbrev/package.json similarity index 57% rename from platforms/android/cordova/node_modules/nopt/node_modules/abbrev/package.json rename to platforms/android/cordova/node_modules/abbrev/package.json index 1daa38c..700d159 100644 --- a/platforms/android/cordova/node_modules/nopt/node_modules/abbrev/package.json +++ b/platforms/android/cordova/node_modules/abbrev/package.json @@ -1,48 +1,74 @@ { - "name": "abbrev", - "version": "1.0.7", - "description": "Like ruby's abbrev module, but in js", - "author": { - "name": "Isaac Z. Schlueter", - "email": "i@izs.me" - }, - "main": "abbrev.js", - "scripts": { - "test": "tap test.js --cov" + "_args": [ + [ + "abbrev@1", + "/Users/steveng/repo/cordova/cordova-android/node_modules/nopt" + ] + ], + "_from": "abbrev@>=1.0.0 <2.0.0", + "_id": "abbrev@1.0.7", + "_inCache": true, + "_installable": true, + "_location": "/abbrev", + "_nodeVersion": "2.0.1", + "_npmUser": { + "email": "isaacs@npmjs.com", + "name": "isaacs" }, - "repository": { - "type": "git", - "url": "git+ssh://git@github.com/isaacs/abbrev-js.git" + "_npmVersion": "2.10.1", + "_phantomChildren": {}, + "_requested": { + "name": "abbrev", + "raw": "abbrev@1", + "rawSpec": "1", + "scope": null, + "spec": ">=1.0.0 <2.0.0", + "type": "range" }, - "license": "ISC", - "devDependencies": { - "tap": "^1.2.0" + "_requiredBy": [ + "/nopt" + ], + "_resolved": "http://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz", + "_shasum": "5b6035b2ee9d4fb5cf859f08a9be81b208491843", + "_shrinkwrap": null, + "_spec": "abbrev@1", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/nopt", + "author": { + "email": "i@izs.me", + "name": "Isaac Z. Schlueter" }, - "gitHead": "821d09ce7da33627f91bbd8ed631497ed6f760c2", "bugs": { "url": "https://github.com/isaacs/abbrev-js/issues" }, - "homepage": "https://github.com/isaacs/abbrev-js#readme", - "_id": "abbrev@1.0.7", - "_shasum": "5b6035b2ee9d4fb5cf859f08a9be81b208491843", - "_from": "abbrev@>=1.0.0 <2.0.0", - "_npmVersion": "2.10.1", - "_nodeVersion": "2.0.1", - "_npmUser": { - "name": "isaacs", - "email": "isaacs@npmjs.com" + "dependencies": {}, + "description": "Like ruby's abbrev module, but in js", + "devDependencies": { + "tap": "^1.2.0" }, + "directories": {}, "dist": { "shasum": "5b6035b2ee9d4fb5cf859f08a9be81b208491843", "tarball": "http://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz" }, + "gitHead": "821d09ce7da33627f91bbd8ed631497ed6f760c2", + "homepage": "https://github.com/isaacs/abbrev-js#readme", + "license": "ISC", + "main": "abbrev.js", "maintainers": [ { "name": "isaacs", "email": "i@izs.me" } ], - "directories": {}, - "_resolved": "http://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz", - "readme": "ERROR: No README data found!" + "name": "abbrev", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git+ssh://git@github.com/isaacs/abbrev-js.git" + }, + "scripts": { + "test": "tap test.js --cov" + }, + "version": "1.0.7" } diff --git a/platforms/android/cordova/node_modules/nopt/node_modules/abbrev/test.js b/platforms/android/cordova/node_modules/abbrev/test.js similarity index 100% rename from platforms/android/cordova/node_modules/nopt/node_modules/abbrev/test.js rename to platforms/android/cordova/node_modules/abbrev/test.js diff --git a/platforms/android/cordova/node_modules/ansi/.jshintrc b/platforms/android/cordova/node_modules/ansi/.jshintrc new file mode 100644 index 0000000..248c542 --- /dev/null +++ b/platforms/android/cordova/node_modules/ansi/.jshintrc @@ -0,0 +1,4 @@ +{ + "laxcomma": true, + "asi": true +} diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/cordova-registry-mapper/.npmignore b/platforms/android/cordova/node_modules/ansi/.npmignore similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/cordova-registry-mapper/.npmignore rename to platforms/android/cordova/node_modules/ansi/.npmignore diff --git a/platforms/android/cordova/node_modules/ansi/History.md b/platforms/android/cordova/node_modules/ansi/History.md new file mode 100644 index 0000000..aea8aaf --- /dev/null +++ b/platforms/android/cordova/node_modules/ansi/History.md @@ -0,0 +1,23 @@ + +0.3.1 / 2016-01-14 +================== + + * add MIT LICENSE file (#23, @kasicka) + * preserve chaining after redundant style-method calls (#19, @drewblaisdell) + * package: add "license" field (#16, @BenjaminTsai) + +0.3.0 / 2014-05-09 +================== + + * package: remove "test" script and "devDependencies" + * package: remove "engines" section + * pacakge: remove "bin" section + * package: beautify + * examples: remove `starwars` example (#15) + * Documented goto, horizontalAbsolute, and eraseLine methods in README.md (#12, @Jammerwoch) + * add `.jshintrc` file + +< 0.3.0 +======= + + * Prehistoric diff --git a/platforms/android/cordova/node_modules/ansi/LICENSE b/platforms/android/cordova/node_modules/ansi/LICENSE new file mode 100644 index 0000000..2ea4dc5 --- /dev/null +++ b/platforms/android/cordova/node_modules/ansi/LICENSE @@ -0,0 +1,24 @@ +(The MIT License) + +Copyright (c) 2012 Nathan Rajlich + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. diff --git a/platforms/android/cordova/node_modules/ansi/README.md b/platforms/android/cordova/node_modules/ansi/README.md new file mode 100644 index 0000000..6ce1940 --- /dev/null +++ b/platforms/android/cordova/node_modules/ansi/README.md @@ -0,0 +1,98 @@ +ansi.js +========= +### Advanced ANSI formatting tool for Node.js + +`ansi.js` is a module for Node.js that provides an easy-to-use API for +writing ANSI escape codes to `Stream` instances. ANSI escape codes are used to do +fancy things in a terminal window, like render text in colors, delete characters, +lines, the entire window, or hide and show the cursor, and lots more! + +#### Features: + + * 256 color support for the terminal! + * Make a beep sound from your terminal! + * Works with *any* writable `Stream` instance. + * Allows you to move the cursor anywhere on the terminal window. + * Allows you to delete existing contents from the terminal window. + * Allows you to hide and show the cursor. + * Converts CSS color codes and RGB values into ANSI escape codes. + * Low-level; you are in control of when escape codes are used, it's not abstracted. + + +Installation +------------ + +Install with `npm`: + +``` bash +$ npm install ansi +``` + + +Example +------- + +``` js +var ansi = require('ansi') + , cursor = ansi(process.stdout) + +// You can chain your calls forever: +cursor + .red() // Set font color to red + .bg.grey() // Set background color to grey + .write('Hello World!') // Write 'Hello World!' to stdout + .bg.reset() // Reset the bgcolor before writing the trailing \n, + // to avoid Terminal glitches + .write('\n') // And a final \n to wrap things up + +// Rendering modes are persistent: +cursor.hex('#660000').bold().underline() + +// You can use the regular logging functions, text will be green: +console.log('This is blood red, bold text') + +// To reset just the foreground color: +cursor.fg.reset() + +console.log('This will still be bold') + +// to go to a location (x,y) on the console +// note: 1-indexed, not 0-indexed: +cursor.goto(10, 5).write('Five down, ten over') + +// to clear the current line: +cursor.horizontalAbsolute(0).eraseLine().write('Starting again') + +// to go to a different column on the current line: +cursor.horizontalAbsolute(5).write('column five') + +// Clean up after yourself! +cursor.reset() +``` + + +License +------- + +(The MIT License) + +Copyright (c) 2012 Nathan Rajlich <nathan@tootallnate.net> + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +'Software'), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/platforms/android/cordova/node_modules/ansi/examples/beep/index.js b/platforms/android/cordova/node_modules/ansi/examples/beep/index.js new file mode 100644 index 0000000..c1ec929 --- /dev/null +++ b/platforms/android/cordova/node_modules/ansi/examples/beep/index.js @@ -0,0 +1,16 @@ +#!/usr/bin/env node + +/** + * Invokes the terminal "beep" sound once per second on every exact second. + */ + +process.title = 'beep' + +var cursor = require('../../')(process.stdout) + +function beep () { + cursor.beep() + setTimeout(beep, 1000 - (new Date()).getMilliseconds()) +} + +setTimeout(beep, 1000 - (new Date()).getMilliseconds()) diff --git a/platforms/android/cordova/node_modules/ansi/examples/clear/index.js b/platforms/android/cordova/node_modules/ansi/examples/clear/index.js new file mode 100644 index 0000000..6ac21ff --- /dev/null +++ b/platforms/android/cordova/node_modules/ansi/examples/clear/index.js @@ -0,0 +1,15 @@ +#!/usr/bin/env node + +/** + * Like GNU ncurses "clear" command. + * https://github.com/mscdex/node-ncurses/blob/master/deps/ncurses/progs/clear.c + */ + +process.title = 'clear' + +function lf () { return '\n' } + +require('../../')(process.stdout) + .write(Array.apply(null, Array(process.stdout.getWindowSize()[1])).map(lf).join('')) + .eraseData(2) + .goto(1, 1) diff --git a/platforms/android/cordova/node_modules/ansi/examples/cursorPosition.js b/platforms/android/cordova/node_modules/ansi/examples/cursorPosition.js new file mode 100644 index 0000000..50f9644 --- /dev/null +++ b/platforms/android/cordova/node_modules/ansi/examples/cursorPosition.js @@ -0,0 +1,32 @@ +#!/usr/bin/env node + +var tty = require('tty') +var cursor = require('../')(process.stdout) + +// listen for the queryPosition report on stdin +process.stdin.resume() +raw(true) + +process.stdin.once('data', function (b) { + var match = /\[(\d+)\;(\d+)R$/.exec(b.toString()) + if (match) { + var xy = match.slice(1, 3).reverse().map(Number) + console.error(xy) + } + + // cleanup and close stdin + raw(false) + process.stdin.pause() +}) + + +// send the query position request code to stdout +cursor.queryPosition() + +function raw (mode) { + if (process.stdin.setRawMode) { + process.stdin.setRawMode(mode) + } else { + tty.setRawMode(mode) + } +} diff --git a/platforms/android/cordova/node_modules/ansi/examples/progress/index.js b/platforms/android/cordova/node_modules/ansi/examples/progress/index.js new file mode 100644 index 0000000..d28dbda --- /dev/null +++ b/platforms/android/cordova/node_modules/ansi/examples/progress/index.js @@ -0,0 +1,87 @@ +#!/usr/bin/env node + +var assert = require('assert') + , ansi = require('../../') + +function Progress (stream, width) { + this.cursor = ansi(stream) + this.delta = this.cursor.newlines + this.width = width | 0 || 10 + this.open = '[' + this.close = ']' + this.complete = 'â–ˆ' + this.incomplete = '_' + + // initial render + this.progress = 0 +} + +Object.defineProperty(Progress.prototype, 'progress', { + get: get + , set: set + , configurable: true + , enumerable: true +}) + +function get () { + return this._progress +} + +function set (v) { + this._progress = Math.max(0, Math.min(v, 100)) + + var w = this.width - this.complete.length - this.incomplete.length + , n = w * (this._progress / 100) | 0 + , i = w - n + , com = c(this.complete, n) + , inc = c(this.incomplete, i) + , delta = this.cursor.newlines - this.delta + + assert.equal(com.length + inc.length, w) + + if (delta > 0) { + this.cursor.up(delta) + this.delta = this.cursor.newlines + } + + this.cursor + .horizontalAbsolute(0) + .eraseLine(2) + .fg.white() + .write(this.open) + .fg.grey() + .bold() + .write(com) + .resetBold() + .write(inc) + .fg.white() + .write(this.close) + .fg.reset() + .write('\n') +} + +function c (char, length) { + return Array.apply(null, Array(length)).map(function () { + return char + }).join('') +} + + + + +// Usage +var width = parseInt(process.argv[2], 10) || process.stdout.getWindowSize()[0] / 2 + , p = new Progress(process.stdout, width) + +;(function tick () { + p.progress += Math.random() * 5 + p.cursor + .eraseLine(2) + .write('Progress: ') + .bold().write(p.progress.toFixed(2)) + .write('%') + .resetBold() + .write('\n') + if (p.progress < 100) + setTimeout(tick, 100) +})() diff --git a/platforms/android/cordova/node_modules/ansi/lib/ansi.js b/platforms/android/cordova/node_modules/ansi/lib/ansi.js new file mode 100644 index 0000000..b1714e3 --- /dev/null +++ b/platforms/android/cordova/node_modules/ansi/lib/ansi.js @@ -0,0 +1,405 @@ + +/** + * References: + * + * - http://en.wikipedia.org/wiki/ANSI_escape_code + * - http://www.termsys.demon.co.uk/vtansi.htm + * + */ + +/** + * Module dependencies. + */ + +var emitNewlineEvents = require('./newlines') + , prefix = '\x1b[' // For all escape codes + , suffix = 'm' // Only for color codes + +/** + * The ANSI escape sequences. + */ + +var codes = { + up: 'A' + , down: 'B' + , forward: 'C' + , back: 'D' + , nextLine: 'E' + , previousLine: 'F' + , horizontalAbsolute: 'G' + , eraseData: 'J' + , eraseLine: 'K' + , scrollUp: 'S' + , scrollDown: 'T' + , savePosition: 's' + , restorePosition: 'u' + , queryPosition: '6n' + , hide: '?25l' + , show: '?25h' +} + +/** + * Rendering ANSI codes. + */ + +var styles = { + bold: 1 + , italic: 3 + , underline: 4 + , inverse: 7 +} + +/** + * The negating ANSI code for the rendering modes. + */ + +var reset = { + bold: 22 + , italic: 23 + , underline: 24 + , inverse: 27 +} + +/** + * The standard, styleable ANSI colors. + */ + +var colors = { + white: 37 + , black: 30 + , blue: 34 + , cyan: 36 + , green: 32 + , magenta: 35 + , red: 31 + , yellow: 33 + , grey: 90 + , brightBlack: 90 + , brightRed: 91 + , brightGreen: 92 + , brightYellow: 93 + , brightBlue: 94 + , brightMagenta: 95 + , brightCyan: 96 + , brightWhite: 97 +} + + +/** + * Creates a Cursor instance based off the given `writable stream` instance. + */ + +function ansi (stream, options) { + if (stream._ansicursor) { + return stream._ansicursor + } else { + return stream._ansicursor = new Cursor(stream, options) + } +} +module.exports = exports = ansi + +/** + * The `Cursor` class. + */ + +function Cursor (stream, options) { + if (!(this instanceof Cursor)) { + return new Cursor(stream, options) + } + if (typeof stream != 'object' || typeof stream.write != 'function') { + throw new Error('a valid Stream instance must be passed in') + } + + // the stream to use + this.stream = stream + + // when 'enabled' is false then all the functions are no-ops except for write() + this.enabled = options && options.enabled + if (typeof this.enabled === 'undefined') { + this.enabled = stream.isTTY + } + this.enabled = !!this.enabled + + // then `buffering` is true, then `write()` calls are buffered in + // memory until `flush()` is invoked + this.buffering = !!(options && options.buffering) + this._buffer = [] + + // controls the foreground and background colors + this.fg = this.foreground = new Colorer(this, 0) + this.bg = this.background = new Colorer(this, 10) + + // defaults + this.Bold = false + this.Italic = false + this.Underline = false + this.Inverse = false + + // keep track of the number of "newlines" that get encountered + this.newlines = 0 + emitNewlineEvents(stream) + stream.on('newline', function () { + this.newlines++ + }.bind(this)) +} +exports.Cursor = Cursor + +/** + * Helper function that calls `write()` on the underlying Stream. + * Returns `this` instead of the write() return value to keep + * the chaining going. + */ + +Cursor.prototype.write = function (data) { + if (this.buffering) { + this._buffer.push(arguments) + } else { + this.stream.write.apply(this.stream, arguments) + } + return this +} + +/** + * Buffer `write()` calls into memory. + * + * @api public + */ + +Cursor.prototype.buffer = function () { + this.buffering = true + return this +} + +/** + * Write out the in-memory buffer. + * + * @api public + */ + +Cursor.prototype.flush = function () { + this.buffering = false + var str = this._buffer.map(function (args) { + if (args.length != 1) throw new Error('unexpected args length! ' + args.length); + return args[0]; + }).join(''); + this._buffer.splice(0); // empty + this.write(str); + return this +} + + +/** + * The `Colorer` class manages both the background and foreground colors. + */ + +function Colorer (cursor, base) { + this.current = null + this.cursor = cursor + this.base = base +} +exports.Colorer = Colorer + +/** + * Write an ANSI color code, ensuring that the same code doesn't get rewritten. + */ + +Colorer.prototype._setColorCode = function setColorCode (code) { + var c = String(code) + if (this.current === c) return + this.cursor.enabled && this.cursor.write(prefix + c + suffix) + this.current = c + return this +} + + +/** + * Set up the positional ANSI codes. + */ + +Object.keys(codes).forEach(function (name) { + var code = String(codes[name]) + Cursor.prototype[name] = function () { + var c = code + if (arguments.length > 0) { + c = toArray(arguments).map(Math.round).join(';') + code + } + this.enabled && this.write(prefix + c) + return this + } +}) + +/** + * Set up the functions for the rendering ANSI codes. + */ + +Object.keys(styles).forEach(function (style) { + var name = style[0].toUpperCase() + style.substring(1) + , c = styles[style] + , r = reset[style] + + Cursor.prototype[style] = function () { + if (this[name]) return this + this.enabled && this.write(prefix + c + suffix) + this[name] = true + return this + } + + Cursor.prototype['reset' + name] = function () { + if (!this[name]) return this + this.enabled && this.write(prefix + r + suffix) + this[name] = false + return this + } +}) + +/** + * Setup the functions for the standard colors. + */ + +Object.keys(colors).forEach(function (color) { + var code = colors[color] + + Colorer.prototype[color] = function () { + this._setColorCode(this.base + code) + return this.cursor + } + + Cursor.prototype[color] = function () { + return this.foreground[color]() + } +}) + +/** + * Makes a beep sound! + */ + +Cursor.prototype.beep = function () { + this.enabled && this.write('\x07') + return this +} + +/** + * Moves cursor to specific position + */ + +Cursor.prototype.goto = function (x, y) { + x = x | 0 + y = y | 0 + this.enabled && this.write(prefix + y + ';' + x + 'H') + return this +} + +/** + * Resets the color. + */ + +Colorer.prototype.reset = function () { + this._setColorCode(this.base + 39) + return this.cursor +} + +/** + * Resets all ANSI formatting on the stream. + */ + +Cursor.prototype.reset = function () { + this.enabled && this.write(prefix + '0' + suffix) + this.Bold = false + this.Italic = false + this.Underline = false + this.Inverse = false + this.foreground.current = null + this.background.current = null + return this +} + +/** + * Sets the foreground color with the given RGB values. + * The closest match out of the 216 colors is picked. + */ + +Colorer.prototype.rgb = function (r, g, b) { + var base = this.base + 38 + , code = rgb(r, g, b) + this._setColorCode(base + ';5;' + code) + return this.cursor +} + +/** + * Same as `cursor.fg.rgb(r, g, b)`. + */ + +Cursor.prototype.rgb = function (r, g, b) { + return this.foreground.rgb(r, g, b) +} + +/** + * Accepts CSS color codes for use with ANSI escape codes. + * For example: `#FF000` would be bright red. + */ + +Colorer.prototype.hex = function (color) { + return this.rgb.apply(this, hex(color)) +} + +/** + * Same as `cursor.fg.hex(color)`. + */ + +Cursor.prototype.hex = function (color) { + return this.foreground.hex(color) +} + + +// UTIL FUNCTIONS // + +/** + * Translates a 255 RGB value to a 0-5 ANSI RGV value, + * then returns the single ANSI color code to use. + */ + +function rgb (r, g, b) { + var red = r / 255 * 5 + , green = g / 255 * 5 + , blue = b / 255 * 5 + return rgb5(red, green, blue) +} + +/** + * Turns rgb 0-5 values into a single ANSI color code to use. + */ + +function rgb5 (r, g, b) { + var red = Math.round(r) + , green = Math.round(g) + , blue = Math.round(b) + return 16 + (red*36) + (green*6) + blue +} + +/** + * Accepts a hex CSS color code string (# is optional) and + * translates it into an Array of 3 RGB 0-255 values, which + * can then be used with rgb(). + */ + +function hex (color) { + var c = color[0] === '#' ? color.substring(1) : color + , r = c.substring(0, 2) + , g = c.substring(2, 4) + , b = c.substring(4, 6) + return [parseInt(r, 16), parseInt(g, 16), parseInt(b, 16)] +} + +/** + * Turns an array-like object into a real array. + */ + +function toArray (a) { + var i = 0 + , l = a.length + , rtn = [] + for (; i 0) { + var len = data.length + , i = 0 + // now try to calculate any deltas + if (typeof data == 'string') { + for (; i=0.3.1 <0.4.0", + "_id": "ansi@0.3.1", + "_inCache": true, + "_installable": true, + "_location": "/ansi", + "_nodeVersion": "5.3.0", + "_npmUser": { + "email": "nathan@tootallnate.net", + "name": "tootallnate" + }, + "_npmVersion": "3.3.12", + "_phantomChildren": {}, + "_requested": { + "name": "ansi", + "raw": "ansi@^0.3.1", + "rawSpec": "^0.3.1", + "scope": null, + "spec": ">=0.3.1 <0.4.0", + "type": "range" + }, + "_requiredBy": [ + "/cordova-common" + ], + "_resolved": "http://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz", + "_shasum": "0c42d4fb17160d5a9af1e484bace1c66922c1b21", + "_shrinkwrap": null, + "_spec": "ansi@^0.3.1", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common", + "author": { + "email": "nathan@tootallnate.net", + "name": "Nathan Rajlich", + "url": "http://tootallnate.net" + }, + "bugs": { + "url": "https://github.com/TooTallNate/ansi.js/issues" + }, + "dependencies": {}, + "description": "Advanced ANSI formatting tool for Node.js", + "devDependencies": {}, + "directories": {}, + "dist": { + "shasum": "0c42d4fb17160d5a9af1e484bace1c66922c1b21", + "tarball": "http://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz" + }, + "gitHead": "4d0d4af94e0bdaa648bd7262acd3bde4b98d5246", + "homepage": "https://github.com/TooTallNate/ansi.js#readme", + "keywords": [ + "256", + "ansi", + "color", + "cursor", + "formatting", + "rgb", + "stream", + "terminal" + ], + "license": "MIT", + "main": "./lib/ansi.js", + "maintainers": [ + { + "name": "TooTallNate", + "email": "nathan@tootallnate.net" + }, + { + "name": "tootallnate", + "email": "nathan@tootallnate.net" + } + ], + "name": "ansi", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git://github.com/TooTallNate/ansi.js.git" + }, + "scripts": {}, + "version": "0.3.1" +} diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.npmignore b/platforms/android/cordova/node_modules/balanced-match/.npmignore similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.npmignore rename to platforms/android/cordova/node_modules/balanced-match/.npmignore diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.travis.yml b/platforms/android/cordova/node_modules/balanced-match/.travis.yml similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.travis.yml rename to platforms/android/cordova/node_modules/balanced-match/.travis.yml diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/LICENSE.md b/platforms/android/cordova/node_modules/balanced-match/LICENSE.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/LICENSE.md rename to platforms/android/cordova/node_modules/balanced-match/LICENSE.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile b/platforms/android/cordova/node_modules/balanced-match/Makefile similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile rename to platforms/android/cordova/node_modules/balanced-match/Makefile diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md b/platforms/android/cordova/node_modules/balanced-match/README.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md rename to platforms/android/cordova/node_modules/balanced-match/README.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js b/platforms/android/cordova/node_modules/balanced-match/example.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js rename to platforms/android/cordova/node_modules/balanced-match/example.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js b/platforms/android/cordova/node_modules/balanced-match/index.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js rename to platforms/android/cordova/node_modules/balanced-match/index.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json b/platforms/android/cordova/node_modules/balanced-match/package.json similarity index 64% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json rename to platforms/android/cordova/node_modules/balanced-match/package.json index 64460d4..044a171 100644 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json +++ b/platforms/android/cordova/node_modules/balanced-match/package.json @@ -1,73 +1,98 @@ { - "name": "balanced-match", - "description": "Match balanced character pairs, like \"{\" and \"}\"", - "version": "0.3.0", - "repository": { - "type": "git", - "url": "git://github.com/juliangruber/balanced-match.git" - }, - "homepage": "https://github.com/juliangruber/balanced-match", - "main": "index.js", - "scripts": { - "test": "make test" + "_args": [ + [ + "balanced-match@^0.3.0", + "/Users/steveng/repo/cordova/cordova-android/node_modules/brace-expansion" + ] + ], + "_from": "balanced-match@>=0.3.0 <0.4.0", + "_id": "balanced-match@0.3.0", + "_inCache": true, + "_installable": true, + "_location": "/balanced-match", + "_nodeVersion": "4.2.1", + "_npmUser": { + "email": "julian@juliangruber.com", + "name": "juliangruber" }, - "dependencies": {}, - "devDependencies": { - "tape": "~4.2.2" + "_npmVersion": "2.14.7", + "_phantomChildren": {}, + "_requested": { + "name": "balanced-match", + "raw": "balanced-match@^0.3.0", + "rawSpec": "^0.3.0", + "scope": null, + "spec": ">=0.3.0 <0.4.0", + "type": "range" }, - "keywords": [ - "match", - "regexp", - "test", - "balanced", - "parse" + "_requiredBy": [ + "/brace-expansion" ], + "_resolved": "http://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz", + "_shasum": "a91cdd1ebef1a86659e70ff4def01625fc2d6756", + "_shrinkwrap": null, + "_spec": "balanced-match@^0.3.0", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/brace-expansion", "author": { - "name": "Julian Gruber", "email": "mail@juliangruber.com", + "name": "Julian Gruber", "url": "http://juliangruber.com" }, - "license": "MIT", - "testling": { - "files": "test/*.js", - "browsers": [ - "ie/8..latest", - "firefox/20..latest", - "firefox/nightly", - "chrome/25..latest", - "chrome/canary", - "opera/12..latest", - "opera/next", - "safari/5.1..latest", - "ipad/6.0..latest", - "iphone/6.0..latest", - "android-browser/4.2..latest" - ] - }, - "gitHead": "a7114b0986554787e90b7ac595a043ca75ea77e5", "bugs": { "url": "https://github.com/juliangruber/balanced-match/issues" }, - "_id": "balanced-match@0.3.0", - "_shasum": "a91cdd1ebef1a86659e70ff4def01625fc2d6756", - "_from": "balanced-match@>=0.3.0 <0.4.0", - "_npmVersion": "2.14.7", - "_nodeVersion": "4.2.1", - "_npmUser": { - "name": "juliangruber", - "email": "julian@juliangruber.com" + "dependencies": {}, + "description": "Match balanced character pairs, like \"{\" and \"}\"", + "devDependencies": { + "tape": "~4.2.2" }, + "directories": {}, "dist": { "shasum": "a91cdd1ebef1a86659e70ff4def01625fc2d6756", "tarball": "http://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz" }, + "gitHead": "a7114b0986554787e90b7ac595a043ca75ea77e5", + "homepage": "https://github.com/juliangruber/balanced-match", + "keywords": [ + "balanced", + "match", + "parse", + "regexp", + "test" + ], + "license": "MIT", + "main": "index.js", "maintainers": [ { "name": "juliangruber", "email": "julian@juliangruber.com" } ], - "directories": {}, - "_resolved": "http://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz", - "readme": "ERROR: No README data found!" + "name": "balanced-match", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git://github.com/juliangruber/balanced-match.git" + }, + "scripts": { + "test": "make test" + }, + "testling": { + "browsers": [ + "android-browser/4.2..latest", + "chrome/25..latest", + "chrome/canary", + "firefox/20..latest", + "firefox/nightly", + "ie/8..latest", + "ipad/6.0..latest", + "iphone/6.0..latest", + "opera/12..latest", + "opera/next", + "safari/5.1..latest" + ], + "files": "test/*.js" + }, + "version": "0.3.0" } diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/test/balanced.js b/platforms/android/cordova/node_modules/balanced-match/test/balanced.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/test/balanced.js rename to platforms/android/cordova/node_modules/balanced-match/test/balanced.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/base64-js/.travis.yml b/platforms/android/cordova/node_modules/base64-js/.travis.yml similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/base64-js/.travis.yml rename to platforms/android/cordova/node_modules/base64-js/.travis.yml diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/base64-js/LICENSE.MIT b/platforms/android/cordova/node_modules/base64-js/LICENSE.MIT similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/base64-js/LICENSE.MIT rename to platforms/android/cordova/node_modules/base64-js/LICENSE.MIT diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/base64-js/README.md b/platforms/android/cordova/node_modules/base64-js/README.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/base64-js/README.md rename to platforms/android/cordova/node_modules/base64-js/README.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/base64-js/bench/bench.js b/platforms/android/cordova/node_modules/base64-js/bench/bench.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/base64-js/bench/bench.js rename to platforms/android/cordova/node_modules/base64-js/bench/bench.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/base64-js/lib/b64.js b/platforms/android/cordova/node_modules/base64-js/lib/b64.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/base64-js/lib/b64.js rename to platforms/android/cordova/node_modules/base64-js/lib/b64.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/base64-js/package.json b/platforms/android/cordova/node_modules/base64-js/package.json similarity index 61% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/base64-js/package.json rename to platforms/android/cordova/node_modules/base64-js/package.json index 82e0dca..4b30e7d 100644 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/base64-js/package.json +++ b/platforms/android/cordova/node_modules/base64-js/package.json @@ -1,53 +1,62 @@ { - "author": { - "name": "T. Jameson Little", - "email": "t.jameson.little@gmail.com" - }, - "name": "base64-js", - "description": "Base64 encoding/decoding in pure JS", - "version": "0.0.8", - "repository": { - "type": "git", - "url": "git://github.com/beatgammit/base64-js.git" + "_args": [ + [ + "base64-js@0.0.8", + "/Users/steveng/repo/cordova/cordova-android/node_modules/plist" + ] + ], + "_from": "base64-js@0.0.8", + "_id": "base64-js@0.0.8", + "_inCache": true, + "_installable": true, + "_location": "/base64-js", + "_nodeVersion": "0.10.35", + "_npmUser": { + "email": "feross@feross.org", + "name": "feross" }, - "main": "lib/b64.js", - "scripts": { - "test": "tape test/*.js" + "_npmVersion": "2.1.16", + "_phantomChildren": {}, + "_requested": { + "name": "base64-js", + "raw": "base64-js@0.0.8", + "rawSpec": "0.0.8", + "scope": null, + "spec": "0.0.8", + "type": "version" }, - "testling": { - "files": "test/*.js", - "browsers": [ - "ie/6..latest", - "chrome/4..latest", - "firefox/3..latest", - "safari/5.1..latest", - "opera/11.0..latest", - "iphone/6", - "ipad/6" - ] + "_requiredBy": [ + "/plist" + ], + "_resolved": "http://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz", + "_shasum": "1101e9544f4a76b1bc3b26d452ca96d7a35e7978", + "_shrinkwrap": null, + "_spec": "base64-js@0.0.8", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/plist", + "author": { + "email": "t.jameson.little@gmail.com", + "name": "T. Jameson Little" }, - "engines": { - "node": ">= 0.4" + "bugs": { + "url": "https://github.com/beatgammit/base64-js/issues" }, - "license": "MIT", "dependencies": {}, + "description": "Base64 encoding/decoding in pure JS", "devDependencies": { "tape": "~2.3.2" }, - "gitHead": "b4a8a5fa9b0caeddb5ad94dd1108253d8f2a315f", - "bugs": { - "url": "https://github.com/beatgammit/base64-js/issues" + "directories": {}, + "dist": { + "shasum": "1101e9544f4a76b1bc3b26d452ca96d7a35e7978", + "tarball": "http://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz" }, - "homepage": "https://github.com/beatgammit/base64-js", - "_id": "base64-js@0.0.8", - "_shasum": "1101e9544f4a76b1bc3b26d452ca96d7a35e7978", - "_from": "base64-js@0.0.8", - "_npmVersion": "2.1.16", - "_nodeVersion": "0.10.35", - "_npmUser": { - "name": "feross", - "email": "feross@feross.org" + "engines": { + "node": ">= 0.4" }, + "gitHead": "b4a8a5fa9b0caeddb5ad94dd1108253d8f2a315f", + "homepage": "https://github.com/beatgammit/base64-js", + "license": "MIT", + "main": "lib/b64.js", "maintainers": [ { "name": "beatgammit", @@ -58,11 +67,27 @@ "email": "feross@feross.org" } ], - "dist": { - "shasum": "1101e9544f4a76b1bc3b26d452ca96d7a35e7978", - "tarball": "http://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz" + "name": "base64-js", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git://github.com/beatgammit/base64-js.git" }, - "directories": {}, - "_resolved": "http://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz", - "readme": "ERROR: No README data found!" + "scripts": { + "test": "tape test/*.js" + }, + "testling": { + "browsers": [ + "chrome/4..latest", + "firefox/3..latest", + "ie/6..latest", + "ipad/6", + "iphone/6", + "opera/11.0..latest", + "safari/5.1..latest" + ], + "files": "test/*.js" + }, + "version": "0.0.8" } diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/base64-js/test/convert.js b/platforms/android/cordova/node_modules/base64-js/test/convert.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/base64-js/test/convert.js rename to platforms/android/cordova/node_modules/base64-js/test/convert.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/base64-js/test/url-safe.js b/platforms/android/cordova/node_modules/base64-js/test/url-safe.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/base64-js/test/url-safe.js rename to platforms/android/cordova/node_modules/base64-js/test/url-safe.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/node_modules/big-integer/BigInteger.js b/platforms/android/cordova/node_modules/big-integer/BigInteger.js similarity index 98% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/node_modules/big-integer/BigInteger.js rename to platforms/android/cordova/node_modules/big-integer/BigInteger.js index b3f9558..8c06143 100644 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/node_modules/big-integer/BigInteger.js +++ b/platforms/android/cordova/node_modules/big-integer/BigInteger.js @@ -294,7 +294,7 @@ var bigInt = (function (undefined) { function multiplyKaratsuba(x, y) { var n = Math.max(x.length, y.length); - if (n <= 400) return multiplyLong(x, y); + if (n <= 30) return multiplyLong(x, y); n = Math.ceil(n / 2); var b = x.slice(n), @@ -306,7 +306,15 @@ var bigInt = (function (undefined) { bd = multiplyKaratsuba(b, d), abcd = multiplyKaratsuba(addAny(a, b), addAny(c, d)); - return addAny(addAny(ac, shiftLeft(subtract(subtract(abcd, ac), bd), n)), shiftLeft(bd, 2 * n)); + var product = addAny(addAny(ac, shiftLeft(subtract(subtract(abcd, ac), bd), n)), shiftLeft(bd, 2 * n)); + trim(product); + return product; + } + + // The following function is derived from a surface fit of a graph plotting the performance difference + // between long multiplication and karatsuba multiplication versus the lengths of the two arrays. + function useKaratsuba(l1, l2) { + return -0.012 * l1 - 0.012 * l2 + 0.000015 * l1 * l2 > 0; } BigInteger.prototype.multiply = function (v) { @@ -324,7 +332,7 @@ var bigInt = (function (undefined) { } b = smallToArray(abs); } - if (a.length + b.length > 4000) // Karatsuba is only faster for sufficiently large inputs + if (useKaratsuba(a.length, b.length)) // Karatsuba is only faster for certain array sizes return new BigInteger(multiplyKaratsuba(a, b), sign); return new BigInteger(multiplyLong(a, b), sign); }; diff --git a/platforms/android/cordova/node_modules/big-integer/BigInteger.min.js b/platforms/android/cordova/node_modules/big-integer/BigInteger.min.js new file mode 100644 index 0000000..53480ea --- /dev/null +++ b/platforms/android/cordova/node_modules/big-integer/BigInteger.min.js @@ -0,0 +1 @@ +var bigInt=function(e){"use strict";function o(e,t){this.value=e,this.sign=t,this.isSmall=!1}function u(e){this.value=e,this.sign=e<0,this.isSmall=!0}function a(e){return-r0?Math.floor(e):Math.ceil(e)}function d(e,n){var r=e.length,i=n.length,s=new Array(r),o=0,u=t,a,f;for(f=0;f=u?1:0,s[f]=a-o*u;while(f0&&s.push(o),s}function v(e,t){return e.length>=t.length?d(e,t):d(t,e)}function m(e,n){var r=e.length,i=new Array(r),s=t,o,u;for(u=0;u0)i[u++]=n%s,n=Math.floor(n/s);return i}function g(e,n){var r=e.length,i=n.length,s=new Array(r),o=0,u=t,a,f;for(a=0;a=0?r=g(e,t):(r=g(t,e),n=!n),r=l(r),typeof r=="number"?(n&&(r=-r),new u(r)):new o(r,n)}function b(e,n,r){var i=e.length,s=new Array(i),a=-n,f=t,c,h;for(c=0;c0)i[a++]=o%s,o=Math.floor(o/s);return i}function S(e,t){var n=[];while(t-->0)n.push(0);return n.concat(e)}function x(e,t){var n=Math.max(e.length,t.length);if(n<=30)return w(e,t);n=Math.ceil(n/2);var r=e.slice(n),i=e.slice(0,n),s=t.slice(n),o=t.slice(0,n),u=x(i,o),a=x(r,s),f=x(v(i,r),v(o,s)),l=v(v(u,S(g(g(f,u),a),n)),S(a,2*n));return c(l),l}function T(e,t){return-0.012*e-.012*t+15e-6*e*t>0}function N(e,n,r){return e=0;d--){p=s-1,f[d+i]!==u&&(p=Math.floor((f[d+i]*s+f[d+i-1])/u)),v=0,m=0,y=c.length;for(g=0;gi&&(c=(c+1)*u),a=Math.ceil(c/h);do{p=E(n,a);if(M(p,o)<=0)break;a--}while(a);s.push(a),o=g(o,p)}return s.reverse(),[l(s),l(o)]}function A(e,n){var r=e.length,i=h(r),s=t,o,u,a,f;a=0;for(o=r-1;o>=0;--o)f=a*s+e[o],u=p(f/n),a=f-u*n,i[o]=u|0;return[i,a|0]}function O(e,n){var r,i=G(n),s=e.value,a=i.value,c;if(a===0)throw new Error("Cannot divide by zero");if(e.isSmall)return i.isSmall?[new u(p(s/a)),new u(s%a)]:[Y[0],e];if(i.isSmall){if(a===1)return[e,Y[0]];if(a==-1)return[e.negate(),Y[0]];var h=Math.abs(a);if(ht.length?1:-1;for(var n=e.length-1;n>=0;n--)if(e[n]!==t[n])return e[n]>t[n]?1:-1;return 0}function _(e){var t=e.abs();if(t.isUnit())return!1;if(t.equals(2)||t.equals(3)||t.equals(5))return!0;if(t.isEven()||t.isDivisibleBy(3)||t.isDivisibleBy(5))return!1;if(t.lesser(25))return!0}function B(e){return(typeof e=="number"||typeof e=="string")&&+Math.abs(e)<=t||e instanceof o&&e.value.length<=1}function j(e,t,n){t=G(t);var r=e.isNegative(),i=t.isNegative(),s=r?e.not():e,o=i?t.not():t,u=[],a=[],f=!1,l=!1;while(!f||!l)s.isZero()?(f=!0,u.push(r?1:0)):r?u.push(s.isEven()?1:0):u.push(s.isEven()?0:1),o.isZero()?(l=!0,a.push(i?1:0)):i?a.push(o.isEven()?1:0):a.push(o.isEven()?0:1),s=s.over(2),o=o.over(2);var c=[];for(var h=0;h=0;h--){var d=c?s.value[h]:t,v=p(Math.random()*d);f.unshift(v),v"}function J(e,t){t=bigInt(t);if(t.isZero()){if(e.isZero())return"0";throw new Error("Cannot convert nonzero numbers to base 0.")}if(t.equals(-1))return e.isZero()?"0":e.isNegative()?(new Array(1-e)).join("10"):"1"+(new Array(+e)).join("01");var n="";e.isNegative()&&t.isPositive()&&(n="-",e=e.abs());if(t.equals(1))return e.isZero()?"0":n+(new Array(+e+1)).join(1);var r=[],i=e,s;while(i.isNegative()||i.compareAbs(t)>=0){s=i.divmod(t),i=s.quotient;var o=s.remainder;o.isNegative()&&(o=t.minus(o).abs(),i=i.next()),r.push($(o))}return r.push($(i)),n+r.reverse().join("")}function K(e){if(a(+e)){var t=+e;if(t===p(t))return new u(t);throw"Invalid integer: "+e}var r=e[0]==="-";r&&(e=e.slice(1));var i=e.split(/e/i);if(i.length>2)throw new Error("Invalid integer: "+f.join("e"));if(i.length===2){var s=i[1];s[0]==="+"&&(s=s.slice(1)),s=+s;if(s!==p(s)||!a(s))throw new Error("Invalid integer: "+s+" is not a valid exponent.");var f=i[0],l=f.indexOf(".");l>=0&&(s-=f.length-l-1,f=f.slice(0,l)+f.slice(l+1));if(s<0)throw new Error("Cannot include negative exponent part for integers");f+=(new Array(s+1)).join("0"),e=f}var h=/^([0-9][0-9]*)$/.test(e);if(!h)throw new Error("Invalid integer: "+e);var d=[],v=e.length,m=n,g=v-m;while(v>0)d.push(+e.slice(g,v)),g-=m,g<0&&(g=0),v-=m;return c(d),new o(d,r)}function Q(e){return a(e)?new u(e):K(e.toString())}function G(e){return typeof e=="number"?Q(e):typeof e=="string"?K(e):e}var t=1e7,n=7,r=9007199254740992,i=f(r),s=Math.log(r);o.prototype.add=function(e){var t,n=G(e);if(this.sign!==n.sign)return this.subtract(n.negate());var r=this.value,i=n.value;return n.isSmall?new o(m(r,Math.abs(i)),this.sign):new o(v(r,i),this.sign)},o.prototype.plus=o.prototype.add,u.prototype.add=function(e){var t=G(e),n=this.value;if(n<0!==t.sign)return this.subtract(t.negate());var r=t.value;if(t.isSmall){if(a(n+r))return new u(n+r);r=f(Math.abs(r))}return new o(m(r,Math.abs(n)),n<0)},u.prototype.plus=u.prototype.add,o.prototype.subtract=function(e){var t=G(e);if(this.sign!==t.sign)return this.add(t.negate());var n=this.value,r=t.value;return t.isSmall?b(n,Math.abs(r),this.sign):y(n,r,this.sign)},o.prototype.minus=o.prototype.subtract,u.prototype.subtract=function(e){var t=G(e),n=this.value;if(n<0!==t.sign)return this.add(t.negate());var r=t.value;return t.isSmall?new u(n-r):b(r,Math.abs(n),n>=0)},u.prototype.minus=u.prototype.subtract,o.prototype.negate=function(){return new o(this.value,!this.sign)},u.prototype.negate=function(){var e=this.sign,t=new u(-this.value);return t.sign=!e,t},o.prototype.abs=function(){return new o(this.value,!1)},u.prototype.abs=function(){return new u(Math.abs(this.value))},o.prototype.multiply=function(e){var n,r=G(e),i=this.value,s=r.value,u=this.sign!==r.sign,a;if(r.isSmall){if(s===0)return Y[0];if(s===1)return this;if(s===-1)return this.negate();a=Math.abs(s);if(ar?1:-1):-1},o.prototype.compare=function(e){if(e===Infinity)return-1;if(e===-Infinity)return 1;var t=G(e),n=this.value,r=t.value;return this.sign!==t.sign?t.sign?1:-1:t.isSmall?this.sign?-1:1:M(n,r)*(this.sign?-1:1)},o.prototype.compareTo=o.prototype.compare,u.prototype.compare=function(e){if(e===Infinity)return-1;if(e===-Infinity)return 1;var t=G(e),n=this.value,r=t.value;return t.isSmall?n==r?0:n>r?1:-1:n<0!==t.sign?n<0?-1:1:n<0?1:-1},u.prototype.compareTo=u.prototype.compare,o.prototype.equals=function(e){return this.compare(e)===0},u.prototype.eq=u.prototype.equals=o.prototype.eq=o.prototype.equals,o.prototype.notEquals=function(e){return this.compare(e)!==0},u.prototype.neq=u.prototype.notEquals=o.prototype.neq=o.prototype.notEquals,o.prototype.greater=function(e){return this.compare(e)>0},u.prototype.gt=u.prototype.greater=o.prototype.gt=o.prototype.greater,o.prototype.lesser=function(e){return this.compare(e)<0},u.prototype.lt=u.prototype.lesser=o.prototype.lt=o.prototype.lesser,o.prototype.greaterOrEquals=function(e){return this.compare(e)>=0},u.prototype.geq=u.prototype.greaterOrEquals=o.prototype.geq=o.prototype.greaterOrEquals,o.prototype.lesserOrEquals=function(e){return this.compare(e)<=0},u.prototype.leq=u.prototype.lesserOrEquals=o.prototype.leq=o.prototype.lesserOrEquals,o.prototype.isEven=function(){return(this.value[0]&1)===0},u.prototype.isEven=function(){return(this.value&1)===0},o.prototype.isOdd=function(){return(this.value[0]&1)===1},u.prototype.isOdd=function(){return(this.value&1)===1},o.prototype.isPositive=function(){return!this.sign},u.prototype.isPositive=function(){return this.value>0},o.prototype.isNegative=function(){return this.sign},u.prototype.isNegative=function(){return this.value<0},o.prototype.isUnit=function(){return!1},u.prototype.isUnit=function(){return Math.abs(this.value)===1},o.prototype.isZero=function(){return!1},u.prototype.isZero=function(){return this.value===0},o.prototype.isDivisibleBy=function(e){var t=G(e),n=t.value;return n===0?!1:n===1?!0:n===2?this.isEven():this.mod(t).equals(Y[0])},u.prototype.isDivisibleBy=o.prototype.isDivisibleBy,o.prototype.isPrime=function(){var t=_(this);if(t!==e)return t;var n=this.abs(),r=n.prev(),i=[2,3,5,7,11,13,17,19],s=r,o,u,a,f;while(s.isEven())s=s.divide(2);for(a=0;a-r?new u(e-1):new o(i,!0)};var D=[1];while(D[D.length-1]<=t)D.push(2*D[D.length-1]);var P=D.length,H=D[P-1];o.prototype.shiftLeft=function(e){if(!B(e))throw new Error(String(e)+" is too large for shifting.");e=+e;if(e<0)return this.shiftRight(-e);var t=this;while(e>=P)t=t.multiply(H),e-=P-1;return t.multiply(D[e])},u.prototype.shiftLeft=o.prototype.shiftLeft,o.prototype.shiftRight=function(e){var t;if(!B(e))throw new Error(String(e)+" is too large for shifting.");e=+e;if(e<0)return this.shiftLeft(-e);var n=this;while(e>=P){if(n.isZero())return n;t=O(n,H),n=t[1].isNegative()?t[0].prev():t[0],e-=P-1}return t=O(n,D[e]),t[1].isNegative()?t[0].prev():t[0]},u.prototype.shiftRight=o.prototype.shiftRight,o.prototype.not=function(){return this.negate().prev()},u.prototype.not=o.prototype.not,o.prototype.and=function(e){return j(this,e,function(e,t){return e&t})},u.prototype.and=o.prototype.and,o.prototype.or=function(e){return j(this,e,function(e,t){return e|t})},u.prototype.or=o.prototype.or,o.prototype.xor=function(e){return j(this,e,function(e,t){return e^t})},u.prototype.xor=o.prototype.xor;var F=1<<30,I=(t&-t)*(t&-t)|F,V=function(e,t){var n=Y[0],r=Y[1],i=e.length;if(2<=t&&t<=36&&i<=s/Math.log(t))return new u(parseInt(e,t));t=G(t);var o=[],a,f=e[0]==="-";for(a=f?1:0;a");o.push(G(e.slice(h+1,a)))}}o.reverse();for(a=0;a=0)o=String(n[r]),i+=s.slice(o.length)+o;var u=this.sign?"-":"";return u+i},u.prototype.toString=function(t){return t===e&&(t=10),t!=10?J(this,t):String(this.value)},o.prototype.valueOf=function(){return+this.toString()},o.prototype.toJSNumber=o.prototype.valueOf,u.prototype.valueOf=function(){return this.value},u.prototype.toJSNumber=u.prototype.valueOf;var Y=function(e,t){return typeof e=="undefined"?Y[0]:typeof t!="undefined"?+t===10?G(e):V(e,t):G(e)};for(var Z=0;Z<1e3;Z++)Y[Z]=new u(Z),Z>0&&(Y[-Z]=new u(-Z));return Y.one=Y[1],Y.zero=Y[0],Y.minusOne=Y[-1],Y.max=R,Y.min=U,Y.gcd=z,Y.lcm=W,Y.isInstance=function(e){return e instanceof o||e instanceof u},Y.randBetween=X,Y}();typeof module!="undefined"&&module.hasOwnProperty("exports")&&(module.exports=bigInt); \ No newline at end of file diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/node_modules/big-integer/README.md b/platforms/android/cordova/node_modules/big-integer/README.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/node_modules/big-integer/README.md rename to platforms/android/cordova/node_modules/big-integer/README.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/node_modules/big-integer/package.json b/platforms/android/cordova/node_modules/big-integer/package.json similarity index 50% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/node_modules/big-integer/package.json rename to platforms/android/cordova/node_modules/big-integer/package.json index 5ec444f..f51a9b6 100644 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/node_modules/big-integer/package.json +++ b/platforms/android/cordova/node_modules/big-integer/package.json @@ -1,32 +1,53 @@ { - "name": "big-integer", - "version": "1.6.10", - "author": { - "name": "Peter Olson", - "email": "peter.e.c.olson+npm@gmail.com" + "_args": [ + [ + "big-integer@^1.6.7", + "/Users/steveng/repo/cordova/cordova-android/node_modules/bplist-parser" + ] + ], + "_from": "big-integer@>=1.6.7 <2.0.0", + "_id": "big-integer@1.6.12", + "_inCache": true, + "_installable": true, + "_location": "/big-integer", + "_nodeVersion": "0.12.3", + "_npmOperationalInternal": { + "host": "packages-6-west.internal.npmjs.com", + "tmp": "tmp/big-integer-1.6.12.tgz_1455702804335_0.11810904298909009" }, - "description": "An arbitrary length integer library for Javascript", - "contributors": [], - "bin": {}, - "scripts": { - "test": "karma start my.conf.js" + "_npmUser": { + "email": "peter.e.c.olson+npm@gmail.com", + "name": "peterolson" }, - "main": "./BigInteger", - "repository": { - "type": "git", - "url": "git+ssh://git@github.com/peterolson/BigInteger.js.git" + "_npmVersion": "2.9.1", + "_phantomChildren": {}, + "_requested": { + "name": "big-integer", + "raw": "big-integer@^1.6.7", + "rawSpec": "^1.6.7", + "scope": null, + "spec": ">=1.6.7 <2.0.0", + "type": "range" }, - "keywords": [ - "math", - "big", - "bignum", - "bigint", - "biginteger", - "integer", - "arbitrary", - "precision", - "arithmetic" + "_requiredBy": [ + "/bplist-parser" ], + "_resolved": "http://registry.npmjs.org/big-integer/-/big-integer-1.6.12.tgz", + "_shasum": "39afcddafcd5c4480864efb757337d508938bb26", + "_shrinkwrap": null, + "_spec": "big-integer@^1.6.7", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/bplist-parser", + "author": { + "email": "peter.e.c.olson+npm@gmail.com", + "name": "Peter Olson" + }, + "bin": {}, + "bugs": { + "url": "https://github.com/peterolson/BigInteger.js/issues" + }, + "contributors": [], + "dependencies": {}, + "description": "An arbitrary length integer library for Javascript", "devDependencies": { "coveralls": "^2.11.4", "jasmine": "2.1.x", @@ -36,35 +57,44 @@ "karma-jasmine": "^0.3.6", "karma-phantomjs-launcher": "~0.1" }, - "license": "Unlicense", + "directories": {}, + "dist": { + "shasum": "39afcddafcd5c4480864efb757337d508938bb26", + "tarball": "http://registry.npmjs.org/big-integer/-/big-integer-1.6.12.tgz" + }, "engines": { "node": ">=0.6" }, - "gitHead": "e9a739fa1a15fe3da4eb302ea7072112ec91e318", - "bugs": { - "url": "https://github.com/peterolson/BigInteger.js/issues" - }, + "gitHead": "56f449108e31542f939e701f1fe562a46e6c1fab", "homepage": "https://github.com/peterolson/BigInteger.js#readme", - "_id": "big-integer@1.6.10", - "_shasum": "0f05dcce24278bc33bd8eb9297f4858acacb1fea", - "_from": "big-integer@>=1.6.7 <2.0.0", - "_npmVersion": "2.9.1", - "_nodeVersion": "0.12.3", - "_npmUser": { - "name": "peterolson", - "email": "peter.e.c.olson+npm@gmail.com" - }, + "keywords": [ + "arbitrary", + "arithmetic", + "big", + "bigint", + "biginteger", + "bignum", + "integer", + "math", + "precision" + ], + "license": "Unlicense", + "main": "./BigInteger", "maintainers": [ { "name": "peterolson", "email": "peter.e.c.olson+npm@gmail.com" } ], - "dist": { - "shasum": "0f05dcce24278bc33bd8eb9297f4858acacb1fea", - "tarball": "http://registry.npmjs.org/big-integer/-/big-integer-1.6.10.tgz" + "name": "big-integer", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git+ssh://git@github.com/peterolson/BigInteger.js.git" }, - "directories": {}, - "_resolved": "http://registry.npmjs.org/big-integer/-/big-integer-1.6.10.tgz", - "readme": "ERROR: No README data found!" + "scripts": { + "test": "karma start my.conf.js" + }, + "version": "1.6.12" } diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/.npmignore b/platforms/android/cordova/node_modules/bplist-parser/.npmignore similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/.npmignore rename to platforms/android/cordova/node_modules/bplist-parser/.npmignore diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/README.md b/platforms/android/cordova/node_modules/bplist-parser/README.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/README.md rename to platforms/android/cordova/node_modules/bplist-parser/README.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/bplistParser.js b/platforms/android/cordova/node_modules/bplist-parser/bplistParser.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/bplistParser.js rename to platforms/android/cordova/node_modules/bplist-parser/bplistParser.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/package.json b/platforms/android/cordova/node_modules/bplist-parser/package.json similarity index 59% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/package.json rename to platforms/android/cordova/node_modules/bplist-parser/package.json index fb184ea..899b577 100644 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/package.json +++ b/platforms/android/cordova/node_modules/bplist-parser/package.json @@ -1,56 +1,81 @@ { - "name": "bplist-parser", - "version": "0.1.1", - "description": "Binary plist parser.", - "main": "bplistParser.js", - "scripts": { - "test": "./node_modules/nodeunit/bin/nodeunit test" + "_args": [ + [ + "bplist-parser@^0.1.0", + "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common" + ] + ], + "_from": "bplist-parser@>=0.1.0 <0.2.0", + "_id": "bplist-parser@0.1.1", + "_inCache": true, + "_installable": true, + "_location": "/bplist-parser", + "_nodeVersion": "5.1.0", + "_npmUser": { + "email": "joe@fernsroth.com", + "name": "joeferner" }, - "keywords": [ - "bplist", - "plist", - "parser" + "_npmVersion": "3.4.0", + "_phantomChildren": {}, + "_requested": { + "name": "bplist-parser", + "raw": "bplist-parser@^0.1.0", + "rawSpec": "^0.1.0", + "scope": null, + "spec": ">=0.1.0 <0.2.0", + "type": "range" + }, + "_requiredBy": [ + "/cordova-common" ], + "_resolved": "http://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz", + "_shasum": "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6", + "_shrinkwrap": null, + "_spec": "bplist-parser@^0.1.0", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common", "author": { - "name": "Joe Ferner", - "email": "joe.ferner@nearinfinity.com" + "email": "joe.ferner@nearinfinity.com", + "name": "Joe Ferner" }, - "license": "MIT", - "devDependencies": { - "nodeunit": "~0.9.1" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/nearinfinity/node-bplist-parser.git" + "bugs": { + "url": "https://github.com/nearinfinity/node-bplist-parser/issues" }, "dependencies": { "big-integer": "^1.6.7" }, - "gitHead": "c4f22650de2cc95edd21a6e609ff0654a2b951bd", - "bugs": { - "url": "https://github.com/nearinfinity/node-bplist-parser/issues" - }, - "homepage": "https://github.com/nearinfinity/node-bplist-parser#readme", - "_id": "bplist-parser@0.1.1", - "_shasum": "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6", - "_from": "bplist-parser@>=0.1.0 <0.2.0", - "_npmVersion": "3.4.0", - "_nodeVersion": "5.1.0", - "_npmUser": { - "name": "joeferner", - "email": "joe@fernsroth.com" + "description": "Binary plist parser.", + "devDependencies": { + "nodeunit": "~0.9.1" }, + "directories": {}, "dist": { "shasum": "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6", "tarball": "http://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz" }, + "gitHead": "c4f22650de2cc95edd21a6e609ff0654a2b951bd", + "homepage": "https://github.com/nearinfinity/node-bplist-parser#readme", + "keywords": [ + "bplist", + "parser", + "plist" + ], + "license": "MIT", + "main": "bplistParser.js", "maintainers": [ { "name": "joeferner", "email": "joe@fernsroth.com" } ], - "directories": {}, - "_resolved": "http://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz", - "readme": "ERROR: No README data found!" + "name": "bplist-parser", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git+https://github.com/nearinfinity/node-bplist-parser.git" + }, + "scripts": { + "test": "./node_modules/nodeunit/bin/nodeunit test" + }, + "version": "0.1.1" } diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/test/airplay.bplist b/platforms/android/cordova/node_modules/bplist-parser/test/airplay.bplist similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/test/airplay.bplist rename to platforms/android/cordova/node_modules/bplist-parser/test/airplay.bplist diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/test/iTunes-small.bplist b/platforms/android/cordova/node_modules/bplist-parser/test/iTunes-small.bplist similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/test/iTunes-small.bplist rename to platforms/android/cordova/node_modules/bplist-parser/test/iTunes-small.bplist diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/test/int64.bplist b/platforms/android/cordova/node_modules/bplist-parser/test/int64.bplist similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/test/int64.bplist rename to platforms/android/cordova/node_modules/bplist-parser/test/int64.bplist diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/test/int64.xml b/platforms/android/cordova/node_modules/bplist-parser/test/int64.xml similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/test/int64.xml rename to platforms/android/cordova/node_modules/bplist-parser/test/int64.xml diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/test/parseTest.js b/platforms/android/cordova/node_modules/bplist-parser/test/parseTest.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/test/parseTest.js rename to platforms/android/cordova/node_modules/bplist-parser/test/parseTest.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/test/sample1.bplist b/platforms/android/cordova/node_modules/bplist-parser/test/sample1.bplist similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/test/sample1.bplist rename to platforms/android/cordova/node_modules/bplist-parser/test/sample1.bplist diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/test/sample2.bplist b/platforms/android/cordova/node_modules/bplist-parser/test/sample2.bplist similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/test/sample2.bplist rename to platforms/android/cordova/node_modules/bplist-parser/test/sample2.bplist diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/test/uid.bplist b/platforms/android/cordova/node_modules/bplist-parser/test/uid.bplist similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/test/uid.bplist rename to platforms/android/cordova/node_modules/bplist-parser/test/uid.bplist diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/test/utf16.bplist b/platforms/android/cordova/node_modules/bplist-parser/test/utf16.bplist similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/test/utf16.bplist rename to platforms/android/cordova/node_modules/bplist-parser/test/utf16.bplist diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/test/utf16_chinese.plist b/platforms/android/cordova/node_modules/bplist-parser/test/utf16_chinese.plist similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/test/utf16_chinese.plist rename to platforms/android/cordova/node_modules/bplist-parser/test/utf16_chinese.plist diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/.npmignore b/platforms/android/cordova/node_modules/brace-expansion/.npmignore similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/.npmignore rename to platforms/android/cordova/node_modules/brace-expansion/.npmignore diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/README.md b/platforms/android/cordova/node_modules/brace-expansion/README.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/README.md rename to platforms/android/cordova/node_modules/brace-expansion/README.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/example.js b/platforms/android/cordova/node_modules/brace-expansion/example.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/example.js rename to platforms/android/cordova/node_modules/brace-expansion/example.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/index.js b/platforms/android/cordova/node_modules/brace-expansion/index.js similarity index 99% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/index.js rename to platforms/android/cordova/node_modules/brace-expansion/index.js index a23104e..932718f 100644 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/index.js +++ b/platforms/android/cordova/node_modules/brace-expansion/index.js @@ -99,7 +99,7 @@ function expand(str, isTop) { var isOptions = /^(.*,)+(.+)?$/.test(m.body); if (!isSequence && !isOptions) { // {a},b} - if (m.post.match(/,.*}/)) { + if (m.post.match(/,.*\}/)) { str = m.pre + '{' + m.body + escClose + m.post; return expand(str); } diff --git a/platforms/android/cordova/node_modules/brace-expansion/package.json b/platforms/android/cordova/node_modules/brace-expansion/package.json new file mode 100644 index 0000000..d6d2f78 --- /dev/null +++ b/platforms/android/cordova/node_modules/brace-expansion/package.json @@ -0,0 +1,104 @@ +{ + "_args": [ + [ + "brace-expansion@^1.0.0", + "/Users/steveng/repo/cordova/cordova-android/node_modules/minimatch" + ] + ], + "_from": "brace-expansion@>=1.0.0 <2.0.0", + "_id": "brace-expansion@1.1.3", + "_inCache": true, + "_installable": true, + "_location": "/brace-expansion", + "_nodeVersion": "5.5.0", + "_npmOperationalInternal": { + "host": "packages-6-west.internal.npmjs.com", + "tmp": "tmp/brace-expansion-1.1.3.tgz_1455216688668_0.948847763473168" + }, + "_npmUser": { + "email": "julian@juliangruber.com", + "name": "juliangruber" + }, + "_npmVersion": "3.3.12", + "_phantomChildren": {}, + "_requested": { + "name": "brace-expansion", + "raw": "brace-expansion@^1.0.0", + "rawSpec": "^1.0.0", + "scope": null, + "spec": ">=1.0.0 <2.0.0", + "type": "range" + }, + "_requiredBy": [ + "/minimatch" + ], + "_resolved": "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.3.tgz", + "_shasum": "46bff50115d47fc9ab89854abb87d98078a10991", + "_shrinkwrap": null, + "_spec": "brace-expansion@^1.0.0", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/minimatch", + "author": { + "email": "mail@juliangruber.com", + "name": "Julian Gruber", + "url": "http://juliangruber.com" + }, + "bugs": { + "url": "https://github.com/juliangruber/brace-expansion/issues" + }, + "dependencies": { + "balanced-match": "^0.3.0", + "concat-map": "0.0.1" + }, + "description": "Brace expansion as known from sh/bash", + "devDependencies": { + "tape": "4.4.0" + }, + "directories": {}, + "dist": { + "shasum": "46bff50115d47fc9ab89854abb87d98078a10991", + "tarball": "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.3.tgz" + }, + "gitHead": "f0da1bb668e655f67b6b2d660c6e1c19e2a6f231", + "homepage": "https://github.com/juliangruber/brace-expansion", + "keywords": [], + "license": "MIT", + "main": "index.js", + "maintainers": [ + { + "name": "juliangruber", + "email": "julian@juliangruber.com" + }, + { + "name": "isaacs", + "email": "isaacs@npmjs.com" + } + ], + "name": "brace-expansion", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git://github.com/juliangruber/brace-expansion.git" + }, + "scripts": { + "gentest": "bash test/generate.sh", + "test": "tape test/*.js" + }, + "testling": { + "browsers": [ + "android-browser/4.2..latest", + "chrome/25..latest", + "chrome/canary", + "firefox/20..latest", + "firefox/nightly", + "ie/8..latest", + "ipad/6.0..latest", + "iphone/6.0..latest", + "opera/12..latest", + "opera/next", + "safari/5.1..latest" + ], + "files": "test/*.js" + }, + "version": "1.1.3" +} diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/.travis.yml b/platforms/android/cordova/node_modules/concat-map/.travis.yml similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/.travis.yml rename to platforms/android/cordova/node_modules/concat-map/.travis.yml diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/LICENSE b/platforms/android/cordova/node_modules/concat-map/LICENSE similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/LICENSE rename to platforms/android/cordova/node_modules/concat-map/LICENSE diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/README.markdown b/platforms/android/cordova/node_modules/concat-map/README.markdown similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/README.markdown rename to platforms/android/cordova/node_modules/concat-map/README.markdown diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/example/map.js b/platforms/android/cordova/node_modules/concat-map/example/map.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/example/map.js rename to platforms/android/cordova/node_modules/concat-map/example/map.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js b/platforms/android/cordova/node_modules/concat-map/index.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js rename to platforms/android/cordova/node_modules/concat-map/index.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json b/platforms/android/cordova/node_modules/concat-map/package.json similarity index 63% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json rename to platforms/android/cordova/node_modules/concat-map/package.json index 10162a7..3ebe787 100644 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json +++ b/platforms/android/cordova/node_modules/concat-map/package.json @@ -1,83 +1,109 @@ { - "name": "concat-map", + "_args": [ + [ + "concat-map@0.0.1", + "/Users/steveng/repo/cordova/cordova-android/node_modules/brace-expansion" + ] + ], + "_from": "concat-map@0.0.1", + "_id": "concat-map@0.0.1", + "_inCache": true, + "_installable": true, + "_location": "/concat-map", + "_npmUser": { + "email": "mail@substack.net", + "name": "substack" + }, + "_npmVersion": "1.3.21", + "_phantomChildren": {}, + "_requested": { + "name": "concat-map", + "raw": "concat-map@0.0.1", + "rawSpec": "0.0.1", + "scope": null, + "spec": "0.0.1", + "type": "version" + }, + "_requiredBy": [ + "/brace-expansion" + ], + "_resolved": "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "_shasum": "d8a96bd77fd68df7793a73036a3ba0d5405d477b", + "_shrinkwrap": null, + "_spec": "concat-map@0.0.1", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/brace-expansion", + "author": { + "email": "mail@substack.net", + "name": "James Halliday", + "url": "http://substack.net" + }, + "bugs": { + "url": "https://github.com/substack/node-concat-map/issues" + }, + "dependencies": {}, "description": "concatenative mapdashery", - "version": "0.0.1", - "repository": { - "type": "git", - "url": "git://github.com/substack/node-concat-map.git" + "devDependencies": { + "tape": "~2.4.0" }, - "main": "index.js", + "directories": { + "example": "example", + "test": "test" + }, + "dist": { + "shasum": "d8a96bd77fd68df7793a73036a3ba0d5405d477b", + "tarball": "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" + }, + "homepage": "https://github.com/substack/node-concat-map", "keywords": [ "concat", "concatMap", - "map", "functional", - "higher-order" + "higher-order", + "map" ], - "directories": { - "example": "example", - "test": "test" + "license": "MIT", + "main": "index.js", + "maintainers": [ + { + "name": "substack", + "email": "mail@substack.net" + } + ], + "name": "concat-map", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git://github.com/substack/node-concat-map.git" }, "scripts": { "test": "tape test/*.js" }, - "devDependencies": { - "tape": "~2.4.0" - }, - "license": "MIT", - "author": { - "name": "James Halliday", - "email": "mail@substack.net", - "url": "http://substack.net" - }, "testling": { - "files": "test/*.js", "browsers": { + "chrome": [ + 10, + 22 + ], + "ff": [ + 10, + 15, + 3.5 + ], "ie": [ 6, 7, 8, 9 ], - "ff": [ - 3.5, - 10, - 15 - ], - "chrome": [ - 10, - 22 + "opera": [ + 12 ], "safari": [ 5.1 - ], - "opera": [ - 12 ] - } - }, - "bugs": { - "url": "https://github.com/substack/node-concat-map/issues" - }, - "homepage": "https://github.com/substack/node-concat-map", - "_id": "concat-map@0.0.1", - "dist": { - "shasum": "d8a96bd77fd68df7793a73036a3ba0d5405d477b", - "tarball": "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" + }, + "files": "test/*.js" }, - "_from": "concat-map@0.0.1", - "_npmVersion": "1.3.21", - "_npmUser": { - "name": "substack", - "email": "mail@substack.net" - }, - "maintainers": [ - { - "name": "substack", - "email": "mail@substack.net" - } - ], - "_shasum": "d8a96bd77fd68df7793a73036a3ba0d5405d477b", - "_resolved": "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "readme": "ERROR: No README data found!" + "version": "0.0.1" } diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/test/map.js b/platforms/android/cordova/node_modules/concat-map/test/map.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/test/map.js rename to platforms/android/cordova/node_modules/concat-map/test/map.js diff --git a/platforms/android/cordova/node_modules/cordova-common/README.md b/platforms/android/cordova/node_modules/cordova-common/README.md index f19b59f..6454481 100644 --- a/platforms/android/cordova/node_modules/cordova-common/README.md +++ b/platforms/android/cordova/node_modules/cordova-common/README.md @@ -107,6 +107,10 @@ Usage: ``` var superspawn = require('cordova-common').superspawn; superspawn.spawn('adb', ['devices']) +.progress(function(data){ + if (data.stderr) + console.error('"adb devices" raised an error: ' + data.stderr); +}) .then(function(devices){ // Do something... }) diff --git a/platforms/android/cordova/node_modules/cordova-common/RELEASENOTES.md b/platforms/android/cordova/node_modules/cordova-common/RELEASENOTES.md index 5a4cc51..e7db69c 100644 --- a/platforms/android/cordova/node_modules/cordova-common/RELEASENOTES.md +++ b/platforms/android/cordova/node_modules/cordova-common/RELEASENOTES.md @@ -20,6 +20,14 @@ --> # Cordova-common Release Notes +### 1.1.0 (Feb 16, 2016) +* CB-10482 Remove references to windows8 from cordova-lib/cli +* CB-10430 Adds forwardEvents method to easily connect two EventEmitters +* CB-10176 Adds CordovaLogger class, based on logger module from cordova-cli +* CB-10052 Expose child process' io streams via promise progress notification +* CB-10497 Prefer .bat over .cmd on windows platform +* CB-9984 Bumps plist version and fixes failing cordova-common test + ### 1.0.0 (Oct 29, 2015) * CB-9890 Documents cordova-common diff --git a/platforms/android/cordova/node_modules/cordova-common/cordova-common.js b/platforms/android/cordova/node_modules/cordova-common/cordova-common.js index 59b52fc..22e90a7 100644 --- a/platforms/android/cordova/node_modules/cordova-common/cordova-common.js +++ b/platforms/android/cordova/node_modules/cordova-common/cordova-common.js @@ -26,6 +26,7 @@ exports = module.exports = { ActionStack: require('./src/ActionStack'), CordovaError: require('./src/CordovaError/CordovaError'), + CordovaLogger: require('./src/CordovaLogger'), CordovaExternalToolErrorContext: require('./src/CordovaError/CordovaExternalToolErrorContext'), PlatformJson: require('./src/PlatformJson'), ConfigParser: require('./src/ConfigParser/ConfigParser.js'), diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/node_modules/big-integer/.gitconfig b/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/node_modules/big-integer/.gitconfig deleted file mode 100644 index 7683432..0000000 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/node_modules/big-integer/.gitconfig +++ /dev/null @@ -1,3 +0,0 @@ -[remote "github"] - push = +refs/heads/master:refs/heads/gh-pages - push = +refs/heads/master:refs/heads/master diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/node_modules/big-integer/.zuul.yml b/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/node_modules/big-integer/.zuul.yml deleted file mode 100644 index b32b22a..0000000 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/node_modules/big-integer/.zuul.yml +++ /dev/null @@ -1,8 +0,0 @@ -ui: jasmine2 -browsers: - - name: chrome - version: 27 - - name: ie - version: latest - - name: iphone - version: 6.1 \ No newline at end of file diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/node_modules/big-integer/.zuulrc b/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/node_modules/big-integer/.zuulrc deleted file mode 100644 index 5ecb992..0000000 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/node_modules/big-integer/.zuulrc +++ /dev/null @@ -1,2 +0,0 @@ -sauce_username: peterolson -sauce_key: 3553a315-10c0-4661-9d8e-7150d87064c7 \ No newline at end of file diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/node_modules/big-integer/BigInteger.min.js b/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/node_modules/big-integer/BigInteger.min.js deleted file mode 100644 index b39f103..0000000 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/node_modules/big-integer/BigInteger.min.js +++ /dev/null @@ -1 +0,0 @@ -var bigInt=function(e){"use strict";function o(e,t){this.value=e,this.sign=t,this.isSmall=!1}function u(e){this.value=e,this.sign=e<0,this.isSmall=!0}function a(e){return-r0?Math.floor(e):Math.ceil(e)}function d(e,n){var r=e.length,i=n.length,s=new Array(r),o=0,u=t,a,f;for(f=0;f=u?1:0,s[f]=a-o*u;while(f0&&s.push(o),s}function v(e,t){return e.length>=t.length?d(e,t):d(t,e)}function m(e,n){var r=e.length,i=new Array(r),s=t,o,u;for(u=0;u0)i[u++]=n%s,n=Math.floor(n/s);return i}function g(e,n){var r=e.length,i=n.length,s=new Array(r),o=0,u=t,a,f;for(a=0;a=0?r=g(e,t):(r=g(t,e),n=!n),r=l(r),typeof r=="number"?(n&&(r=-r),new u(r)):new o(r,n)}function b(e,n,r){var i=e.length,s=new Array(i),a=-n,f=t,c,h;for(c=0;c0)i[a++]=o%s,o=Math.floor(o/s);return i}function S(e,t){var n=[];while(t-->0)n.push(0);return n.concat(e)}function x(e,t){var n=Math.max(e.length,t.length);if(n<=400)return w(e,t);n=Math.ceil(n/2);var r=e.slice(n),i=e.slice(0,n),s=t.slice(n),o=t.slice(0,n),u=x(i,o),a=x(r,s),f=x(v(i,r),v(o,s));return v(v(u,S(g(g(f,u),a),n)),S(a,2*n))}function T(e,n,r){return e=0;d--){p=s-1,f[d+i]!==u&&(p=Math.floor((f[d+i]*s+f[d+i-1])/u)),v=0,m=0,y=c.length;for(g=0;gi&&(c=(c+1)*u),a=Math.ceil(c/h);do{p=E(n,a);if(O(p,o)<=0)break;a--}while(a);s.push(a),o=g(o,p)}return s.reverse(),[l(s),l(o)]}function L(e,n){var r=e.length,i=h(r),s=t,o,u,a,f;a=0;for(o=r-1;o>=0;--o)f=a*s+e[o],u=p(f/n),a=f-u*n,i[o]=u|0;return[i,a|0]}function A(e,n){var r,i=Q(n),s=e.value,a=i.value,c;if(a===0)throw new Error("Cannot divide by zero");if(e.isSmall)return i.isSmall?[new u(p(s/a)),new u(s%a)]:[G[0],e];if(i.isSmall){if(a===1)return[e,G[0]];if(a==-1)return[e.negate(),G[0]];var h=Math.abs(a);if(ht.length?1:-1;for(var n=e.length-1;n>=0;n--)if(e[n]!==t[n])return e[n]>t[n]?1:-1;return 0}function M(e){var t=e.abs();if(t.isUnit())return!1;if(t.equals(2)||t.equals(3)||t.equals(5))return!0;if(t.isEven()||t.isDivisibleBy(3)||t.isDivisibleBy(5))return!1;if(t.lesser(25))return!0}function H(e){return(typeof e=="number"||typeof e=="string")&&+Math.abs(e)<=t||e instanceof o&&e.value.length<=1}function B(e,t,n){t=Q(t);var r=e.isNegative(),i=t.isNegative(),s=r?e.not():e,o=i?t.not():t,u=[],a=[],f=!1,l=!1;while(!f||!l)s.isZero()?(f=!0,u.push(r?1:0)):r?u.push(s.isEven()?1:0):u.push(s.isEven()?0:1),o.isZero()?(l=!0,a.push(i?1:0)):i?a.push(o.isEven()?1:0):a.push(o.isEven()?0:1),s=s.over(2),o=o.over(2);var c=[];for(var h=0;h=0;h--){var d=c?s.value[h]:t,v=p(Math.random()*d);f.unshift(v),v"}function $(e,t){t=bigInt(t);if(t.isZero()){if(e.isZero())return"0";throw new Error("Cannot convert nonzero numbers to base 0.")}if(t.equals(-1))return e.isZero()?"0":e.isNegative()?(new Array(1-e)).join("10"):"1"+(new Array(+e)).join("01");var n="";e.isNegative()&&t.isPositive()&&(n="-",e=e.abs());if(t.equals(1))return e.isZero()?"0":n+(new Array(+e+1)).join(1);var r=[],i=e,s;while(i.isNegative()||i.compareAbs(t)>=0){s=i.divmod(t),i=s.quotient;var o=s.remainder;o.isNegative()&&(o=t.minus(o).abs(),i=i.next()),r.push(V(o))}return r.push(V(i)),n+r.reverse().join("")}function J(e){if(a(+e)){var t=+e;if(t===p(t))return new u(t);throw"Invalid integer: "+e}var r=e[0]==="-";r&&(e=e.slice(1));var i=e.split(/e/i);if(i.length>2)throw new Error("Invalid integer: "+f.join("e"));if(i.length===2){var s=i[1];s[0]==="+"&&(s=s.slice(1)),s=+s;if(s!==p(s)||!a(s))throw new Error("Invalid integer: "+s+" is not a valid exponent.");var f=i[0],l=f.indexOf(".");l>=0&&(s-=f.length-l-1,f=f.slice(0,l)+f.slice(l+1));if(s<0)throw new Error("Cannot include negative exponent part for integers");f+=(new Array(s+1)).join("0"),e=f}var h=/^([0-9][0-9]*)$/.test(e);if(!h)throw new Error("Invalid integer: "+e);var d=[],v=e.length,m=n,g=v-m;while(v>0)d.push(+e.slice(g,v)),g-=m,g<0&&(g=0),v-=m;return c(d),new o(d,r)}function K(e){return a(e)?new u(e):J(e.toString())}function Q(e){return typeof e=="number"?K(e):typeof e=="string"?J(e):e}var t=1e7,n=7,r=9007199254740992,i=f(r),s=Math.log(r);o.prototype.add=function(e){var t,n=Q(e);if(this.sign!==n.sign)return this.subtract(n.negate());var r=this.value,i=n.value;return n.isSmall?new o(m(r,Math.abs(i)),this.sign):new o(v(r,i),this.sign)},o.prototype.plus=o.prototype.add,u.prototype.add=function(e){var t=Q(e),n=this.value;if(n<0!==t.sign)return this.subtract(t.negate());var r=t.value;if(t.isSmall){if(a(n+r))return new u(n+r);r=f(Math.abs(r))}return new o(m(r,Math.abs(n)),n<0)},u.prototype.plus=u.prototype.add,o.prototype.subtract=function(e){var t=Q(e);if(this.sign!==t.sign)return this.add(t.negate());var n=this.value,r=t.value;return t.isSmall?b(n,Math.abs(r),this.sign):y(n,r,this.sign)},o.prototype.minus=o.prototype.subtract,u.prototype.subtract=function(e){var t=Q(e),n=this.value;if(n<0!==t.sign)return this.add(t.negate());var r=t.value;return t.isSmall?new u(n-r):b(r,Math.abs(n),n>=0)},u.prototype.minus=u.prototype.subtract,o.prototype.negate=function(){return new o(this.value,!this.sign)},u.prototype.negate=function(){var e=this.sign,t=new u(-this.value);return t.sign=!e,t},o.prototype.abs=function(){return new o(this.value,!1)},u.prototype.abs=function(){return new u(Math.abs(this.value))},o.prototype.multiply=function(e){var n,r=Q(e),i=this.value,s=r.value,u=this.sign!==r.sign,a;if(r.isSmall){if(s===0)return G[0];if(s===1)return this;if(s===-1)return this.negate();a=Math.abs(s);if(a4e3?new o(x(i,s),u):new o(w(i,s),u)},o.prototype.times=o.prototype.multiply,u.prototype._multiplyBySmall=function(e){return a(e.value*this.value)?new u(e.value*this.value):T(Math.abs(e.value),f(Math.abs(this.value)),this.sign!==e.sign)},o.prototype._multiplyBySmall=function(e){return e.value===0?G[0]:e.value===1?this:e.value===-1?this.negate():T(Math.abs(e.value),this.value,this.sign!==e.sign)},u.prototype.multiply=function(e){return Q(e)._multiplyBySmall(this)},u.prototype.times=u.prototype.multiply,o.prototype.square=function(){return new o(N(this.value),!1)},u.prototype.square=function(){var e=this.value*this.value;return a(e)?new u(e):new o(N(f(Math.abs(this.value))),!1)},o.prototype.divmod=function(e){var t=A(this,e);return{quotient:t[0],remainder:t[1]}},u.prototype.divmod=o.prototype.divmod,o.prototype.divide=function(e){return A(this,e)[0]},u.prototype.over=u.prototype.divide=o.prototype.over=o.prototype.divide,o.prototype.mod=function(e){return A(this,e)[1]},u.prototype.remainder=u.prototype.mod=o.prototype.remainder=o.prototype.mod,o.prototype.pow=function(e){var t=Q(e),n=this.value,r=t.value,i,s,o;if(r===0)return G[1];if(n===0)return G[0];if(n===1)return G[1];if(n===-1)return t.isEven()?G[1]:G[-1];if(t.sign)return G[0];if(!t.isSmall)throw new Error("The exponent "+t.toString()+" is too large.");if(this.isSmall&&a(i=Math.pow(n,r)))return new u(p(i));s=this,o=G[1];for(;;){r&!0&&(o=o.times(s),--r);if(r===0)break;r/=2,s=s.square()}return o},u.prototype.pow=o.prototype.pow,o.prototype.modPow=function(e,t){e=Q(e),t=Q(t);if(t.isZero())throw new Error("Cannot take modPow with modulus 0");var n=G[1],r=this.mod(t);while(e.isPositive()){if(r.isZero())return G[0];e.isOdd()&&(n=n.multiply(r).mod(t)),e=e.divide(2),r=r.square().mod(t)}return n},u.prototype.modPow=o.prototype.modPow,o.prototype.compareAbs=function(e){var t=Q(e),n=this.value,r=t.value;return t.isSmall?1:O(n,r)},u.prototype.compareAbs=function(e){var t=Q(e),n=Math.abs(this.value),r=t.value;return t.isSmall?(r=Math.abs(r),n===r?0:n>r?1:-1):-1},o.prototype.compare=function(e){if(e===Infinity)return-1;if(e===-Infinity)return 1;var t=Q(e),n=this.value,r=t.value;return this.sign!==t.sign?t.sign?1:-1:t.isSmall?this.sign?-1:1:O(n,r)*(this.sign?-1:1)},o.prototype.compareTo=o.prototype.compare,u.prototype.compare=function(e){if(e===Infinity)return-1;if(e===-Infinity)return 1;var t=Q(e),n=this.value,r=t.value;return t.isSmall?n==r?0:n>r?1:-1:n<0!==t.sign?n<0?-1:1:n<0?1:-1},u.prototype.compareTo=u.prototype.compare,o.prototype.equals=function(e){return this.compare(e)===0},u.prototype.eq=u.prototype.equals=o.prototype.eq=o.prototype.equals,o.prototype.notEquals=function(e){return this.compare(e)!==0},u.prototype.neq=u.prototype.notEquals=o.prototype.neq=o.prototype.notEquals,o.prototype.greater=function(e){return this.compare(e)>0},u.prototype.gt=u.prototype.greater=o.prototype.gt=o.prototype.greater,o.prototype.lesser=function(e){return this.compare(e)<0},u.prototype.lt=u.prototype.lesser=o.prototype.lt=o.prototype.lesser,o.prototype.greaterOrEquals=function(e){return this.compare(e)>=0},u.prototype.geq=u.prototype.greaterOrEquals=o.prototype.geq=o.prototype.greaterOrEquals,o.prototype.lesserOrEquals=function(e){return this.compare(e)<=0},u.prototype.leq=u.prototype.lesserOrEquals=o.prototype.leq=o.prototype.lesserOrEquals,o.prototype.isEven=function(){return(this.value[0]&1)===0},u.prototype.isEven=function(){return(this.value&1)===0},o.prototype.isOdd=function(){return(this.value[0]&1)===1},u.prototype.isOdd=function(){return(this.value&1)===1},o.prototype.isPositive=function(){return!this.sign},u.prototype.isPositive=function(){return this.value>0},o.prototype.isNegative=function(){return this.sign},u.prototype.isNegative=function(){return this.value<0},o.prototype.isUnit=function(){return!1},u.prototype.isUnit=function(){return Math.abs(this.value)===1},o.prototype.isZero=function(){return!1},u.prototype.isZero=function(){return this.value===0},o.prototype.isDivisibleBy=function(e){var t=Q(e),n=t.value;return n===0?!1:n===1?!0:n===2?this.isEven():this.mod(t).equals(G[0])},u.prototype.isDivisibleBy=o.prototype.isDivisibleBy,o.prototype.isPrime=function(){var t=M(this);if(t!==e)return t;var n=this.abs(),r=n.prev(),i=[2,3,5,7,11,13,17,19],s=r,o,u,a,f;while(s.isEven())s=s.divide(2);for(a=0;a-r?new u(e-1):new o(i,!0)};var _=[1];while(_[_.length-1]<=t)_.push(2*_[_.length-1]);var D=_.length,P=_[D-1];o.prototype.shiftLeft=function(e){if(!H(e))throw new Error(String(e)+" is too large for shifting.");e=+e;if(e<0)return this.shiftRight(-e);var t=this;while(e>=D)t=t.multiply(P),e-=D-1;return t.multiply(_[e])},u.prototype.shiftLeft=o.prototype.shiftLeft,o.prototype.shiftRight=function(e){var t;if(!H(e))throw new Error(String(e)+" is too large for shifting.");e=+e;if(e<0)return this.shiftLeft(-e);var n=this;while(e>=D){if(n.isZero())return n;t=A(n,P),n=t[1].isNegative()?t[0].prev():t[0],e-=D-1}return t=A(n,_[e]),t[1].isNegative()?t[0].prev():t[0]},u.prototype.shiftRight=o.prototype.shiftRight,o.prototype.not=function(){return this.negate().prev()},u.prototype.not=o.prototype.not,o.prototype.and=function(e){return B(this,e,function(e,t){return e&t})},u.prototype.and=o.prototype.and,o.prototype.or=function(e){return B(this,e,function(e,t){return e|t})},u.prototype.or=o.prototype.or,o.prototype.xor=function(e){return B(this,e,function(e,t){return e^t})},u.prototype.xor=o.prototype.xor;var j=1<<30,F=(t&-t)*(t&-t)|j,X=function(e,t){var n=G[0],r=G[1],i=e.length;if(2<=t&&t<=36&&i<=s/Math.log(t))return new u(parseInt(e,t));t=Q(t);var o=[],a,f=e[0]==="-";for(a=f?1:0;a");o.push(Q(e.slice(h+1,a)))}}o.reverse();for(a=0;a=0)o=String(n[r]),i+=s.slice(o.length)+o;var u=this.sign?"-":"";return u+i},u.prototype.toString=function(t){return t===e&&(t=10),t!=10?$(this,t):String(this.value)},o.prototype.valueOf=function(){return+this.toString()},o.prototype.toJSNumber=o.prototype.valueOf,u.prototype.valueOf=function(){return this.value},u.prototype.toJSNumber=u.prototype.valueOf;var G=function(e,t){return typeof e=="undefined"?G[0]:typeof t!="undefined"?+t===10?Q(e):X(e,t):Q(e)};for(var Y=0;Y<1e3;Y++)G[Y]=new u(Y),Y>0&&(G[-Y]=new u(-Y));return G.one=G[1],G.zero=G[0],G.minusOne=G[-1],G.max=q,G.min=R,G.gcd=U,G.lcm=z,G.isInstance=function(e){return e instanceof o||e instanceof u},G.randBetween=W,G}();typeof module!="undefined"&&module.hasOwnProperty("exports")&&(module.exports=bigInt); \ No newline at end of file diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/node_modules/big-integer/LICENSE b/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/node_modules/big-integer/LICENSE deleted file mode 100644 index cf1ab25..0000000 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/bplist-parser/node_modules/big-integer/LICENSE +++ /dev/null @@ -1,24 +0,0 @@ -This is free and unencumbered software released into the public domain. - -Anyone is free to copy, modify, publish, use, compile, sell, or -distribute this software, either in source code form or as a compiled -binary, for any purpose, commercial or non-commercial, and by any -means. - -In jurisdictions that recognize copyright laws, the author or authors -of this software dedicate any and all copyright interest in the -software to the public domain. We make this dedication for the benefit -of the public at large and to the detriment of our heirs and -successors. We intend this dedication to be an overt act of -relinquishment in perpetuity of all present and future rights to this -software under copyright law. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -For more information, please refer to diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/cordova-registry-mapper/package.json b/platforms/android/cordova/node_modules/cordova-common/node_modules/cordova-registry-mapper/package.json deleted file mode 100644 index e6aff05..0000000 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/cordova-registry-mapper/package.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "name": "cordova-registry-mapper", - "version": "1.1.14", - "description": "Maps old plugin ids to new plugin names for fetching from npm", - "main": "index.js", - "repository": { - "type": "git", - "url": "git+https://github.com/stevengill/cordova-registry-mapper.git" - }, - "scripts": { - "test": "node tests/test.js" - }, - "keywords": [ - "cordova", - "plugins" - ], - "author": { - "name": "Steve Gill" - }, - "license": "Apache version 2.0", - "devDependencies": { - "tape": "^3.5.0" - }, - "gitHead": "0ad8505f61afaac3c7ab112e6e79bd61cb953762", - "bugs": { - "url": "https://github.com/stevengill/cordova-registry-mapper/issues" - }, - "homepage": "https://github.com/stevengill/cordova-registry-mapper#readme", - "_id": "cordova-registry-mapper@1.1.14", - "_shasum": "cca1084e1e3a1b4737405123989251d4a6a5ca07", - "_from": "cordova-registry-mapper@>=1.1.8 <2.0.0", - "_npmVersion": "3.5.1", - "_nodeVersion": "5.0.0", - "_npmUser": { - "name": "stevegill", - "email": "stevengill97@gmail.com" - }, - "dist": { - "shasum": "cca1084e1e3a1b4737405123989251d4a6a5ca07", - "tarball": "http://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.14.tgz" - }, - "maintainers": [ - { - "name": "stevegill", - "email": "stevengill97@gmail.com" - } - ], - "directories": {}, - "_resolved": "http://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.14.tgz", - "readme": "ERROR: No README data found!" -} diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inflight/node_modules/wrappy/package.json b/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inflight/node_modules/wrappy/package.json deleted file mode 100644 index b5ee2f1..0000000 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inflight/node_modules/wrappy/package.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "name": "wrappy", - "version": "1.0.1", - "description": "Callback wrapping utility", - "main": "wrappy.js", - "directories": { - "test": "test" - }, - "dependencies": {}, - "devDependencies": { - "tap": "^0.4.12" - }, - "scripts": { - "test": "tap test/*.js" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/npm/wrappy.git" - }, - "author": { - "name": "Isaac Z. Schlueter", - "email": "i@izs.me", - "url": "http://blog.izs.me/" - }, - "license": "ISC", - "bugs": { - "url": "https://github.com/npm/wrappy/issues" - }, - "homepage": "https://github.com/npm/wrappy", - "gitHead": "006a8cbac6b99988315834c207896eed71fd069a", - "_id": "wrappy@1.0.1", - "_shasum": "1e65969965ccbc2db4548c6b84a6f2c5aedd4739", - "_from": "wrappy@>=1.0.0 <2.0.0", - "_npmVersion": "2.0.0", - "_nodeVersion": "0.10.31", - "_npmUser": { - "name": "isaacs", - "email": "i@izs.me" - }, - "maintainers": [ - { - "name": "isaacs", - "email": "i@izs.me" - } - ], - "dist": { - "shasum": "1e65969965ccbc2db4548c6b84a6f2c5aedd4739", - "tarball": "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz" - }, - "_resolved": "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz", - "readme": "ERROR: No README data found!" -} diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json b/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json deleted file mode 100644 index 58c7b2d..0000000 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "name": "brace-expansion", - "description": "Brace expansion as known from sh/bash", - "version": "1.1.2", - "repository": { - "type": "git", - "url": "git://github.com/juliangruber/brace-expansion.git" - }, - "homepage": "https://github.com/juliangruber/brace-expansion", - "main": "index.js", - "scripts": { - "test": "tape test/*.js", - "gentest": "bash test/generate.sh" - }, - "dependencies": { - "balanced-match": "^0.3.0", - "concat-map": "0.0.1" - }, - "devDependencies": { - "tape": "4.2.2" - }, - "keywords": [], - "author": { - "name": "Julian Gruber", - "email": "mail@juliangruber.com", - "url": "http://juliangruber.com" - }, - "license": "MIT", - "testling": { - "files": "test/*.js", - "browsers": [ - "ie/8..latest", - "firefox/20..latest", - "firefox/nightly", - "chrome/25..latest", - "chrome/canary", - "opera/12..latest", - "opera/next", - "safari/5.1..latest", - "ipad/6.0..latest", - "iphone/6.0..latest", - "android-browser/4.2..latest" - ] - }, - "gitHead": "b03773a30fa516b1374945b68e9acb6253d595fa", - "bugs": { - "url": "https://github.com/juliangruber/brace-expansion/issues" - }, - "_id": "brace-expansion@1.1.2", - "_shasum": "f21445d0488b658e2771efd870eff51df29f04ef", - "_from": "brace-expansion@>=1.0.0 <2.0.0", - "_npmVersion": "2.14.7", - "_nodeVersion": "4.2.1", - "_npmUser": { - "name": "juliangruber", - "email": "julian@juliangruber.com" - }, - "dist": { - "shasum": "f21445d0488b658e2771efd870eff51df29f04ef", - "tarball": "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz" - }, - "maintainers": [ - { - "name": "juliangruber", - "email": "julian@juliangruber.com" - }, - { - "name": "isaacs", - "email": "isaacs@npmjs.com" - } - ], - "directories": {}, - "_resolved": "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz", - "readme": "ERROR: No README data found!" -} diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/once/node_modules/wrappy/README.md b/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/once/node_modules/wrappy/README.md deleted file mode 100644 index 98eab25..0000000 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/once/node_modules/wrappy/README.md +++ /dev/null @@ -1,36 +0,0 @@ -# wrappy - -Callback wrapping utility - -## USAGE - -```javascript -var wrappy = require("wrappy") - -// var wrapper = wrappy(wrapperFunction) - -// make sure a cb is called only once -// See also: http://npm.im/once for this specific use case -var once = wrappy(function (cb) { - var called = false - return function () { - if (called) return - called = true - return cb.apply(this, arguments) - } -}) - -function printBoo () { - console.log('boo') -} -// has some rando property -printBoo.iAmBooPrinter = true - -var onlyPrintOnce = once(printBoo) - -onlyPrintOnce() // prints 'boo' -onlyPrintOnce() // does nothing - -// random property is retained! -assert.equal(onlyPrintOnce.iAmBooPrinter, true) -``` diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/once/node_modules/wrappy/test/basic.js b/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/once/node_modules/wrappy/test/basic.js deleted file mode 100644 index 5ed0fcd..0000000 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/once/node_modules/wrappy/test/basic.js +++ /dev/null @@ -1,51 +0,0 @@ -var test = require('tap').test -var wrappy = require('../wrappy.js') - -test('basic', function (t) { - function onceifier (cb) { - var called = false - return function () { - if (called) return - called = true - return cb.apply(this, arguments) - } - } - onceifier.iAmOnce = {} - var once = wrappy(onceifier) - t.equal(once.iAmOnce, onceifier.iAmOnce) - - var called = 0 - function boo () { - t.equal(called, 0) - called++ - } - // has some rando property - boo.iAmBoo = true - - var onlyPrintOnce = once(boo) - - onlyPrintOnce() // prints 'boo' - onlyPrintOnce() // does nothing - t.equal(called, 1) - - // random property is retained! - t.equal(onlyPrintOnce.iAmBoo, true) - - var logs = [] - var logwrap = wrappy(function (msg, cb) { - logs.push(msg + ' wrapping cb') - return function () { - logs.push(msg + ' before cb') - var ret = cb.apply(this, arguments) - logs.push(msg + ' after cb') - } - }) - - var c = logwrap('foo', function () { - t.same(logs, [ 'foo wrapping cb', 'foo before cb' ]) - }) - c() - t.same(logs, [ 'foo wrapping cb', 'foo before cb', 'foo after cb' ]) - - t.end() -}) diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/once/node_modules/wrappy/wrappy.js b/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/once/node_modules/wrappy/wrappy.js deleted file mode 100644 index bb7e7d6..0000000 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/once/node_modules/wrappy/wrappy.js +++ /dev/null @@ -1,33 +0,0 @@ -// Returns a wrapper function that returns a wrapped callback -// The wrapper function should do some stuff, and return a -// presumably different callback function. -// This makes sure that own properties are retained, so that -// decorations and such are not lost along the way. -module.exports = wrappy -function wrappy (fn, cb) { - if (fn && cb) return wrappy(fn)(cb) - - if (typeof fn !== 'function') - throw new TypeError('need wrapper function') - - Object.keys(fn).forEach(function (k) { - wrapper[k] = fn[k] - }) - - return wrapper - - function wrapper() { - var args = new Array(arguments.length) - for (var i = 0; i < args.length; i++) { - args[i] = arguments[i] - } - var ret = fn.apply(this, args) - var cb = args[args.length-1] - if (typeof ret === 'function' && ret !== cb) { - Object.keys(cb).forEach(function (k) { - ret[k] = cb[k] - }) - } - return ret - } -} diff --git a/platforms/android/cordova/node_modules/cordova-common/package.json b/platforms/android/cordova/node_modules/cordova-common/package.json index 6c4d7e8..4bd1675 100644 --- a/platforms/android/cordova/node_modules/cordova-common/package.json +++ b/platforms/android/cordova/node_modules/cordova-common/package.json @@ -1,63 +1,81 @@ { - "author": { - "name": "Apache Software Foundation" + "_args": [ + [ + "cordova-common@^1.1.0", + "/Users/steveng/repo/cordova/cordova-android" + ] + ], + "_from": "cordova-common@>=1.1.0 <2.0.0", + "_id": "cordova-common@1.1.0", + "_inCache": true, + "_installable": true, + "_location": "/cordova-common", + "_nodeVersion": "4.2.3", + "_npmOperationalInternal": { + "host": "packages-5-east.internal.npmjs.com", + "tmp": "tmp/cordova-common-1.1.0.tgz_1455781889491_0.6937742941081524" }, - "name": "cordova-common", - "description": "Apache Cordova tools and platforms shared routines", - "license": "Apache-2.0", - "version": "1.0.0", - "repository": { - "type": "git", - "url": "git://git-wip-us.apache.org/repos/asf/cordova-common.git" + "_npmUser": { + "email": "kotikov.vladimir@gmail.com", + "name": "kotikov.vladimir" }, - "bugs": { - "url": "https://issues.apache.org/jira/browse/CB", - "email": "dev@cordova.apache.org" + "_npmVersion": "2.14.7", + "_phantomChildren": {}, + "_requested": { + "name": "cordova-common", + "raw": "cordova-common@^1.1.0", + "rawSpec": "^1.1.0", + "scope": null, + "spec": ">=1.1.0 <2.0.0", + "type": "range" }, - "main": "cordova-common.js", - "engines": { - "node": ">=0.9.9" + "_requiredBy": [ + "/" + ], + "_resolved": "http://registry.npmjs.org/cordova-common/-/cordova-common-1.1.0.tgz", + "_shasum": "8682721466ee354747ec6241f34f412b7e0ef636", + "_shrinkwrap": null, + "_spec": "cordova-common@^1.1.0", + "_where": "/Users/steveng/repo/cordova/cordova-android", + "author": { + "name": "Apache Software Foundation" }, - "scripts": { - "test": "npm run jshint && npm run jasmine", - "jshint": "node node_modules/jshint/bin/jshint src && node node_modules/jshint/bin/jshint spec", - "jasmine": "node node_modules/jasmine-node/bin/jasmine-node --captureExceptions --color spec", - "cover": "node node_modules/istanbul/lib/cli.js cover --root src --print detail node_modules/jasmine-node/bin/jasmine-node -- spec" + "bugs": { + "email": "dev@cordova.apache.org", + "url": "https://issues.apache.org/jira/browse/CB" }, - "engineStrict": true, + "contributors": [], "dependencies": { + "ansi": "^0.3.1", "bplist-parser": "^0.1.0", "cordova-registry-mapper": "^1.1.8", "elementtree": "^0.1.6", "glob": "^5.0.13", "osenv": "^0.1.3", - "plist": "^1.1.0", + "plist": "^1.2.0", "q": "^1.4.1", "semver": "^5.0.1", "shelljs": "^0.5.1", "underscore": "^1.8.3", "unorm": "^1.3.3" }, + "description": "Apache Cordova tools and platforms shared routines", "devDependencies": { "istanbul": "^0.3.17", "jasmine-node": "^1.14.5", "jshint": "^2.8.0" }, - "contributors": [], - "_id": "cordova-common@1.0.0", - "_shasum": "b21947e89a4a89292ec563abf9ee6ccb2b9f3aef", - "_resolved": "http://registry.npmjs.org/cordova-common/-/cordova-common-1.0.0.tgz", - "_from": "cordova-common@>=1.0.0 <1.1.0", - "_npmVersion": "2.14.7", - "_nodeVersion": "4.2.1", - "_npmUser": { - "name": "kotikov.vladimir", - "email": "kotikov.vladimir@gmail.com" - }, + "directories": {}, "dist": { - "shasum": "b21947e89a4a89292ec563abf9ee6ccb2b9f3aef", - "tarball": "http://registry.npmjs.org/cordova-common/-/cordova-common-1.0.0.tgz" + "shasum": "8682721466ee354747ec6241f34f412b7e0ef636", + "tarball": "http://registry.npmjs.org/cordova-common/-/cordova-common-1.1.0.tgz" + }, + "engineStrict": true, + "engines": { + "node": ">=0.9.9" }, + "license": "Apache-2.0", + "main": "cordova-common.js", "maintainers": [ { "name": "bowserj", @@ -84,6 +102,18 @@ "email": "npmjs@barhams.info" } ], - "directories": {}, - "readme": "ERROR: No README data found!" + "name": "cordova-common", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git://git-wip-us.apache.org/repos/asf/cordova-common.git" + }, + "scripts": { + "cover": "node node_modules/istanbul/lib/cli.js cover --root src --print detail node_modules/jasmine-node/bin/jasmine-node -- spec", + "jasmine": "node node_modules/jasmine-node/bin/jasmine-node --captureExceptions --color spec", + "jshint": "node node_modules/jshint/bin/jshint src && node node_modules/jshint/bin/jshint spec", + "test": "npm run jshint && npm run jasmine" + }, + "version": "1.1.0" } diff --git a/platforms/android/cordova/node_modules/cordova-common/src/ConfigChanges/ConfigChanges.js b/platforms/android/cordova/node_modules/cordova-common/src/ConfigChanges/ConfigChanges.js index a38fca6..a914fc8 100644 --- a/platforms/android/cordova/node_modules/cordova-common/src/ConfigChanges/ConfigChanges.js +++ b/platforms/android/cordova/node_modules/cordova-common/src/ConfigChanges/ConfigChanges.js @@ -106,8 +106,8 @@ function remove_plugin_changes(pluginInfo, is_top_level) { // CB-6976 Windows Universal Apps. Compatibility fix for existing plugins. if (self.platform == 'windows' && file == 'package.appxmanifest' && !fs.existsSync(path.join(self.project_dir, 'package.appxmanifest'))) { - // New windows template separate manifest files for Windows8, Windows8.1 and WP8.1 - var substs = ['package.phone.appxmanifest', 'package.windows.appxmanifest', 'package.windows80.appxmanifest', 'package.windows10.appxmanifest']; + // New windows template separate manifest files for Windows10, Windows8.1 and WP8.1 + var substs = ['package.phone.appxmanifest', 'package.windows.appxmanifest', 'package.windows10.appxmanifest']; /* jshint loopfunc:true */ substs.forEach(function(subst) { events.emit('verbose', 'Applying munge to ' + subst); @@ -149,7 +149,7 @@ function add_plugin_changes(pluginInfo, plugin_vars, is_top_level, should_increm // CB-6976 Windows Universal Apps. Compatibility fix for existing plugins. if (self.platform == 'windows' && file == 'package.appxmanifest' && !fs.existsSync(path.join(self.project_dir, 'package.appxmanifest'))) { - var substs = ['package.phone.appxmanifest', 'package.windows.appxmanifest', 'package.windows80.appxmanifest', 'package.windows10.appxmanifest']; + var substs = ['package.phone.appxmanifest', 'package.windows.appxmanifest', 'package.windows10.appxmanifest']; /* jshint loopfunc:true */ substs.forEach(function(subst) { events.emit('verbose', 'Applying munge to ' + subst); @@ -203,7 +203,6 @@ function generate_plugin_config_munge(pluginInfo, vars) { { var manifests = { 'windows': { - '8.0.0': 'package.windows80.appxmanifest', '8.1.0': 'package.windows.appxmanifest', '10.0.0': 'package.windows10.appxmanifest' }, @@ -212,7 +211,6 @@ function generate_plugin_config_munge(pluginInfo, vars) { '10.0.0': 'package.windows10.appxmanifest' }, 'all': { - '8.0.0': 'package.windows80.appxmanifest', '8.1.0': ['package.windows.appxmanifest', 'package.phone.appxmanifest'], '10.0.0': 'package.windows10.appxmanifest' } diff --git a/platforms/android/cordova/node_modules/cordova-common/src/CordovaLogger.js b/platforms/android/cordova/node_modules/cordova-common/src/CordovaLogger.js new file mode 100644 index 0000000..06dbcf3 --- /dev/null +++ b/platforms/android/cordova/node_modules/cordova-common/src/CordovaLogger.js @@ -0,0 +1,203 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + */ + +var ansi = require('ansi'); +var EventEmitter = require('events').EventEmitter; +var CordovaError = require('./CordovaError/CordovaError'); +var EOL = require('os').EOL; + +var INSTANCE; + +/** + * @class CordovaLogger + * + * Implements logging facility that anybody could use. Should not be + * instantiated directly, `CordovaLogger.get()` method should be used instead + * to acquire logger instance + */ +function CordovaLogger () { + this.levels = {}; + this.colors = {}; + this.stdout = process.stdout; + this.stderr = process.stderr; + + this.stdoutCursor = ansi(this.stdout); + this.stderrCursor = ansi(this.stderr); + + this.addLevel('verbose', 1000, 'grey'); + this.addLevel('normal' , 2000); + this.addLevel('warn' , 2000, 'yellow'); + this.addLevel('info' , 3000, 'blue'); + this.addLevel('error' , 5000, 'red'); + this.addLevel('results' , 10000); + + this.setLevel('normal'); +} + +/** + * Static method to create new or acquire existing instance. + * + * @return {CordovaLogger} Logger instance + */ +CordovaLogger.get = function () { + return INSTANCE || (INSTANCE = new CordovaLogger()); +}; + +CordovaLogger.VERBOSE = 'verbose'; +CordovaLogger.NORMAL = 'normal'; +CordovaLogger.WARN = 'warn'; +CordovaLogger.INFO = 'info'; +CordovaLogger.ERROR = 'error'; +CordovaLogger.RESULTS = 'results'; + +/** + * Emits log message to process' stdout/stderr depending on message's severity + * and current log level. If severity is less than current logger's level, + * then the message is ignored. + * + * @param {String} logLevel The message's log level. The logger should have + * corresponding level added (via logger.addLevel), otherwise + * `CordovaLogger.NORMAL` level will be used. + * @param {String} message The message, that should be logged to process' + * stdio + * + * @return {CordovaLogger} Current instance, to allow calls chaining. + */ +CordovaLogger.prototype.log = function (logLevel, message) { + // if there is no such logLevel defined, or provided level has + // less severity than active level, then just ignore this call and return + if (!this.levels[logLevel] || this.levels[logLevel] < this.levels[this.logLevel]) + // return instance to allow to chain calls + return this; + + var isVerbose = this.logLevel === 'verbose'; + var cursor = this.stdoutCursor; + + if(message instanceof Error || logLevel === CordovaLogger.ERROR) { + message = formatError(message, isVerbose); + cursor = this.stderrCursor; + } + + var color = this.colors[logLevel]; + if (color) { + cursor.bold().fg[color](); + } + + cursor.write(message).reset().write(EOL); + + return this; +}; + +/** + * Adds a new level to logger instance. This method also creates a shortcut + * method to log events with the level provided (i.e. after adding new level + * 'debug', the method `debug(message)`, equal to logger.log('debug', message), + * will be added to logger instance) + * + * @param {String} level A log level name. The levels with the following + * names added by default to every instance: 'verbose', 'normal', 'warn', + * 'info', 'error', 'results' + * @param {Number} severity A number that represents level's severity. + * @param {String} color A valid color name, that will be used to log + * messages with this level. Any CSS color code or RGB value is allowed + * (according to ansi documentation: + * https://github.com/TooTallNate/ansi.js#features) + * + * @return {CordovaLogger} Current instance, to allow calls chaining. + */ +CordovaLogger.prototype.addLevel = function (level, severity, color) { + + this.levels[level] = severity; + + if (color) { + this.colors[level] = color; + } + + // Define own method with corresponding name + if (!this[level]) { + this[level] = this.log.bind(this, level); + } + + return this; +}; + +/** + * Sets the current logger level to provided value. If logger doesn't have level + * with this name, `CordovaLogger.NORMAL` will be used. + * + * @param {String} logLevel Level name. The level with this name should be + * added to logger before. + * + * @return {CordovaLogger} Current instance, to allow calls chaining. + */ +CordovaLogger.prototype.setLevel = function (logLevel) { + this.logLevel = this.levels[logLevel] ? logLevel : CordovaLogger.NORMAL; + + return this; +}; + +/** + * Attaches logger to EventEmitter instance provided. + * + * @param {EventEmitter} eventEmitter An EventEmitter instance to attach + * logger to. + * + * @return {CordovaLogger} Current instance, to allow calls chaining. + */ +CordovaLogger.prototype.subscribe = function (eventEmitter) { + + if (!(eventEmitter instanceof EventEmitter)) + throw new Error('Subscribe method only accepts an EventEmitter instance as argument'); + + eventEmitter.on('verbose', this.verbose) + .on('log', this.normal) + .on('info', this.info) + .on('warn', this.warn) + .on('warning', this.warn) + // Set up event handlers for logging and results emitted as events. + .on('results', this.results); + + return this; +}; + +function formatError(error, isVerbose) { + var message = ''; + + if(error instanceof CordovaError) { + message = error.toString(isVerbose); + } else if(error instanceof Error) { + if(isVerbose) { + message = error.stack; + } else { + message = error.message; + } + } else { + // Plain text error message + message = error; + } + + if(message.toUpperCase().indexOf('ERROR:') !== 0) { + // Needed for backward compatibility with external tools + message = 'Error: ' + message; + } + + return message; +} + +module.exports = CordovaLogger; diff --git a/platforms/android/cordova/node_modules/cordova-common/src/PluginInfo/PluginInfo.js b/platforms/android/cordova/node_modules/cordova-common/src/PluginInfo/PluginInfo.js index 073f3f9..2554a3c 100644 --- a/platforms/android/cordova/node_modules/cordova-common/src/PluginInfo/PluginInfo.js +++ b/platforms/android/cordova/node_modules/cordova-common/src/PluginInfo/PluginInfo.js @@ -376,9 +376,6 @@ function addCordova(someArray) { // applied to each element. function _getTags(pelem, tag, platform, transform) { var platformTag = pelem.find('./platform[@name="' + platform + '"]'); - if (platform == 'windows' && !platformTag) { - platformTag = pelem.find('platform[@name="' + 'windows8' + '"]'); - } var tagsInRoot = pelem.findall(tag); tagsInRoot = tagsInRoot || []; var tagsInPlatform = platformTag ? platformTag.findall(tag) : []; @@ -392,9 +389,6 @@ function _getTags(pelem, tag, platform, transform) { // Same as _getTags() but only looks inside a platfrom section. function _getTagsInPlatform(pelem, tag, platform, transform) { var platformTag = pelem.find('./platform[@name="' + platform + '"]'); - if (platform == 'windows' && !platformTag) { - platformTag = pelem.find('platform[@name="' + 'windows8' + '"]'); - } var tags = platformTag ? platformTag.findall(tag) : []; if ( typeof transform === 'function' ) { tags = tags.map(transform); diff --git a/platforms/android/cordova/node_modules/cordova-common/src/events.js b/platforms/android/cordova/node_modules/cordova-common/src/events.js index a6ec340..868d363 100644 --- a/platforms/android/cordova/node_modules/cordova-common/src/events.js +++ b/platforms/android/cordova/node_modules/cordova-common/src/events.js @@ -16,4 +16,50 @@ specific language governing permissions and limitations under the License. */ -module.exports = new (require('events').EventEmitter)(); + +var EventEmitter = require('events').EventEmitter; + +var INSTANCE = new EventEmitter(); +var EVENTS_RECEIVER; + +module.exports = INSTANCE; + +/** + * Sets up current instance to forward emitted events to another EventEmitter + * instance. + * + * @param {EventEmitter} [eventEmitter] The emitter instance to forward + * events to. Falsy value, when passed, disables forwarding. + */ +module.exports.forwardEventsTo = function (eventEmitter) { + + // If no argument is specified disable events forwarding + if (!eventEmitter) { + EVENTS_RECEIVER = undefined; + return; + } + + if (!(eventEmitter instanceof EventEmitter)) + throw new Error('Cordova events could be redirected to another EventEmitter instance only'); + + EVENTS_RECEIVER = eventEmitter; +}; + +var emit = INSTANCE.emit; + +/** + * This method replaces original 'emit' method to allow events forwarding. + * + * @return {eventEmitter} Current instance to allow calls chaining, as + * original 'emit' does + */ +module.exports.emit = function () { + + var args = Array.prototype.slice.call(arguments); + + if (EVENTS_RECEIVER) { + EVENTS_RECEIVER.emit.apply(EVENTS_RECEIVER, args); + } + + return emit.apply(this, args); +}; diff --git a/platforms/android/cordova/node_modules/cordova-common/src/superspawn.js b/platforms/android/cordova/node_modules/cordova-common/src/superspawn.js index b4129ec..a3f1431 100644 --- a/platforms/android/cordova/node_modules/cordova-common/src/superspawn.js +++ b/platforms/android/cordova/node_modules/cordova-common/src/superspawn.js @@ -28,7 +28,7 @@ var iswin32 = process.platform == 'win32'; // On Windows, spawn() for batch files requires absolute path & having the extension. function resolveWindowsExe(cmd) { - var winExtensions = ['.exe', '.cmd', '.bat', '.js', '.vbs']; + var winExtensions = ['.exe', '.bat', '.cmd', '.js', '.vbs']; function isValidExe(c) { return winExtensions.indexOf(path.extname(c)) !== -1 && fs.existsSync(c); } @@ -52,15 +52,39 @@ function maybeQuote(a) { return a; } -// opts: -// printCommand: Whether to log the command (default: false) -// stdio: 'default' is to capture output and returning it as a string to success (same as exec) -// 'ignore' means don't bother capturing it -// 'inherit' means pipe the input & output. This is required for anything that prompts. -// env: Map of extra environment variables. -// cwd: Working directory for the command. -// chmod: If truthy, will attempt to set the execute bit before executing on non-Windows platforms. -// Returns a promise that succeeds only for return code = 0. +/** + * A special implementation for child_process.spawn that handles + * Windows-specific issues with batch files and spaces in paths. Returns a + * promise that succeeds only for return code 0. It is also possible to + * subscribe on spawned process' stdout and stderr streams using progress + * handler for resultant promise. + * + * @example spawn('mycommand', [], {stdio: 'pipe'}) .progress(function (stdio){ + * if (stdio.stderr) { console.error(stdio.stderr); } }) + * .then(function(result){ // do other stuff }) + * + * @param {String} cmd A command to spawn + * @param {String[]} [args=[]] An array of arguments, passed to spawned + * process + * @param {Object} [opts={}] A configuration object + * @param {String|String[]|Object} opts.stdio Property that configures how + * spawned process' stdio will behave. Has the same meaning and possible + * values as 'stdio' options for child_process.spawn method + * (https://nodejs.org/api/child_process.html#child_process_options_stdio). + * @param {Object} [env={}] A map of extra environment variables + * @param {String} [cwd=process.cwd()] Working directory for the command + * @param {Boolean} [chmod=false] If truthy, will attempt to set the execute + * bit before executing on non-Windows platforms + * + * @return {Promise} A promise that is either fulfilled if the spawned + * process is exited with zero error code or rejected otherwise. If the + * 'stdio' option set to 'default' or 'pipe', the promise also emits progress + * messages with the following contents: + * { + * 'stdout': ..., + * 'stderr': ... + * } + */ exports.spawn = function(cmd, args, opts) { args = args || []; opts = opts || {}; @@ -83,17 +107,19 @@ exports.spawn = function(cmd, args, opts) { } } - if (opts.stdio == 'ignore') { - spawnOpts.stdio = 'ignore'; - } else if (opts.stdio == 'inherit') { - spawnOpts.stdio = 'inherit'; + if (opts.stdio !== 'default') { + // Ignore 'default' value for stdio because it corresponds to child_process's default 'pipe' option + spawnOpts.stdio = opts.stdio; } + if (opts.cwd) { spawnOpts.cwd = opts.cwd; } + if (opts.env) { spawnOpts.env = _.extend(_.extend({}, process.env), opts.env); } + if (opts.chmod && !iswin32) { try { // This fails when module is installed in a system directory (e.g. via sudo npm install) @@ -113,11 +139,15 @@ exports.spawn = function(cmd, args, opts) { child.stdout.setEncoding('utf8'); child.stdout.on('data', function(data) { capturedOut += data; + d.notify({'stdout': data}); }); + } + if (child.stderr) { child.stderr.setEncoding('utf8'); child.stderr.on('data', function(data) { capturedErr += data; + d.notify({'stderr': data}); }); } diff --git a/platforms/android/cordova/node_modules/cordova-registry-mapper/.npmignore b/platforms/android/cordova/node_modules/cordova-registry-mapper/.npmignore new file mode 100644 index 0000000..3c3629e --- /dev/null +++ b/platforms/android/cordova/node_modules/cordova-registry-mapper/.npmignore @@ -0,0 +1 @@ +node_modules diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/cordova-registry-mapper/.travis.yml b/platforms/android/cordova/node_modules/cordova-registry-mapper/.travis.yml similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/cordova-registry-mapper/.travis.yml rename to platforms/android/cordova/node_modules/cordova-registry-mapper/.travis.yml diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/cordova-registry-mapper/README.md b/platforms/android/cordova/node_modules/cordova-registry-mapper/README.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/cordova-registry-mapper/README.md rename to platforms/android/cordova/node_modules/cordova-registry-mapper/README.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/cordova-registry-mapper/index.js b/platforms/android/cordova/node_modules/cordova-registry-mapper/index.js similarity index 97% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/cordova-registry-mapper/index.js rename to platforms/android/cordova/node_modules/cordova-registry-mapper/index.js index 72279d0..4550774 100644 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/cordova-registry-mapper/index.js +++ b/platforms/android/cordova/node_modules/cordova-registry-mapper/index.js @@ -159,7 +159,7 @@ var map = { 'de.fastr.phonegap.plugins.downloader' : 'cordova-plugin-fastrde-downloader', 'de.fastr.phonegap.plugins.injectView' : 'cordova-plugin-fastrde-injectview', 'de.fastr.phonegap.plugins.CheckGPS' : 'cordova-plugin-fastrde-checkgps', - 'de.fastr.phonegap.plugins.md5chksum' : ' cordova-plugin-fastrde-md5', + 'de.fastr.phonegap.plugins.md5chksum' : 'cordova-plugin-fastrde-md5', 'io.repro.cordova' : 'cordova-plugin-repro', 're.notifica.cordova': 'cordova-plugin-notificare-push', 'com.megster.cordova.ble': 'cordova-plugin-ble-central', @@ -188,7 +188,10 @@ var map = { 'com.chariotsolutions.nfc.plugin': 'phonegap-nfc', 'com.samz.mixpanel': 'cordova-plugin-mixpanel', 'de.appplant.cordova.common.RegisterUserNotificationSettings': 'cordova-plugin-registerusernotificationsettings', - 'plugin.google.maps': 'cordova-plugin-googlemaps' + 'plugin.google.maps': 'cordova-plugin-googlemaps', + 'xu.li.cordova.wechat': 'cordova-plugin-wechat', + 'es.keensoft.fullscreenimage': 'cordova-plugin-fullscreenimage', + 'com.arcoirislabs.plugin.mqtt' : 'cordova-plugin-mqtt' }; module.exports.oldToNew = map; diff --git a/platforms/android/cordova/node_modules/cordova-registry-mapper/package.json b/platforms/android/cordova/node_modules/cordova-registry-mapper/package.json new file mode 100644 index 0000000..989efad --- /dev/null +++ b/platforms/android/cordova/node_modules/cordova-registry-mapper/package.json @@ -0,0 +1,77 @@ +{ + "_args": [ + [ + "cordova-registry-mapper@^1.1.8", + "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common" + ] + ], + "_from": "cordova-registry-mapper@>=1.1.8 <2.0.0", + "_id": "cordova-registry-mapper@1.1.15", + "_inCache": true, + "_installable": true, + "_location": "/cordova-registry-mapper", + "_nodeVersion": "5.4.1", + "_npmUser": { + "email": "stevengill97@gmail.com", + "name": "stevegill" + }, + "_npmVersion": "3.5.3", + "_phantomChildren": {}, + "_requested": { + "name": "cordova-registry-mapper", + "raw": "cordova-registry-mapper@^1.1.8", + "rawSpec": "^1.1.8", + "scope": null, + "spec": ">=1.1.8 <2.0.0", + "type": "range" + }, + "_requiredBy": [ + "/cordova-common" + ], + "_resolved": "http://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz", + "_shasum": "e244b9185b8175473bff6079324905115f83dc7c", + "_shrinkwrap": null, + "_spec": "cordova-registry-mapper@^1.1.8", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common", + "author": { + "name": "Steve Gill" + }, + "bugs": { + "url": "https://github.com/stevengill/cordova-registry-mapper/issues" + }, + "dependencies": {}, + "description": "Maps old plugin ids to new plugin names for fetching from npm", + "devDependencies": { + "tape": "^3.5.0" + }, + "directories": {}, + "dist": { + "shasum": "e244b9185b8175473bff6079324905115f83dc7c", + "tarball": "http://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz" + }, + "gitHead": "00af0f028ec94154a364eeabe38b8e22320647bd", + "homepage": "https://github.com/stevengill/cordova-registry-mapper#readme", + "keywords": [ + "cordova", + "plugins" + ], + "license": "Apache version 2.0", + "main": "index.js", + "maintainers": [ + { + "name": "stevegill", + "email": "stevengill97@gmail.com" + } + ], + "name": "cordova-registry-mapper", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git+https://github.com/stevengill/cordova-registry-mapper.git" + }, + "scripts": { + "test": "node tests/test.js" + }, + "version": "1.1.15" +} diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/cordova-registry-mapper/tests/test.js b/platforms/android/cordova/node_modules/cordova-registry-mapper/tests/test.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/cordova-registry-mapper/tests/test.js rename to platforms/android/cordova/node_modules/cordova-registry-mapper/tests/test.js diff --git a/platforms/android/cordova/node_modules/elementtree/package.json b/platforms/android/cordova/node_modules/elementtree/package.json index 03adc91..f1a5f14 100644 --- a/platforms/android/cordova/node_modules/elementtree/package.json +++ b/platforms/android/cordova/node_modules/elementtree/package.json @@ -1,7 +1,44 @@ { + "_args": [ + [ + "elementtree@^0.1.6", + "/Users/steveng/repo/cordova/cordova-android" + ] + ], + "_from": "elementtree@>=0.1.6 <0.2.0", + "_id": "elementtree@0.1.6", + "_inCache": true, + "_installable": true, + "_location": "/elementtree", + "_npmUser": { + "email": "ryan@trolocsis.com", + "name": "rphillips" + }, + "_npmVersion": "1.3.24", + "_phantomChildren": {}, + "_requested": { + "name": "elementtree", + "raw": "elementtree@^0.1.6", + "rawSpec": "^0.1.6", + "scope": null, + "spec": ">=0.1.6 <0.2.0", + "type": "range" + }, + "_requiredBy": [ + "/", + "/cordova-common" + ], + "_resolved": "http://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz", + "_shasum": "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c", + "_shrinkwrap": null, + "_spec": "elementtree@^0.1.6", + "_where": "/Users/steveng/repo/cordova/cordova-android", "author": { "name": "Rackspace US, Inc." }, + "bugs": { + "url": "https://github.com/racker/node-elementtree/issues" + }, "contributors": [ { "name": "Paul Querna", @@ -12,64 +49,53 @@ "email": "tomaz.muraus@rackspace.com" } ], - "name": "elementtree", + "dependencies": { + "sax": "0.3.5" + }, "description": "XML Serialization and Parsing module based on Python's ElementTree.", - "version": "0.1.6", - "keywords": [ - "xml", - "sax", - "parser", - "seralization", - "elementtree" - ], - "homepage": "https://github.com/racker/node-elementtree", - "repository": { - "type": "git", - "url": "git://github.com/racker/node-elementtree.git" + "devDependencies": { + "whiskey": "0.8.x" }, - "main": "lib/elementtree.js", "directories": { "lib": "lib" }, - "scripts": { - "test": "make test" + "dist": { + "shasum": "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c", + "tarball": "http://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz" }, "engines": { "node": ">= 0.4.0" }, - "dependencies": { - "sax": "0.3.5" - }, - "devDependencies": { - "whiskey": "0.8.x" - }, + "homepage": "https://github.com/racker/node-elementtree", + "keywords": [ + "elementtree", + "parser", + "sax", + "seralization", + "xml" + ], "licenses": [ { "type": "Apache", "url": "http://www.apache.org/licenses/LICENSE-2.0.html" } ], - "bugs": { - "url": "https://github.com/racker/node-elementtree/issues" - }, - "_id": "elementtree@0.1.6", - "dist": { - "shasum": "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c", - "tarball": "http://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz" - }, - "_from": "elementtree@>=0.1.6 <0.2.0", - "_npmVersion": "1.3.24", - "_npmUser": { - "name": "rphillips", - "email": "ryan@trolocsis.com" - }, + "main": "lib/elementtree.js", "maintainers": [ { "name": "rphillips", "email": "ryan@trolocsis.com" } ], - "_shasum": "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c", - "_resolved": "http://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz", - "readme": "ERROR: No README data found!" + "name": "elementtree", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git://github.com/racker/node-elementtree.git" + }, + "scripts": { + "test": "make test" + }, + "version": "0.1.6" } diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inflight/node_modules/wrappy/LICENSE b/platforms/android/cordova/node_modules/glob/LICENSE similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inflight/node_modules/wrappy/LICENSE rename to platforms/android/cordova/node_modules/glob/LICENSE diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/README.md b/platforms/android/cordova/node_modules/glob/README.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/README.md rename to platforms/android/cordova/node_modules/glob/README.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/common.js b/platforms/android/cordova/node_modules/glob/common.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/common.js rename to platforms/android/cordova/node_modules/glob/common.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/glob.js b/platforms/android/cordova/node_modules/glob/glob.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/glob.js rename to platforms/android/cordova/node_modules/glob/glob.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/package.json b/platforms/android/cordova/node_modules/glob/package.json similarity index 66% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/package.json rename to platforms/android/cordova/node_modules/glob/package.json index e1d5cb7..7c398ae 100644 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/package.json +++ b/platforms/android/cordova/node_modules/glob/package.json @@ -1,24 +1,45 @@ { + "_args": [ + [ + "glob@^5.0.13", + "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common" + ] + ], + "_from": "glob@>=5.0.13 <6.0.0", + "_id": "glob@5.0.15", + "_inCache": true, + "_installable": true, + "_location": "/glob", + "_nodeVersion": "4.0.0", + "_npmUser": { + "email": "isaacs@npmjs.com", + "name": "isaacs" + }, + "_npmVersion": "3.3.2", + "_phantomChildren": {}, + "_requested": { + "name": "glob", + "raw": "glob@^5.0.13", + "rawSpec": "^5.0.13", + "scope": null, + "spec": ">=5.0.13 <6.0.0", + "type": "range" + }, + "_requiredBy": [ + "/cordova-common" + ], + "_resolved": "http://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "_shasum": "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1", + "_shrinkwrap": null, + "_spec": "glob@^5.0.13", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common", "author": { - "name": "Isaac Z. Schlueter", "email": "i@izs.me", + "name": "Isaac Z. Schlueter", "url": "http://blog.izs.me/" }, - "name": "glob", - "description": "a little globber", - "version": "5.0.15", - "repository": { - "type": "git", - "url": "git://github.com/isaacs/node-glob.git" - }, - "main": "glob.js", - "files": [ - "glob.js", - "sync.js", - "common.js" - ], - "engines": { - "node": "*" + "bugs": { + "url": "https://github.com/isaacs/node-glob/issues" }, "dependencies": { "inflight": "^1.0.4", @@ -27,47 +48,51 @@ "once": "^1.3.0", "path-is-absolute": "^1.0.0" }, + "description": "a little globber", "devDependencies": { "mkdirp": "0", "rimraf": "^2.2.8", "tap": "^1.1.4", "tick": "0.0.6" }, - "scripts": { - "prepublish": "npm run benchclean", - "profclean": "rm -f v8.log profile.txt", - "test": "tap test/*.js --cov", - "test-regen": "npm run profclean && TEST_REGEN=1 node test/00-setup.js", - "bench": "bash benchmark.sh", - "prof": "bash prof.sh && cat profile.txt", - "benchclean": "node benchclean.js" - }, - "license": "ISC", - "gitHead": "3a7e71d453dd80e75b196fd262dd23ed54beeceb", - "bugs": { - "url": "https://github.com/isaacs/node-glob/issues" - }, - "homepage": "https://github.com/isaacs/node-glob#readme", - "_id": "glob@5.0.15", - "_shasum": "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1", - "_from": "glob@>=5.0.13 <6.0.0", - "_npmVersion": "3.3.2", - "_nodeVersion": "4.0.0", - "_npmUser": { - "name": "isaacs", - "email": "isaacs@npmjs.com" - }, + "directories": {}, "dist": { "shasum": "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1", "tarball": "http://registry.npmjs.org/glob/-/glob-5.0.15.tgz" }, + "engines": { + "node": "*" + }, + "files": [ + "common.js", + "glob.js", + "sync.js" + ], + "gitHead": "3a7e71d453dd80e75b196fd262dd23ed54beeceb", + "homepage": "https://github.com/isaacs/node-glob#readme", + "license": "ISC", + "main": "glob.js", "maintainers": [ { "name": "isaacs", "email": "i@izs.me" } ], - "directories": {}, - "_resolved": "http://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "readme": "ERROR: No README data found!" + "name": "glob", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git://github.com/isaacs/node-glob.git" + }, + "scripts": { + "bench": "bash benchmark.sh", + "benchclean": "node benchclean.js", + "prepublish": "npm run benchclean", + "prof": "bash prof.sh && cat profile.txt", + "profclean": "rm -f v8.log profile.txt", + "test": "tap test/*.js --cov", + "test-regen": "npm run profclean && TEST_REGEN=1 node test/00-setup.js" + }, + "version": "5.0.15" } diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/sync.js b/platforms/android/cordova/node_modules/glob/sync.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/sync.js rename to platforms/android/cordova/node_modules/glob/sync.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inflight/.eslintrc b/platforms/android/cordova/node_modules/inflight/.eslintrc similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inflight/.eslintrc rename to platforms/android/cordova/node_modules/inflight/.eslintrc diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inflight/LICENSE b/platforms/android/cordova/node_modules/inflight/LICENSE similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inflight/LICENSE rename to platforms/android/cordova/node_modules/inflight/LICENSE diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inflight/README.md b/platforms/android/cordova/node_modules/inflight/README.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inflight/README.md rename to platforms/android/cordova/node_modules/inflight/README.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inflight/inflight.js b/platforms/android/cordova/node_modules/inflight/inflight.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inflight/inflight.js rename to platforms/android/cordova/node_modules/inflight/inflight.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inflight/package.json b/platforms/android/cordova/node_modules/inflight/package.json similarity index 65% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inflight/package.json rename to platforms/android/cordova/node_modules/inflight/package.json index dafb7e0..3bc7cf7 100644 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inflight/package.json +++ b/platforms/android/cordova/node_modules/inflight/package.json @@ -1,42 +1,63 @@ { - "name": "inflight", - "version": "1.0.4", - "description": "Add callbacks to requests in flight to avoid async duplication", - "main": "inflight.js", - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - }, - "devDependencies": { - "tap": "^0.4.10" - }, - "scripts": { - "test": "tap test.js" + "_args": [ + [ + "inflight@^1.0.4", + "/Users/steveng/repo/cordova/cordova-android/node_modules/glob" + ] + ], + "_from": "inflight@>=1.0.4 <2.0.0", + "_id": "inflight@1.0.4", + "_inCache": true, + "_installable": true, + "_location": "/inflight", + "_nodeVersion": "0.10.32", + "_npmUser": { + "email": "ogd@aoaioxxysz.net", + "name": "othiym23" }, - "repository": { - "type": "git", - "url": "git://github.com/isaacs/inflight.git" + "_npmVersion": "2.1.3", + "_phantomChildren": {}, + "_requested": { + "name": "inflight", + "raw": "inflight@^1.0.4", + "rawSpec": "^1.0.4", + "scope": null, + "spec": ">=1.0.4 <2.0.0", + "type": "range" }, + "_requiredBy": [ + "/glob" + ], + "_resolved": "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz", + "_shasum": "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a", + "_shrinkwrap": null, + "_spec": "inflight@^1.0.4", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/glob", "author": { - "name": "Isaac Z. Schlueter", "email": "i@izs.me", + "name": "Isaac Z. Schlueter", "url": "http://blog.izs.me/" }, "bugs": { "url": "https://github.com/isaacs/inflight/issues" }, + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + }, + "description": "Add callbacks to requests in flight to avoid async duplication", + "devDependencies": { + "tap": "^0.4.10" + }, + "directories": {}, + "dist": { + "shasum": "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a", + "tarball": "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz" + }, + "gitHead": "c7b5531d572a867064d4a1da9e013e8910b7d1ba", "homepage": "https://github.com/isaacs/inflight", "license": "ISC", - "gitHead": "c7b5531d572a867064d4a1da9e013e8910b7d1ba", - "_id": "inflight@1.0.4", - "_shasum": "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a", - "_from": "inflight@>=1.0.4 <2.0.0", - "_npmVersion": "2.1.3", - "_nodeVersion": "0.10.32", - "_npmUser": { - "name": "othiym23", - "email": "ogd@aoaioxxysz.net" - }, + "main": "inflight.js", "maintainers": [ { "name": "isaacs", @@ -51,11 +72,15 @@ "email": "me@re-becca.org" } ], - "dist": { - "shasum": "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a", - "tarball": "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz" + "name": "inflight", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git://github.com/isaacs/inflight.git" }, - "directories": {}, - "_resolved": "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz", - "readme": "ERROR: No README data found!" + "scripts": { + "test": "tap test.js" + }, + "version": "1.0.4" } diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inflight/test.js b/platforms/android/cordova/node_modules/inflight/test.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inflight/test.js rename to platforms/android/cordova/node_modules/inflight/test.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inherits/LICENSE b/platforms/android/cordova/node_modules/inherits/LICENSE similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inherits/LICENSE rename to platforms/android/cordova/node_modules/inherits/LICENSE diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inherits/README.md b/platforms/android/cordova/node_modules/inherits/README.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inherits/README.md rename to platforms/android/cordova/node_modules/inherits/README.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inherits/inherits.js b/platforms/android/cordova/node_modules/inherits/inherits.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inherits/inherits.js rename to platforms/android/cordova/node_modules/inherits/inherits.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inherits/inherits_browser.js b/platforms/android/cordova/node_modules/inherits/inherits_browser.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inherits/inherits_browser.js rename to platforms/android/cordova/node_modules/inherits/inherits_browser.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inherits/package.json b/platforms/android/cordova/node_modules/inherits/package.json similarity index 58% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inherits/package.json rename to platforms/android/cordova/node_modules/inherits/package.json index 435bd6e..6313b8e 100644 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inherits/package.json +++ b/platforms/android/cordova/node_modules/inherits/package.json @@ -1,50 +1,77 @@ { - "name": "inherits", - "description": "Browser-friendly inheritance fully compatible with standard node.js inherits()", - "version": "2.0.1", - "keywords": [ - "inheritance", - "class", - "klass", - "oop", - "object-oriented", - "inherits", - "browser", - "browserify" + "_args": [ + [ + "inherits@2", + "/Users/steveng/repo/cordova/cordova-android/node_modules/glob" + ] ], - "main": "./inherits.js", - "browser": "./inherits_browser.js", - "repository": { - "type": "git", - "url": "git://github.com/isaacs/inherits.git" + "_from": "inherits@>=2.0.0 <3.0.0", + "_id": "inherits@2.0.1", + "_inCache": true, + "_installable": true, + "_location": "/inherits", + "_npmUser": { + "email": "i@izs.me", + "name": "isaacs" }, - "license": "ISC", - "scripts": { - "test": "node test" + "_npmVersion": "1.3.8", + "_phantomChildren": {}, + "_requested": { + "name": "inherits", + "raw": "inherits@2", + "rawSpec": "2", + "scope": null, + "spec": ">=2.0.0 <3.0.0", + "type": "range" }, + "_requiredBy": [ + "/glob" + ], + "_resolved": "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "_shasum": "b17d08d326b4423e568eff719f91b0b1cbdf69f1", + "_shrinkwrap": null, + "_spec": "inherits@2", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/glob", + "browser": "./inherits_browser.js", "bugs": { "url": "https://github.com/isaacs/inherits/issues" }, - "_id": "inherits@2.0.1", + "dependencies": {}, + "description": "Browser-friendly inheritance fully compatible with standard node.js inherits()", + "devDependencies": {}, + "directories": {}, "dist": { "shasum": "b17d08d326b4423e568eff719f91b0b1cbdf69f1", "tarball": "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" }, - "_from": "inherits@>=2.0.0 <3.0.0", - "_npmVersion": "1.3.8", - "_npmUser": { - "name": "isaacs", - "email": "i@izs.me" - }, + "homepage": "https://github.com/isaacs/inherits#readme", + "keywords": [ + "browser", + "browserify", + "class", + "inheritance", + "inherits", + "klass", + "object-oriented", + "oop" + ], + "license": "ISC", + "main": "./inherits.js", "maintainers": [ { "name": "isaacs", "email": "i@izs.me" } ], - "directories": {}, - "_shasum": "b17d08d326b4423e568eff719f91b0b1cbdf69f1", - "_resolved": "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "name": "inherits", + "optionalDependencies": {}, "readme": "ERROR: No README data found!", - "homepage": "https://github.com/isaacs/inherits#readme" + "repository": { + "type": "git", + "url": "git://github.com/isaacs/inherits.git" + }, + "scripts": { + "test": "node test" + }, + "version": "2.0.1" } diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inherits/test.js b/platforms/android/cordova/node_modules/inherits/test.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inherits/test.js rename to platforms/android/cordova/node_modules/inherits/test.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/LICENSE b/platforms/android/cordova/node_modules/lodash/LICENSE similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/LICENSE rename to platforms/android/cordova/node_modules/lodash/LICENSE diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/README.md b/platforms/android/cordova/node_modules/lodash/README.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/README.md rename to platforms/android/cordova/node_modules/lodash/README.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array.js b/platforms/android/cordova/node_modules/lodash/array.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array.js rename to platforms/android/cordova/node_modules/lodash/array.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/chunk.js b/platforms/android/cordova/node_modules/lodash/array/chunk.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/chunk.js rename to platforms/android/cordova/node_modules/lodash/array/chunk.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/compact.js b/platforms/android/cordova/node_modules/lodash/array/compact.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/compact.js rename to platforms/android/cordova/node_modules/lodash/array/compact.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/difference.js b/platforms/android/cordova/node_modules/lodash/array/difference.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/difference.js rename to platforms/android/cordova/node_modules/lodash/array/difference.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/drop.js b/platforms/android/cordova/node_modules/lodash/array/drop.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/drop.js rename to platforms/android/cordova/node_modules/lodash/array/drop.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/dropRight.js b/platforms/android/cordova/node_modules/lodash/array/dropRight.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/dropRight.js rename to platforms/android/cordova/node_modules/lodash/array/dropRight.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/dropRightWhile.js b/platforms/android/cordova/node_modules/lodash/array/dropRightWhile.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/dropRightWhile.js rename to platforms/android/cordova/node_modules/lodash/array/dropRightWhile.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/dropWhile.js b/platforms/android/cordova/node_modules/lodash/array/dropWhile.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/dropWhile.js rename to platforms/android/cordova/node_modules/lodash/array/dropWhile.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/fill.js b/platforms/android/cordova/node_modules/lodash/array/fill.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/fill.js rename to platforms/android/cordova/node_modules/lodash/array/fill.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/findIndex.js b/platforms/android/cordova/node_modules/lodash/array/findIndex.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/findIndex.js rename to platforms/android/cordova/node_modules/lodash/array/findIndex.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/findLastIndex.js b/platforms/android/cordova/node_modules/lodash/array/findLastIndex.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/findLastIndex.js rename to platforms/android/cordova/node_modules/lodash/array/findLastIndex.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/first.js b/platforms/android/cordova/node_modules/lodash/array/first.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/first.js rename to platforms/android/cordova/node_modules/lodash/array/first.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/flatten.js b/platforms/android/cordova/node_modules/lodash/array/flatten.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/flatten.js rename to platforms/android/cordova/node_modules/lodash/array/flatten.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/flattenDeep.js b/platforms/android/cordova/node_modules/lodash/array/flattenDeep.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/flattenDeep.js rename to platforms/android/cordova/node_modules/lodash/array/flattenDeep.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/head.js b/platforms/android/cordova/node_modules/lodash/array/head.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/head.js rename to platforms/android/cordova/node_modules/lodash/array/head.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/indexOf.js b/platforms/android/cordova/node_modules/lodash/array/indexOf.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/indexOf.js rename to platforms/android/cordova/node_modules/lodash/array/indexOf.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/initial.js b/platforms/android/cordova/node_modules/lodash/array/initial.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/initial.js rename to platforms/android/cordova/node_modules/lodash/array/initial.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/intersection.js b/platforms/android/cordova/node_modules/lodash/array/intersection.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/intersection.js rename to platforms/android/cordova/node_modules/lodash/array/intersection.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/last.js b/platforms/android/cordova/node_modules/lodash/array/last.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/last.js rename to platforms/android/cordova/node_modules/lodash/array/last.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/lastIndexOf.js b/platforms/android/cordova/node_modules/lodash/array/lastIndexOf.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/lastIndexOf.js rename to platforms/android/cordova/node_modules/lodash/array/lastIndexOf.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/object.js b/platforms/android/cordova/node_modules/lodash/array/object.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/object.js rename to platforms/android/cordova/node_modules/lodash/array/object.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/pull.js b/platforms/android/cordova/node_modules/lodash/array/pull.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/pull.js rename to platforms/android/cordova/node_modules/lodash/array/pull.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/pullAt.js b/platforms/android/cordova/node_modules/lodash/array/pullAt.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/pullAt.js rename to platforms/android/cordova/node_modules/lodash/array/pullAt.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/remove.js b/platforms/android/cordova/node_modules/lodash/array/remove.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/remove.js rename to platforms/android/cordova/node_modules/lodash/array/remove.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/rest.js b/platforms/android/cordova/node_modules/lodash/array/rest.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/rest.js rename to platforms/android/cordova/node_modules/lodash/array/rest.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/slice.js b/platforms/android/cordova/node_modules/lodash/array/slice.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/slice.js rename to platforms/android/cordova/node_modules/lodash/array/slice.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/sortedIndex.js b/platforms/android/cordova/node_modules/lodash/array/sortedIndex.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/sortedIndex.js rename to platforms/android/cordova/node_modules/lodash/array/sortedIndex.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/sortedLastIndex.js b/platforms/android/cordova/node_modules/lodash/array/sortedLastIndex.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/sortedLastIndex.js rename to platforms/android/cordova/node_modules/lodash/array/sortedLastIndex.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/tail.js b/platforms/android/cordova/node_modules/lodash/array/tail.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/tail.js rename to platforms/android/cordova/node_modules/lodash/array/tail.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/take.js b/platforms/android/cordova/node_modules/lodash/array/take.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/take.js rename to platforms/android/cordova/node_modules/lodash/array/take.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/takeRight.js b/platforms/android/cordova/node_modules/lodash/array/takeRight.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/takeRight.js rename to platforms/android/cordova/node_modules/lodash/array/takeRight.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/takeRightWhile.js b/platforms/android/cordova/node_modules/lodash/array/takeRightWhile.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/takeRightWhile.js rename to platforms/android/cordova/node_modules/lodash/array/takeRightWhile.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/takeWhile.js b/platforms/android/cordova/node_modules/lodash/array/takeWhile.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/takeWhile.js rename to platforms/android/cordova/node_modules/lodash/array/takeWhile.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/union.js b/platforms/android/cordova/node_modules/lodash/array/union.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/union.js rename to platforms/android/cordova/node_modules/lodash/array/union.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/uniq.js b/platforms/android/cordova/node_modules/lodash/array/uniq.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/uniq.js rename to platforms/android/cordova/node_modules/lodash/array/uniq.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/unique.js b/platforms/android/cordova/node_modules/lodash/array/unique.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/unique.js rename to platforms/android/cordova/node_modules/lodash/array/unique.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/unzip.js b/platforms/android/cordova/node_modules/lodash/array/unzip.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/unzip.js rename to platforms/android/cordova/node_modules/lodash/array/unzip.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/unzipWith.js b/platforms/android/cordova/node_modules/lodash/array/unzipWith.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/unzipWith.js rename to platforms/android/cordova/node_modules/lodash/array/unzipWith.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/without.js b/platforms/android/cordova/node_modules/lodash/array/without.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/without.js rename to platforms/android/cordova/node_modules/lodash/array/without.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/xor.js b/platforms/android/cordova/node_modules/lodash/array/xor.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/xor.js rename to platforms/android/cordova/node_modules/lodash/array/xor.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/zip.js b/platforms/android/cordova/node_modules/lodash/array/zip.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/zip.js rename to platforms/android/cordova/node_modules/lodash/array/zip.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/zipObject.js b/platforms/android/cordova/node_modules/lodash/array/zipObject.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/zipObject.js rename to platforms/android/cordova/node_modules/lodash/array/zipObject.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/zipWith.js b/platforms/android/cordova/node_modules/lodash/array/zipWith.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/array/zipWith.js rename to platforms/android/cordova/node_modules/lodash/array/zipWith.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain.js b/platforms/android/cordova/node_modules/lodash/chain.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain.js rename to platforms/android/cordova/node_modules/lodash/chain.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/chain.js b/platforms/android/cordova/node_modules/lodash/chain/chain.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/chain.js rename to platforms/android/cordova/node_modules/lodash/chain/chain.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/commit.js b/platforms/android/cordova/node_modules/lodash/chain/commit.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/commit.js rename to platforms/android/cordova/node_modules/lodash/chain/commit.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/concat.js b/platforms/android/cordova/node_modules/lodash/chain/concat.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/concat.js rename to platforms/android/cordova/node_modules/lodash/chain/concat.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/lodash.js b/platforms/android/cordova/node_modules/lodash/chain/lodash.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/lodash.js rename to platforms/android/cordova/node_modules/lodash/chain/lodash.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/plant.js b/platforms/android/cordova/node_modules/lodash/chain/plant.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/plant.js rename to platforms/android/cordova/node_modules/lodash/chain/plant.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/reverse.js b/platforms/android/cordova/node_modules/lodash/chain/reverse.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/reverse.js rename to platforms/android/cordova/node_modules/lodash/chain/reverse.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/run.js b/platforms/android/cordova/node_modules/lodash/chain/run.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/run.js rename to platforms/android/cordova/node_modules/lodash/chain/run.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/tap.js b/platforms/android/cordova/node_modules/lodash/chain/tap.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/tap.js rename to platforms/android/cordova/node_modules/lodash/chain/tap.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/thru.js b/platforms/android/cordova/node_modules/lodash/chain/thru.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/thru.js rename to platforms/android/cordova/node_modules/lodash/chain/thru.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/toJSON.js b/platforms/android/cordova/node_modules/lodash/chain/toJSON.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/toJSON.js rename to platforms/android/cordova/node_modules/lodash/chain/toJSON.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/toString.js b/platforms/android/cordova/node_modules/lodash/chain/toString.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/toString.js rename to platforms/android/cordova/node_modules/lodash/chain/toString.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/value.js b/platforms/android/cordova/node_modules/lodash/chain/value.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/value.js rename to platforms/android/cordova/node_modules/lodash/chain/value.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/valueOf.js b/platforms/android/cordova/node_modules/lodash/chain/valueOf.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/valueOf.js rename to platforms/android/cordova/node_modules/lodash/chain/valueOf.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/wrapperChain.js b/platforms/android/cordova/node_modules/lodash/chain/wrapperChain.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/wrapperChain.js rename to platforms/android/cordova/node_modules/lodash/chain/wrapperChain.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/wrapperCommit.js b/platforms/android/cordova/node_modules/lodash/chain/wrapperCommit.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/wrapperCommit.js rename to platforms/android/cordova/node_modules/lodash/chain/wrapperCommit.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/wrapperConcat.js b/platforms/android/cordova/node_modules/lodash/chain/wrapperConcat.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/wrapperConcat.js rename to platforms/android/cordova/node_modules/lodash/chain/wrapperConcat.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/wrapperPlant.js b/platforms/android/cordova/node_modules/lodash/chain/wrapperPlant.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/wrapperPlant.js rename to platforms/android/cordova/node_modules/lodash/chain/wrapperPlant.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/wrapperReverse.js b/platforms/android/cordova/node_modules/lodash/chain/wrapperReverse.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/wrapperReverse.js rename to platforms/android/cordova/node_modules/lodash/chain/wrapperReverse.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/wrapperToString.js b/platforms/android/cordova/node_modules/lodash/chain/wrapperToString.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/wrapperToString.js rename to platforms/android/cordova/node_modules/lodash/chain/wrapperToString.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/wrapperValue.js b/platforms/android/cordova/node_modules/lodash/chain/wrapperValue.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/chain/wrapperValue.js rename to platforms/android/cordova/node_modules/lodash/chain/wrapperValue.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection.js b/platforms/android/cordova/node_modules/lodash/collection.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection.js rename to platforms/android/cordova/node_modules/lodash/collection.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/all.js b/platforms/android/cordova/node_modules/lodash/collection/all.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/all.js rename to platforms/android/cordova/node_modules/lodash/collection/all.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/any.js b/platforms/android/cordova/node_modules/lodash/collection/any.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/any.js rename to platforms/android/cordova/node_modules/lodash/collection/any.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/at.js b/platforms/android/cordova/node_modules/lodash/collection/at.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/at.js rename to platforms/android/cordova/node_modules/lodash/collection/at.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/collect.js b/platforms/android/cordova/node_modules/lodash/collection/collect.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/collect.js rename to platforms/android/cordova/node_modules/lodash/collection/collect.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/contains.js b/platforms/android/cordova/node_modules/lodash/collection/contains.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/contains.js rename to platforms/android/cordova/node_modules/lodash/collection/contains.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/countBy.js b/platforms/android/cordova/node_modules/lodash/collection/countBy.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/countBy.js rename to platforms/android/cordova/node_modules/lodash/collection/countBy.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/detect.js b/platforms/android/cordova/node_modules/lodash/collection/detect.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/detect.js rename to platforms/android/cordova/node_modules/lodash/collection/detect.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/each.js b/platforms/android/cordova/node_modules/lodash/collection/each.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/each.js rename to platforms/android/cordova/node_modules/lodash/collection/each.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/eachRight.js b/platforms/android/cordova/node_modules/lodash/collection/eachRight.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/eachRight.js rename to platforms/android/cordova/node_modules/lodash/collection/eachRight.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/every.js b/platforms/android/cordova/node_modules/lodash/collection/every.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/every.js rename to platforms/android/cordova/node_modules/lodash/collection/every.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/filter.js b/platforms/android/cordova/node_modules/lodash/collection/filter.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/filter.js rename to platforms/android/cordova/node_modules/lodash/collection/filter.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/find.js b/platforms/android/cordova/node_modules/lodash/collection/find.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/find.js rename to platforms/android/cordova/node_modules/lodash/collection/find.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/findLast.js b/platforms/android/cordova/node_modules/lodash/collection/findLast.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/findLast.js rename to platforms/android/cordova/node_modules/lodash/collection/findLast.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/findWhere.js b/platforms/android/cordova/node_modules/lodash/collection/findWhere.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/findWhere.js rename to platforms/android/cordova/node_modules/lodash/collection/findWhere.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/foldl.js b/platforms/android/cordova/node_modules/lodash/collection/foldl.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/foldl.js rename to platforms/android/cordova/node_modules/lodash/collection/foldl.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/foldr.js b/platforms/android/cordova/node_modules/lodash/collection/foldr.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/foldr.js rename to platforms/android/cordova/node_modules/lodash/collection/foldr.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/forEach.js b/platforms/android/cordova/node_modules/lodash/collection/forEach.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/forEach.js rename to platforms/android/cordova/node_modules/lodash/collection/forEach.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/forEachRight.js b/platforms/android/cordova/node_modules/lodash/collection/forEachRight.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/forEachRight.js rename to platforms/android/cordova/node_modules/lodash/collection/forEachRight.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/groupBy.js b/platforms/android/cordova/node_modules/lodash/collection/groupBy.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/groupBy.js rename to platforms/android/cordova/node_modules/lodash/collection/groupBy.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/include.js b/platforms/android/cordova/node_modules/lodash/collection/include.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/include.js rename to platforms/android/cordova/node_modules/lodash/collection/include.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/includes.js b/platforms/android/cordova/node_modules/lodash/collection/includes.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/includes.js rename to platforms/android/cordova/node_modules/lodash/collection/includes.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/indexBy.js b/platforms/android/cordova/node_modules/lodash/collection/indexBy.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/indexBy.js rename to platforms/android/cordova/node_modules/lodash/collection/indexBy.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/inject.js b/platforms/android/cordova/node_modules/lodash/collection/inject.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/inject.js rename to platforms/android/cordova/node_modules/lodash/collection/inject.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/invoke.js b/platforms/android/cordova/node_modules/lodash/collection/invoke.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/invoke.js rename to platforms/android/cordova/node_modules/lodash/collection/invoke.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/map.js b/platforms/android/cordova/node_modules/lodash/collection/map.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/map.js rename to platforms/android/cordova/node_modules/lodash/collection/map.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/max.js b/platforms/android/cordova/node_modules/lodash/collection/max.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/max.js rename to platforms/android/cordova/node_modules/lodash/collection/max.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/min.js b/platforms/android/cordova/node_modules/lodash/collection/min.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/min.js rename to platforms/android/cordova/node_modules/lodash/collection/min.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/partition.js b/platforms/android/cordova/node_modules/lodash/collection/partition.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/partition.js rename to platforms/android/cordova/node_modules/lodash/collection/partition.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/pluck.js b/platforms/android/cordova/node_modules/lodash/collection/pluck.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/pluck.js rename to platforms/android/cordova/node_modules/lodash/collection/pluck.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/reduce.js b/platforms/android/cordova/node_modules/lodash/collection/reduce.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/reduce.js rename to platforms/android/cordova/node_modules/lodash/collection/reduce.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/reduceRight.js b/platforms/android/cordova/node_modules/lodash/collection/reduceRight.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/reduceRight.js rename to platforms/android/cordova/node_modules/lodash/collection/reduceRight.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/reject.js b/platforms/android/cordova/node_modules/lodash/collection/reject.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/reject.js rename to platforms/android/cordova/node_modules/lodash/collection/reject.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/sample.js b/platforms/android/cordova/node_modules/lodash/collection/sample.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/sample.js rename to platforms/android/cordova/node_modules/lodash/collection/sample.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/select.js b/platforms/android/cordova/node_modules/lodash/collection/select.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/select.js rename to platforms/android/cordova/node_modules/lodash/collection/select.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/shuffle.js b/platforms/android/cordova/node_modules/lodash/collection/shuffle.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/shuffle.js rename to platforms/android/cordova/node_modules/lodash/collection/shuffle.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/size.js b/platforms/android/cordova/node_modules/lodash/collection/size.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/size.js rename to platforms/android/cordova/node_modules/lodash/collection/size.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/some.js b/platforms/android/cordova/node_modules/lodash/collection/some.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/some.js rename to platforms/android/cordova/node_modules/lodash/collection/some.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/sortBy.js b/platforms/android/cordova/node_modules/lodash/collection/sortBy.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/sortBy.js rename to platforms/android/cordova/node_modules/lodash/collection/sortBy.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/sortByAll.js b/platforms/android/cordova/node_modules/lodash/collection/sortByAll.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/sortByAll.js rename to platforms/android/cordova/node_modules/lodash/collection/sortByAll.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/sortByOrder.js b/platforms/android/cordova/node_modules/lodash/collection/sortByOrder.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/sortByOrder.js rename to platforms/android/cordova/node_modules/lodash/collection/sortByOrder.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/sum.js b/platforms/android/cordova/node_modules/lodash/collection/sum.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/sum.js rename to platforms/android/cordova/node_modules/lodash/collection/sum.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/where.js b/platforms/android/cordova/node_modules/lodash/collection/where.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/collection/where.js rename to platforms/android/cordova/node_modules/lodash/collection/where.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/date.js b/platforms/android/cordova/node_modules/lodash/date.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/date.js rename to platforms/android/cordova/node_modules/lodash/date.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/date/now.js b/platforms/android/cordova/node_modules/lodash/date/now.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/date/now.js rename to platforms/android/cordova/node_modules/lodash/date/now.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function.js b/platforms/android/cordova/node_modules/lodash/function.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function.js rename to platforms/android/cordova/node_modules/lodash/function.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/after.js b/platforms/android/cordova/node_modules/lodash/function/after.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/after.js rename to platforms/android/cordova/node_modules/lodash/function/after.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/ary.js b/platforms/android/cordova/node_modules/lodash/function/ary.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/ary.js rename to platforms/android/cordova/node_modules/lodash/function/ary.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/backflow.js b/platforms/android/cordova/node_modules/lodash/function/backflow.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/backflow.js rename to platforms/android/cordova/node_modules/lodash/function/backflow.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/before.js b/platforms/android/cordova/node_modules/lodash/function/before.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/before.js rename to platforms/android/cordova/node_modules/lodash/function/before.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/bind.js b/platforms/android/cordova/node_modules/lodash/function/bind.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/bind.js rename to platforms/android/cordova/node_modules/lodash/function/bind.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/bindAll.js b/platforms/android/cordova/node_modules/lodash/function/bindAll.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/bindAll.js rename to platforms/android/cordova/node_modules/lodash/function/bindAll.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/bindKey.js b/platforms/android/cordova/node_modules/lodash/function/bindKey.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/bindKey.js rename to platforms/android/cordova/node_modules/lodash/function/bindKey.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/compose.js b/platforms/android/cordova/node_modules/lodash/function/compose.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/compose.js rename to platforms/android/cordova/node_modules/lodash/function/compose.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/curry.js b/platforms/android/cordova/node_modules/lodash/function/curry.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/curry.js rename to platforms/android/cordova/node_modules/lodash/function/curry.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/curryRight.js b/platforms/android/cordova/node_modules/lodash/function/curryRight.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/curryRight.js rename to platforms/android/cordova/node_modules/lodash/function/curryRight.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/debounce.js b/platforms/android/cordova/node_modules/lodash/function/debounce.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/debounce.js rename to platforms/android/cordova/node_modules/lodash/function/debounce.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/defer.js b/platforms/android/cordova/node_modules/lodash/function/defer.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/defer.js rename to platforms/android/cordova/node_modules/lodash/function/defer.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/delay.js b/platforms/android/cordova/node_modules/lodash/function/delay.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/delay.js rename to platforms/android/cordova/node_modules/lodash/function/delay.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/flow.js b/platforms/android/cordova/node_modules/lodash/function/flow.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/flow.js rename to platforms/android/cordova/node_modules/lodash/function/flow.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/flowRight.js b/platforms/android/cordova/node_modules/lodash/function/flowRight.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/flowRight.js rename to platforms/android/cordova/node_modules/lodash/function/flowRight.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/memoize.js b/platforms/android/cordova/node_modules/lodash/function/memoize.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/memoize.js rename to platforms/android/cordova/node_modules/lodash/function/memoize.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/modArgs.js b/platforms/android/cordova/node_modules/lodash/function/modArgs.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/modArgs.js rename to platforms/android/cordova/node_modules/lodash/function/modArgs.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/negate.js b/platforms/android/cordova/node_modules/lodash/function/negate.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/negate.js rename to platforms/android/cordova/node_modules/lodash/function/negate.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/once.js b/platforms/android/cordova/node_modules/lodash/function/once.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/once.js rename to platforms/android/cordova/node_modules/lodash/function/once.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/partial.js b/platforms/android/cordova/node_modules/lodash/function/partial.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/partial.js rename to platforms/android/cordova/node_modules/lodash/function/partial.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/partialRight.js b/platforms/android/cordova/node_modules/lodash/function/partialRight.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/partialRight.js rename to platforms/android/cordova/node_modules/lodash/function/partialRight.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/rearg.js b/platforms/android/cordova/node_modules/lodash/function/rearg.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/rearg.js rename to platforms/android/cordova/node_modules/lodash/function/rearg.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/restParam.js b/platforms/android/cordova/node_modules/lodash/function/restParam.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/restParam.js rename to platforms/android/cordova/node_modules/lodash/function/restParam.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/spread.js b/platforms/android/cordova/node_modules/lodash/function/spread.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/spread.js rename to platforms/android/cordova/node_modules/lodash/function/spread.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/throttle.js b/platforms/android/cordova/node_modules/lodash/function/throttle.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/throttle.js rename to platforms/android/cordova/node_modules/lodash/function/throttle.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/wrap.js b/platforms/android/cordova/node_modules/lodash/function/wrap.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/function/wrap.js rename to platforms/android/cordova/node_modules/lodash/function/wrap.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/index.js b/platforms/android/cordova/node_modules/lodash/index.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/index.js rename to platforms/android/cordova/node_modules/lodash/index.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/LazyWrapper.js b/platforms/android/cordova/node_modules/lodash/internal/LazyWrapper.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/LazyWrapper.js rename to platforms/android/cordova/node_modules/lodash/internal/LazyWrapper.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/LodashWrapper.js b/platforms/android/cordova/node_modules/lodash/internal/LodashWrapper.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/LodashWrapper.js rename to platforms/android/cordova/node_modules/lodash/internal/LodashWrapper.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/MapCache.js b/platforms/android/cordova/node_modules/lodash/internal/MapCache.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/MapCache.js rename to platforms/android/cordova/node_modules/lodash/internal/MapCache.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/SetCache.js b/platforms/android/cordova/node_modules/lodash/internal/SetCache.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/SetCache.js rename to platforms/android/cordova/node_modules/lodash/internal/SetCache.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/arrayConcat.js b/platforms/android/cordova/node_modules/lodash/internal/arrayConcat.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/arrayConcat.js rename to platforms/android/cordova/node_modules/lodash/internal/arrayConcat.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/arrayCopy.js b/platforms/android/cordova/node_modules/lodash/internal/arrayCopy.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/arrayCopy.js rename to platforms/android/cordova/node_modules/lodash/internal/arrayCopy.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/arrayEach.js b/platforms/android/cordova/node_modules/lodash/internal/arrayEach.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/arrayEach.js rename to platforms/android/cordova/node_modules/lodash/internal/arrayEach.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/arrayEachRight.js b/platforms/android/cordova/node_modules/lodash/internal/arrayEachRight.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/arrayEachRight.js rename to platforms/android/cordova/node_modules/lodash/internal/arrayEachRight.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/arrayEvery.js b/platforms/android/cordova/node_modules/lodash/internal/arrayEvery.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/arrayEvery.js rename to platforms/android/cordova/node_modules/lodash/internal/arrayEvery.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/arrayExtremum.js b/platforms/android/cordova/node_modules/lodash/internal/arrayExtremum.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/arrayExtremum.js rename to platforms/android/cordova/node_modules/lodash/internal/arrayExtremum.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/arrayFilter.js b/platforms/android/cordova/node_modules/lodash/internal/arrayFilter.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/arrayFilter.js rename to platforms/android/cordova/node_modules/lodash/internal/arrayFilter.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/arrayMap.js b/platforms/android/cordova/node_modules/lodash/internal/arrayMap.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/arrayMap.js rename to platforms/android/cordova/node_modules/lodash/internal/arrayMap.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/arrayPush.js b/platforms/android/cordova/node_modules/lodash/internal/arrayPush.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/arrayPush.js rename to platforms/android/cordova/node_modules/lodash/internal/arrayPush.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/arrayReduce.js b/platforms/android/cordova/node_modules/lodash/internal/arrayReduce.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/arrayReduce.js rename to platforms/android/cordova/node_modules/lodash/internal/arrayReduce.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/arrayReduceRight.js b/platforms/android/cordova/node_modules/lodash/internal/arrayReduceRight.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/arrayReduceRight.js rename to platforms/android/cordova/node_modules/lodash/internal/arrayReduceRight.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/arraySome.js b/platforms/android/cordova/node_modules/lodash/internal/arraySome.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/arraySome.js rename to platforms/android/cordova/node_modules/lodash/internal/arraySome.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/arraySum.js b/platforms/android/cordova/node_modules/lodash/internal/arraySum.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/arraySum.js rename to platforms/android/cordova/node_modules/lodash/internal/arraySum.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/assignDefaults.js b/platforms/android/cordova/node_modules/lodash/internal/assignDefaults.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/assignDefaults.js rename to platforms/android/cordova/node_modules/lodash/internal/assignDefaults.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/assignOwnDefaults.js b/platforms/android/cordova/node_modules/lodash/internal/assignOwnDefaults.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/assignOwnDefaults.js rename to platforms/android/cordova/node_modules/lodash/internal/assignOwnDefaults.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/assignWith.js b/platforms/android/cordova/node_modules/lodash/internal/assignWith.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/assignWith.js rename to platforms/android/cordova/node_modules/lodash/internal/assignWith.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseAssign.js b/platforms/android/cordova/node_modules/lodash/internal/baseAssign.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseAssign.js rename to platforms/android/cordova/node_modules/lodash/internal/baseAssign.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseAt.js b/platforms/android/cordova/node_modules/lodash/internal/baseAt.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseAt.js rename to platforms/android/cordova/node_modules/lodash/internal/baseAt.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseCallback.js b/platforms/android/cordova/node_modules/lodash/internal/baseCallback.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseCallback.js rename to platforms/android/cordova/node_modules/lodash/internal/baseCallback.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseClone.js b/platforms/android/cordova/node_modules/lodash/internal/baseClone.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseClone.js rename to platforms/android/cordova/node_modules/lodash/internal/baseClone.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseCompareAscending.js b/platforms/android/cordova/node_modules/lodash/internal/baseCompareAscending.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseCompareAscending.js rename to platforms/android/cordova/node_modules/lodash/internal/baseCompareAscending.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseCopy.js b/platforms/android/cordova/node_modules/lodash/internal/baseCopy.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseCopy.js rename to platforms/android/cordova/node_modules/lodash/internal/baseCopy.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseCreate.js b/platforms/android/cordova/node_modules/lodash/internal/baseCreate.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseCreate.js rename to platforms/android/cordova/node_modules/lodash/internal/baseCreate.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseDelay.js b/platforms/android/cordova/node_modules/lodash/internal/baseDelay.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseDelay.js rename to platforms/android/cordova/node_modules/lodash/internal/baseDelay.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseDifference.js b/platforms/android/cordova/node_modules/lodash/internal/baseDifference.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseDifference.js rename to platforms/android/cordova/node_modules/lodash/internal/baseDifference.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseEach.js b/platforms/android/cordova/node_modules/lodash/internal/baseEach.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseEach.js rename to platforms/android/cordova/node_modules/lodash/internal/baseEach.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseEachRight.js b/platforms/android/cordova/node_modules/lodash/internal/baseEachRight.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseEachRight.js rename to platforms/android/cordova/node_modules/lodash/internal/baseEachRight.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseEvery.js b/platforms/android/cordova/node_modules/lodash/internal/baseEvery.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseEvery.js rename to platforms/android/cordova/node_modules/lodash/internal/baseEvery.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseExtremum.js b/platforms/android/cordova/node_modules/lodash/internal/baseExtremum.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseExtremum.js rename to platforms/android/cordova/node_modules/lodash/internal/baseExtremum.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseFill.js b/platforms/android/cordova/node_modules/lodash/internal/baseFill.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseFill.js rename to platforms/android/cordova/node_modules/lodash/internal/baseFill.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseFilter.js b/platforms/android/cordova/node_modules/lodash/internal/baseFilter.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseFilter.js rename to platforms/android/cordova/node_modules/lodash/internal/baseFilter.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseFind.js b/platforms/android/cordova/node_modules/lodash/internal/baseFind.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseFind.js rename to platforms/android/cordova/node_modules/lodash/internal/baseFind.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseFindIndex.js b/platforms/android/cordova/node_modules/lodash/internal/baseFindIndex.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseFindIndex.js rename to platforms/android/cordova/node_modules/lodash/internal/baseFindIndex.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseFlatten.js b/platforms/android/cordova/node_modules/lodash/internal/baseFlatten.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseFlatten.js rename to platforms/android/cordova/node_modules/lodash/internal/baseFlatten.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseFor.js b/platforms/android/cordova/node_modules/lodash/internal/baseFor.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseFor.js rename to platforms/android/cordova/node_modules/lodash/internal/baseFor.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseForIn.js b/platforms/android/cordova/node_modules/lodash/internal/baseForIn.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseForIn.js rename to platforms/android/cordova/node_modules/lodash/internal/baseForIn.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseForOwn.js b/platforms/android/cordova/node_modules/lodash/internal/baseForOwn.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseForOwn.js rename to platforms/android/cordova/node_modules/lodash/internal/baseForOwn.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseForOwnRight.js b/platforms/android/cordova/node_modules/lodash/internal/baseForOwnRight.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseForOwnRight.js rename to platforms/android/cordova/node_modules/lodash/internal/baseForOwnRight.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseForRight.js b/platforms/android/cordova/node_modules/lodash/internal/baseForRight.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseForRight.js rename to platforms/android/cordova/node_modules/lodash/internal/baseForRight.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseFunctions.js b/platforms/android/cordova/node_modules/lodash/internal/baseFunctions.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseFunctions.js rename to platforms/android/cordova/node_modules/lodash/internal/baseFunctions.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseGet.js b/platforms/android/cordova/node_modules/lodash/internal/baseGet.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseGet.js rename to platforms/android/cordova/node_modules/lodash/internal/baseGet.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseIndexOf.js b/platforms/android/cordova/node_modules/lodash/internal/baseIndexOf.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseIndexOf.js rename to platforms/android/cordova/node_modules/lodash/internal/baseIndexOf.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseIsEqual.js b/platforms/android/cordova/node_modules/lodash/internal/baseIsEqual.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseIsEqual.js rename to platforms/android/cordova/node_modules/lodash/internal/baseIsEqual.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseIsEqualDeep.js b/platforms/android/cordova/node_modules/lodash/internal/baseIsEqualDeep.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseIsEqualDeep.js rename to platforms/android/cordova/node_modules/lodash/internal/baseIsEqualDeep.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseIsFunction.js b/platforms/android/cordova/node_modules/lodash/internal/baseIsFunction.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseIsFunction.js rename to platforms/android/cordova/node_modules/lodash/internal/baseIsFunction.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseIsMatch.js b/platforms/android/cordova/node_modules/lodash/internal/baseIsMatch.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseIsMatch.js rename to platforms/android/cordova/node_modules/lodash/internal/baseIsMatch.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseLodash.js b/platforms/android/cordova/node_modules/lodash/internal/baseLodash.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseLodash.js rename to platforms/android/cordova/node_modules/lodash/internal/baseLodash.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseMap.js b/platforms/android/cordova/node_modules/lodash/internal/baseMap.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseMap.js rename to platforms/android/cordova/node_modules/lodash/internal/baseMap.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseMatches.js b/platforms/android/cordova/node_modules/lodash/internal/baseMatches.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseMatches.js rename to platforms/android/cordova/node_modules/lodash/internal/baseMatches.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseMatchesProperty.js b/platforms/android/cordova/node_modules/lodash/internal/baseMatchesProperty.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseMatchesProperty.js rename to platforms/android/cordova/node_modules/lodash/internal/baseMatchesProperty.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseMerge.js b/platforms/android/cordova/node_modules/lodash/internal/baseMerge.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseMerge.js rename to platforms/android/cordova/node_modules/lodash/internal/baseMerge.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseMergeDeep.js b/platforms/android/cordova/node_modules/lodash/internal/baseMergeDeep.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseMergeDeep.js rename to platforms/android/cordova/node_modules/lodash/internal/baseMergeDeep.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseProperty.js b/platforms/android/cordova/node_modules/lodash/internal/baseProperty.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseProperty.js rename to platforms/android/cordova/node_modules/lodash/internal/baseProperty.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/basePropertyDeep.js b/platforms/android/cordova/node_modules/lodash/internal/basePropertyDeep.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/basePropertyDeep.js rename to platforms/android/cordova/node_modules/lodash/internal/basePropertyDeep.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/basePullAt.js b/platforms/android/cordova/node_modules/lodash/internal/basePullAt.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/basePullAt.js rename to platforms/android/cordova/node_modules/lodash/internal/basePullAt.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseRandom.js b/platforms/android/cordova/node_modules/lodash/internal/baseRandom.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseRandom.js rename to platforms/android/cordova/node_modules/lodash/internal/baseRandom.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseReduce.js b/platforms/android/cordova/node_modules/lodash/internal/baseReduce.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseReduce.js rename to platforms/android/cordova/node_modules/lodash/internal/baseReduce.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseSetData.js b/platforms/android/cordova/node_modules/lodash/internal/baseSetData.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseSetData.js rename to platforms/android/cordova/node_modules/lodash/internal/baseSetData.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseSlice.js b/platforms/android/cordova/node_modules/lodash/internal/baseSlice.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseSlice.js rename to platforms/android/cordova/node_modules/lodash/internal/baseSlice.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseSome.js b/platforms/android/cordova/node_modules/lodash/internal/baseSome.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseSome.js rename to platforms/android/cordova/node_modules/lodash/internal/baseSome.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseSortBy.js b/platforms/android/cordova/node_modules/lodash/internal/baseSortBy.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseSortBy.js rename to platforms/android/cordova/node_modules/lodash/internal/baseSortBy.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseSortByOrder.js b/platforms/android/cordova/node_modules/lodash/internal/baseSortByOrder.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseSortByOrder.js rename to platforms/android/cordova/node_modules/lodash/internal/baseSortByOrder.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseSum.js b/platforms/android/cordova/node_modules/lodash/internal/baseSum.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseSum.js rename to platforms/android/cordova/node_modules/lodash/internal/baseSum.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseToString.js b/platforms/android/cordova/node_modules/lodash/internal/baseToString.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseToString.js rename to platforms/android/cordova/node_modules/lodash/internal/baseToString.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseUniq.js b/platforms/android/cordova/node_modules/lodash/internal/baseUniq.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseUniq.js rename to platforms/android/cordova/node_modules/lodash/internal/baseUniq.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseValues.js b/platforms/android/cordova/node_modules/lodash/internal/baseValues.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseValues.js rename to platforms/android/cordova/node_modules/lodash/internal/baseValues.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseWhile.js b/platforms/android/cordova/node_modules/lodash/internal/baseWhile.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseWhile.js rename to platforms/android/cordova/node_modules/lodash/internal/baseWhile.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseWrapperValue.js b/platforms/android/cordova/node_modules/lodash/internal/baseWrapperValue.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/baseWrapperValue.js rename to platforms/android/cordova/node_modules/lodash/internal/baseWrapperValue.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/binaryIndex.js b/platforms/android/cordova/node_modules/lodash/internal/binaryIndex.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/binaryIndex.js rename to platforms/android/cordova/node_modules/lodash/internal/binaryIndex.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/binaryIndexBy.js b/platforms/android/cordova/node_modules/lodash/internal/binaryIndexBy.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/binaryIndexBy.js rename to platforms/android/cordova/node_modules/lodash/internal/binaryIndexBy.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/bindCallback.js b/platforms/android/cordova/node_modules/lodash/internal/bindCallback.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/bindCallback.js rename to platforms/android/cordova/node_modules/lodash/internal/bindCallback.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/bufferClone.js b/platforms/android/cordova/node_modules/lodash/internal/bufferClone.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/bufferClone.js rename to platforms/android/cordova/node_modules/lodash/internal/bufferClone.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/cacheIndexOf.js b/platforms/android/cordova/node_modules/lodash/internal/cacheIndexOf.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/cacheIndexOf.js rename to platforms/android/cordova/node_modules/lodash/internal/cacheIndexOf.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/cachePush.js b/platforms/android/cordova/node_modules/lodash/internal/cachePush.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/cachePush.js rename to platforms/android/cordova/node_modules/lodash/internal/cachePush.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/charsLeftIndex.js b/platforms/android/cordova/node_modules/lodash/internal/charsLeftIndex.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/charsLeftIndex.js rename to platforms/android/cordova/node_modules/lodash/internal/charsLeftIndex.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/charsRightIndex.js b/platforms/android/cordova/node_modules/lodash/internal/charsRightIndex.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/charsRightIndex.js rename to platforms/android/cordova/node_modules/lodash/internal/charsRightIndex.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/compareAscending.js b/platforms/android/cordova/node_modules/lodash/internal/compareAscending.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/compareAscending.js rename to platforms/android/cordova/node_modules/lodash/internal/compareAscending.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/compareMultiple.js b/platforms/android/cordova/node_modules/lodash/internal/compareMultiple.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/compareMultiple.js rename to platforms/android/cordova/node_modules/lodash/internal/compareMultiple.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/composeArgs.js b/platforms/android/cordova/node_modules/lodash/internal/composeArgs.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/composeArgs.js rename to platforms/android/cordova/node_modules/lodash/internal/composeArgs.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/composeArgsRight.js b/platforms/android/cordova/node_modules/lodash/internal/composeArgsRight.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/composeArgsRight.js rename to platforms/android/cordova/node_modules/lodash/internal/composeArgsRight.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createAggregator.js b/platforms/android/cordova/node_modules/lodash/internal/createAggregator.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createAggregator.js rename to platforms/android/cordova/node_modules/lodash/internal/createAggregator.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createAssigner.js b/platforms/android/cordova/node_modules/lodash/internal/createAssigner.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createAssigner.js rename to platforms/android/cordova/node_modules/lodash/internal/createAssigner.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createBaseEach.js b/platforms/android/cordova/node_modules/lodash/internal/createBaseEach.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createBaseEach.js rename to platforms/android/cordova/node_modules/lodash/internal/createBaseEach.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createBaseFor.js b/platforms/android/cordova/node_modules/lodash/internal/createBaseFor.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createBaseFor.js rename to platforms/android/cordova/node_modules/lodash/internal/createBaseFor.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createBindWrapper.js b/platforms/android/cordova/node_modules/lodash/internal/createBindWrapper.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createBindWrapper.js rename to platforms/android/cordova/node_modules/lodash/internal/createBindWrapper.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createCache.js b/platforms/android/cordova/node_modules/lodash/internal/createCache.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createCache.js rename to platforms/android/cordova/node_modules/lodash/internal/createCache.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createCompounder.js b/platforms/android/cordova/node_modules/lodash/internal/createCompounder.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createCompounder.js rename to platforms/android/cordova/node_modules/lodash/internal/createCompounder.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createCtorWrapper.js b/platforms/android/cordova/node_modules/lodash/internal/createCtorWrapper.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createCtorWrapper.js rename to platforms/android/cordova/node_modules/lodash/internal/createCtorWrapper.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createCurry.js b/platforms/android/cordova/node_modules/lodash/internal/createCurry.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createCurry.js rename to platforms/android/cordova/node_modules/lodash/internal/createCurry.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createDefaults.js b/platforms/android/cordova/node_modules/lodash/internal/createDefaults.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createDefaults.js rename to platforms/android/cordova/node_modules/lodash/internal/createDefaults.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createExtremum.js b/platforms/android/cordova/node_modules/lodash/internal/createExtremum.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createExtremum.js rename to platforms/android/cordova/node_modules/lodash/internal/createExtremum.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createFind.js b/platforms/android/cordova/node_modules/lodash/internal/createFind.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createFind.js rename to platforms/android/cordova/node_modules/lodash/internal/createFind.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createFindIndex.js b/platforms/android/cordova/node_modules/lodash/internal/createFindIndex.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createFindIndex.js rename to platforms/android/cordova/node_modules/lodash/internal/createFindIndex.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createFindKey.js b/platforms/android/cordova/node_modules/lodash/internal/createFindKey.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createFindKey.js rename to platforms/android/cordova/node_modules/lodash/internal/createFindKey.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createFlow.js b/platforms/android/cordova/node_modules/lodash/internal/createFlow.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createFlow.js rename to platforms/android/cordova/node_modules/lodash/internal/createFlow.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createForEach.js b/platforms/android/cordova/node_modules/lodash/internal/createForEach.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createForEach.js rename to platforms/android/cordova/node_modules/lodash/internal/createForEach.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createForIn.js b/platforms/android/cordova/node_modules/lodash/internal/createForIn.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createForIn.js rename to platforms/android/cordova/node_modules/lodash/internal/createForIn.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createForOwn.js b/platforms/android/cordova/node_modules/lodash/internal/createForOwn.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createForOwn.js rename to platforms/android/cordova/node_modules/lodash/internal/createForOwn.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createHybridWrapper.js b/platforms/android/cordova/node_modules/lodash/internal/createHybridWrapper.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createHybridWrapper.js rename to platforms/android/cordova/node_modules/lodash/internal/createHybridWrapper.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createObjectMapper.js b/platforms/android/cordova/node_modules/lodash/internal/createObjectMapper.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createObjectMapper.js rename to platforms/android/cordova/node_modules/lodash/internal/createObjectMapper.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createPadDir.js b/platforms/android/cordova/node_modules/lodash/internal/createPadDir.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createPadDir.js rename to platforms/android/cordova/node_modules/lodash/internal/createPadDir.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createPadding.js b/platforms/android/cordova/node_modules/lodash/internal/createPadding.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createPadding.js rename to platforms/android/cordova/node_modules/lodash/internal/createPadding.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createPartial.js b/platforms/android/cordova/node_modules/lodash/internal/createPartial.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createPartial.js rename to platforms/android/cordova/node_modules/lodash/internal/createPartial.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createPartialWrapper.js b/platforms/android/cordova/node_modules/lodash/internal/createPartialWrapper.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createPartialWrapper.js rename to platforms/android/cordova/node_modules/lodash/internal/createPartialWrapper.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createReduce.js b/platforms/android/cordova/node_modules/lodash/internal/createReduce.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createReduce.js rename to platforms/android/cordova/node_modules/lodash/internal/createReduce.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createRound.js b/platforms/android/cordova/node_modules/lodash/internal/createRound.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createRound.js rename to platforms/android/cordova/node_modules/lodash/internal/createRound.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createSortedIndex.js b/platforms/android/cordova/node_modules/lodash/internal/createSortedIndex.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createSortedIndex.js rename to platforms/android/cordova/node_modules/lodash/internal/createSortedIndex.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createWrapper.js b/platforms/android/cordova/node_modules/lodash/internal/createWrapper.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/createWrapper.js rename to platforms/android/cordova/node_modules/lodash/internal/createWrapper.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/deburrLetter.js b/platforms/android/cordova/node_modules/lodash/internal/deburrLetter.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/deburrLetter.js rename to platforms/android/cordova/node_modules/lodash/internal/deburrLetter.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/equalArrays.js b/platforms/android/cordova/node_modules/lodash/internal/equalArrays.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/equalArrays.js rename to platforms/android/cordova/node_modules/lodash/internal/equalArrays.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/equalByTag.js b/platforms/android/cordova/node_modules/lodash/internal/equalByTag.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/equalByTag.js rename to platforms/android/cordova/node_modules/lodash/internal/equalByTag.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/equalObjects.js b/platforms/android/cordova/node_modules/lodash/internal/equalObjects.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/equalObjects.js rename to platforms/android/cordova/node_modules/lodash/internal/equalObjects.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/escapeHtmlChar.js b/platforms/android/cordova/node_modules/lodash/internal/escapeHtmlChar.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/escapeHtmlChar.js rename to platforms/android/cordova/node_modules/lodash/internal/escapeHtmlChar.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/escapeRegExpChar.js b/platforms/android/cordova/node_modules/lodash/internal/escapeRegExpChar.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/escapeRegExpChar.js rename to platforms/android/cordova/node_modules/lodash/internal/escapeRegExpChar.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/escapeStringChar.js b/platforms/android/cordova/node_modules/lodash/internal/escapeStringChar.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/escapeStringChar.js rename to platforms/android/cordova/node_modules/lodash/internal/escapeStringChar.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/getData.js b/platforms/android/cordova/node_modules/lodash/internal/getData.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/getData.js rename to platforms/android/cordova/node_modules/lodash/internal/getData.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/getFuncName.js b/platforms/android/cordova/node_modules/lodash/internal/getFuncName.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/getFuncName.js rename to platforms/android/cordova/node_modules/lodash/internal/getFuncName.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/getLength.js b/platforms/android/cordova/node_modules/lodash/internal/getLength.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/getLength.js rename to platforms/android/cordova/node_modules/lodash/internal/getLength.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/getMatchData.js b/platforms/android/cordova/node_modules/lodash/internal/getMatchData.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/getMatchData.js rename to platforms/android/cordova/node_modules/lodash/internal/getMatchData.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/getNative.js b/platforms/android/cordova/node_modules/lodash/internal/getNative.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/getNative.js rename to platforms/android/cordova/node_modules/lodash/internal/getNative.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/getView.js b/platforms/android/cordova/node_modules/lodash/internal/getView.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/getView.js rename to platforms/android/cordova/node_modules/lodash/internal/getView.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/indexOfNaN.js b/platforms/android/cordova/node_modules/lodash/internal/indexOfNaN.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/indexOfNaN.js rename to platforms/android/cordova/node_modules/lodash/internal/indexOfNaN.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/initCloneArray.js b/platforms/android/cordova/node_modules/lodash/internal/initCloneArray.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/initCloneArray.js rename to platforms/android/cordova/node_modules/lodash/internal/initCloneArray.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/initCloneByTag.js b/platforms/android/cordova/node_modules/lodash/internal/initCloneByTag.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/initCloneByTag.js rename to platforms/android/cordova/node_modules/lodash/internal/initCloneByTag.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/initCloneObject.js b/platforms/android/cordova/node_modules/lodash/internal/initCloneObject.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/initCloneObject.js rename to platforms/android/cordova/node_modules/lodash/internal/initCloneObject.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/invokePath.js b/platforms/android/cordova/node_modules/lodash/internal/invokePath.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/invokePath.js rename to platforms/android/cordova/node_modules/lodash/internal/invokePath.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/isArrayLike.js b/platforms/android/cordova/node_modules/lodash/internal/isArrayLike.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/isArrayLike.js rename to platforms/android/cordova/node_modules/lodash/internal/isArrayLike.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/isIndex.js b/platforms/android/cordova/node_modules/lodash/internal/isIndex.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/isIndex.js rename to platforms/android/cordova/node_modules/lodash/internal/isIndex.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/isIterateeCall.js b/platforms/android/cordova/node_modules/lodash/internal/isIterateeCall.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/isIterateeCall.js rename to platforms/android/cordova/node_modules/lodash/internal/isIterateeCall.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/isKey.js b/platforms/android/cordova/node_modules/lodash/internal/isKey.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/isKey.js rename to platforms/android/cordova/node_modules/lodash/internal/isKey.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/isLaziable.js b/platforms/android/cordova/node_modules/lodash/internal/isLaziable.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/isLaziable.js rename to platforms/android/cordova/node_modules/lodash/internal/isLaziable.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/isLength.js b/platforms/android/cordova/node_modules/lodash/internal/isLength.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/isLength.js rename to platforms/android/cordova/node_modules/lodash/internal/isLength.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/isObjectLike.js b/platforms/android/cordova/node_modules/lodash/internal/isObjectLike.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/isObjectLike.js rename to platforms/android/cordova/node_modules/lodash/internal/isObjectLike.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/isSpace.js b/platforms/android/cordova/node_modules/lodash/internal/isSpace.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/isSpace.js rename to platforms/android/cordova/node_modules/lodash/internal/isSpace.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/isStrictComparable.js b/platforms/android/cordova/node_modules/lodash/internal/isStrictComparable.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/isStrictComparable.js rename to platforms/android/cordova/node_modules/lodash/internal/isStrictComparable.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/lazyClone.js b/platforms/android/cordova/node_modules/lodash/internal/lazyClone.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/lazyClone.js rename to platforms/android/cordova/node_modules/lodash/internal/lazyClone.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/lazyReverse.js b/platforms/android/cordova/node_modules/lodash/internal/lazyReverse.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/lazyReverse.js rename to platforms/android/cordova/node_modules/lodash/internal/lazyReverse.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/lazyValue.js b/platforms/android/cordova/node_modules/lodash/internal/lazyValue.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/lazyValue.js rename to platforms/android/cordova/node_modules/lodash/internal/lazyValue.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/mapDelete.js b/platforms/android/cordova/node_modules/lodash/internal/mapDelete.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/mapDelete.js rename to platforms/android/cordova/node_modules/lodash/internal/mapDelete.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/mapGet.js b/platforms/android/cordova/node_modules/lodash/internal/mapGet.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/mapGet.js rename to platforms/android/cordova/node_modules/lodash/internal/mapGet.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/mapHas.js b/platforms/android/cordova/node_modules/lodash/internal/mapHas.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/mapHas.js rename to platforms/android/cordova/node_modules/lodash/internal/mapHas.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/mapSet.js b/platforms/android/cordova/node_modules/lodash/internal/mapSet.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/mapSet.js rename to platforms/android/cordova/node_modules/lodash/internal/mapSet.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/mergeData.js b/platforms/android/cordova/node_modules/lodash/internal/mergeData.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/mergeData.js rename to platforms/android/cordova/node_modules/lodash/internal/mergeData.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/mergeDefaults.js b/platforms/android/cordova/node_modules/lodash/internal/mergeDefaults.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/mergeDefaults.js rename to platforms/android/cordova/node_modules/lodash/internal/mergeDefaults.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/metaMap.js b/platforms/android/cordova/node_modules/lodash/internal/metaMap.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/metaMap.js rename to platforms/android/cordova/node_modules/lodash/internal/metaMap.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/pickByArray.js b/platforms/android/cordova/node_modules/lodash/internal/pickByArray.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/pickByArray.js rename to platforms/android/cordova/node_modules/lodash/internal/pickByArray.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/pickByCallback.js b/platforms/android/cordova/node_modules/lodash/internal/pickByCallback.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/pickByCallback.js rename to platforms/android/cordova/node_modules/lodash/internal/pickByCallback.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/reEscape.js b/platforms/android/cordova/node_modules/lodash/internal/reEscape.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/reEscape.js rename to platforms/android/cordova/node_modules/lodash/internal/reEscape.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/reEvaluate.js b/platforms/android/cordova/node_modules/lodash/internal/reEvaluate.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/reEvaluate.js rename to platforms/android/cordova/node_modules/lodash/internal/reEvaluate.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/reInterpolate.js b/platforms/android/cordova/node_modules/lodash/internal/reInterpolate.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/reInterpolate.js rename to platforms/android/cordova/node_modules/lodash/internal/reInterpolate.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/realNames.js b/platforms/android/cordova/node_modules/lodash/internal/realNames.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/realNames.js rename to platforms/android/cordova/node_modules/lodash/internal/realNames.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/reorder.js b/platforms/android/cordova/node_modules/lodash/internal/reorder.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/reorder.js rename to platforms/android/cordova/node_modules/lodash/internal/reorder.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/replaceHolders.js b/platforms/android/cordova/node_modules/lodash/internal/replaceHolders.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/replaceHolders.js rename to platforms/android/cordova/node_modules/lodash/internal/replaceHolders.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/setData.js b/platforms/android/cordova/node_modules/lodash/internal/setData.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/setData.js rename to platforms/android/cordova/node_modules/lodash/internal/setData.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/shimKeys.js b/platforms/android/cordova/node_modules/lodash/internal/shimKeys.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/shimKeys.js rename to platforms/android/cordova/node_modules/lodash/internal/shimKeys.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/sortedUniq.js b/platforms/android/cordova/node_modules/lodash/internal/sortedUniq.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/sortedUniq.js rename to platforms/android/cordova/node_modules/lodash/internal/sortedUniq.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/toIterable.js b/platforms/android/cordova/node_modules/lodash/internal/toIterable.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/toIterable.js rename to platforms/android/cordova/node_modules/lodash/internal/toIterable.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/toObject.js b/platforms/android/cordova/node_modules/lodash/internal/toObject.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/toObject.js rename to platforms/android/cordova/node_modules/lodash/internal/toObject.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/toPath.js b/platforms/android/cordova/node_modules/lodash/internal/toPath.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/toPath.js rename to platforms/android/cordova/node_modules/lodash/internal/toPath.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/trimmedLeftIndex.js b/platforms/android/cordova/node_modules/lodash/internal/trimmedLeftIndex.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/trimmedLeftIndex.js rename to platforms/android/cordova/node_modules/lodash/internal/trimmedLeftIndex.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/trimmedRightIndex.js b/platforms/android/cordova/node_modules/lodash/internal/trimmedRightIndex.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/trimmedRightIndex.js rename to platforms/android/cordova/node_modules/lodash/internal/trimmedRightIndex.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/unescapeHtmlChar.js b/platforms/android/cordova/node_modules/lodash/internal/unescapeHtmlChar.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/unescapeHtmlChar.js rename to platforms/android/cordova/node_modules/lodash/internal/unescapeHtmlChar.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/wrapperClone.js b/platforms/android/cordova/node_modules/lodash/internal/wrapperClone.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/internal/wrapperClone.js rename to platforms/android/cordova/node_modules/lodash/internal/wrapperClone.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang.js b/platforms/android/cordova/node_modules/lodash/lang.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang.js rename to platforms/android/cordova/node_modules/lodash/lang.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/clone.js b/platforms/android/cordova/node_modules/lodash/lang/clone.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/clone.js rename to platforms/android/cordova/node_modules/lodash/lang/clone.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/cloneDeep.js b/platforms/android/cordova/node_modules/lodash/lang/cloneDeep.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/cloneDeep.js rename to platforms/android/cordova/node_modules/lodash/lang/cloneDeep.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/eq.js b/platforms/android/cordova/node_modules/lodash/lang/eq.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/eq.js rename to platforms/android/cordova/node_modules/lodash/lang/eq.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/gt.js b/platforms/android/cordova/node_modules/lodash/lang/gt.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/gt.js rename to platforms/android/cordova/node_modules/lodash/lang/gt.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/gte.js b/platforms/android/cordova/node_modules/lodash/lang/gte.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/gte.js rename to platforms/android/cordova/node_modules/lodash/lang/gte.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isArguments.js b/platforms/android/cordova/node_modules/lodash/lang/isArguments.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isArguments.js rename to platforms/android/cordova/node_modules/lodash/lang/isArguments.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isArray.js b/platforms/android/cordova/node_modules/lodash/lang/isArray.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isArray.js rename to platforms/android/cordova/node_modules/lodash/lang/isArray.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isBoolean.js b/platforms/android/cordova/node_modules/lodash/lang/isBoolean.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isBoolean.js rename to platforms/android/cordova/node_modules/lodash/lang/isBoolean.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isDate.js b/platforms/android/cordova/node_modules/lodash/lang/isDate.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isDate.js rename to platforms/android/cordova/node_modules/lodash/lang/isDate.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isElement.js b/platforms/android/cordova/node_modules/lodash/lang/isElement.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isElement.js rename to platforms/android/cordova/node_modules/lodash/lang/isElement.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isEmpty.js b/platforms/android/cordova/node_modules/lodash/lang/isEmpty.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isEmpty.js rename to platforms/android/cordova/node_modules/lodash/lang/isEmpty.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isEqual.js b/platforms/android/cordova/node_modules/lodash/lang/isEqual.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isEqual.js rename to platforms/android/cordova/node_modules/lodash/lang/isEqual.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isError.js b/platforms/android/cordova/node_modules/lodash/lang/isError.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isError.js rename to platforms/android/cordova/node_modules/lodash/lang/isError.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isFinite.js b/platforms/android/cordova/node_modules/lodash/lang/isFinite.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isFinite.js rename to platforms/android/cordova/node_modules/lodash/lang/isFinite.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isFunction.js b/platforms/android/cordova/node_modules/lodash/lang/isFunction.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isFunction.js rename to platforms/android/cordova/node_modules/lodash/lang/isFunction.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isMatch.js b/platforms/android/cordova/node_modules/lodash/lang/isMatch.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isMatch.js rename to platforms/android/cordova/node_modules/lodash/lang/isMatch.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isNaN.js b/platforms/android/cordova/node_modules/lodash/lang/isNaN.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isNaN.js rename to platforms/android/cordova/node_modules/lodash/lang/isNaN.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isNative.js b/platforms/android/cordova/node_modules/lodash/lang/isNative.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isNative.js rename to platforms/android/cordova/node_modules/lodash/lang/isNative.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isNull.js b/platforms/android/cordova/node_modules/lodash/lang/isNull.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isNull.js rename to platforms/android/cordova/node_modules/lodash/lang/isNull.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isNumber.js b/platforms/android/cordova/node_modules/lodash/lang/isNumber.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isNumber.js rename to platforms/android/cordova/node_modules/lodash/lang/isNumber.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isObject.js b/platforms/android/cordova/node_modules/lodash/lang/isObject.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isObject.js rename to platforms/android/cordova/node_modules/lodash/lang/isObject.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isPlainObject.js b/platforms/android/cordova/node_modules/lodash/lang/isPlainObject.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isPlainObject.js rename to platforms/android/cordova/node_modules/lodash/lang/isPlainObject.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isRegExp.js b/platforms/android/cordova/node_modules/lodash/lang/isRegExp.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isRegExp.js rename to platforms/android/cordova/node_modules/lodash/lang/isRegExp.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isString.js b/platforms/android/cordova/node_modules/lodash/lang/isString.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isString.js rename to platforms/android/cordova/node_modules/lodash/lang/isString.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isTypedArray.js b/platforms/android/cordova/node_modules/lodash/lang/isTypedArray.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isTypedArray.js rename to platforms/android/cordova/node_modules/lodash/lang/isTypedArray.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isUndefined.js b/platforms/android/cordova/node_modules/lodash/lang/isUndefined.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/isUndefined.js rename to platforms/android/cordova/node_modules/lodash/lang/isUndefined.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/lt.js b/platforms/android/cordova/node_modules/lodash/lang/lt.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/lt.js rename to platforms/android/cordova/node_modules/lodash/lang/lt.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/lte.js b/platforms/android/cordova/node_modules/lodash/lang/lte.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/lte.js rename to platforms/android/cordova/node_modules/lodash/lang/lte.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/toArray.js b/platforms/android/cordova/node_modules/lodash/lang/toArray.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/toArray.js rename to platforms/android/cordova/node_modules/lodash/lang/toArray.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/toPlainObject.js b/platforms/android/cordova/node_modules/lodash/lang/toPlainObject.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/lang/toPlainObject.js rename to platforms/android/cordova/node_modules/lodash/lang/toPlainObject.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/math.js b/platforms/android/cordova/node_modules/lodash/math.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/math.js rename to platforms/android/cordova/node_modules/lodash/math.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/math/add.js b/platforms/android/cordova/node_modules/lodash/math/add.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/math/add.js rename to platforms/android/cordova/node_modules/lodash/math/add.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/math/ceil.js b/platforms/android/cordova/node_modules/lodash/math/ceil.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/math/ceil.js rename to platforms/android/cordova/node_modules/lodash/math/ceil.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/math/floor.js b/platforms/android/cordova/node_modules/lodash/math/floor.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/math/floor.js rename to platforms/android/cordova/node_modules/lodash/math/floor.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/math/max.js b/platforms/android/cordova/node_modules/lodash/math/max.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/math/max.js rename to platforms/android/cordova/node_modules/lodash/math/max.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/math/min.js b/platforms/android/cordova/node_modules/lodash/math/min.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/math/min.js rename to platforms/android/cordova/node_modules/lodash/math/min.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/math/round.js b/platforms/android/cordova/node_modules/lodash/math/round.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/math/round.js rename to platforms/android/cordova/node_modules/lodash/math/round.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/math/sum.js b/platforms/android/cordova/node_modules/lodash/math/sum.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/math/sum.js rename to platforms/android/cordova/node_modules/lodash/math/sum.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/number.js b/platforms/android/cordova/node_modules/lodash/number.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/number.js rename to platforms/android/cordova/node_modules/lodash/number.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/number/inRange.js b/platforms/android/cordova/node_modules/lodash/number/inRange.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/number/inRange.js rename to platforms/android/cordova/node_modules/lodash/number/inRange.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/number/random.js b/platforms/android/cordova/node_modules/lodash/number/random.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/number/random.js rename to platforms/android/cordova/node_modules/lodash/number/random.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object.js b/platforms/android/cordova/node_modules/lodash/object.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object.js rename to platforms/android/cordova/node_modules/lodash/object.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/assign.js b/platforms/android/cordova/node_modules/lodash/object/assign.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/assign.js rename to platforms/android/cordova/node_modules/lodash/object/assign.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/create.js b/platforms/android/cordova/node_modules/lodash/object/create.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/create.js rename to platforms/android/cordova/node_modules/lodash/object/create.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/defaults.js b/platforms/android/cordova/node_modules/lodash/object/defaults.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/defaults.js rename to platforms/android/cordova/node_modules/lodash/object/defaults.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/defaultsDeep.js b/platforms/android/cordova/node_modules/lodash/object/defaultsDeep.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/defaultsDeep.js rename to platforms/android/cordova/node_modules/lodash/object/defaultsDeep.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/extend.js b/platforms/android/cordova/node_modules/lodash/object/extend.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/extend.js rename to platforms/android/cordova/node_modules/lodash/object/extend.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/findKey.js b/platforms/android/cordova/node_modules/lodash/object/findKey.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/findKey.js rename to platforms/android/cordova/node_modules/lodash/object/findKey.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/findLastKey.js b/platforms/android/cordova/node_modules/lodash/object/findLastKey.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/findLastKey.js rename to platforms/android/cordova/node_modules/lodash/object/findLastKey.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/forIn.js b/platforms/android/cordova/node_modules/lodash/object/forIn.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/forIn.js rename to platforms/android/cordova/node_modules/lodash/object/forIn.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/forInRight.js b/platforms/android/cordova/node_modules/lodash/object/forInRight.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/forInRight.js rename to platforms/android/cordova/node_modules/lodash/object/forInRight.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/forOwn.js b/platforms/android/cordova/node_modules/lodash/object/forOwn.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/forOwn.js rename to platforms/android/cordova/node_modules/lodash/object/forOwn.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/forOwnRight.js b/platforms/android/cordova/node_modules/lodash/object/forOwnRight.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/forOwnRight.js rename to platforms/android/cordova/node_modules/lodash/object/forOwnRight.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/functions.js b/platforms/android/cordova/node_modules/lodash/object/functions.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/functions.js rename to platforms/android/cordova/node_modules/lodash/object/functions.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/get.js b/platforms/android/cordova/node_modules/lodash/object/get.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/get.js rename to platforms/android/cordova/node_modules/lodash/object/get.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/has.js b/platforms/android/cordova/node_modules/lodash/object/has.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/has.js rename to platforms/android/cordova/node_modules/lodash/object/has.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/invert.js b/platforms/android/cordova/node_modules/lodash/object/invert.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/invert.js rename to platforms/android/cordova/node_modules/lodash/object/invert.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/keys.js b/platforms/android/cordova/node_modules/lodash/object/keys.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/keys.js rename to platforms/android/cordova/node_modules/lodash/object/keys.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/keysIn.js b/platforms/android/cordova/node_modules/lodash/object/keysIn.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/keysIn.js rename to platforms/android/cordova/node_modules/lodash/object/keysIn.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/mapKeys.js b/platforms/android/cordova/node_modules/lodash/object/mapKeys.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/mapKeys.js rename to platforms/android/cordova/node_modules/lodash/object/mapKeys.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/mapValues.js b/platforms/android/cordova/node_modules/lodash/object/mapValues.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/mapValues.js rename to platforms/android/cordova/node_modules/lodash/object/mapValues.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/merge.js b/platforms/android/cordova/node_modules/lodash/object/merge.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/merge.js rename to platforms/android/cordova/node_modules/lodash/object/merge.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/methods.js b/platforms/android/cordova/node_modules/lodash/object/methods.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/methods.js rename to platforms/android/cordova/node_modules/lodash/object/methods.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/omit.js b/platforms/android/cordova/node_modules/lodash/object/omit.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/omit.js rename to platforms/android/cordova/node_modules/lodash/object/omit.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/pairs.js b/platforms/android/cordova/node_modules/lodash/object/pairs.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/pairs.js rename to platforms/android/cordova/node_modules/lodash/object/pairs.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/pick.js b/platforms/android/cordova/node_modules/lodash/object/pick.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/pick.js rename to platforms/android/cordova/node_modules/lodash/object/pick.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/result.js b/platforms/android/cordova/node_modules/lodash/object/result.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/result.js rename to platforms/android/cordova/node_modules/lodash/object/result.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/set.js b/platforms/android/cordova/node_modules/lodash/object/set.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/set.js rename to platforms/android/cordova/node_modules/lodash/object/set.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/transform.js b/platforms/android/cordova/node_modules/lodash/object/transform.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/transform.js rename to platforms/android/cordova/node_modules/lodash/object/transform.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/values.js b/platforms/android/cordova/node_modules/lodash/object/values.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/values.js rename to platforms/android/cordova/node_modules/lodash/object/values.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/valuesIn.js b/platforms/android/cordova/node_modules/lodash/object/valuesIn.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/object/valuesIn.js rename to platforms/android/cordova/node_modules/lodash/object/valuesIn.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/package.json b/platforms/android/cordova/node_modules/lodash/package.json similarity index 73% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/package.json rename to platforms/android/cordova/node_modules/lodash/package.json index daef6d2..38e2638 100644 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/package.json +++ b/platforms/android/cordova/node_modules/lodash/package.json @@ -1,21 +1,46 @@ { - "name": "lodash", - "version": "3.10.1", - "description": "The modern build of lodash modular utilities.", - "homepage": "https://lodash.com/", - "icon": "https://lodash.com/icon.svg", - "license": "MIT", - "main": "index.js", - "keywords": [ - "modules", - "stdlib", - "util" + "_args": [ + [ + "lodash@^3.5.0", + "/Users/steveng/repo/cordova/cordova-android/node_modules/xmlbuilder" + ] + ], + "_from": "lodash@>=3.5.0 <4.0.0", + "_id": "lodash@3.10.1", + "_inCache": true, + "_installable": true, + "_location": "/lodash", + "_nodeVersion": "0.12.5", + "_npmUser": { + "email": "john.david.dalton@gmail.com", + "name": "jdalton" + }, + "_npmVersion": "2.13.1", + "_phantomChildren": {}, + "_requested": { + "name": "lodash", + "raw": "lodash@^3.5.0", + "rawSpec": "^3.5.0", + "scope": null, + "spec": ">=3.5.0 <4.0.0", + "type": "range" + }, + "_requiredBy": [ + "/xmlbuilder" ], + "_resolved": "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "_shasum": "5bf45e8e49ba4189e17d482789dfd15bd140b7b6", + "_shrinkwrap": null, + "_spec": "lodash@^3.5.0", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/xmlbuilder", "author": { - "name": "John-David Dalton", "email": "john.david.dalton@gmail.com", + "name": "John-David Dalton", "url": "http://allyoucanleet.com/" }, + "bugs": { + "url": "https://github.com/lodash/lodash/issues" + }, "contributors": [ { "name": "John-David Dalton", @@ -43,25 +68,23 @@ "url": "https://mathiasbynens.be/" } ], - "repository": { - "type": "git", - "url": "git+https://github.com/lodash/lodash.git" - }, - "scripts": { - "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\"" - }, - "bugs": { - "url": "https://github.com/lodash/lodash/issues" - }, - "_id": "lodash@3.10.1", - "_shasum": "5bf45e8e49ba4189e17d482789dfd15bd140b7b6", - "_from": "lodash@>=3.5.0 <4.0.0", - "_npmVersion": "2.13.1", - "_nodeVersion": "0.12.5", - "_npmUser": { - "name": "jdalton", - "email": "john.david.dalton@gmail.com" + "dependencies": {}, + "description": "The modern build of lodash modular utilities.", + "devDependencies": {}, + "directories": {}, + "dist": { + "shasum": "5bf45e8e49ba4189e17d482789dfd15bd140b7b6", + "tarball": "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz" }, + "homepage": "https://lodash.com/", + "icon": "https://lodash.com/icon.svg", + "keywords": [ + "modules", + "stdlib", + "util" + ], + "license": "MIT", + "main": "index.js", "maintainers": [ { "name": "jdalton", @@ -84,11 +107,15 @@ "email": "demoneaux@gmail.com" } ], - "dist": { - "shasum": "5bf45e8e49ba4189e17d482789dfd15bd140b7b6", - "tarball": "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz" + "name": "lodash", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git+https://github.com/lodash/lodash.git" }, - "directories": {}, - "_resolved": "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", - "readme": "ERROR: No README data found!" + "scripts": { + "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\"" + }, + "version": "3.10.1" } diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string.js b/platforms/android/cordova/node_modules/lodash/string.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string.js rename to platforms/android/cordova/node_modules/lodash/string.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/camelCase.js b/platforms/android/cordova/node_modules/lodash/string/camelCase.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/camelCase.js rename to platforms/android/cordova/node_modules/lodash/string/camelCase.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/capitalize.js b/platforms/android/cordova/node_modules/lodash/string/capitalize.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/capitalize.js rename to platforms/android/cordova/node_modules/lodash/string/capitalize.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/deburr.js b/platforms/android/cordova/node_modules/lodash/string/deburr.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/deburr.js rename to platforms/android/cordova/node_modules/lodash/string/deburr.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/endsWith.js b/platforms/android/cordova/node_modules/lodash/string/endsWith.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/endsWith.js rename to platforms/android/cordova/node_modules/lodash/string/endsWith.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/escape.js b/platforms/android/cordova/node_modules/lodash/string/escape.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/escape.js rename to platforms/android/cordova/node_modules/lodash/string/escape.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/escapeRegExp.js b/platforms/android/cordova/node_modules/lodash/string/escapeRegExp.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/escapeRegExp.js rename to platforms/android/cordova/node_modules/lodash/string/escapeRegExp.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/kebabCase.js b/platforms/android/cordova/node_modules/lodash/string/kebabCase.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/kebabCase.js rename to platforms/android/cordova/node_modules/lodash/string/kebabCase.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/pad.js b/platforms/android/cordova/node_modules/lodash/string/pad.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/pad.js rename to platforms/android/cordova/node_modules/lodash/string/pad.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/padLeft.js b/platforms/android/cordova/node_modules/lodash/string/padLeft.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/padLeft.js rename to platforms/android/cordova/node_modules/lodash/string/padLeft.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/padRight.js b/platforms/android/cordova/node_modules/lodash/string/padRight.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/padRight.js rename to platforms/android/cordova/node_modules/lodash/string/padRight.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/parseInt.js b/platforms/android/cordova/node_modules/lodash/string/parseInt.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/parseInt.js rename to platforms/android/cordova/node_modules/lodash/string/parseInt.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/repeat.js b/platforms/android/cordova/node_modules/lodash/string/repeat.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/repeat.js rename to platforms/android/cordova/node_modules/lodash/string/repeat.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/snakeCase.js b/platforms/android/cordova/node_modules/lodash/string/snakeCase.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/snakeCase.js rename to platforms/android/cordova/node_modules/lodash/string/snakeCase.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/startCase.js b/platforms/android/cordova/node_modules/lodash/string/startCase.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/startCase.js rename to platforms/android/cordova/node_modules/lodash/string/startCase.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/startsWith.js b/platforms/android/cordova/node_modules/lodash/string/startsWith.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/startsWith.js rename to platforms/android/cordova/node_modules/lodash/string/startsWith.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/template.js b/platforms/android/cordova/node_modules/lodash/string/template.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/template.js rename to platforms/android/cordova/node_modules/lodash/string/template.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/templateSettings.js b/platforms/android/cordova/node_modules/lodash/string/templateSettings.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/templateSettings.js rename to platforms/android/cordova/node_modules/lodash/string/templateSettings.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/trim.js b/platforms/android/cordova/node_modules/lodash/string/trim.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/trim.js rename to platforms/android/cordova/node_modules/lodash/string/trim.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/trimLeft.js b/platforms/android/cordova/node_modules/lodash/string/trimLeft.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/trimLeft.js rename to platforms/android/cordova/node_modules/lodash/string/trimLeft.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/trimRight.js b/platforms/android/cordova/node_modules/lodash/string/trimRight.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/trimRight.js rename to platforms/android/cordova/node_modules/lodash/string/trimRight.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/trunc.js b/platforms/android/cordova/node_modules/lodash/string/trunc.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/trunc.js rename to platforms/android/cordova/node_modules/lodash/string/trunc.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/unescape.js b/platforms/android/cordova/node_modules/lodash/string/unescape.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/unescape.js rename to platforms/android/cordova/node_modules/lodash/string/unescape.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/words.js b/platforms/android/cordova/node_modules/lodash/string/words.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/string/words.js rename to platforms/android/cordova/node_modules/lodash/string/words.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/support.js b/platforms/android/cordova/node_modules/lodash/support.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/support.js rename to platforms/android/cordova/node_modules/lodash/support.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility.js b/platforms/android/cordova/node_modules/lodash/utility.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility.js rename to platforms/android/cordova/node_modules/lodash/utility.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/attempt.js b/platforms/android/cordova/node_modules/lodash/utility/attempt.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/attempt.js rename to platforms/android/cordova/node_modules/lodash/utility/attempt.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/callback.js b/platforms/android/cordova/node_modules/lodash/utility/callback.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/callback.js rename to platforms/android/cordova/node_modules/lodash/utility/callback.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/constant.js b/platforms/android/cordova/node_modules/lodash/utility/constant.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/constant.js rename to platforms/android/cordova/node_modules/lodash/utility/constant.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/identity.js b/platforms/android/cordova/node_modules/lodash/utility/identity.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/identity.js rename to platforms/android/cordova/node_modules/lodash/utility/identity.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/iteratee.js b/platforms/android/cordova/node_modules/lodash/utility/iteratee.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/iteratee.js rename to platforms/android/cordova/node_modules/lodash/utility/iteratee.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/matches.js b/platforms/android/cordova/node_modules/lodash/utility/matches.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/matches.js rename to platforms/android/cordova/node_modules/lodash/utility/matches.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/matchesProperty.js b/platforms/android/cordova/node_modules/lodash/utility/matchesProperty.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/matchesProperty.js rename to platforms/android/cordova/node_modules/lodash/utility/matchesProperty.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/method.js b/platforms/android/cordova/node_modules/lodash/utility/method.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/method.js rename to platforms/android/cordova/node_modules/lodash/utility/method.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/methodOf.js b/platforms/android/cordova/node_modules/lodash/utility/methodOf.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/methodOf.js rename to platforms/android/cordova/node_modules/lodash/utility/methodOf.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/mixin.js b/platforms/android/cordova/node_modules/lodash/utility/mixin.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/mixin.js rename to platforms/android/cordova/node_modules/lodash/utility/mixin.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/noop.js b/platforms/android/cordova/node_modules/lodash/utility/noop.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/noop.js rename to platforms/android/cordova/node_modules/lodash/utility/noop.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/property.js b/platforms/android/cordova/node_modules/lodash/utility/property.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/property.js rename to platforms/android/cordova/node_modules/lodash/utility/property.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/propertyOf.js b/platforms/android/cordova/node_modules/lodash/utility/propertyOf.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/propertyOf.js rename to platforms/android/cordova/node_modules/lodash/utility/propertyOf.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/range.js b/platforms/android/cordova/node_modules/lodash/utility/range.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/range.js rename to platforms/android/cordova/node_modules/lodash/utility/range.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/times.js b/platforms/android/cordova/node_modules/lodash/utility/times.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/times.js rename to platforms/android/cordova/node_modules/lodash/utility/times.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/uniqueId.js b/platforms/android/cordova/node_modules/lodash/utility/uniqueId.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/node_modules/lodash/utility/uniqueId.js rename to platforms/android/cordova/node_modules/lodash/utility/uniqueId.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/LICENSE b/platforms/android/cordova/node_modules/minimatch/LICENSE similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/LICENSE rename to platforms/android/cordova/node_modules/minimatch/LICENSE diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/README.md b/platforms/android/cordova/node_modules/minimatch/README.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/README.md rename to platforms/android/cordova/node_modules/minimatch/README.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/minimatch.js b/platforms/android/cordova/node_modules/minimatch/minimatch.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/minimatch.js rename to platforms/android/cordova/node_modules/minimatch/minimatch.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/package.json b/platforms/android/cordova/node_modules/minimatch/package.json similarity index 65% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/package.json rename to platforms/android/cordova/node_modules/minimatch/package.json index 5cd95f2..5f6a7fc 100644 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/minimatch/package.json +++ b/platforms/android/cordova/node_modules/minimatch/package.json @@ -1,60 +1,85 @@ { + "_args": [ + [ + "minimatch@2 || 3", + "/Users/steveng/repo/cordova/cordova-android/node_modules/glob" + ] + ], + "_from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0", + "_id": "minimatch@3.0.0", + "_inCache": true, + "_installable": true, + "_location": "/minimatch", + "_nodeVersion": "4.0.0", + "_npmUser": { + "email": "isaacs@npmjs.com", + "name": "isaacs" + }, + "_npmVersion": "3.3.2", + "_phantomChildren": {}, + "_requested": { + "name": "minimatch", + "raw": "minimatch@2 || 3", + "rawSpec": "2 || 3", + "scope": null, + "spec": ">=2.0.0 <3.0.0||>=3.0.0 <4.0.0", + "type": "range" + }, + "_requiredBy": [ + "/glob" + ], + "_resolved": "http://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz", + "_shasum": "5236157a51e4f004c177fb3c527ff7dd78f0ef83", + "_shrinkwrap": null, + "_spec": "minimatch@2 || 3", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/glob", "author": { - "name": "Isaac Z. Schlueter", "email": "i@izs.me", + "name": "Isaac Z. Schlueter", "url": "http://blog.izs.me" }, - "name": "minimatch", - "description": "a glob matcher in javascript", - "version": "3.0.0", - "repository": { - "type": "git", - "url": "git://github.com/isaacs/minimatch.git" - }, - "main": "minimatch.js", - "scripts": { - "posttest": "standard minimatch.js test/*.js", - "test": "tap test/*.js" - }, - "engines": { - "node": "*" + "bugs": { + "url": "https://github.com/isaacs/minimatch/issues" }, "dependencies": { "brace-expansion": "^1.0.0" }, + "description": "a glob matcher in javascript", "devDependencies": { "standard": "^3.7.2", "tap": "^1.2.0" }, - "license": "ISC", + "directories": {}, + "dist": { + "shasum": "5236157a51e4f004c177fb3c527ff7dd78f0ef83", + "tarball": "http://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz" + }, + "engines": { + "node": "*" + }, "files": [ "minimatch.js" ], "gitHead": "270dbea567f0af6918cb18103e98c612aa717a20", - "bugs": { - "url": "https://github.com/isaacs/minimatch/issues" - }, "homepage": "https://github.com/isaacs/minimatch#readme", - "_id": "minimatch@3.0.0", - "_shasum": "5236157a51e4f004c177fb3c527ff7dd78f0ef83", - "_from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0", - "_npmVersion": "3.3.2", - "_nodeVersion": "4.0.0", - "_npmUser": { - "name": "isaacs", - "email": "isaacs@npmjs.com" - }, - "dist": { - "shasum": "5236157a51e4f004c177fb3c527ff7dd78f0ef83", - "tarball": "http://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz" - }, + "license": "ISC", + "main": "minimatch.js", "maintainers": [ { "name": "isaacs", "email": "i@izs.me" } ], - "directories": {}, - "_resolved": "http://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz", - "readme": "ERROR: No README data found!" + "name": "minimatch", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git://github.com/isaacs/minimatch.git" + }, + "scripts": { + "posttest": "standard minimatch.js test/*.js", + "test": "tap test/*.js" + }, + "version": "3.0.0" } diff --git a/platforms/android/cordova/node_modules/nopt/node_modules/abbrev/LICENSE b/platforms/android/cordova/node_modules/nopt/node_modules/abbrev/LICENSE deleted file mode 100644 index 19129e3..0000000 --- a/platforms/android/cordova/node_modules/nopt/node_modules/abbrev/LICENSE +++ /dev/null @@ -1,15 +0,0 @@ -The ISC License - -Copyright (c) Isaac Z. Schlueter and Contributors - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR -IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/platforms/android/cordova/node_modules/nopt/package.json b/platforms/android/cordova/node_modules/nopt/package.json index be245f4..37ed58d 100644 --- a/platforms/android/cordova/node_modules/nopt/package.json +++ b/platforms/android/cordova/node_modules/nopt/package.json @@ -1,48 +1,65 @@ { - "name": "nopt", - "version": "3.0.6", - "description": "Option parsing for Node, supporting types, shorthands, etc. Used by npm.", + "_args": [ + [ + "nopt@^3.0.1", + "/Users/steveng/repo/cordova/cordova-android" + ] + ], + "_from": "nopt@>=3.0.1 <4.0.0", + "_id": "nopt@3.0.6", + "_inCache": true, + "_installable": true, + "_location": "/nopt", + "_nodeVersion": "4.2.1", + "_npmUser": { + "email": "ogd@aoaioxxysz.net", + "name": "othiym23" + }, + "_npmVersion": "2.14.10", + "_phantomChildren": {}, + "_requested": { + "name": "nopt", + "raw": "nopt@^3.0.1", + "rawSpec": "^3.0.1", + "scope": null, + "spec": ">=3.0.1 <4.0.0", + "type": "range" + }, + "_requiredBy": [ + "/" + ], + "_resolved": "http://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "_shasum": "c6465dbf08abcd4db359317f79ac68a646b28ff9", + "_shrinkwrap": null, + "_spec": "nopt@^3.0.1", + "_where": "/Users/steveng/repo/cordova/cordova-android", "author": { - "name": "Isaac Z. Schlueter", "email": "i@izs.me", + "name": "Isaac Z. Schlueter", "url": "http://blog.izs.me/" }, - "main": "lib/nopt.js", - "scripts": { - "test": "tap test/*.js" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/npm/nopt.git" - }, "bin": { "nopt": "./bin/nopt.js" }, - "license": "ISC", + "bugs": { + "url": "https://github.com/npm/nopt/issues" + }, "dependencies": { "abbrev": "1" }, + "description": "Option parsing for Node, supporting types, shorthands, etc. Used by npm.", "devDependencies": { "tap": "^1.2.0" }, - "gitHead": "10a750c9bb99c1950160353459e733ac2aa18cb6", - "bugs": { - "url": "https://github.com/npm/nopt/issues" - }, - "homepage": "https://github.com/npm/nopt#readme", - "_id": "nopt@3.0.6", - "_shasum": "c6465dbf08abcd4db359317f79ac68a646b28ff9", - "_from": "nopt@>=3.0.1 <4.0.0", - "_npmVersion": "2.14.10", - "_nodeVersion": "4.2.1", - "_npmUser": { - "name": "othiym23", - "email": "ogd@aoaioxxysz.net" - }, + "directories": {}, "dist": { "shasum": "c6465dbf08abcd4db359317f79ac68a646b28ff9", "tarball": "http://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz" }, + "gitHead": "10a750c9bb99c1950160353459e733ac2aa18cb6", + "homepage": "https://github.com/npm/nopt#readme", + "license": "ISC", + "main": "lib/nopt.js", "maintainers": [ { "name": "isaacs", @@ -57,7 +74,15 @@ "email": "kat@sykosomatic.org" } ], - "directories": {}, - "_resolved": "http://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "readme": "ERROR: No README data found!" + "name": "nopt", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git+https://github.com/npm/nopt.git" + }, + "scripts": { + "test": "tap test/*.js" + }, + "version": "3.0.6" } diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/once/LICENSE b/platforms/android/cordova/node_modules/once/LICENSE similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/once/LICENSE rename to platforms/android/cordova/node_modules/once/LICENSE diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/once/README.md b/platforms/android/cordova/node_modules/once/README.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/once/README.md rename to platforms/android/cordova/node_modules/once/README.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/once/once.js b/platforms/android/cordova/node_modules/once/once.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/once/once.js rename to platforms/android/cordova/node_modules/once/once.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/once/package.json b/platforms/android/cordova/node_modules/once/package.json similarity index 64% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/once/package.json rename to platforms/android/cordova/node_modules/once/package.json index 6e86138..18c7f8c 100644 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/once/package.json +++ b/platforms/android/cordova/node_modules/once/package.json @@ -1,63 +1,89 @@ { - "name": "once", - "version": "1.3.3", - "description": "Run a function exactly one time", - "main": "once.js", - "directories": { - "test": "test" + "_args": [ + [ + "once@^1.3.0", + "/Users/steveng/repo/cordova/cordova-android/node_modules/glob" + ] + ], + "_from": "once@>=1.3.0 <2.0.0", + "_id": "once@1.3.3", + "_inCache": true, + "_installable": true, + "_location": "/once", + "_nodeVersion": "4.0.0", + "_npmUser": { + "email": "i@izs.me", + "name": "isaacs" + }, + "_npmVersion": "3.3.2", + "_phantomChildren": {}, + "_requested": { + "name": "once", + "raw": "once@^1.3.0", + "rawSpec": "^1.3.0", + "scope": null, + "spec": ">=1.3.0 <2.0.0", + "type": "range" + }, + "_requiredBy": [ + "/glob", + "/inflight" + ], + "_resolved": "http://registry.npmjs.org/once/-/once-1.3.3.tgz", + "_shasum": "b2e261557ce4c314ec8304f3fa82663e4297ca20", + "_shrinkwrap": null, + "_spec": "once@^1.3.0", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/glob", + "author": { + "email": "i@izs.me", + "name": "Isaac Z. Schlueter", + "url": "http://blog.izs.me/" + }, + "bugs": { + "url": "https://github.com/isaacs/once/issues" }, "dependencies": { "wrappy": "1" }, + "description": "Run a function exactly one time", "devDependencies": { "tap": "^1.2.0" }, - "scripts": { - "test": "tap test/*.js" + "directories": { + "test": "test" + }, + "dist": { + "shasum": "b2e261557ce4c314ec8304f3fa82663e4297ca20", + "tarball": "http://registry.npmjs.org/once/-/once-1.3.3.tgz" }, "files": [ "once.js" ], - "repository": { - "type": "git", - "url": "git://github.com/isaacs/once.git" - }, + "gitHead": "2ad558657e17fafd24803217ba854762842e4178", + "homepage": "https://github.com/isaacs/once#readme", "keywords": [ - "once", "function", + "once", "one", "single" ], - "author": { - "name": "Isaac Z. Schlueter", - "email": "i@izs.me", - "url": "http://blog.izs.me/" - }, "license": "ISC", - "gitHead": "2ad558657e17fafd24803217ba854762842e4178", - "bugs": { - "url": "https://github.com/isaacs/once/issues" - }, - "homepage": "https://github.com/isaacs/once#readme", - "_id": "once@1.3.3", - "_shasum": "b2e261557ce4c314ec8304f3fa82663e4297ca20", - "_from": "once@>=1.3.0 <2.0.0", - "_npmVersion": "3.3.2", - "_nodeVersion": "4.0.0", - "_npmUser": { - "name": "isaacs", - "email": "i@izs.me" - }, - "dist": { - "shasum": "b2e261557ce4c314ec8304f3fa82663e4297ca20", - "tarball": "http://registry.npmjs.org/once/-/once-1.3.3.tgz" - }, + "main": "once.js", "maintainers": [ { "name": "isaacs", "email": "i@izs.me" } ], - "_resolved": "http://registry.npmjs.org/once/-/once-1.3.3.tgz", - "readme": "ERROR: No README data found!" + "name": "once", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git://github.com/isaacs/once.git" + }, + "scripts": { + "test": "tap test/*.js" + }, + "version": "1.3.3" } diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/node_modules/os-homedir/index.js b/platforms/android/cordova/node_modules/os-homedir/index.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/node_modules/os-homedir/index.js rename to platforms/android/cordova/node_modules/os-homedir/index.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/path-is-absolute/license b/platforms/android/cordova/node_modules/os-homedir/license similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/path-is-absolute/license rename to platforms/android/cordova/node_modules/os-homedir/license diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/node_modules/os-homedir/package.json b/platforms/android/cordova/node_modules/os-homedir/package.json similarity index 65% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/node_modules/os-homedir/package.json rename to platforms/android/cordova/node_modules/os-homedir/package.json index 7078228..7dbd200 100644 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/node_modules/os-homedir/package.json +++ b/platforms/android/cordova/node_modules/os-homedir/package.json @@ -1,70 +1,96 @@ { - "name": "os-homedir", - "version": "1.0.1", - "description": "io.js 2.3.0 os.homedir() ponyfill", - "license": "MIT", - "repository": { - "type": "git", - "url": "git+https://github.com/sindresorhus/os-homedir.git" + "_args": [ + [ + "os-homedir@^1.0.0", + "/Users/steveng/repo/cordova/cordova-android/node_modules/osenv" + ] + ], + "_from": "os-homedir@>=1.0.0 <2.0.0", + "_id": "os-homedir@1.0.1", + "_inCache": true, + "_installable": true, + "_location": "/os-homedir", + "_nodeVersion": "0.12.5", + "_npmUser": { + "email": "sindresorhus@gmail.com", + "name": "sindresorhus" }, + "_npmVersion": "2.11.2", + "_phantomChildren": {}, + "_requested": { + "name": "os-homedir", + "raw": "os-homedir@^1.0.0", + "rawSpec": "^1.0.0", + "scope": null, + "spec": ">=1.0.0 <2.0.0", + "type": "range" + }, + "_requiredBy": [ + "/osenv" + ], + "_resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz", + "_shasum": "0d62bdf44b916fd3bbdcf2cab191948fb094f007", + "_shrinkwrap": null, + "_spec": "os-homedir@^1.0.0", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/osenv", "author": { - "name": "Sindre Sorhus", "email": "sindresorhus@gmail.com", + "name": "Sindre Sorhus", "url": "sindresorhus.com" }, + "bugs": { + "url": "https://github.com/sindresorhus/os-homedir/issues" + }, + "dependencies": {}, + "description": "io.js 2.3.0 os.homedir() ponyfill", + "devDependencies": { + "ava": "0.0.4", + "path-exists": "^1.0.0" + }, + "directories": {}, + "dist": { + "shasum": "0d62bdf44b916fd3bbdcf2cab191948fb094f007", + "tarball": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz" + }, "engines": { "node": ">=0.10.0" }, - "scripts": { - "test": "node test.js" - }, "files": [ "index.js" ], + "gitHead": "13ff83fbd13ebe286a6092286b2c634ab4534c5f", + "homepage": "https://github.com/sindresorhus/os-homedir", "keywords": [ "built-in", "core", - "ponyfill", - "polyfill", - "shim", - "os", - "homedir", - "home", "dir", "directory", "folder", - "user", - "path" + "home", + "homedir", + "os", + "path", + "polyfill", + "ponyfill", + "shim", + "user" ], - "devDependencies": { - "ava": "0.0.4", - "path-exists": "^1.0.0" - }, - "gitHead": "13ff83fbd13ebe286a6092286b2c634ab4534c5f", - "bugs": { - "url": "https://github.com/sindresorhus/os-homedir/issues" - }, - "homepage": "https://github.com/sindresorhus/os-homedir", - "_id": "os-homedir@1.0.1", - "_shasum": "0d62bdf44b916fd3bbdcf2cab191948fb094f007", - "_from": "os-homedir@>=1.0.0 <2.0.0", - "_npmVersion": "2.11.2", - "_nodeVersion": "0.12.5", - "_npmUser": { - "name": "sindresorhus", - "email": "sindresorhus@gmail.com" - }, - "dist": { - "shasum": "0d62bdf44b916fd3bbdcf2cab191948fb094f007", - "tarball": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz" - }, + "license": "MIT", "maintainers": [ { "name": "sindresorhus", "email": "sindresorhus@gmail.com" } ], - "directories": {}, - "_resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz", - "readme": "ERROR: No README data found!" + "name": "os-homedir", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git+https://github.com/sindresorhus/os-homedir.git" + }, + "scripts": { + "test": "node test.js" + }, + "version": "1.0.1" } diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/node_modules/os-homedir/readme.md b/platforms/android/cordova/node_modules/os-homedir/readme.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/node_modules/os-homedir/readme.md rename to platforms/android/cordova/node_modules/os-homedir/readme.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/node_modules/os-tmpdir/index.js b/platforms/android/cordova/node_modules/os-tmpdir/index.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/node_modules/os-tmpdir/index.js rename to platforms/android/cordova/node_modules/os-tmpdir/index.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/node_modules/os-homedir/license b/platforms/android/cordova/node_modules/os-tmpdir/license similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/node_modules/os-homedir/license rename to platforms/android/cordova/node_modules/os-tmpdir/license diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/node_modules/os-tmpdir/package.json b/platforms/android/cordova/node_modules/os-tmpdir/package.json similarity index 64% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/node_modules/os-tmpdir/package.json rename to platforms/android/cordova/node_modules/os-tmpdir/package.json index 8a19b3f..ce48381 100644 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/node_modules/os-tmpdir/package.json +++ b/platforms/android/cordova/node_modules/os-tmpdir/package.json @@ -1,70 +1,96 @@ { - "name": "os-tmpdir", - "version": "1.0.1", - "description": "Node.js os.tmpdir() ponyfill", - "license": "MIT", - "repository": { - "type": "git", - "url": "git+https://github.com/sindresorhus/os-tmpdir.git" + "_args": [ + [ + "os-tmpdir@^1.0.0", + "/Users/steveng/repo/cordova/cordova-android/node_modules/osenv" + ] + ], + "_from": "os-tmpdir@>=1.0.0 <2.0.0", + "_id": "os-tmpdir@1.0.1", + "_inCache": true, + "_installable": true, + "_location": "/os-tmpdir", + "_nodeVersion": "0.12.3", + "_npmUser": { + "email": "sindresorhus@gmail.com", + "name": "sindresorhus" }, + "_npmVersion": "2.9.1", + "_phantomChildren": {}, + "_requested": { + "name": "os-tmpdir", + "raw": "os-tmpdir@^1.0.0", + "rawSpec": "^1.0.0", + "scope": null, + "spec": ">=1.0.0 <2.0.0", + "type": "range" + }, + "_requiredBy": [ + "/osenv" + ], + "_resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz", + "_shasum": "e9b423a1edaf479882562e92ed71d7743a071b6e", + "_shrinkwrap": null, + "_spec": "os-tmpdir@^1.0.0", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/osenv", "author": { - "name": "Sindre Sorhus", "email": "sindresorhus@gmail.com", + "name": "Sindre Sorhus", "url": "sindresorhus.com" }, + "bugs": { + "url": "https://github.com/sindresorhus/os-tmpdir/issues" + }, + "dependencies": {}, + "description": "Node.js os.tmpdir() ponyfill", + "devDependencies": { + "ava": "0.0.4" + }, + "directories": {}, + "dist": { + "shasum": "e9b423a1edaf479882562e92ed71d7743a071b6e", + "tarball": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz" + }, "engines": { "node": ">=0.10.0" }, - "scripts": { - "test": "node test.js" - }, "files": [ "index.js" ], + "gitHead": "5c5d355f81378980db629d60128ad03e02b1c1e5", + "homepage": "https://github.com/sindresorhus/os-tmpdir", "keywords": [ "built-in", "core", - "ponyfill", + "dir", + "directory", + "env", + "environment", + "os", "polyfill", + "ponyfill", "shim", - "os", - "tmpdir", + "temp", "tempdir", "tmp", - "temp", - "dir", - "directory", - "env", - "environment" + "tmpdir" ], - "devDependencies": { - "ava": "0.0.4" - }, - "gitHead": "5c5d355f81378980db629d60128ad03e02b1c1e5", - "bugs": { - "url": "https://github.com/sindresorhus/os-tmpdir/issues" - }, - "homepage": "https://github.com/sindresorhus/os-tmpdir", - "_id": "os-tmpdir@1.0.1", - "_shasum": "e9b423a1edaf479882562e92ed71d7743a071b6e", - "_from": "os-tmpdir@>=1.0.0 <2.0.0", - "_npmVersion": "2.9.1", - "_nodeVersion": "0.12.3", - "_npmUser": { - "name": "sindresorhus", - "email": "sindresorhus@gmail.com" - }, - "dist": { - "shasum": "e9b423a1edaf479882562e92ed71d7743a071b6e", - "tarball": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz" - }, + "license": "MIT", "maintainers": [ { "name": "sindresorhus", "email": "sindresorhus@gmail.com" } ], - "directories": {}, - "_resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz", - "readme": "ERROR: No README data found!" + "name": "os-tmpdir", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git+https://github.com/sindresorhus/os-tmpdir.git" + }, + "scripts": { + "test": "node test.js" + }, + "version": "1.0.1" } diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/node_modules/os-tmpdir/readme.md b/platforms/android/cordova/node_modules/os-tmpdir/readme.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/node_modules/os-tmpdir/readme.md rename to platforms/android/cordova/node_modules/os-tmpdir/readme.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/.npmignore b/platforms/android/cordova/node_modules/osenv/.npmignore similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/.npmignore rename to platforms/android/cordova/node_modules/osenv/.npmignore diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/.travis.yml b/platforms/android/cordova/node_modules/osenv/.travis.yml similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/.travis.yml rename to platforms/android/cordova/node_modules/osenv/.travis.yml diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/once/node_modules/wrappy/LICENSE b/platforms/android/cordova/node_modules/osenv/LICENSE similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/once/node_modules/wrappy/LICENSE rename to platforms/android/cordova/node_modules/osenv/LICENSE diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/README.md b/platforms/android/cordova/node_modules/osenv/README.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/README.md rename to platforms/android/cordova/node_modules/osenv/README.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/osenv.js b/platforms/android/cordova/node_modules/osenv/osenv.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/osenv.js rename to platforms/android/cordova/node_modules/osenv/osenv.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/package.json b/platforms/android/cordova/node_modules/osenv/package.json similarity index 67% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/package.json rename to platforms/android/cordova/node_modules/osenv/package.json index 61262ea..43da54d 100644 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/package.json +++ b/platforms/android/cordova/node_modules/osenv/package.json @@ -1,58 +1,74 @@ { - "name": "osenv", - "version": "0.1.3", - "main": "osenv.js", - "directories": { - "test": "test" + "_args": [ + [ + "osenv@^0.1.3", + "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common" + ] + ], + "_from": "osenv@>=0.1.3 <0.2.0", + "_id": "osenv@0.1.3", + "_inCache": true, + "_installable": true, + "_location": "/osenv", + "_nodeVersion": "2.2.1", + "_npmUser": { + "email": "isaacs@npmjs.com", + "name": "isaacs" + }, + "_npmVersion": "3.0.0", + "_phantomChildren": {}, + "_requested": { + "name": "osenv", + "raw": "osenv@^0.1.3", + "rawSpec": "^0.1.3", + "scope": null, + "spec": ">=0.1.3 <0.2.0", + "type": "range" + }, + "_requiredBy": [ + "/cordova-common" + ], + "_resolved": "http://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz", + "_shasum": "83cf05c6d6458fc4d5ac6362ea325d92f2754217", + "_shrinkwrap": null, + "_spec": "osenv@^0.1.3", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common", + "author": { + "email": "i@izs.me", + "name": "Isaac Z. Schlueter", + "url": "http://blog.izs.me/" + }, + "bugs": { + "url": "https://github.com/npm/osenv/issues" }, "dependencies": { "os-homedir": "^1.0.0", "os-tmpdir": "^1.0.0" }, + "description": "Look up environment settings specific to different operating systems", "devDependencies": { "tap": "^1.2.0" }, - "scripts": { - "test": "tap test/*.js" + "directories": { + "test": "test" }, - "repository": { - "type": "git", - "url": "git+https://github.com/npm/osenv.git" + "dist": { + "shasum": "83cf05c6d6458fc4d5ac6362ea325d92f2754217", + "tarball": "http://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz" }, + "gitHead": "f746b3405d8f9e28054d11b97e1436f6a15016c4", + "homepage": "https://github.com/npm/osenv#readme", "keywords": [ "environment", - "variable", "home", - "tmpdir", "path", "prompt", - "ps1" + "ps1", + "tmpdir", + "variable" ], - "author": { - "name": "Isaac Z. Schlueter", - "email": "i@izs.me", - "url": "http://blog.izs.me/" - }, "license": "ISC", - "description": "Look up environment settings specific to different operating systems", - "gitHead": "f746b3405d8f9e28054d11b97e1436f6a15016c4", - "bugs": { - "url": "https://github.com/npm/osenv/issues" - }, - "homepage": "https://github.com/npm/osenv#readme", - "_id": "osenv@0.1.3", - "_shasum": "83cf05c6d6458fc4d5ac6362ea325d92f2754217", - "_from": "osenv@>=0.1.3 <0.2.0", - "_npmVersion": "3.0.0", - "_nodeVersion": "2.2.1", - "_npmUser": { - "name": "isaacs", - "email": "isaacs@npmjs.com" - }, - "dist": { - "shasum": "83cf05c6d6458fc4d5ac6362ea325d92f2754217", - "tarball": "http://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz" - }, + "main": "osenv.js", "maintainers": [ { "name": "isaacs", @@ -71,6 +87,15 @@ "email": "me@re-becca.org" } ], - "_resolved": "http://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz", - "readme": "ERROR: No README data found!" + "name": "osenv", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git+https://github.com/npm/osenv.git" + }, + "scripts": { + "test": "tap test/*.js" + }, + "version": "0.1.3" } diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/test/unix.js b/platforms/android/cordova/node_modules/osenv/test/unix.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/test/unix.js rename to platforms/android/cordova/node_modules/osenv/test/unix.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/test/windows.js b/platforms/android/cordova/node_modules/osenv/test/windows.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/test/windows.js rename to platforms/android/cordova/node_modules/osenv/test/windows.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/x.tap b/platforms/android/cordova/node_modules/osenv/x.tap similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/x.tap rename to platforms/android/cordova/node_modules/osenv/x.tap diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/path-is-absolute/index.js b/platforms/android/cordova/node_modules/path-is-absolute/index.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/path-is-absolute/index.js rename to platforms/android/cordova/node_modules/path-is-absolute/index.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/node_modules/os-tmpdir/license b/platforms/android/cordova/node_modules/path-is-absolute/license similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/node_modules/os-tmpdir/license rename to platforms/android/cordova/node_modules/path-is-absolute/license diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/path-is-absolute/package.json b/platforms/android/cordova/node_modules/path-is-absolute/package.json similarity index 64% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/path-is-absolute/package.json rename to platforms/android/cordova/node_modules/path-is-absolute/package.json index 1a12c82..12bed5a 100644 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/path-is-absolute/package.json +++ b/platforms/android/cordova/node_modules/path-is-absolute/package.json @@ -1,70 +1,97 @@ { - "name": "path-is-absolute", - "version": "1.0.0", - "description": "Node.js 0.12 path.isAbsolute() ponyfill", - "license": "MIT", - "repository": { - "type": "git", - "url": "git+https://github.com/sindresorhus/path-is-absolute.git" + "_args": [ + [ + "path-is-absolute@^1.0.0", + "/Users/steveng/repo/cordova/cordova-android/node_modules/glob" + ] + ], + "_from": "path-is-absolute@>=1.0.0 <2.0.0", + "_id": "path-is-absolute@1.0.0", + "_inCache": true, + "_installable": true, + "_location": "/path-is-absolute", + "_nodeVersion": "0.12.0", + "_npmUser": { + "email": "sindresorhus@gmail.com", + "name": "sindresorhus" }, + "_npmVersion": "2.5.1", + "_phantomChildren": {}, + "_requested": { + "name": "path-is-absolute", + "raw": "path-is-absolute@^1.0.0", + "rawSpec": "^1.0.0", + "scope": null, + "spec": ">=1.0.0 <2.0.0", + "type": "range" + }, + "_requiredBy": [ + "/glob" + ], + "_resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz", + "_shasum": "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912", + "_shrinkwrap": null, + "_spec": "path-is-absolute@^1.0.0", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/glob", "author": { - "name": "Sindre Sorhus", "email": "sindresorhus@gmail.com", + "name": "Sindre Sorhus", "url": "sindresorhus.com" }, + "bugs": { + "url": "https://github.com/sindresorhus/path-is-absolute/issues" + }, + "dependencies": {}, + "description": "Node.js 0.12 path.isAbsolute() ponyfill", + "devDependencies": {}, + "directories": {}, + "dist": { + "shasum": "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912", + "tarball": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz" + }, "engines": { "node": ">=0.10.0" }, - "scripts": { - "test": "node test.js" - }, "files": [ "index.js" ], + "gitHead": "7a76a0c9f2263192beedbe0a820e4d0baee5b7a1", + "homepage": "https://github.com/sindresorhus/path-is-absolute", "keywords": [ - "path", - "paths", - "file", - "dir", "absolute", - "isabsolute", - "is-absolute", "built-in", - "util", - "utils", + "check", "core", - "ponyfill", + "detect", + "dir", + "file", + "is", + "is-absolute", + "isabsolute", + "path", + "paths", "polyfill", + "ponyfill", "shim", - "is", - "detect", - "check" + "util", + "utils" ], - "gitHead": "7a76a0c9f2263192beedbe0a820e4d0baee5b7a1", - "bugs": { - "url": "https://github.com/sindresorhus/path-is-absolute/issues" - }, - "homepage": "https://github.com/sindresorhus/path-is-absolute", - "_id": "path-is-absolute@1.0.0", - "_shasum": "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912", - "_from": "path-is-absolute@>=1.0.0 <2.0.0", - "_npmVersion": "2.5.1", - "_nodeVersion": "0.12.0", - "_npmUser": { - "name": "sindresorhus", - "email": "sindresorhus@gmail.com" - }, + "license": "MIT", "maintainers": [ { "name": "sindresorhus", "email": "sindresorhus@gmail.com" } ], - "dist": { - "shasum": "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912", - "tarball": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz" + "name": "path-is-absolute", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git+https://github.com/sindresorhus/path-is-absolute.git" }, - "directories": {}, - "_resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz", - "readme": "ERROR: No README data found!" + "scripts": { + "test": "node test.js" + }, + "version": "1.0.0" } diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/path-is-absolute/readme.md b/platforms/android/cordova/node_modules/path-is-absolute/readme.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/path-is-absolute/readme.md rename to platforms/android/cordova/node_modules/path-is-absolute/readme.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/.jshintrc b/platforms/android/cordova/node_modules/plist/.jshintrc similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/.jshintrc rename to platforms/android/cordova/node_modules/plist/.jshintrc diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/.travis.yml b/platforms/android/cordova/node_modules/plist/.travis.yml similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/.travis.yml rename to platforms/android/cordova/node_modules/plist/.travis.yml diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/History.md b/platforms/android/cordova/node_modules/plist/History.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/History.md rename to platforms/android/cordova/node_modules/plist/History.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/LICENSE b/platforms/android/cordova/node_modules/plist/LICENSE similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/LICENSE rename to platforms/android/cordova/node_modules/plist/LICENSE diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/Makefile b/platforms/android/cordova/node_modules/plist/Makefile similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/Makefile rename to platforms/android/cordova/node_modules/plist/Makefile diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/README.md b/platforms/android/cordova/node_modules/plist/README.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/README.md rename to platforms/android/cordova/node_modules/plist/README.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/dist/plist-build.js b/platforms/android/cordova/node_modules/plist/dist/plist-build.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/dist/plist-build.js rename to platforms/android/cordova/node_modules/plist/dist/plist-build.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/dist/plist-parse.js b/platforms/android/cordova/node_modules/plist/dist/plist-parse.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/dist/plist-parse.js rename to platforms/android/cordova/node_modules/plist/dist/plist-parse.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/dist/plist.js b/platforms/android/cordova/node_modules/plist/dist/plist.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/dist/plist.js rename to platforms/android/cordova/node_modules/plist/dist/plist.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/examples/browser/index.html b/platforms/android/cordova/node_modules/plist/examples/browser/index.html similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/examples/browser/index.html rename to platforms/android/cordova/node_modules/plist/examples/browser/index.html diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/lib/build.js b/platforms/android/cordova/node_modules/plist/lib/build.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/lib/build.js rename to platforms/android/cordova/node_modules/plist/lib/build.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/lib/node.js b/platforms/android/cordova/node_modules/plist/lib/node.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/lib/node.js rename to platforms/android/cordova/node_modules/plist/lib/node.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/lib/parse.js b/platforms/android/cordova/node_modules/plist/lib/parse.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/lib/parse.js rename to platforms/android/cordova/node_modules/plist/lib/parse.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/lib/plist.js b/platforms/android/cordova/node_modules/plist/lib/plist.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/lib/plist.js rename to platforms/android/cordova/node_modules/plist/lib/plist.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/package.json b/platforms/android/cordova/node_modules/plist/package.json similarity index 66% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/package.json rename to platforms/android/cordova/node_modules/plist/package.json index b6059ad..dddb405 100644 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/package.json +++ b/platforms/android/cordova/node_modules/plist/package.json @@ -1,10 +1,44 @@ { - "name": "plist", - "description": "Mac OS X Plist parser/builder for Node.js and browsers", - "version": "1.2.0", + "_args": [ + [ + "plist@^1.2.0", + "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common" + ] + ], + "_from": "plist@>=1.2.0 <2.0.0", + "_id": "plist@1.2.0", + "_inCache": true, + "_installable": true, + "_location": "/plist", + "_nodeVersion": "5.0.0", + "_npmUser": { + "email": "reinstein.mike@gmail.com", + "name": "mreinstein" + }, + "_npmVersion": "3.3.11", + "_phantomChildren": {}, + "_requested": { + "name": "plist", + "raw": "plist@^1.2.0", + "rawSpec": "^1.2.0", + "scope": null, + "spec": ">=1.2.0 <2.0.0", + "type": "range" + }, + "_requiredBy": [ + "/cordova-common" + ], + "_resolved": "http://registry.npmjs.org/plist/-/plist-1.2.0.tgz", + "_shasum": "084b5093ddc92506e259f874b8d9b1afb8c79593", + "_shrinkwrap": null, + "_spec": "plist@^1.2.0", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common", "author": { - "name": "Nathan Rajlich", - "email": "nathan@tootallnate.net" + "email": "nathan@tootallnate.net", + "name": "Nathan Rajlich" + }, + "bugs": { + "url": "https://github.com/TooTallNate/node-plist/issues" }, "contributors": [ { @@ -25,53 +59,36 @@ "name": "Mathieu D'Amours" } ], - "repository": { - "type": "git", - "url": "git://github.com/TooTallNate/node-plist.git" - }, - "license": "MIT", - "keywords": [ - "apple", - "browser", - "mac", - "plist", - "parser", - "xml" - ], - "main": "lib/plist.js", "dependencies": { "base64-js": "0.0.8", + "util-deprecate": "1.0.2", "xmlbuilder": "4.0.0", - "xmldom": "0.1.x", - "util-deprecate": "1.0.2" + "xmldom": "0.1.x" }, + "description": "Mac OS X Plist parser/builder for Node.js and browsers", "devDependencies": { "browserify": "12.0.1", "mocha": "2.3.3", "multiline": "1.0.2", "zuul": "3.7.2" }, - "scripts": { - "test": "make test" - }, - "gitHead": "69520574f27864145192338b72e608fbe1bda6f7", - "bugs": { - "url": "https://github.com/TooTallNate/node-plist/issues" - }, - "homepage": "https://github.com/TooTallNate/node-plist#readme", - "_id": "plist@1.2.0", - "_shasum": "084b5093ddc92506e259f874b8d9b1afb8c79593", - "_from": "plist@>=1.1.0 <2.0.0", - "_npmVersion": "3.3.11", - "_nodeVersion": "5.0.0", - "_npmUser": { - "name": "mreinstein", - "email": "reinstein.mike@gmail.com" - }, + "directories": {}, "dist": { "shasum": "084b5093ddc92506e259f874b8d9b1afb8c79593", "tarball": "http://registry.npmjs.org/plist/-/plist-1.2.0.tgz" }, + "gitHead": "69520574f27864145192338b72e608fbe1bda6f7", + "homepage": "https://github.com/TooTallNate/node-plist#readme", + "keywords": [ + "apple", + "browser", + "mac", + "parser", + "plist", + "xml" + ], + "license": "MIT", + "main": "lib/plist.js", "maintainers": [ { "name": "TooTallNate", @@ -86,7 +103,15 @@ "email": "reinstein.mike@gmail.com" } ], - "directories": {}, - "_resolved": "http://registry.npmjs.org/plist/-/plist-1.2.0.tgz", - "readme": "ERROR: No README data found!" + "name": "plist", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git://github.com/TooTallNate/node-plist.git" + }, + "scripts": { + "test": "make test" + }, + "version": "1.2.0" } diff --git a/platforms/android/cordova/node_modules/properties-parser/package.json b/platforms/android/cordova/node_modules/properties-parser/package.json index c74be98..b089b27 100644 --- a/platforms/android/cordova/node_modules/properties-parser/package.json +++ b/platforms/android/cordova/node_modules/properties-parser/package.json @@ -1,46 +1,73 @@ { - "name": "properties-parser", - "version": "0.2.3", + "_args": [ + [ + "properties-parser@^0.2.3", + "/Users/steveng/repo/cordova/cordova-android" + ] + ], + "_from": "properties-parser@>=0.2.3 <0.3.0", + "_id": "properties-parser@0.2.3", + "_inCache": true, + "_installable": true, + "_location": "/properties-parser", + "_npmUser": { + "email": "xavi.rmz@gmail.com", + "name": "xavi" + }, + "_npmVersion": "1.3.23", + "_phantomChildren": {}, + "_requested": { + "name": "properties-parser", + "raw": "properties-parser@^0.2.3", + "rawSpec": "^0.2.3", + "scope": null, + "spec": ">=0.2.3 <0.3.0", + "type": "range" + }, + "_requiredBy": [ + "/" + ], + "_resolved": "http://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz", + "_shasum": "f7591255f707abbff227c7b56b637dbb0373a10f", + "_shrinkwrap": null, + "_spec": "properties-parser@^0.2.3", + "_where": "/Users/steveng/repo/cordova/cordova-android", + "bugs": { + "url": "https://github.com/xavi-/node-properties-parser/issues" + }, + "dependencies": {}, "description": "A parser for .properties files written in javascript", + "devDependencies": {}, + "directories": {}, + "dist": { + "shasum": "f7591255f707abbff227c7b56b637dbb0373a10f", + "tarball": "http://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz" + }, + "engines": { + "node": ">= 0.3.1" + }, + "homepage": "https://github.com/xavi-/node-properties-parser", "keywords": [ - "parser", ".properties", - "properties", - "java", + "actionscript", "file parser", - "actionscript" + "java", + "parser", + "properties" ], + "main": "./index.js", "maintainers": [ { "name": "xavi", "email": "xavi.rmz@gmail.com" } ], - "main": "./index.js", + "name": "properties-parser", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/xavi-/node-properties-parser.git" }, - "engines": { - "node": ">= 0.3.1" - }, - "bugs": { - "url": "https://github.com/xavi-/node-properties-parser/issues" - }, - "homepage": "https://github.com/xavi-/node-properties-parser", - "_id": "properties-parser@0.2.3", - "dist": { - "shasum": "f7591255f707abbff227c7b56b637dbb0373a10f", - "tarball": "http://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz" - }, - "_from": "properties-parser@>=0.2.3 <0.3.0", - "_npmVersion": "1.3.23", - "_npmUser": { - "name": "xavi", - "email": "xavi.rmz@gmail.com" - }, - "directories": {}, - "_shasum": "f7591255f707abbff227c7b56b637dbb0373a10f", - "_resolved": "http://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz", - "readme": "ERROR: No README data found!" + "version": "0.2.3" } diff --git a/platforms/android/cordova/node_modules/q/package.json b/platforms/android/cordova/node_modules/q/package.json index a576af9..40e4b1e 100644 --- a/platforms/android/cordova/node_modules/q/package.json +++ b/platforms/android/cordova/node_modules/q/package.json @@ -1,27 +1,47 @@ { - "name": "q", - "version": "1.4.1", - "description": "A library for promises (CommonJS/Promises/A,B,D)", - "homepage": "https://github.com/kriskowal/q", + "_args": [ + [ + "q@^1.4.1", + "/Users/steveng/repo/cordova/cordova-android" + ] + ], + "_from": "q@>=1.4.1 <2.0.0", + "_id": "q@1.4.1", + "_inCache": true, + "_installable": true, + "_location": "/q", + "_nodeVersion": "1.8.1", + "_npmUser": { + "email": "kris.kowal@cixar.com", + "name": "kriskowal" + }, + "_npmVersion": "2.8.3", + "_phantomChildren": {}, + "_requested": { + "name": "q", + "raw": "q@^1.4.1", + "rawSpec": "^1.4.1", + "scope": null, + "spec": ">=1.4.1 <2.0.0", + "type": "range" + }, + "_requiredBy": [ + "/", + "/cordova-common" + ], + "_resolved": "http://registry.npmjs.org/q/-/q-1.4.1.tgz", + "_shasum": "55705bcd93c5f3673530c2c2cbc0c2b3addc286e", + "_shrinkwrap": null, + "_spec": "q@^1.4.1", + "_where": "/Users/steveng/repo/cordova/cordova-android", "author": { - "name": "Kris Kowal", "email": "kris@cixar.com", + "name": "Kris Kowal", "url": "https://github.com/kriskowal" }, - "keywords": [ - "q", - "promise", - "promises", - "promises-a", - "promises-aplus", - "deferred", - "future", - "async", - "flow control", - "fluent", - "browser", - "node" - ], + "bugs": { + "url": "http://github.com/kriskowal/q/issues" + }, "contributors": [ { "name": "Kris Kowal", @@ -39,28 +59,8 @@ "url": "http://domenicdenicola.com" } ], - "bugs": { - "url": "http://github.com/kriskowal/q/issues" - }, - "license": { - "type": "MIT", - "url": "http://github.com/kriskowal/q/raw/master/LICENSE" - }, - "main": "q.js", - "files": [ - "LICENSE", - "q.js", - "queue.js" - ], - "repository": { - "type": "git", - "url": "git://github.com/kriskowal/q.git" - }, - "engines": { - "node": ">=0.6.0", - "teleport": ">=0.2.0" - }, "dependencies": {}, + "description": "A library for promises (CommonJS/Promises/A,B,D)", "devDependencies": { "cover": "*", "grunt": "~0.4.1", @@ -72,35 +72,43 @@ "opener": "*", "promises-aplus-tests": "1.x" }, - "scripts": { - "test": "jasmine-node spec && promises-aplus-tests spec/aplus-adapter", - "test-browser": "opener spec/q-spec.html", - "benchmark": "matcha", - "lint": "jshint q.js", - "cover": "cover run jasmine-node spec && cover report html && opener cover_html/index.html", - "minify": "grunt", - "prepublish": "grunt" - }, - "overlay": { - "teleport": { - "dependencies": { - "system": ">=0.0.4" - } - } - }, "directories": { "test": "./spec" }, + "dist": { + "shasum": "55705bcd93c5f3673530c2c2cbc0c2b3addc286e", + "tarball": "http://registry.npmjs.org/q/-/q-1.4.1.tgz" + }, + "engines": { + "node": ">=0.6.0", + "teleport": ">=0.2.0" + }, + "files": [ + "LICENSE", + "q.js", + "queue.js" + ], "gitHead": "d373079d3620152e3d60e82f27265a09ee0e81bd", - "_id": "q@1.4.1", - "_shasum": "55705bcd93c5f3673530c2c2cbc0c2b3addc286e", - "_from": "q@>=1.4.1 <2.0.0", - "_npmVersion": "2.8.3", - "_nodeVersion": "1.8.1", - "_npmUser": { - "name": "kriskowal", - "email": "kris.kowal@cixar.com" + "homepage": "https://github.com/kriskowal/q", + "keywords": [ + "async", + "browser", + "deferred", + "flow control", + "fluent", + "future", + "node", + "promise", + "promises", + "promises-a", + "promises-aplus", + "q" + ], + "license": { + "type": "MIT", + "url": "http://github.com/kriskowal/q/raw/master/LICENSE" }, + "main": "q.js", "maintainers": [ { "name": "kriskowal", @@ -111,10 +119,28 @@ "email": "domenic@domenicdenicola.com" } ], - "dist": { - "shasum": "55705bcd93c5f3673530c2c2cbc0c2b3addc286e", - "tarball": "http://registry.npmjs.org/q/-/q-1.4.1.tgz" + "name": "q", + "optionalDependencies": {}, + "overlay": { + "teleport": { + "dependencies": { + "system": ">=0.0.4" + } + } }, - "_resolved": "http://registry.npmjs.org/q/-/q-1.4.1.tgz", - "readme": "ERROR: No README data found!" + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git://github.com/kriskowal/q.git" + }, + "scripts": { + "benchmark": "matcha", + "cover": "cover run jasmine-node spec && cover report html && opener cover_html/index.html", + "lint": "jshint q.js", + "minify": "grunt", + "prepublish": "grunt", + "test": "jasmine-node spec && promises-aplus-tests spec/aplus-adapter", + "test-browser": "opener spec/q-spec.html" + }, + "version": "1.4.1" } diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/AUTHORS b/platforms/android/cordova/node_modules/sax/AUTHORS similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/AUTHORS rename to platforms/android/cordova/node_modules/sax/AUTHORS diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/LICENSE b/platforms/android/cordova/node_modules/sax/LICENSE similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/LICENSE rename to platforms/android/cordova/node_modules/sax/LICENSE diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/README.md b/platforms/android/cordova/node_modules/sax/README.md similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/README.md rename to platforms/android/cordova/node_modules/sax/README.md diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/examples/big-not-pretty.xml b/platforms/android/cordova/node_modules/sax/examples/big-not-pretty.xml similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/examples/big-not-pretty.xml rename to platforms/android/cordova/node_modules/sax/examples/big-not-pretty.xml diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/examples/example.js b/platforms/android/cordova/node_modules/sax/examples/example.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/examples/example.js rename to platforms/android/cordova/node_modules/sax/examples/example.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/examples/get-products.js b/platforms/android/cordova/node_modules/sax/examples/get-products.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/examples/get-products.js rename to platforms/android/cordova/node_modules/sax/examples/get-products.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/examples/hello-world.js b/platforms/android/cordova/node_modules/sax/examples/hello-world.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/examples/hello-world.js rename to platforms/android/cordova/node_modules/sax/examples/hello-world.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/examples/not-pretty.xml b/platforms/android/cordova/node_modules/sax/examples/not-pretty.xml similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/examples/not-pretty.xml rename to platforms/android/cordova/node_modules/sax/examples/not-pretty.xml diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/examples/pretty-print.js b/platforms/android/cordova/node_modules/sax/examples/pretty-print.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/examples/pretty-print.js rename to platforms/android/cordova/node_modules/sax/examples/pretty-print.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/examples/shopping.xml b/platforms/android/cordova/node_modules/sax/examples/shopping.xml similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/examples/shopping.xml rename to platforms/android/cordova/node_modules/sax/examples/shopping.xml diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/examples/strict.dtd b/platforms/android/cordova/node_modules/sax/examples/strict.dtd similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/examples/strict.dtd rename to platforms/android/cordova/node_modules/sax/examples/strict.dtd diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/examples/switch-bench.js b/platforms/android/cordova/node_modules/sax/examples/switch-bench.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/examples/switch-bench.js rename to platforms/android/cordova/node_modules/sax/examples/switch-bench.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/examples/test.html b/platforms/android/cordova/node_modules/sax/examples/test.html similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/examples/test.html rename to platforms/android/cordova/node_modules/sax/examples/test.html diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/examples/test.xml b/platforms/android/cordova/node_modules/sax/examples/test.xml similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/examples/test.xml rename to platforms/android/cordova/node_modules/sax/examples/test.xml diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/lib/sax.js b/platforms/android/cordova/node_modules/sax/lib/sax.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/lib/sax.js rename to platforms/android/cordova/node_modules/sax/lib/sax.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/package.json b/platforms/android/cordova/node_modules/sax/package.json similarity index 72% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/package.json rename to platforms/android/cordova/node_modules/sax/package.json index 74a2664..d53c86b 100644 --- a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/package.json +++ b/platforms/android/cordova/node_modules/sax/package.json @@ -1,29 +1,48 @@ { - "name": "sax", - "description": "An evented streaming XML parser in JavaScript", - "author": { - "name": "Isaac Z. Schlueter", + "_args": [ + [ + "sax@0.3.5", + "/Users/steveng/repo/cordova/cordova-android/node_modules/elementtree" + ] + ], + "_defaultsLoaded": true, + "_engineSupported": true, + "_from": "sax@0.3.5", + "_id": "sax@0.3.5", + "_inCache": true, + "_installable": true, + "_location": "/sax", + "_nodeVersion": "v0.6.7-pre", + "_npmUser": { "email": "i@izs.me", - "url": "http://blog.izs.me/" - }, - "version": "0.3.5", - "main": "lib/sax.js", - "license": { - "type": "MIT", - "url": "https://raw.github.com/isaacs/sax-js/master/LICENSE" + "name": "isaacs" }, - "scripts": { - "test": "node test/index.js" + "_npmVersion": "1.1.0-beta-7", + "_phantomChildren": {}, + "_requested": { + "name": "sax", + "raw": "sax@0.3.5", + "rawSpec": "0.3.5", + "scope": null, + "spec": "0.3.5", + "type": "version" }, - "repository": { - "type": "git", - "url": "git://github.com/isaacs/sax-js.git" + "_requiredBy": [ + "/elementtree" + ], + "_resolved": "http://registry.npmjs.org/sax/-/sax-0.3.5.tgz", + "_shasum": "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d", + "_shrinkwrap": null, + "_spec": "sax@0.3.5", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/elementtree", + "author": { + "email": "i@izs.me", + "name": "Isaac Z. Schlueter", + "url": "http://blog.izs.me/" }, - "_npmUser": { - "name": "isaacs", - "email": "i@izs.me" + "bugs": { + "url": "https://github.com/isaacs/sax-js/issues" }, - "_id": "sax@0.3.5", "contributors": [ { "name": "Isaac Z. Schlueter", @@ -59,31 +78,37 @@ } ], "dependencies": {}, + "description": "An evented streaming XML parser in JavaScript", "devDependencies": {}, - "engines": { - "node": "*" - }, - "_engineSupported": true, - "_npmVersion": "1.1.0-beta-7", - "_nodeVersion": "v0.6.7-pre", - "_defaultsLoaded": true, + "directories": {}, "dist": { "shasum": "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d", "tarball": "http://registry.npmjs.org/sax/-/sax-0.3.5.tgz" }, + "engines": { + "node": "*" + }, + "homepage": "https://github.com/isaacs/sax-js#readme", + "license": { + "type": "MIT", + "url": "https://raw.github.com/isaacs/sax-js/master/LICENSE" + }, + "main": "lib/sax.js", "maintainers": [ { "name": "isaacs", "email": "i@izs.me" } ], - "directories": {}, - "_shasum": "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d", - "_resolved": "http://registry.npmjs.org/sax/-/sax-0.3.5.tgz", - "_from": "sax@0.3.5", - "bugs": { - "url": "https://github.com/isaacs/sax-js/issues" - }, + "name": "sax", + "optionalDependencies": {}, "readme": "ERROR: No README data found!", - "homepage": "https://github.com/isaacs/sax-js#readme" + "repository": { + "type": "git", + "url": "git://github.com/isaacs/sax-js.git" + }, + "scripts": { + "test": "node test/index.js" + }, + "version": "0.3.5" } diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/buffer-overrun.js b/platforms/android/cordova/node_modules/sax/test/buffer-overrun.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/buffer-overrun.js rename to platforms/android/cordova/node_modules/sax/test/buffer-overrun.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/cdata-chunked.js b/platforms/android/cordova/node_modules/sax/test/cdata-chunked.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/cdata-chunked.js rename to platforms/android/cordova/node_modules/sax/test/cdata-chunked.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/cdata-end-split.js b/platforms/android/cordova/node_modules/sax/test/cdata-end-split.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/cdata-end-split.js rename to platforms/android/cordova/node_modules/sax/test/cdata-end-split.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/cdata-fake-end.js b/platforms/android/cordova/node_modules/sax/test/cdata-fake-end.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/cdata-fake-end.js rename to platforms/android/cordova/node_modules/sax/test/cdata-fake-end.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/cdata-multiple.js b/platforms/android/cordova/node_modules/sax/test/cdata-multiple.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/cdata-multiple.js rename to platforms/android/cordova/node_modules/sax/test/cdata-multiple.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/cdata.js b/platforms/android/cordova/node_modules/sax/test/cdata.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/cdata.js rename to platforms/android/cordova/node_modules/sax/test/cdata.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/index.js b/platforms/android/cordova/node_modules/sax/test/index.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/index.js rename to platforms/android/cordova/node_modules/sax/test/index.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/issue-23.js b/platforms/android/cordova/node_modules/sax/test/issue-23.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/issue-23.js rename to platforms/android/cordova/node_modules/sax/test/issue-23.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/issue-30.js b/platforms/android/cordova/node_modules/sax/test/issue-30.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/issue-30.js rename to platforms/android/cordova/node_modules/sax/test/issue-30.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/issue-35.js b/platforms/android/cordova/node_modules/sax/test/issue-35.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/issue-35.js rename to platforms/android/cordova/node_modules/sax/test/issue-35.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/issue-47.js b/platforms/android/cordova/node_modules/sax/test/issue-47.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/issue-47.js rename to platforms/android/cordova/node_modules/sax/test/issue-47.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/issue-49.js b/platforms/android/cordova/node_modules/sax/test/issue-49.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/issue-49.js rename to platforms/android/cordova/node_modules/sax/test/issue-49.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/parser-position.js b/platforms/android/cordova/node_modules/sax/test/parser-position.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/parser-position.js rename to platforms/android/cordova/node_modules/sax/test/parser-position.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/script.js b/platforms/android/cordova/node_modules/sax/test/script.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/script.js rename to platforms/android/cordova/node_modules/sax/test/script.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/self-closing-child-strict.js b/platforms/android/cordova/node_modules/sax/test/self-closing-child-strict.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/self-closing-child-strict.js rename to platforms/android/cordova/node_modules/sax/test/self-closing-child-strict.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/self-closing-child.js b/platforms/android/cordova/node_modules/sax/test/self-closing-child.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/self-closing-child.js rename to platforms/android/cordova/node_modules/sax/test/self-closing-child.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/self-closing-tag.js b/platforms/android/cordova/node_modules/sax/test/self-closing-tag.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/self-closing-tag.js rename to platforms/android/cordova/node_modules/sax/test/self-closing-tag.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/stray-ending.js b/platforms/android/cordova/node_modules/sax/test/stray-ending.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/stray-ending.js rename to platforms/android/cordova/node_modules/sax/test/stray-ending.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/trailing-non-whitespace.js b/platforms/android/cordova/node_modules/sax/test/trailing-non-whitespace.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/trailing-non-whitespace.js rename to platforms/android/cordova/node_modules/sax/test/trailing-non-whitespace.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/unquoted.js b/platforms/android/cordova/node_modules/sax/test/unquoted.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/unquoted.js rename to platforms/android/cordova/node_modules/sax/test/unquoted.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/xmlns-issue-41.js b/platforms/android/cordova/node_modules/sax/test/xmlns-issue-41.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/xmlns-issue-41.js rename to platforms/android/cordova/node_modules/sax/test/xmlns-issue-41.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/xmlns-rebinding.js b/platforms/android/cordova/node_modules/sax/test/xmlns-rebinding.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/xmlns-rebinding.js rename to platforms/android/cordova/node_modules/sax/test/xmlns-rebinding.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/xmlns-strict.js b/platforms/android/cordova/node_modules/sax/test/xmlns-strict.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/xmlns-strict.js rename to platforms/android/cordova/node_modules/sax/test/xmlns-strict.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/xmlns-unbound.js b/platforms/android/cordova/node_modules/sax/test/xmlns-unbound.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/xmlns-unbound.js rename to platforms/android/cordova/node_modules/sax/test/xmlns-unbound.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/xmlns-xml-default-prefix-attribute.js b/platforms/android/cordova/node_modules/sax/test/xmlns-xml-default-prefix-attribute.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/xmlns-xml-default-prefix-attribute.js rename to platforms/android/cordova/node_modules/sax/test/xmlns-xml-default-prefix-attribute.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/xmlns-xml-default-prefix.js b/platforms/android/cordova/node_modules/sax/test/xmlns-xml-default-prefix.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/xmlns-xml-default-prefix.js rename to platforms/android/cordova/node_modules/sax/test/xmlns-xml-default-prefix.js diff --git a/platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/xmlns-xml-default-redefine.js b/platforms/android/cordova/node_modules/sax/test/xmlns-xml-default-redefine.js similarity index 100% rename from platforms/android/cordova/node_modules/elementtree/node_modules/sax/test/xmlns-xml-default-redefine.js rename to platforms/android/cordova/node_modules/sax/test/xmlns-xml-default-redefine.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/semver/.npmignore b/platforms/android/cordova/node_modules/semver/.npmignore similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/semver/.npmignore rename to platforms/android/cordova/node_modules/semver/.npmignore diff --git a/platforms/android/cordova/node_modules/nopt/node_modules/abbrev/.travis.yml b/platforms/android/cordova/node_modules/semver/.travis.yml similarity index 100% rename from platforms/android/cordova/node_modules/nopt/node_modules/abbrev/.travis.yml rename to platforms/android/cordova/node_modules/semver/.travis.yml diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/LICENSE b/platforms/android/cordova/node_modules/semver/LICENSE similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/osenv/LICENSE rename to platforms/android/cordova/node_modules/semver/LICENSE diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/semver/README.md b/platforms/android/cordova/node_modules/semver/README.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/semver/README.md rename to platforms/android/cordova/node_modules/semver/README.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/semver/bin/semver b/platforms/android/cordova/node_modules/semver/bin/semver similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/semver/bin/semver rename to platforms/android/cordova/node_modules/semver/bin/semver diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/semver/package.json b/platforms/android/cordova/node_modules/semver/package.json similarity index 60% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/semver/package.json rename to platforms/android/cordova/node_modules/semver/package.json index 2a8618b..0db0065 100644 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/semver/package.json +++ b/platforms/android/cordova/node_modules/semver/package.json @@ -1,40 +1,58 @@ { - "name": "semver", - "version": "5.1.0", - "description": "The semantic version parser used by npm.", - "main": "semver.js", - "scripts": { - "test": "tap test/*.js" - }, - "devDependencies": { - "tap": "^2.0.0" + "_args": [ + [ + "semver@^5.0.1", + "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common" + ] + ], + "_from": "semver@>=5.0.1 <6.0.0", + "_id": "semver@5.1.0", + "_inCache": true, + "_installable": true, + "_location": "/semver", + "_nodeVersion": "4.0.0", + "_npmUser": { + "email": "i@izs.me", + "name": "isaacs" }, - "license": "ISC", - "repository": { - "type": "git", - "url": "git+https://github.com/npm/node-semver.git" + "_npmVersion": "3.3.2", + "_phantomChildren": {}, + "_requested": { + "name": "semver", + "raw": "semver@^5.0.1", + "rawSpec": "^5.0.1", + "scope": null, + "spec": ">=5.0.1 <6.0.0", + "type": "range" }, + "_requiredBy": [ + "/cordova-common" + ], + "_resolved": "http://registry.npmjs.org/semver/-/semver-5.1.0.tgz", + "_shasum": "85f2cf8550465c4df000cf7d86f6b054106ab9e5", + "_shrinkwrap": null, + "_spec": "semver@^5.0.1", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common", "bin": { "semver": "./bin/semver" }, - "gitHead": "8e33a30e62e40e4983d1c5f55e794331b861aadc", "bugs": { "url": "https://github.com/npm/node-semver/issues" }, - "homepage": "https://github.com/npm/node-semver#readme", - "_id": "semver@5.1.0", - "_shasum": "85f2cf8550465c4df000cf7d86f6b054106ab9e5", - "_from": "semver@>=5.0.1 <6.0.0", - "_npmVersion": "3.3.2", - "_nodeVersion": "4.0.0", - "_npmUser": { - "name": "isaacs", - "email": "i@izs.me" + "dependencies": {}, + "description": "The semantic version parser used by npm.", + "devDependencies": { + "tap": "^2.0.0" }, + "directories": {}, "dist": { "shasum": "85f2cf8550465c4df000cf7d86f6b054106ab9e5", "tarball": "http://registry.npmjs.org/semver/-/semver-5.1.0.tgz" }, + "gitHead": "8e33a30e62e40e4983d1c5f55e794331b861aadc", + "homepage": "https://github.com/npm/node-semver#readme", + "license": "ISC", + "main": "semver.js", "maintainers": [ { "name": "isaacs", @@ -45,7 +63,15 @@ "email": "ogd@aoaioxxysz.net" } ], - "directories": {}, - "_resolved": "http://registry.npmjs.org/semver/-/semver-5.1.0.tgz", - "readme": "ERROR: No README data found!" + "name": "semver", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git+https://github.com/npm/node-semver.git" + }, + "scripts": { + "test": "tap test/*.js" + }, + "version": "5.1.0" } diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/semver/range.bnf b/platforms/android/cordova/node_modules/semver/range.bnf similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/semver/range.bnf rename to platforms/android/cordova/node_modules/semver/range.bnf diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/semver/semver.js b/platforms/android/cordova/node_modules/semver/semver.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/semver/semver.js rename to platforms/android/cordova/node_modules/semver/semver.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/semver/test/big-numbers.js b/platforms/android/cordova/node_modules/semver/test/big-numbers.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/semver/test/big-numbers.js rename to platforms/android/cordova/node_modules/semver/test/big-numbers.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/semver/test/clean.js b/platforms/android/cordova/node_modules/semver/test/clean.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/semver/test/clean.js rename to platforms/android/cordova/node_modules/semver/test/clean.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/semver/test/gtr.js b/platforms/android/cordova/node_modules/semver/test/gtr.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/semver/test/gtr.js rename to platforms/android/cordova/node_modules/semver/test/gtr.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/semver/test/index.js b/platforms/android/cordova/node_modules/semver/test/index.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/semver/test/index.js rename to platforms/android/cordova/node_modules/semver/test/index.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/semver/test/ltr.js b/platforms/android/cordova/node_modules/semver/test/ltr.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/semver/test/ltr.js rename to platforms/android/cordova/node_modules/semver/test/ltr.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/semver/test/major-minor-patch.js b/platforms/android/cordova/node_modules/semver/test/major-minor-patch.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/semver/test/major-minor-patch.js rename to platforms/android/cordova/node_modules/semver/test/major-minor-patch.js diff --git a/platforms/android/cordova/node_modules/shelljs/package.json b/platforms/android/cordova/node_modules/shelljs/package.json index 2c9f998..572bd7c 100644 --- a/platforms/android/cordova/node_modules/shelljs/package.json +++ b/platforms/android/cordova/node_modules/shelljs/package.json @@ -1,64 +1,89 @@ { - "name": "shelljs", - "version": "0.5.3", - "author": { - "name": "Artur Adib", - "email": "arturadib@gmail.com" - }, - "description": "Portable Unix shell commands for Node.js", - "keywords": [ - "unix", - "shell", - "makefile", - "make", - "jake", - "synchronous" + "_args": [ + [ + "shelljs@^0.5.3", + "/Users/steveng/repo/cordova/cordova-android" + ] ], - "repository": { - "type": "git", - "url": "git://github.com/arturadib/shelljs.git" + "_from": "shelljs@>=0.5.3 <0.6.0", + "_id": "shelljs@0.5.3", + "_inCache": true, + "_installable": true, + "_location": "/shelljs", + "_nodeVersion": "1.2.0", + "_npmUser": { + "email": "arturadib@gmail.com", + "name": "artur" }, - "license": "BSD*", - "homepage": "http://github.com/arturadib/shelljs", - "main": "./shell.js", - "scripts": { - "test": "node scripts/run-tests" + "_npmVersion": "2.5.1", + "_phantomChildren": {}, + "_requested": { + "name": "shelljs", + "raw": "shelljs@^0.5.3", + "rawSpec": "^0.5.3", + "scope": null, + "spec": ">=0.5.3 <0.6.0", + "type": "range" + }, + "_requiredBy": [ + "/", + "/cordova-common" + ], + "_resolved": "http://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz", + "_shasum": "c54982b996c76ef0c1e6b59fbdc5825f5b713113", + "_shrinkwrap": null, + "_spec": "shelljs@^0.5.3", + "_where": "/Users/steveng/repo/cordova/cordova-android", + "author": { + "email": "arturadib@gmail.com", + "name": "Artur Adib" }, "bin": { "shjs": "./bin/shjs" }, + "bugs": { + "url": "https://github.com/arturadib/shelljs/issues" + }, "dependencies": {}, + "description": "Portable Unix shell commands for Node.js", "devDependencies": { "jshint": "~2.1.11" }, - "optionalDependencies": {}, + "directories": {}, + "dist": { + "shasum": "c54982b996c76ef0c1e6b59fbdc5825f5b713113", + "tarball": "http://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz" + }, "engines": { "node": ">=0.8.0" }, "gitHead": "22d0975040b9b8234755dc6e692d6869436e8485", - "bugs": { - "url": "https://github.com/arturadib/shelljs/issues" - }, - "_id": "shelljs@0.5.3", - "_shasum": "c54982b996c76ef0c1e6b59fbdc5825f5b713113", - "_from": "shelljs@>=0.5.3 <0.6.0", - "_npmVersion": "2.5.1", - "_nodeVersion": "1.2.0", - "_npmUser": { - "name": "artur", - "email": "arturadib@gmail.com" - }, + "homepage": "http://github.com/arturadib/shelljs", + "keywords": [ + "jake", + "make", + "makefile", + "shell", + "synchronous", + "unix" + ], + "license": "BSD*", + "main": "./shell.js", "maintainers": [ { "name": "artur", "email": "arturadib@gmail.com" } ], - "dist": { - "shasum": "c54982b996c76ef0c1e6b59fbdc5825f5b713113", - "tarball": "http://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz" + "name": "shelljs", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git://github.com/arturadib/shelljs.git" }, - "directories": {}, - "_resolved": "http://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz", - "readme": "ERROR: No README data found!" + "scripts": { + "test": "node scripts/run-tests" + }, + "version": "0.5.3" } diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/underscore/LICENSE b/platforms/android/cordova/node_modules/underscore/LICENSE similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/underscore/LICENSE rename to platforms/android/cordova/node_modules/underscore/LICENSE diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/underscore/README.md b/platforms/android/cordova/node_modules/underscore/README.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/underscore/README.md rename to platforms/android/cordova/node_modules/underscore/README.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/underscore/package.json b/platforms/android/cordova/node_modules/underscore/package.json similarity index 62% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/underscore/package.json rename to platforms/android/cordova/node_modules/underscore/package.json index 36ad4c0..3304948 100644 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/underscore/package.json +++ b/platforms/android/cordova/node_modules/underscore/package.json @@ -1,24 +1,46 @@ { - "name": "underscore", - "description": "JavaScript's functional programming helper library.", - "homepage": "http://underscorejs.org", - "keywords": [ - "util", - "functional", - "server", - "client", - "browser" + "_args": [ + [ + "underscore@^1.8.3", + "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common" + ] ], + "_from": "underscore@>=1.8.3 <2.0.0", + "_id": "underscore@1.8.3", + "_inCache": true, + "_installable": true, + "_location": "/underscore", + "_npmUser": { + "email": "jashkenas@gmail.com", + "name": "jashkenas" + }, + "_npmVersion": "1.4.28", + "_phantomChildren": {}, + "_requested": { + "name": "underscore", + "raw": "underscore@^1.8.3", + "rawSpec": "^1.8.3", + "scope": null, + "spec": ">=1.8.3 <2.0.0", + "type": "range" + }, + "_requiredBy": [ + "/cordova-common" + ], + "_resolved": "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", + "_shasum": "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022", + "_shrinkwrap": null, + "_spec": "underscore@^1.8.3", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common", "author": { - "name": "Jeremy Ashkenas", - "email": "jeremy@documentcloud.org" + "email": "jeremy@documentcloud.org", + "name": "Jeremy Ashkenas" }, - "repository": { - "type": "git", - "url": "git://github.com/jashkenas/underscore.git" + "bugs": { + "url": "https://github.com/jashkenas/underscore/issues" }, - "main": "underscore.js", - "version": "1.8.3", + "dependencies": {}, + "description": "JavaScript's functional programming helper library.", "devDependencies": { "docco": "*", "eslint": "0.6.x", @@ -27,44 +49,48 @@ "qunit-cli": "~0.2.0", "uglify-js": "2.4.x" }, - "scripts": { - "test": "npm run test-node && npm run lint", - "lint": "eslint underscore.js test/*.js", - "test-node": "qunit-cli test/*.js", - "test-browser": "npm i karma-phantomjs-launcher && ./node_modules/karma/bin/karma start", - "build": "uglifyjs underscore.js -c \"evaluate=false\" --comments \"/ .*/\" -m --source-map underscore-min.map -o underscore-min.js", - "doc": "docco underscore.js" + "directories": {}, + "dist": { + "shasum": "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022", + "tarball": "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz" }, - "license": "MIT", "files": [ - "underscore.js", + "LICENSE", "underscore-min.js", "underscore-min.map", - "LICENSE" + "underscore.js" ], "gitHead": "e4743ab712b8ab42ad4ccb48b155034d02394e4d", - "bugs": { - "url": "https://github.com/jashkenas/underscore/issues" - }, - "_id": "underscore@1.8.3", - "_shasum": "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022", - "_from": "underscore@>=1.8.3 <2.0.0", - "_npmVersion": "1.4.28", - "_npmUser": { - "name": "jashkenas", - "email": "jashkenas@gmail.com" - }, + "homepage": "http://underscorejs.org", + "keywords": [ + "browser", + "client", + "functional", + "server", + "util" + ], + "license": "MIT", + "main": "underscore.js", "maintainers": [ { "name": "jashkenas", "email": "jashkenas@gmail.com" } ], - "dist": { - "shasum": "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022", - "tarball": "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz" + "name": "underscore", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git://github.com/jashkenas/underscore.git" }, - "directories": {}, - "_resolved": "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", - "readme": "ERROR: No README data found!" + "scripts": { + "build": "uglifyjs underscore.js -c \"evaluate=false\" --comments \"/ .*/\" -m --source-map underscore-min.map -o underscore-min.js", + "doc": "docco underscore.js", + "lint": "eslint underscore.js test/*.js", + "test": "npm run test-node && npm run lint", + "test-browser": "npm i karma-phantomjs-launcher && ./node_modules/karma/bin/karma start", + "test-node": "qunit-cli test/*.js" + }, + "version": "1.8.3" } diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/underscore/underscore-min.js b/platforms/android/cordova/node_modules/underscore/underscore-min.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/underscore/underscore-min.js rename to platforms/android/cordova/node_modules/underscore/underscore-min.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/underscore/underscore-min.map b/platforms/android/cordova/node_modules/underscore/underscore-min.map similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/underscore/underscore-min.map rename to platforms/android/cordova/node_modules/underscore/underscore-min.map diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/underscore/underscore.js b/platforms/android/cordova/node_modules/underscore/underscore.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/underscore/underscore.js rename to platforms/android/cordova/node_modules/underscore/underscore.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/unorm/LICENSE.md b/platforms/android/cordova/node_modules/unorm/LICENSE.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/unorm/LICENSE.md rename to platforms/android/cordova/node_modules/unorm/LICENSE.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/unorm/README.md b/platforms/android/cordova/node_modules/unorm/README.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/unorm/README.md rename to platforms/android/cordova/node_modules/unorm/README.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/unorm/lib/unorm.js b/platforms/android/cordova/node_modules/unorm/lib/unorm.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/unorm/lib/unorm.js rename to platforms/android/cordova/node_modules/unorm/lib/unorm.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/unorm/package.json b/platforms/android/cordova/node_modules/unorm/package.json similarity index 64% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/unorm/package.json rename to platforms/android/cordova/node_modules/unorm/package.json index a978cb1..ca5fd67 100644 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/unorm/package.json +++ b/platforms/android/cordova/node_modules/unorm/package.json @@ -1,12 +1,44 @@ { - "name": "unorm", - "version": "1.4.1", - "description": "JavaScript Unicode 8.0 Normalization - NFC, NFD, NFKC, NFKD. Read UAX #15 Unicode Normalization Forms.", + "_args": [ + [ + "unorm@^1.3.3", + "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common" + ] + ], + "_from": "unorm@>=1.3.3 <2.0.0", + "_id": "unorm@1.4.1", + "_inCache": true, + "_installable": true, + "_location": "/unorm", + "_npmUser": { + "email": "bwp@bwp.dk", + "name": "walling" + }, + "_npmVersion": "1.4.28", + "_phantomChildren": {}, + "_requested": { + "name": "unorm", + "raw": "unorm@^1.3.3", + "rawSpec": "^1.3.3", + "scope": null, + "spec": ">=1.3.3 <2.0.0", + "type": "range" + }, + "_requiredBy": [ + "/cordova-common" + ], + "_resolved": "http://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz", + "_shasum": "364200d5f13646ca8bcd44490271335614792300", + "_shrinkwrap": null, + "_spec": "unorm@^1.3.3", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common", "author": { - "name": "Bjarke Walling", - "email": "bwp@bwp.dk" + "email": "bwp@bwp.dk", + "name": "Bjarke Walling" + }, + "bugs": { + "url": "https://github.com/walling/unorm/issues" }, - "license": "MIT or GPL-2.0", "contributors": [ { "name": "Bjarke Walling", @@ -21,49 +53,43 @@ "email": "matsuza@gmail.com" } ], - "repository": { - "type": "git", - "url": "git+ssh://git@github.com/walling/unorm.git" - }, - "main": "./lib/unorm.js", - "engines": { - "node": ">= 0.4.0" - }, - "scripts": { - "test": "grunt test" - }, + "dependencies": {}, + "description": "JavaScript Unicode 8.0 Normalization - NFC, NFD, NFKC, NFKD. Read UAX #15 Unicode Normalization Forms.", "devDependencies": { "benchmark": "~1.0.0", - "unorm": "1.4.1", + "grunt": "~0.4.1", "grunt-contrib-jshint": "~0.8.0", "grunt-contrib-watch": "~0.5.0", "grunt-simple-mocha": "~0.4.0", - "grunt": "~0.4.1" + "unorm": "1.4.1" }, - "gitHead": "e802d0d7844cf74b03742bce1147a82ace218396", - "bugs": { - "url": "https://github.com/walling/unorm/issues" + "directories": {}, + "dist": { + "shasum": "364200d5f13646ca8bcd44490271335614792300", + "tarball": "http://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz" }, - "homepage": "https://github.com/walling/unorm", - "_id": "unorm@1.4.1", - "_shasum": "364200d5f13646ca8bcd44490271335614792300", - "_from": "unorm@>=1.3.3 <2.0.0", - "_npmVersion": "1.4.28", - "_npmUser": { - "name": "walling", - "email": "bwp@bwp.dk" + "engines": { + "node": ">= 0.4.0" }, + "gitHead": "e802d0d7844cf74b03742bce1147a82ace218396", + "homepage": "https://github.com/walling/unorm", + "license": "MIT or GPL-2.0", + "main": "./lib/unorm.js", "maintainers": [ { "name": "walling", "email": "bwp@bwp.dk" } ], - "dist": { - "shasum": "364200d5f13646ca8bcd44490271335614792300", - "tarball": "http://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz" + "name": "unorm", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git+ssh://git@github.com/walling/unorm.git" }, - "directories": {}, - "_resolved": "http://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz", - "readme": "ERROR: No README data found!" + "scripts": { + "test": "grunt test" + }, + "version": "1.4.1" } diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/util-deprecate/History.md b/platforms/android/cordova/node_modules/util-deprecate/History.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/util-deprecate/History.md rename to platforms/android/cordova/node_modules/util-deprecate/History.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/util-deprecate/LICENSE b/platforms/android/cordova/node_modules/util-deprecate/LICENSE similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/util-deprecate/LICENSE rename to platforms/android/cordova/node_modules/util-deprecate/LICENSE diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/util-deprecate/README.md b/platforms/android/cordova/node_modules/util-deprecate/README.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/util-deprecate/README.md rename to platforms/android/cordova/node_modules/util-deprecate/README.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/util-deprecate/browser.js b/platforms/android/cordova/node_modules/util-deprecate/browser.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/util-deprecate/browser.js rename to platforms/android/cordova/node_modules/util-deprecate/browser.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/util-deprecate/node.js b/platforms/android/cordova/node_modules/util-deprecate/node.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/util-deprecate/node.js rename to platforms/android/cordova/node_modules/util-deprecate/node.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/util-deprecate/package.json b/platforms/android/cordova/node_modules/util-deprecate/package.json similarity index 61% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/util-deprecate/package.json rename to platforms/android/cordova/node_modules/util-deprecate/package.json index b73c41e..4ad9893 100644 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/util-deprecate/package.json +++ b/platforms/android/cordova/node_modules/util-deprecate/package.json @@ -1,54 +1,81 @@ { - "name": "util-deprecate", - "version": "1.0.2", - "description": "The Node.js `util.deprecate()` function with browser support", - "main": "node.js", - "browser": "browser.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "_args": [ + [ + "util-deprecate@1.0.2", + "/Users/steveng/repo/cordova/cordova-android/node_modules/plist" + ] + ], + "_from": "util-deprecate@1.0.2", + "_id": "util-deprecate@1.0.2", + "_inCache": true, + "_installable": true, + "_location": "/util-deprecate", + "_nodeVersion": "4.1.2", + "_npmUser": { + "email": "nathan@tootallnate.net", + "name": "tootallnate" }, - "repository": { - "type": "git", - "url": "git://github.com/TooTallNate/util-deprecate.git" + "_npmVersion": "2.14.4", + "_phantomChildren": {}, + "_requested": { + "name": "util-deprecate", + "raw": "util-deprecate@1.0.2", + "rawSpec": "1.0.2", + "scope": null, + "spec": "1.0.2", + "type": "version" }, - "keywords": [ - "util", - "deprecate", - "browserify", - "browser", - "node" + "_requiredBy": [ + "/plist" ], + "_resolved": "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "_shasum": "450d4dc9fa70de732762fbd2d4a28981419a0ccf", + "_shrinkwrap": null, + "_spec": "util-deprecate@1.0.2", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/plist", "author": { - "name": "Nathan Rajlich", "email": "nathan@tootallnate.net", + "name": "Nathan Rajlich", "url": "http://n8.io/" }, - "license": "MIT", + "browser": "browser.js", "bugs": { "url": "https://github.com/TooTallNate/util-deprecate/issues" }, - "homepage": "https://github.com/TooTallNate/util-deprecate", - "gitHead": "475fb6857cd23fafff20c1be846c1350abf8e6d4", - "_id": "util-deprecate@1.0.2", - "_shasum": "450d4dc9fa70de732762fbd2d4a28981419a0ccf", - "_from": "util-deprecate@1.0.2", - "_npmVersion": "2.14.4", - "_nodeVersion": "4.1.2", - "_npmUser": { - "name": "tootallnate", - "email": "nathan@tootallnate.net" + "dependencies": {}, + "description": "The Node.js `util.deprecate()` function with browser support", + "devDependencies": {}, + "directories": {}, + "dist": { + "shasum": "450d4dc9fa70de732762fbd2d4a28981419a0ccf", + "tarball": "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" }, + "gitHead": "475fb6857cd23fafff20c1be846c1350abf8e6d4", + "homepage": "https://github.com/TooTallNate/util-deprecate", + "keywords": [ + "browser", + "browserify", + "deprecate", + "node", + "util" + ], + "license": "MIT", + "main": "node.js", "maintainers": [ { "name": "tootallnate", "email": "nathan@tootallnate.net" } ], - "dist": { - "shasum": "450d4dc9fa70de732762fbd2d4a28981419a0ccf", - "tarball": "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" + "name": "util-deprecate", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git://github.com/TooTallNate/util-deprecate.git" }, - "directories": {}, - "_resolved": "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "readme": "ERROR: No README data found!" + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "version": "1.0.2" } diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/semver/LICENSE b/platforms/android/cordova/node_modules/wrappy/LICENSE similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/semver/LICENSE rename to platforms/android/cordova/node_modules/wrappy/LICENSE diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inflight/node_modules/wrappy/README.md b/platforms/android/cordova/node_modules/wrappy/README.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inflight/node_modules/wrappy/README.md rename to platforms/android/cordova/node_modules/wrappy/README.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/once/node_modules/wrappy/package.json b/platforms/android/cordova/node_modules/wrappy/package.json similarity index 62% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/once/node_modules/wrappy/package.json rename to platforms/android/cordova/node_modules/wrappy/package.json index b5ee2f1..35d4cc7 100644 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/once/node_modules/wrappy/package.json +++ b/platforms/android/cordova/node_modules/wrappy/package.json @@ -1,52 +1,78 @@ { - "name": "wrappy", - "version": "1.0.1", - "description": "Callback wrapping utility", - "main": "wrappy.js", - "directories": { - "test": "test" - }, - "dependencies": {}, - "devDependencies": { - "tap": "^0.4.12" - }, - "scripts": { - "test": "tap test/*.js" + "_args": [ + [ + "wrappy@1", + "/Users/steveng/repo/cordova/cordova-android/node_modules/inflight" + ] + ], + "_from": "wrappy@>=1.0.0 <2.0.0", + "_id": "wrappy@1.0.1", + "_inCache": true, + "_installable": true, + "_location": "/wrappy", + "_nodeVersion": "0.10.31", + "_npmUser": { + "email": "i@izs.me", + "name": "isaacs" }, - "repository": { - "type": "git", - "url": "git+https://github.com/npm/wrappy.git" + "_npmVersion": "2.0.0", + "_phantomChildren": {}, + "_requested": { + "name": "wrappy", + "raw": "wrappy@1", + "rawSpec": "1", + "scope": null, + "spec": ">=1.0.0 <2.0.0", + "type": "range" }, + "_requiredBy": [ + "/inflight", + "/once" + ], + "_resolved": "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz", + "_shasum": "1e65969965ccbc2db4548c6b84a6f2c5aedd4739", + "_shrinkwrap": null, + "_spec": "wrappy@1", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/inflight", "author": { - "name": "Isaac Z. Schlueter", "email": "i@izs.me", + "name": "Isaac Z. Schlueter", "url": "http://blog.izs.me/" }, - "license": "ISC", "bugs": { "url": "https://github.com/npm/wrappy/issues" }, - "homepage": "https://github.com/npm/wrappy", - "gitHead": "006a8cbac6b99988315834c207896eed71fd069a", - "_id": "wrappy@1.0.1", - "_shasum": "1e65969965ccbc2db4548c6b84a6f2c5aedd4739", - "_from": "wrappy@>=1.0.0 <2.0.0", - "_npmVersion": "2.0.0", - "_nodeVersion": "0.10.31", - "_npmUser": { - "name": "isaacs", - "email": "i@izs.me" + "dependencies": {}, + "description": "Callback wrapping utility", + "devDependencies": { + "tap": "^0.4.12" + }, + "directories": { + "test": "test" + }, + "dist": { + "shasum": "1e65969965ccbc2db4548c6b84a6f2c5aedd4739", + "tarball": "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz" }, + "gitHead": "006a8cbac6b99988315834c207896eed71fd069a", + "homepage": "https://github.com/npm/wrappy", + "license": "ISC", + "main": "wrappy.js", "maintainers": [ { "name": "isaacs", "email": "i@izs.me" } ], - "dist": { - "shasum": "1e65969965ccbc2db4548c6b84a6f2c5aedd4739", - "tarball": "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz" + "name": "wrappy", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git+https://github.com/npm/wrappy.git" }, - "_resolved": "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz", - "readme": "ERROR: No README data found!" + "scripts": { + "test": "tap test/*.js" + }, + "version": "1.0.1" } diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inflight/node_modules/wrappy/test/basic.js b/platforms/android/cordova/node_modules/wrappy/test/basic.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inflight/node_modules/wrappy/test/basic.js rename to platforms/android/cordova/node_modules/wrappy/test/basic.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inflight/node_modules/wrappy/wrappy.js b/platforms/android/cordova/node_modules/wrappy/wrappy.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/glob/node_modules/inflight/node_modules/wrappy/wrappy.js rename to platforms/android/cordova/node_modules/wrappy/wrappy.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/.npmignore b/platforms/android/cordova/node_modules/xmlbuilder/.npmignore similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/.npmignore rename to platforms/android/cordova/node_modules/xmlbuilder/.npmignore diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/LICENSE b/platforms/android/cordova/node_modules/xmlbuilder/LICENSE similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/LICENSE rename to platforms/android/cordova/node_modules/xmlbuilder/LICENSE diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/README.md b/platforms/android/cordova/node_modules/xmlbuilder/README.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/README.md rename to platforms/android/cordova/node_modules/xmlbuilder/README.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLAttribute.js b/platforms/android/cordova/node_modules/xmlbuilder/lib/XMLAttribute.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLAttribute.js rename to platforms/android/cordova/node_modules/xmlbuilder/lib/XMLAttribute.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLBuilder.js b/platforms/android/cordova/node_modules/xmlbuilder/lib/XMLBuilder.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLBuilder.js rename to platforms/android/cordova/node_modules/xmlbuilder/lib/XMLBuilder.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLCData.js b/platforms/android/cordova/node_modules/xmlbuilder/lib/XMLCData.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLCData.js rename to platforms/android/cordova/node_modules/xmlbuilder/lib/XMLCData.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLComment.js b/platforms/android/cordova/node_modules/xmlbuilder/lib/XMLComment.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLComment.js rename to platforms/android/cordova/node_modules/xmlbuilder/lib/XMLComment.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLDTDAttList.js b/platforms/android/cordova/node_modules/xmlbuilder/lib/XMLDTDAttList.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLDTDAttList.js rename to platforms/android/cordova/node_modules/xmlbuilder/lib/XMLDTDAttList.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLDTDElement.js b/platforms/android/cordova/node_modules/xmlbuilder/lib/XMLDTDElement.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLDTDElement.js rename to platforms/android/cordova/node_modules/xmlbuilder/lib/XMLDTDElement.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLDTDEntity.js b/platforms/android/cordova/node_modules/xmlbuilder/lib/XMLDTDEntity.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLDTDEntity.js rename to platforms/android/cordova/node_modules/xmlbuilder/lib/XMLDTDEntity.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLDTDNotation.js b/platforms/android/cordova/node_modules/xmlbuilder/lib/XMLDTDNotation.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLDTDNotation.js rename to platforms/android/cordova/node_modules/xmlbuilder/lib/XMLDTDNotation.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLDeclaration.js b/platforms/android/cordova/node_modules/xmlbuilder/lib/XMLDeclaration.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLDeclaration.js rename to platforms/android/cordova/node_modules/xmlbuilder/lib/XMLDeclaration.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLDocType.js b/platforms/android/cordova/node_modules/xmlbuilder/lib/XMLDocType.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLDocType.js rename to platforms/android/cordova/node_modules/xmlbuilder/lib/XMLDocType.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLElement.js b/platforms/android/cordova/node_modules/xmlbuilder/lib/XMLElement.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLElement.js rename to platforms/android/cordova/node_modules/xmlbuilder/lib/XMLElement.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLNode.js b/platforms/android/cordova/node_modules/xmlbuilder/lib/XMLNode.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLNode.js rename to platforms/android/cordova/node_modules/xmlbuilder/lib/XMLNode.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLProcessingInstruction.js b/platforms/android/cordova/node_modules/xmlbuilder/lib/XMLProcessingInstruction.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLProcessingInstruction.js rename to platforms/android/cordova/node_modules/xmlbuilder/lib/XMLProcessingInstruction.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLRaw.js b/platforms/android/cordova/node_modules/xmlbuilder/lib/XMLRaw.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLRaw.js rename to platforms/android/cordova/node_modules/xmlbuilder/lib/XMLRaw.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLStringifier.js b/platforms/android/cordova/node_modules/xmlbuilder/lib/XMLStringifier.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLStringifier.js rename to platforms/android/cordova/node_modules/xmlbuilder/lib/XMLStringifier.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLText.js b/platforms/android/cordova/node_modules/xmlbuilder/lib/XMLText.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/XMLText.js rename to platforms/android/cordova/node_modules/xmlbuilder/lib/XMLText.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/index.js b/platforms/android/cordova/node_modules/xmlbuilder/lib/index.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/lib/index.js rename to platforms/android/cordova/node_modules/xmlbuilder/lib/index.js diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/package.json b/platforms/android/cordova/node_modules/xmlbuilder/package.json similarity index 62% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/package.json rename to platforms/android/cordova/node_modules/xmlbuilder/package.json index e2c86ed..cc32dc4 100644 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmlbuilder/package.json +++ b/platforms/android/cordova/node_modules/xmlbuilder/package.json @@ -1,64 +1,89 @@ { - "name": "xmlbuilder", - "version": "4.0.0", - "keywords": [ - "xml", - "xmlbuilder" + "_args": [ + [ + "xmlbuilder@4.0.0", + "/Users/steveng/repo/cordova/cordova-android/node_modules/plist" + ] ], - "homepage": "http://github.com/oozcitak/xmlbuilder-js", - "description": "An XML builder for node.js", - "author": { - "name": "Ozgur Ozcitak", - "email": "oozcitak@gmail.com" + "_from": "xmlbuilder@4.0.0", + "_id": "xmlbuilder@4.0.0", + "_inCache": true, + "_installable": true, + "_location": "/xmlbuilder", + "_npmUser": { + "email": "oozcitak@gmail.com", + "name": "oozcitak" }, - "contributors": [], - "license": "MIT", - "repository": { - "type": "git", - "url": "git://github.com/oozcitak/xmlbuilder-js.git" + "_npmVersion": "1.4.28", + "_phantomChildren": {}, + "_requested": { + "name": "xmlbuilder", + "raw": "xmlbuilder@4.0.0", + "rawSpec": "4.0.0", + "scope": null, + "spec": "4.0.0", + "type": "version" + }, + "_requiredBy": [ + "/plist" + ], + "_resolved": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz", + "_shasum": "98b8f651ca30aa624036f127d11cc66dc7b907a3", + "_shrinkwrap": null, + "_spec": "xmlbuilder@4.0.0", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/plist", + "author": { + "email": "oozcitak@gmail.com", + "name": "Ozgur Ozcitak" }, "bugs": { "url": "http://github.com/oozcitak/xmlbuilder-js/issues" }, - "main": "./lib/index", - "engines": { - "node": ">=0.8.0" - }, + "contributors": [], "dependencies": { "lodash": "^3.5.0" }, + "description": "An XML builder for node.js", "devDependencies": { - "coffee-script": "*", - "mocha": "*", "coffee-coverage": "*", + "coffee-script": "*", + "coveralls": "*", "istanbul": "*", - "coveralls": "*" + "mocha": "*" }, - "scripts": { - "prepublish": "coffee -co lib src", - "postpublish": "rm -rf lib", - "test": "mocha && istanbul report text lcov" + "directories": {}, + "dist": { + "shasum": "98b8f651ca30aa624036f127d11cc66dc7b907a3", + "tarball": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz" }, - "gitHead": "ec17840a6705ef666b7d04c771de11df6091fff5", - "_id": "xmlbuilder@4.0.0", - "_shasum": "98b8f651ca30aa624036f127d11cc66dc7b907a3", - "_from": "xmlbuilder@4.0.0", - "_npmVersion": "1.4.28", - "_npmUser": { - "name": "oozcitak", - "email": "oozcitak@gmail.com" + "engines": { + "node": ">=0.8.0" }, + "gitHead": "ec17840a6705ef666b7d04c771de11df6091fff5", + "homepage": "http://github.com/oozcitak/xmlbuilder-js", + "keywords": [ + "xml", + "xmlbuilder" + ], + "license": "MIT", + "main": "./lib/index", "maintainers": [ { "name": "oozcitak", "email": "oozcitak@gmail.com" } ], - "dist": { - "shasum": "98b8f651ca30aa624036f127d11cc66dc7b907a3", - "tarball": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz" + "name": "xmlbuilder", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git://github.com/oozcitak/xmlbuilder-js.git" }, - "directories": {}, - "_resolved": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz", - "readme": "ERROR: No README data found!" + "scripts": { + "postpublish": "rm -rf lib", + "prepublish": "coffee -co lib src", + "test": "mocha && istanbul report text lcov" + }, + "version": "4.0.0" } diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/.npmignore b/platforms/android/cordova/node_modules/xmldom/.npmignore similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/.npmignore rename to platforms/android/cordova/node_modules/xmldom/.npmignore diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/.travis.yml b/platforms/android/cordova/node_modules/xmldom/.travis.yml similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/.travis.yml rename to platforms/android/cordova/node_modules/xmldom/.travis.yml diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/LICENSE b/platforms/android/cordova/node_modules/xmldom/LICENSE similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/LICENSE rename to platforms/android/cordova/node_modules/xmldom/LICENSE diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/__package__.js b/platforms/android/cordova/node_modules/xmldom/__package__.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/__package__.js rename to platforms/android/cordova/node_modules/xmldom/__package__.js diff --git a/platforms/android/cordova/node_modules/xmldom/changelog b/platforms/android/cordova/node_modules/xmldom/changelog new file mode 100644 index 0000000..ab815bb --- /dev/null +++ b/platforms/android/cordova/node_modules/xmldom/changelog @@ -0,0 +1,14 @@ +### Version 0.1.16 + +Sat May 4 14:58:03 UTC 2013 + + * Correctly handle multibyte Unicode greater than two byts. #57. #56. + * Initial unit testing and test coverage. #53. #46. #19. + * Create Bower `component.json` #52. + +### Version 0.1.8 + + * Add: some test case from node-o3-xml(excludes xpath support) + * Fix: remove existed attribute before setting (bug introduced in v0.1.5) + * Fix: index direct access for childNodes and any NodeList collection(not w3c standard) + * Fix: remove last child bug diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/component.json b/platforms/android/cordova/node_modules/xmldom/component.json similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/component.json rename to platforms/android/cordova/node_modules/xmldom/component.json diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/dom-parser.js b/platforms/android/cordova/node_modules/xmldom/dom-parser.js similarity index 93% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/dom-parser.js rename to platforms/android/cordova/node_modules/xmldom/dom-parser.js index 7d763f4..08c2f70 100644 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/dom-parser.js +++ b/platforms/android/cordova/node_modules/xmldom/dom-parser.js @@ -41,27 +41,20 @@ function buildErrorHandler(errorImpl,domBuilder,locator){ locator = locator||{} function build(key){ var fn = errorImpl[key]; - if(!fn){ - if(isCallback){ - fn = errorImpl.length == 2?function(msg){errorImpl(key,msg)}:errorImpl; - }else{ - var i=arguments.length; - while(--i){ - if(fn = errorImpl[arguments[i]]){ - break; - } - } - } + if(!fn && isCallback){ + fn = errorImpl.length == 2?function(msg){errorImpl(key,msg)}:errorImpl; } errorHandler[key] = fn && function(msg){ - fn(msg+_locator(locator)); + fn('[xmldom '+key+']\t'+msg+_locator(locator)); }||function(){}; } - build('warning','warn'); - build('error','warn','warning'); - build('fatalError','warn','warning','error'); + build('warning'); + build('error'); + build('fatalError'); return errorHandler; } + +//console.log('#\n\n\n\n\n\n\n####') /** * +ContentHandler+ErrorHandler * +LexicalHandler+EntityResolver2 @@ -178,13 +171,13 @@ DOMHandler.prototype = { * @link http://www.saxproject.org/apidoc/org/xml/sax/ErrorHandler.html */ warning:function(error) { - console.warn(error,_locator(this.locator)); + console.warn('[xmldom warning]\t'+error,_locator(this.locator)); }, error:function(error) { - console.error(error,_locator(this.locator)); + console.error('[xmldom error]\t'+error,_locator(this.locator)); }, fatalError:function(error) { - console.error(error,_locator(this.locator)); + console.error('[xmldom fatalError]\t'+error,_locator(this.locator)); throw error; } } diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/dom.js b/platforms/android/cordova/node_modules/xmldom/dom.js similarity index 99% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/dom.js rename to platforms/android/cordova/node_modules/xmldom/dom.js index 0a3b8ad..460a1be 100644 --- a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/dom.js +++ b/platforms/android/cordova/node_modules/xmldom/dom.js @@ -109,6 +109,12 @@ NodeList.prototype = { */ item: function(index) { return this[index] || null; + }, + toString:function(){ + for(var buf = [], i = 0;i=0.1.0 <0.2.0", + "_id": "xmldom@0.1.22", + "_inCache": true, + "_installable": true, + "_location": "/xmldom", + "_nodeVersion": "5.5.0", + "_npmUser": { "email": "jindw@xidea.org", - "url": "http://www.xidea.org" + "name": "jindw" }, - "homepage": "https://github.com/jindw/xmldom", - "repository": { - "type": "git", - "url": "git://github.com/jindw/xmldom.git" + "_npmVersion": "3.3.12", + "_phantomChildren": {}, + "_requested": { + "name": "xmldom", + "raw": "xmldom@0.1.x", + "rawSpec": "0.1.x", + "scope": null, + "spec": ">=0.1.0 <0.2.0", + "type": "range" }, - "main": "./dom-parser.js", - "scripts": { - "test": "proof platform win32 && proof test */*/*.t.js || t/test" + "_requiredBy": [ + "/plist" + ], + "_resolved": "http://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz", + "_shasum": "10de4e5e964981f03c8cc72fadc08d14b6c3aa26", + "_shrinkwrap": null, + "_spec": "xmldom@0.1.x", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/plist", + "author": { + "email": "jindw@xidea.org", + "name": "jindw", + "url": "http://www.xidea.org" }, - "engines": { - "node": ">=0.1" + "bugs": { + "email": "jindw@xidea.org", + "url": "http://github.com/jindw/xmldom/issues" }, + "contributors": [ + { + "name": "Yaron Naveh", + "email": "yaronn01@gmail.com", + "url": "http://webservices20.blogspot.com/" + }, + { + "name": "Harutyun Amirjanyan", + "email": "amirjanyan@gmail.com", + "url": "https://github.com/nightwing" + }, + { + "name": "Alan Gutierrez", + "email": "alan@prettyrobots.com", + "url": "http://www.prettyrobots.com/" + } + ], "dependencies": {}, + "description": "A W3C Standard XML DOM(Level2 CORE) implementation and parser(DOMParser/XMLSerializer).", "devDependencies": { "proof": "0.0.28" }, + "directories": {}, + "dist": { + "shasum": "10de4e5e964981f03c8cc72fadc08d14b6c3aa26", + "tarball": "http://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz" + }, + "engines": { + "node": ">=0.1" + }, + "gitHead": "29a83b315aef56c156602286b2d884a3b4c2521f", + "homepage": "https://github.com/jindw/xmldom", + "keywords": [ + "DOMParser", + "XMLSerializer", + "dom", + "javascript", + "parser", + "w3c", + "xml" + ], + "licenses": [ + { + "type": "LGPL", + "url": "http://www.gnu.org/licenses/lgpl.html", + "MIT": "http://opensource.org/licenses/MIT" + } + ], + "main": "./dom-parser.js", "maintainers": [ { "name": "jindw", @@ -54,47 +113,15 @@ "email": "jinyun.jin@gmail.com" } ], - "contributors": [ - { - "name": "Yaron Naveh", - "email": "yaronn01@gmail.com", - "url": "http://webservices20.blogspot.com/" - }, - { - "name": "Harutyun Amirjanyan", - "email": "amirjanyan@gmail.com", - "url": "https://github.com/nightwing" - }, - { - "name": "Alan Gutierrez", - "email": "alan@prettyrobots.com", - "url": "http://www.prettyrobots.com/" - } - ], - "bugs": { - "url": "http://github.com/jindw/xmldom/issues", - "email": "jindw@xidea.org" - }, - "licenses": [ - { - "type": "LGPL", - "url": "http://www.gnu.org/licenses/lgpl.html", - "MIT": "http://opensource.org/licenses/MIT" - } - ], - "_id": "xmldom@0.1.21", - "_shasum": "a29e1210dab1f10c25665b5e80129baa8d69a97b", - "_from": "xmldom@>=0.1.0 <0.2.0", - "_npmVersion": "1.4.9", - "_npmUser": { - "name": "jindw", - "email": "jindw@xidea.org" + "name": "xmldom", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git://github.com/jindw/xmldom.git" }, - "dist": { - "shasum": "a29e1210dab1f10c25665b5e80129baa8d69a97b", - "tarball": "http://registry.npmjs.org/xmldom/-/xmldom-0.1.21.tgz" + "scripts": { + "test": "proof platform win32 && proof test */*/*.t.js || t/test" }, - "directories": {}, - "_resolved": "http://registry.npmjs.org/xmldom/-/xmldom-0.1.21.tgz", - "readme": "ERROR: No README data found!" + "version": "0.1.22" } diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/readme.md b/platforms/android/cordova/node_modules/xmldom/readme.md similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/readme.md rename to platforms/android/cordova/node_modules/xmldom/readme.md diff --git a/platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/sax.js b/platforms/android/cordova/node_modules/xmldom/sax.js similarity index 100% rename from platforms/android/cordova/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/sax.js rename to platforms/android/cordova/node_modules/xmldom/sax.js diff --git a/platforms/android/cordova/version b/platforms/android/cordova/version index 0778301..2a55fb9 100644 --- a/platforms/android/cordova/version +++ b/platforms/android/cordova/version @@ -20,7 +20,7 @@ */ // Coho updates this line: -var VERSION = "5.1.0"; +var VERSION = "5.1.1"; module.exports.version = VERSION; diff --git a/platforms/android/platform_www/cordova-js-src/platform.js b/platforms/android/platform_www/cordova-js-src/platform.js index 0706a34..2bfd024 100644 --- a/platforms/android/platform_www/cordova-js-src/platform.js +++ b/platforms/android/platform_www/cordova-js-src/platform.js @@ -19,6 +19,9 @@ * */ +// The last resume event that was received that had the result of a plugin call. +var lastResumeEvent = null; + module.exports = { id: 'android', bootstrap: function() { @@ -58,6 +61,19 @@ module.exports = { bindButtonChannel('volumeup'); bindButtonChannel('volumedown'); + // The resume event is not "sticky", but it is possible that the event + // will contain the result of a plugin call. We need to ensure that the + // plugin result is delivered even after the event is fired (CB-10498) + var cordovaAddEventListener = document.addEventListener; + + document.addEventListener = function(evt, handler, capture) { + cordovaAddEventListener(evt, handler, capture); + + if (evt === 'resume' && lastResumeEvent) { + handler(lastResumeEvent); + } + }; + // Let native code know we are all done on the JS side. // Native code will then un-hide the WebView. channel.onCordovaReady.subscribe(function() { @@ -96,6 +112,10 @@ function onMessageFromNative(msg) { } msg.pendingResult.result = res; } + + // Save the plugin result so that it can be delivered to the js + // even if they miss the initial firing of the event + lastResumeEvent = msg; } cordova.fireDocumentEvent(action, msg); break; diff --git a/platforms/android/platform_www/cordova.js b/platforms/android/platform_www/cordova.js index ece529c..e94e0f7 100644 --- a/platforms/android/platform_www/cordova.js +++ b/platforms/android/platform_www/cordova.js @@ -1,5 +1,5 @@ // Platform: android -// ded62dda172755defaf75378ed007dc05730ec22 +// c517ca811b4948b630e0b74dbae6c9637939da24 /* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -19,7 +19,7 @@ under the License. */ ;(function() { -var PLATFORM_VERSION_BUILD_LABEL = '5.1.0'; +var PLATFORM_VERSION_BUILD_LABEL = '5.1.1'; // file: src/scripts/require.js /*jshint -W079 */ @@ -1614,6 +1614,9 @@ exports.reset(); // file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/platform.js define("cordova/platform", function(require, exports, module) { +// The last resume event that was received that had the result of a plugin call. +var lastResumeEvent = null; + module.exports = { id: 'android', bootstrap: function() { @@ -1653,6 +1656,19 @@ module.exports = { bindButtonChannel('volumeup'); bindButtonChannel('volumedown'); + // The resume event is not "sticky", but it is possible that the event + // will contain the result of a plugin call. We need to ensure that the + // plugin result is delivered even after the event is fired (CB-10498) + var cordovaAddEventListener = document.addEventListener; + + document.addEventListener = function(evt, handler, capture) { + cordovaAddEventListener(evt, handler, capture); + + if (evt === 'resume' && lastResumeEvent) { + handler(lastResumeEvent); + } + }; + // Let native code know we are all done on the JS side. // Native code will then un-hide the WebView. channel.onCordovaReady.subscribe(function() { @@ -1691,6 +1707,10 @@ function onMessageFromNative(msg) { } msg.pendingResult.result = res; } + + // Save the plugin result so that it can be delivered to the js + // even if they miss the initial firing of the event + lastResumeEvent = msg; } cordova.fireDocumentEvent(action, msg); break; diff --git a/platforms/android/platform_www/cordova_plugins.js b/platforms/android/platform_www/cordova_plugins.js index 412ba08..a70214c 100644 --- a/platforms/android/platform_www/cordova_plugins.js +++ b/platforms/android/platform_www/cordova_plugins.js @@ -6,10 +6,20 @@ module.exports = [ "clobbers": [ "window.bluetoothSerial" ] + }, + { + "file": "plugins/cordova-plugin-rfduino/www/rfduino.js", + "id": "cordova-plugin-rfduino.rfduino", + "clobbers": [ + "rfduino" + ] } ]; module.exports.metadata = // TOP OF METADATA -{} +{ + "cordova-plugin-bluetooth-serial": "0.4.5", + "cordova-plugin-rfduino": "0.1.4" +}; // BOTTOM OF METADATA }); \ No newline at end of file diff --git a/platforms/android/res/xml/config.xml b/platforms/android/res/xml/config.xml index 004442d..5ea5a8b 100644 --- a/platforms/android/res/xml/config.xml +++ b/platforms/android/res/xml/config.xml @@ -4,6 +4,9 @@ + + + diff --git a/platforms/platforms.json b/platforms/platforms.json index f73de65..caf2115 100644 --- a/platforms/platforms.json +++ b/platforms/platforms.json @@ -1,3 +1,3 @@ { - "android": "5.1.0" + "android": "5.1.1" } \ No newline at end of file diff --git a/plugins/android.json b/plugins/android.json index 5f1e026..949b056 100644 --- a/plugins/android.json +++ b/plugins/android.json @@ -9,6 +9,9 @@ "installed_plugins": { "cordova-plugin-bluetooth-serial": { "PACKAGE_NAME": "com.ionicframework.testtabs509143" + }, + "cordova-plugin-rfduino": { + "PACKAGE_NAME": "com.ionicframework.testtabs509143" } }, "dependent_plugins": {} diff --git a/www/app/app.js b/www/app/app.js index 9228bbb..f46f320 100644 --- a/www/app/app.js +++ b/www/app/app.js @@ -2,23 +2,23 @@ // 'openbarbell' is the name of this angular module (also set in a attribute in index.html) // the 2nd parameter is an array of 'required' modules angular.module('openbarbell', [ - 'ngMaterial', - 'ionic', - 'appConfig', - 'appRoutes', + 'ngMaterial', + 'ionic', + 'appConfig', + 'appRoutes', 'shell', 'workout', 'history', 'settings', /* Services */ - 'bluetooth-service', 'settings-service' + 'bluetooth-service', 'rfduino-service', 'settings-service' ]); //.run(function($ionicPlatform) { // $ionicPlatform.ready(function() { // // Hide the accessory bar by default (remove this to show the accessory bar above the keyboard // // for form inputs) -// +// // // This is where we could setup initial plug-in settings // if (window.cordova && window.cordova.plugins && window.cordova.plugins.Keyboard) { // cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true); @@ -29,4 +29,4 @@ angular.module('openbarbell', [ // StatusBar.styleDefault(); // } // }); -//}); \ No newline at end of file +//}); diff --git a/www/app/services/rfduino.service.js b/www/app/services/rfduino.service.js index 6d7f064..ba7edaa 100644 --- a/www/app/services/rfduino.service.js +++ b/www/app/services/rfduino.service.js @@ -12,11 +12,11 @@ isEnabled : isEnabled, isConnected : isConnected, discoverDevices : discoverDevices, - listDevices : listDevices, + // listDevices : listDevices, connect : function(device) { return connect(device); - }, - disconnect : disconnect + }//, + //disconnect : disconnect }; return service; @@ -71,7 +71,7 @@ /** * Some REGEX for OpenBarbell Device detection "^(OB){1}\s{1}\d+$" - * + * * rfduino will call success callback each time a peripheral is discovered. * @sampleDevice { * "name": "RFduino", @@ -81,62 +81,66 @@ * } */ function discoverDevices() { - var deferred = $q.defer(); - - if ($window.rfduino && enabled) { - // cannot resolve on first device! Resolve when timer is done - rfduino.discover(3, function(device) { - deferred.resolve(devices); - }, - function() { - deferred.reject("Could not find any devices."); - }); - } - else if (!enabled) { - deferred.reject("Bluetooth is not enabled!"); - } - else { - deferred.reject("rfduino plug-in not loaded."); - } - - return deferred.promise; - } - - function connect(device) { - var deferred = $q.defer(); - - if ($window.rfduino && enabled) { - rfduino.connect(device.uuid, function() { - deferred.resolve("Connected to " + device.name + "!"); - connectedDevice = device; - - /* Store MAC Address of connected device */ - settingsService.setSetting("mac_address", device.address); - - //rfduino.subscribe('\n', onReceive, onSubscribeFail); - }, - function(error) { - deferred.resolve("Failed to connected to " + device.name + "!"); - connectedDevice = {}; - }); - } - else if (!enabled) { - deferred.reject("Bluetooth is not enabled!"); - } - else { - deferred.reject("rfduino plug-in not loaded."); - } - - return deferred.promise; - } - - function onReceive(data) { - //TODO: Do something with the data - } - - //TODO: Test subscribing with the device, otherwise may need read/timeouts - function onSubscribeFail() { - console.log("Failed to subscribe."); - } + var deferred = $q.defer(); + + if ($window.rfduino) { + // cannot resolve on first device! Resolve when timer is done + rfduino.discover(3, function(device) { + deferred.resolve(device); + if (device.name === "OB 48") {connect(device); } + }, + function() { + deferred.reject("Could not find any devices."); + }); + } + else if (!enabled) { + deferred.reject("Bluetooth is not enabled!"); + } + else { + deferred.reject("rfduino plug-in not loaded."); + } + + return deferred.promise; + } + + function connect(device) { + var deferred = $q.defer(); + + if ($window.rfduino) { + rfduino.connect(device.uuid, function() { + deferred.resolve("Connected to " + device.name + "!"); + connectedDevice = device; + + /* Store MAC Address of connected device */ + settingsService.setSetting("mac_address", device.address); + + rfduino.onData(onReceive, onSubscribeFail); + + //rfduino.subscribe('\n', onReceive, onSubscribeFail); + }, + function(error) { + deferred.resolve("Failed to connected to " + device.name + "!"); + connectedDevice = {}; + }); + } + else if (!enabled) { + deferred.reject("Bluetooth is not enabled!"); + } + else { + deferred.reject("rfduino plug-in not loaded."); + } + + return deferred.promise; + } + + function onReceive(data) { + //TODO: Do something with the data + console.log(data); + } + + //TODO: Test subscribing with the device, otherwise may need read/timeouts + function onSubscribeFail() { + console.log("Failed to subscribe."); + } }; })(angular); diff --git a/www/app/settings/settings.controller.js b/www/app/settings/settings.controller.js index c3bc348..a979428 100644 --- a/www/app/settings/settings.controller.js +++ b/www/app/settings/settings.controller.js @@ -3,8 +3,8 @@ .module('settings') .controller('SettingsController', SettingsController); - SettingsController.$inject = ['$scope', '$timeout', 'settingsService', 'bluetoothService']; - function SettingsController($scope, $timeout, settingsService, bluetoothService) { + SettingsController.$inject = ['$scope', '$timeout', 'settingsService', 'bluetoothService', 'rfduinoService']; + function SettingsController($scope, $timeout, settingsService, bluetoothService, rfduinoService) { var vm = this; vm.bluetoothBtnText = "Enable Bluetooth"; @@ -63,7 +63,7 @@ vm.scanning = true; $timeout(function() { - bluetoothService.scanDevices() + rfduinoService.discoverDevices() .then(function(devices) { vm.scanBtnText = "Scan Devices"; vm.disableScanBtn = false; @@ -87,7 +87,7 @@ vm.pairing = "indeterminate"; $timeout(function() { - bluetoothService.connect(device) + rfduinoService.connect(device) .then(function(response) { vm.deviceConnected = true; delete vm.pairing; @@ -100,7 +100,7 @@ } function getDeviceInfo(property) { - return bluetoothService.getConnectedDevice()[property]; + return rfduinoService.getConnectedDevice()[property]; } $scope.$on('syncSettings', function(params) { diff --git a/www/app/shell/tab.controller.js b/www/app/shell/tab.controller.js index 9370fbb..2bc9c61 100644 --- a/www/app/shell/tab.controller.js +++ b/www/app/shell/tab.controller.js @@ -28,30 +28,31 @@ }; /****************** Cordova Events ******************/ - + // Check status of bluetooth once plug-in is detected - var unbindWatcher = $scope.$watch(function() { - return $window.bluetoothSerial; - }, + var unbindWatcher = $scope.$watch(function() { + return $window.rfduino; + }, function(newValue, oldValue) { if (newValue !== undefined) { $scope.$broadcast('checkConnectionStatus', {}); unbindWatcher(); } }); - + // Check status of bluetooth when app resumed $document[0].addEventListener("deviceready", onDeviceReady, false); + function onDeviceReady() { $document[0].addEventListener("pause", onPause, false); $document[0].addEventListener("resume", onResume, false); } - + // Handle the pause event function onPause() { - + } - + // Handle the resume event function onResume() { $scope.$broadcast('checkConnectionStatus', {}); diff --git a/www/index.html b/www/index.html index d2c95c3..3ff3c00 100644 --- a/www/index.html +++ b/www/index.html @@ -3,34 +3,34 @@ - + Open Barbell - + - + - + - + - + - + - + - + @@ -39,45 +39,46 @@ - + - + - + - + - + - + - + - + - + + - + - +