From fd1d3006c0f656091e6c45068f8653775eaa65d7 Mon Sep 17 00:00:00 2001 From: Steve Gill Date: Wed, 29 Jun 2016 12:39:42 -0700 Subject: [PATCH 01/14] CB-11444 Updated RELEASENOTES and Version for release 5.2.0 --- .gitignore | 83 ++++++++ .ratignore | 2 + RELEASENOTES.md | 515 ++++++++++++++++++++++++++---------------------- package.json | 2 +- 4 files changed, 361 insertions(+), 241 deletions(-) diff --git a/.gitignore b/.gitignore index 65636c012..075f4fc6a 100644 --- a/.gitignore +++ b/.gitignore @@ -46,4 +46,87 @@ node_modules/promise-matchers node_modules/jasmine-node node_modules/rewire node_modules/istanbul +node_modules/.bin/cake +node_modules/.bin/coffee +node_modules/.bin/escodegen +node_modules/.bin/esgenerate +node_modules/.bin/esparse +node_modules/.bin/esvalidate +node_modules/.bin/handlebars +node_modules/.bin/istanbul +node_modules/.bin/jasmine-node +node_modules/.bin/js-yaml +node_modules/.bin/jshint +node_modules/.bin/mkdirp +node_modules/.bin/r.js +node_modules/.bin/r_js +node_modules/.bin/strip-json-comments +node_modules/.bin/uglifyjs +node_modules/.bin/which +node_modules/align-text/ +node_modules/amdefine/ +node_modules/argparse/ +node_modules/async/ +node_modules/camelcase/ +node_modules/center-align/ +node_modules/cli/ +node_modules/cliui/ +node_modules/coffee-script/ +node_modules/console-browserify/ +node_modules/core-util-is/ +node_modules/date-now/ +node_modules/decamelize/ +node_modules/deep-is/ +node_modules/dom-serializer/ +node_modules/domelementtype/ +node_modules/domhandler/ +node_modules/domutils/ +node_modules/entities/ +node_modules/escodegen/ +node_modules/esprima/ +node_modules/estraverse/ +node_modules/esutils/ +node_modules/exit/ +node_modules/fast-levenshtein/ +node_modules/fileset/ +node_modules/gaze/ +node_modules/growl/ +node_modules/handlebars/ +node_modules/has-flag/ +node_modules/htmlparser2/ +node_modules/is-buffer/ +node_modules/isarray/ +node_modules/isexe/ +node_modules/jasmine-growl-reporter/ +node_modules/jasmine-reporters/ +node_modules/js-yaml/ +node_modules/kind-of/ +node_modules/lazy-cache/ +node_modules/levn/ +node_modules/longest/ +node_modules/lru-cache/ +node_modules/minimist/ +node_modules/mkdirp/ +node_modules/optimist/ +node_modules/optionator/ +node_modules/prelude-ls/ +node_modules/readable-stream/ +node_modules/repeat-string/ +node_modules/requirejs/ +node_modules/resolve/ +node_modules/right-align/ +node_modules/sigmund/ +node_modules/source-map/ +node_modules/sprintf-js/ +node_modules/string_decoder/ +node_modules/strip-json-comments/ +node_modules/supports-color/ +node_modules/type-check/ +node_modules/uglify-js/ +node_modules/uglify-to-browserify/ +node_modules/walkdir/ +node_modules/which/ +node_modules/window-size/ +node_modules/wordwrap/ +node_modules/yargs/ /coverage diff --git a/.ratignore b/.ratignore index 411e59975..d91fabc55 100644 --- a/.ratignore +++ b/.ratignore @@ -2,3 +2,5 @@ bin gen proguard-project.txt +spec +appveyor.yml diff --git a/RELEASENOTES.md b/RELEASENOTES.md index db7c16afd..1f9974130 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -20,123 +20,158 @@ --> ## Release Notes for Cordova (Android) ## +### 5.2.0 (Jun 29, 2016) +* [CB-11383](https://issues.apache.org/jira/browse/CB-11383) Update to gradle for using `jcenter` and correct Application plugin +* [CB-11365](https://issues.apache.org/jira/browse/CB-11365) fixed plugin rm issue with emit being `undefined` +* [CB-11117](https://issues.apache.org/jira/browse/CB-11117) Use `FileUpdater` to optimize prepare for **android** platform +* [CB-10096](https://issues.apache.org/jira/browse/CB-10096) Upgrade test project to `Gradle Plugin 2.1.0` +* [CB-11292](https://issues.apache.org/jira/browse/CB-11292) fix broken `MessageChannel` after plugins are recreated +* [CB-11259](https://issues.apache.org/jira/browse/CB-11259) Improving build output +* [CB-10096](https://issues.apache.org/jira/browse/CB-10096) Upgrading to `Gradle Plugin 2.1.0` +* [CB-11198](https://issues.apache.org/jira/browse/CB-11198) Skip **android** target sdk check. This closes #303. +* [CB-11138](https://issues.apache.org/jira/browse/CB-11138) Reuse `PluginManager` from `common` to add/rm plugins +* [CB-11133](https://issues.apache.org/jira/browse/CB-11133) Handle **android** emulator start failure +* [CB-11132](https://issues.apache.org/jira/browse/CB-11132) Fix Error: Cannot read property `match` of undefined in `cordova-android` `emulator.js` +* Add simple log for package name being deployed +* [CB-11015](https://issues.apache.org/jira/browse/CB-11015) Error adding plugin with gradle extras +* [CB-11095](https://issues.apache.org/jira/browse/CB-11095) Fix plugin add/removal when running on `Node v.010` +* [CB-11022](https://issues.apache.org/jira/browse/CB-11022) Duplicate www files to both destinations on plugin operations +* [CB-10964](https://issues.apache.org/jira/browse/CB-10964) Handle `build.json` file starting with a BOM. +* [CB-10963](https://issues.apache.org/jira/browse/CB-10963) Handle overlapping permission requests from plugins +* [CB-8582](https://issues.apache.org/jira/browse/CB-8582) Obscure `INSTALL_FAILED_VERSION_DOWNGRADE` error when installing app +* [CB-10862](https://issues.apache.org/jira/browse/CB-10862) Cannot set `minsdkversion` +* [CB-10896](https://issues.apache.org/jira/browse/CB-10896) We never enabled cookies on the `WebView` proper +* [CB-10837](https://issues.apache.org/jira/browse/CB-10837) Support platform-specific orientation on **Android** +* [CB-10600](https://issues.apache.org/jira/browse/CB-10600) `cordova run android --release` does not use signed and zip-aligned version of `APK` +* [CB-9710](https://issues.apache.org/jira/browse/CB-9710) Fixing issues parsing `android avd list` output for certain AVDs which resulted in them not being included in the selection process even if they are the best match. +* [CB-10888](https://issues.apache.org/jira/browse/CB-10888) Enable coverage reports collection via codecov +* [CB-10846](https://issues.apache.org/jira/browse/CB-10846) Add Travis and AppVeyor badges to readme +* [CB-10846](https://issues.apache.org/jira/browse/CB-10846) Add AppVeyor configuration +* [CB-10749](https://issues.apache.org/jira/browse/CB-10749) Use `cordova-common.CordovaLogger` in `cordova-android` +* [CB-10673](https://issues.apache.org/jira/browse/CB-10673) fixed conflicting plugin install issue with overlapped `` tag. Add `--force` flag. +* [CB-8976](https://issues.apache.org/jira/browse/CB-8976) Removing the auto-version for non-Crosswalk applications +* [CB-10768](https://issues.apache.org/jira/browse/CB-10768) Use `cordova-common.superspawn` in `GradleBuilder` +* [CB-10729](https://issues.apache.org/jira/browse/CB-10729) Move plugin handlers tests for into platform's repo +* [CB-10669](https://issues.apache.org/jira/browse/CB-10669) `cordova run --list` cannot find `adb` +* [CB-10660](https://issues.apache.org/jira/browse/CB-10660) fixed the exception when removing a non-existing directory. + ### 5.1.1 (Feb 24, 2016) * updated `cordova-common` dependnecy to `1.1.0` -* CB-10628 Fix `emulate android --target` -* CB-10618 Handle gradle frameworks on plugin installation/uninstallation -* CB-10510: Add an optional timeout to `emu` start script -* CB-10498: Resume event should be sticky if it has a plugin result +* [CB-10628](https://issues.apache.org/jira/browse/CB-10628) Fix `emulate android --target` +* [CB-10618](https://issues.apache.org/jira/browse/CB-10618) Handle gradle frameworks on plugin installation/uninstallation +* [CB-10510](https://issues.apache.org/jira/browse/CB-10510) Add an optional timeout to `emu` start script +* [CB-10498](https://issues.apache.org/jira/browse/CB-10498) Resume event should be sticky if it has a plugin result * fix `HtmlNotFoundTest` so that it passes when file not found is handled correctly -* CB-10472 `NullPointerException`: `org.apache.cordova.PluginManager.onSaveInstanceState` check if `pluginManager` is `null` before using it -* CB-10138 Adds missing plugin metadata to `plugin_list` module. -* CB-10443 Pass original options instead of remaining -* CB-10443 Fix `this.root` null reference -* CB-10421 Fixes exception when calling run script with `--help` option +* [CB-10472](https://issues.apache.org/jira/browse/CB-10472) `NullPointerException`: `org.apache.cordova.PluginManager.onSaveInstanceState` check if `pluginManager` is `null` before using it +* [CB-10138](https://issues.apache.org/jira/browse/CB-10138) Adds missing plugin metadata to `plugin_list` module. +* [CB-10443](https://issues.apache.org/jira/browse/CB-10443) Pass original options instead of remaining +* [CB-10443](https://issues.apache.org/jira/browse/CB-10443) Fix `this.root` null reference +* [CB-10421](https://issues.apache.org/jira/browse/CB-10421) Fixes exception when calling run script with `--help` option * updated `.gitignore` -* CB-10406 Fixes an exception, thrown when building using Ant. -* CB-10157 Uninstall app from device/emulator only when signed apk is already installed +* [CB-10406](https://issues.apache.org/jira/browse/CB-10406) Fixes an exception, thrown when building using Ant. +* [CB-10157](https://issues.apache.org/jira/browse/CB-10157) Uninstall app from device/emulator only when signed apk is already installed ### 5.1.0 (Jan 19, 2016) -* CB-10386 Add `android.useDeprecatedNdk=true` to support `NDK` in `gradle` -* CB-8864: Fixing this to mitigate CB-8685 and CB-10104 -* CB-10105: Spot fix for tilde errors on paths. +* [CB-10386](https://issues.apache.org/jira/browse/CB-10386) Add `android.useDeprecatedNdk=true` to support `NDK` in `gradle` +* [CB-8864](https://issues.apache.org/jira/browse/CB-8864) Fixing this to mitigate [CB-8685](https://issues.apache.org/jira/browse/CB-8685) and [CB-10104](https://issues.apache.org/jira/browse/CB-10104) +* [CB-10105](https://issues.apache.org/jira/browse/CB-10105) Spot fix for tilde errors on paths. * Update theme to `Theme.DeviceDefault.NoActionBar` -* CB-10014: Set gradle `applicationId` to `package name`. -* CB-9949: Fixing menu button event not fired in **Android** -* CB-9479: Fixing the conditionals again, we should -* CB-8917: New Plugin API for passing results on resume after Activity destruction -* CB-9971 Suppress `gradlew _JAVA_OPTIONS` output during build -* CB-9836 Add `.gitattributes` to prevent `CRLF` line endings in repos +* [CB-10014](https://issues.apache.org/jira/browse/CB-10014) Set gradle `applicationId` to `package name`. +* [CB-9949](https://issues.apache.org/jira/browse/CB-9949) Fixing menu button event not fired in **Android** +* [CB-9479](https://issues.apache.org/jira/browse/CB-9479) Fixing the conditionals again, we should +* [CB-8917](https://issues.apache.org/jira/browse/CB-8917) New Plugin API for passing results on resume after Activity destruction +* [CB-9971](https://issues.apache.org/jira/browse/CB-9971) Suppress `gradlew _JAVA_OPTIONS` output during build +* [CB-9836](https://issues.apache.org/jira/browse/CB-9836) Add `.gitattributes` to prevent `CRLF` line endings in repos * added node_modules back into `.gitignore` ### 5.0.0 (Nov 01, 2015) * Update CordovaWebViewEngine.java -* CB-9909 Shouldn't escape spaces in paths on Windows. -* CB-9870 updated hello world template -* CB-9880 Fixes platform update failure when upgrading from android@<4.1.0 -* CB-9844 Remove old .java after renaming activity -* CB-9800 Fixing contribute link. -* CB-9782 Check in `cordova-common` dependency +* [CB-9909](https://issues.apache.org/jira/browse/CB-9909) Shouldn't escape spaces in paths on Windows. +* [CB-9870](https://issues.apache.org/jira/browse/CB-9870) updated hello world template +* [CB-9880](https://issues.apache.org/jira/browse/CB-9880) Fixes platform update failure when upgrading from android@<4.1.0 +* [CB-9844](https://issues.apache.org/jira/browse/CB-9844) Remove old .java after renaming activity +* [CB-9800](https://issues.apache.org/jira/browse/CB-9800) Fixing contribute link. +* [CB-9782](https://issues.apache.org/jira/browse/CB-9782) Check in `cordova-common` dependency * Adds licence header to Adb to pass rat audit -* CB-9835 Downgrade `properties-parser` to prevent failures in Node < 4.x -* CB-9782 Implements PlatformApi contract for Android platform. -* CB-9826 Fixed `test-build` script on windows. +* [CB-9835](https://issues.apache.org/jira/browse/CB-9835) Downgrade `properties-parser` to prevent failures in Node < 4.x +* [CB-9782](https://issues.apache.org/jira/browse/CB-9782) Implements PlatformApi contract for Android platform. +* [CB-9826](https://issues.apache.org/jira/browse/CB-9826) Fixed `test-build` script on windows. * Refactor of the Cordova Plugin/Permissions API * Manually updating version to 5.0.0-dev for engine tags * Bump up to API level 23 * Commiting code to handle permissions, and the special case of the Geolocation Plugin -* CB-9608 cordova-android no longer builds on Node 0.10 or below -* CB-9080 Cordova CLI run for Android versions 4.1.1 and lower throws error -* CB-9557 Fixes apk install failure when switching from debug to release build -* CB-9496 removed permissions added for crosswalk -* CB-9402 Allow to set gradle distubutionUrl via env variable CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL -* CB-9428 update script now bumps up minSdkVersion to 14 if it is less than that. -* CB-9430 Fixes check_reqs failure when javac returns an extra line -* CB-9172 Improved emulator deploy stability. This closes #188. -* CB-9404 Fixed an exception when path contained -debug or -release -* CB-8320 Setting up gradle so we can use CordovaLib as a standard Android Library -* CB-9185 Fixed an issue when unsigned apks couldn't be found. -* CB-9397 Fixes minor issues with `cordova requirements android` -* CB-9389 Fixes build/check_reqs hang +* [CB-9608](https://issues.apache.org/jira/browse/CB-9608) cordova-android no longer builds on Node 0.10 or below +* [CB-9080](https://issues.apache.org/jira/browse/CB-9080) Cordova CLI run for Android versions 4.1.1 and lower throws error +* [CB-9557](https://issues.apache.org/jira/browse/CB-9557) Fixes apk install failure when switching from debug to release build +* [CB-9496](https://issues.apache.org/jira/browse/CB-9496) removed permissions added for crosswalk +* [CB-9402](https://issues.apache.org/jira/browse/CB-9402) Allow to set gradle distubutionUrl via env variable CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL +* [CB-9428](https://issues.apache.org/jira/browse/CB-9428) update script now bumps up minSdkVersion to 14 if it is less than that. +* [CB-9430](https://issues.apache.org/jira/browse/CB-9430) Fixes check_reqs failure when javac returns an extra line +* [CB-9172](https://issues.apache.org/jira/browse/CB-9172) Improved emulator deploy stability. This closes #188. +* [CB-9404](https://issues.apache.org/jira/browse/CB-9404) Fixed an exception when path contained -debug or -release +* [CB-8320](https://issues.apache.org/jira/browse/CB-8320) Setting up gradle so we can use CordovaLib as a standard Android Library +* [CB-9185](https://issues.apache.org/jira/browse/CB-9185) Fixed an issue when unsigned apks couldn't be found. +* [CB-9397](https://issues.apache.org/jira/browse/CB-9397) Fixes minor issues with `cordova requirements android` +* [CB-9389](https://issues.apache.org/jira/browse/CB-9389) Fixes build/check_reqs hang ### Release 4.1.1 (Aug 2015) ### -* CB-9428 update script now bumps up minSdkVersion to 14 if it is less than that -* CB-9430 Fixes check_reqs failure when javac returns an extra line +* [CB-9428](https://issues.apache.org/jira/browse/CB-9428) update script now bumps up minSdkVersion to 14 if it is less than that +* [CB-9430](https://issues.apache.org/jira/browse/CB-9430) Fixes check_reqs failure when javac returns an extra line ### Release 4.1.0 (Jul 2015) ### -* CB-9392 Fixed printing flavored versions. This closes #184. -* CB-9382 [Android] Fix KeepRunning setting when Plugin activity is showed. This closes #200 -* CB-9391 Fixes cdvBuildMultipleApks option casting -* CB-9343 Split the Content-Type to obtain a clean mimetype -* CB-9255 Make getUriType case insensitive. -* CB-9149 Fixes JSHint issue introduced by 899daa9 -* CB-9372: Remove unused files: 'main.js' & 'master.css'. This closes #198 -* CB-9149 Make gradle alias subprojects in order to handle libs that depend on libs. This closes #182 +* [CB-9392](https://issues.apache.org/jira/browse/CB-9392) Fixed printing flavored versions. This closes #184. +* [CB-9382](https://issues.apache.org/jira/browse/CB-9382) [Android] Fix KeepRunning setting when Plugin activity is showed. This closes #200 +* [CB-9391](https://issues.apache.org/jira/browse/CB-9391) Fixes cdvBuildMultipleApks option casting +* [CB-9343](https://issues.apache.org/jira/browse/CB-9343) Split the Content-Type to obtain a clean mimetype +* [CB-9255](https://issues.apache.org/jira/browse/CB-9255) Make getUriType case insensitive. +* [CB-9149](https://issues.apache.org/jira/browse/CB-9149) Fixes JSHint issue introduced by 899daa9 +* [CB-9372](https://issues.apache.org/jira/browse/CB-9372) Remove unused files: 'main.js' & 'master.css'. This closes #198 +* [CB-9149](https://issues.apache.org/jira/browse/CB-9149) Make gradle alias subprojects in order to handle libs that depend on libs. This closes #182 * Update min SDK version to 14 * Update licenses. This closes #190 -* CB-9185 Fix signed release build exception. This closes #193. -* CB-9286 Fixes build failure when ANDROID_HOME is not set. -* CB-9284 Fix for handling absolute path for keystore in build.json -* CB-9260 Install Android-22 on Travis-CI +* [CB-9185](https://issues.apache.org/jira/browse/CB-9185) Fix signed release build exception. This closes #193. +* [CB-9286](https://issues.apache.org/jira/browse/CB-9286) Fixes build failure when ANDROID_HOME is not set. +* [CB-9284](https://issues.apache.org/jira/browse/CB-9284) Fix for handling absolute path for keystore in build.json +* [CB-9260](https://issues.apache.org/jira/browse/CB-9260) Install Android-22 on Travis-CI * Adding .ratignore file. -* CB-9119 Adding lib/retry.js for retrying promise-returning functions. Retrying 'adb install' in emulator.js because it sometimes hangs. -* CB-9115 android: Grant Lollipop permission req +* [CB-9119](https://issues.apache.org/jira/browse/CB-9119) Adding lib/retry.js for retrying promise-returning functions. Retrying 'adb install' in emulator.js because it sometimes hangs. +* [CB-9115](https://issues.apache.org/jira/browse/CB-9115) android: Grant Lollipop permission req * Remove extra console message -* CB-8898 Report expected gradle location properly -* CB-8898 Fixes gradle check failure due to missing quotes -* CB-9080: -d option is not supported on Android 4.1.1 and lower, removing -* CB-8954 Adds `requirements` command support to check_reqs module +* [CB-8898](https://issues.apache.org/jira/browse/CB-8898) Report expected gradle location properly +* [CB-8898](https://issues.apache.org/jira/browse/CB-8898) Fixes gradle check failure due to missing quotes +* [CB-9080](https://issues.apache.org/jira/browse/CB-9080) -d option is not supported on Android 4.1.1 and lower, removing +* [CB-8954](https://issues.apache.org/jira/browse/CB-8954) Adds `requirements` command support to check_reqs module * Update JS snapshot to version 4.1.0-dev (via coho) -* CB-8417 updated platform specific files from cordova.js repo +* [CB-8417](https://issues.apache.org/jira/browse/CB-8417) updated platform specific files from cordova.js repo * Adding tests to confirm that preferences aren't changed by Intents * Forgot to remove the method that copied over the intent data * Getting around to removing this old Intent code * Update JS snapshot to version 4.1.0-dev (via coho) * Fix CordovaPluginTest on KitKat (start-up events seem to change) -* CB-3360 Allow setting a custom User-Agent (close #162) -* CB-8902 Use immersive mode when available when going fullscreen (close #175) +* [CB-3360](https://issues.apache.org/jira/browse/CB-3360) Allow setting a custom User-Agent (close #162) +* [CB-8902](https://issues.apache.org/jira/browse/CB-8902) Use immersive mode when available when going fullscreen (close #175) * Make BridgeMode methods public (they were always supposed to be) * Simplify: EncodingUtils.getBytes(str) -> str.getBytes() * Don't show warning when gradlew file is read-only * Don't show warning when prepEnv copies gradlew and it's read-only * Make gradle wrapper prepEnv code work even when android-sdk is read-only -* CB-8897 Delete drawable/icon.png since it duplicates drawable-mdpi/icon.png +* [CB-8897](https://issues.apache.org/jira/browse/CB-8897) Delete drawable/icon.png since it duplicates drawable-mdpi/icon.png * Updating the template to target mininumSdkTarget=14 -* CB-8894: Updating the template to target mininumSdkTarget=14 -* CB-8891 Add a note about when the gradle helpers were added -* CB-8891 Add a gradle helper for retrieving config.xml preference values -* CB-8884 Delete Eclipse tweaks from create script -* CB-8834 Don't fail to install on VERSION_DOWNGRADE +* [CB-8894](https://issues.apache.org/jira/browse/CB-8894) Updating the template to target mininumSdkTarget=14 +* [CB-8891](https://issues.apache.org/jira/browse/CB-8891) Add a note about when the gradle helpers were added +* [CB-8891](https://issues.apache.org/jira/browse/CB-8891) Add a gradle helper for retrieving config.xml preference values +* [CB-8884](https://issues.apache.org/jira/browse/CB-8884) Delete Eclipse tweaks from create script +* [CB-8834](https://issues.apache.org/jira/browse/CB-8834) Don't fail to install on VERSION_DOWNGRADE * Automated tools fail, and you have to remember all four places where this is set. * Update the package.json -* CB-9042 coho failed to update version, so here we are +* [CB-9042](https://issues.apache.org/jira/browse/CB-9042) coho failed to update version, so here we are * CB9042 - Updating Release Notes * Adding tests to confirm that preferences aren't changed by Intents * updating existing test code * Forgot to remove the method that copied over the intent data * Getting around to removing this old Intent code -* CB-8834 Don't fail to install on VERSION_DOWNGRADE +* [CB-8834](https://issues.apache.org/jira/browse/CB-8834) Don't fail to install on VERSION_DOWNGRADE ### Release 4.0.2 (May 2015) ### @@ -178,111 +213,111 @@ Changes For Plugin Developers: * Plugins can depend on Maven libraries using `` tags * New APIs: `onStart`, `onStop`, `onConfigurationChanged` * `"onScrollChanged"` message removed. Use `view.getViewTreeObserver().addOnScrollChangedListener(...)` instead -* CB-8702 New API for plugins to override `shouldInterceptRequest` with a stream +* [CB-8702](https://issues.apache.org/jira/browse/CB-8702) New API for plugins to override `shouldInterceptRequest` with a stream #### Other Changes #### -* CB-8378 Removed `hidekeyboard` and `showkeyboard` events (apps should use a plugin instead) -* CB-8735 `bin/create` regex relaxed / better support for numbers -* CB-8699 Fix CordovaResourceApi `copyResource` creating zero-length files when src=uncompressed asset -* CB-8693 CordovaLib should not contain icons / splashscreens -* CB-8592 Fix NPE if lifecycle events reach CordovaWebView before `init()` has been called -* CB-8588 Add CATEGORY_BROWSABLE to intents from showWebPage openExternal=true -* CB-8587 Don't allow WebView navigations within showWebPage that are not whitelisted -* CB-7827 Add `--activity-name` for `bin/create` -* CB-8548 Use debug-signing.properties and release-signing.properties when they exist -* CB-8545 Don't add a layout as a parent of the WebView -* CB-7159 BackgroundColor not used when ``, nor during screen rotation -* CB-6630 Removed OkHttp from core library. It's now available as a plugin: [cordova-plugin-okhttp](https://www.npmjs.com/package/cordova-plugin-okhttp) +* [CB-8378](https://issues.apache.org/jira/browse/CB-8378) Removed `hidekeyboard` and `showkeyboard` events (apps should use a plugin instead) +* [CB-8735](https://issues.apache.org/jira/browse/CB-8735) `bin/create` regex relaxed / better support for numbers +* [CB-8699](https://issues.apache.org/jira/browse/CB-8699) Fix CordovaResourceApi `copyResource` creating zero-length files when src=uncompressed asset +* [CB-8693](https://issues.apache.org/jira/browse/CB-8693) CordovaLib should not contain icons / splashscreens +* [CB-8592](https://issues.apache.org/jira/browse/CB-8592) Fix NPE if lifecycle events reach CordovaWebView before `init()` has been called +* [CB-8588](https://issues.apache.org/jira/browse/CB-8588) Add CATEGORY_BROWSABLE to intents from showWebPage openExternal=true +* [CB-8587](https://issues.apache.org/jira/browse/CB-8587) Don't allow WebView navigations within showWebPage that are not whitelisted +* [CB-7827](https://issues.apache.org/jira/browse/CB-7827) Add `--activity-name` for `bin/create` +* [CB-8548](https://issues.apache.org/jira/browse/CB-8548) Use debug-signing.properties and release-signing.properties when they exist +* [CB-8545](https://issues.apache.org/jira/browse/CB-8545) Don't add a layout as a parent of the WebView +* [CB-7159](https://issues.apache.org/jira/browse/CB-7159) BackgroundColor not used when ``, nor during screen rotation +* [CB-6630](https://issues.apache.org/jira/browse/CB-6630) Removed OkHttp from core library. It's now available as a plugin: [cordova-plugin-okhttp](https://www.npmjs.com/package/cordova-plugin-okhttp) ### Release 3.7.1 (January 2015) ### -* CB-8411 Initialize plugins only after `createViews()` is called (regression in 3.7.0) +* [CB-8411](https://issues.apache.org/jira/browse/CB-8411) Initialize plugins only after `createViews()` is called (regression in 3.7.0) ### Release 3.7.0 (January 2015) ### -* CB-8328 Allow plugins to handle certificate challenges (close #150) -* CB-8201 Add support for auth dialogs into Cordova Android -* CB-8017 Add support for `` for Lollipop -* CB-8143 Loads of gradle improvements (try it with cordova/build --gradle) -* CB-8329 Cancel outstanding ActivityResult requests when a new startActivityForResult occurs -* CB-8026 Bumping up Android Version and setting it up to allow third-party cookies. This might change later. -* CB-8210 Use PluginResult for various events from native so that content-security-policy can be used -* CB-8168 Add support for `cordova/run --list` (closes #139) -* CB-8176 Vastly better auto-detection of SDK & JDK locations -* CB-8079 Use activity class package name, but fallback to application package name when looking for splash screen drawable -* CB-8147 Have corodva/build warn about unrecognized flags rather than fail -* CB-7881 Android tooling shouldn't lock application directory -* CB-8112 Turn off mediaPlaybackRequiresUserGesture -* CB-6153 Add a preference for controlling hardware button audio stream (DefaultVolumeStream) -* CB-8031 Fix race condition that shows as ConcurrentModificationException -* CB-7974 Cancel timeout timer if view is destroyed -* CB-7940 Disable exec bridge if bridgeSecret is wrong -* CB-7758 Allow content-url-hosted pages to access the bridge -* CB-6511 Fixes build for android when app name contains unicode characters. -* CB-7707 Added multipart PluginResult -* CB-6837 Fix leaked window when hitting back button while alert being rendered -* CB-7674 Move preference activation back into onCreate() -* CB-7499 Support RTL text direction -* CB-7330 Don't run check_reqs for bin/create. +* [CB-8328](https://issues.apache.org/jira/browse/CB-8328) Allow plugins to handle certificate challenges (close #150) +* [CB-8201](https://issues.apache.org/jira/browse/CB-8201) Add support for auth dialogs into Cordova Android +* [CB-8017](https://issues.apache.org/jira/browse/CB-8017) Add support for `` for Lollipop +* [CB-8143](https://issues.apache.org/jira/browse/CB-8143) Loads of gradle improvements (try it with cordova/build --gradle) +* [CB-8329](https://issues.apache.org/jira/browse/CB-8329) Cancel outstanding ActivityResult requests when a new startActivityForResult occurs +* [CB-8026](https://issues.apache.org/jira/browse/CB-8026) Bumping up Android Version and setting it up to allow third-party cookies. This might change later. +* [CB-8210](https://issues.apache.org/jira/browse/CB-8210) Use PluginResult for various events from native so that content-security-policy can be used +* [CB-8168](https://issues.apache.org/jira/browse/CB-8168) Add support for `cordova/run --list` (closes #139) +* [CB-8176](https://issues.apache.org/jira/browse/CB-8176) Vastly better auto-detection of SDK & JDK locations +* [CB-8079](https://issues.apache.org/jira/browse/CB-8079) Use activity class package name, but fallback to application package name when looking for splash screen drawable +* [CB-8147](https://issues.apache.org/jira/browse/CB-8147) Have corodva/build warn about unrecognized flags rather than fail +* [CB-7881](https://issues.apache.org/jira/browse/CB-7881) Android tooling shouldn't lock application directory +* [CB-8112](https://issues.apache.org/jira/browse/CB-8112) Turn off mediaPlaybackRequiresUserGesture +* [CB-6153](https://issues.apache.org/jira/browse/CB-6153) Add a preference for controlling hardware button audio stream (DefaultVolumeStream) +* [CB-8031](https://issues.apache.org/jira/browse/CB-8031) Fix race condition that shows as ConcurrentModificationException +* [CB-7974](https://issues.apache.org/jira/browse/CB-7974) Cancel timeout timer if view is destroyed +* [CB-7940](https://issues.apache.org/jira/browse/CB-7940) Disable exec bridge if bridgeSecret is wrong +* [CB-7758](https://issues.apache.org/jira/browse/CB-7758) Allow content-url-hosted pages to access the bridge +* [CB-6511](https://issues.apache.org/jira/browse/CB-6511) Fixes build for android when app name contains unicode characters. +* [CB-7707](https://issues.apache.org/jira/browse/CB-7707) Added multipart PluginResult +* [CB-6837](https://issues.apache.org/jira/browse/CB-6837) Fix leaked window when hitting back button while alert being rendered +* [CB-7674](https://issues.apache.org/jira/browse/CB-7674) Move preference activation back into onCreate() +* [CB-7499](https://issues.apache.org/jira/browse/CB-7499) Support RTL text direction +* [CB-7330](https://issues.apache.org/jira/browse/CB-7330) Don't run check_reqs for bin/create. ### 3.6.4 (Sept 30, 2014) ### * Set VERSION to 3.6.4 (via coho) * Update JS snapshot to version 3.6.4 (via coho) -* CB-7634 Detect JAVA_HOME properly on Ubuntu -* CB-7579 Fix run script's ability to use non-arch-specific APKs -* CB-6511 Fixes build for android when app name contains unicode characters. -* CB-7463: Adding licences. I don't know what the gradle syntax is for comments, that still needs to be done. -* CB-7463: Looked at the Apache BigTop git, gradle uses C-style comments -* CB-7460: Fixing bug with KitKat where the background colour would override the CSS colours on the application +* [CB-7634](https://issues.apache.org/jira/browse/CB-7634) Detect JAVA_HOME properly on Ubuntu +* [CB-7579](https://issues.apache.org/jira/browse/CB-7579) Fix run script's ability to use non-arch-specific APKs +* [CB-6511](https://issues.apache.org/jira/browse/CB-6511) Fixes build for android when app name contains unicode characters. +* [CB-7463](https://issues.apache.org/jira/browse/CB-7463) Adding licences. I don't know what the gradle syntax is for comments, that still needs to be done. +* [CB-7463](https://issues.apache.org/jira/browse/CB-7463) Looked at the Apache BigTop git, gradle uses C-style comments +* [CB-7460](https://issues.apache.org/jira/browse/CB-7460) Fixing bug with KitKat where the background colour would override the CSS colours on the application ### 3.6.0 (Sept 2014) ### * Set VERSION to 3.6.0 (via coho) -* CB-7410 fix the menu test -* CB-7410 Fix the errorUrl test -* CB-7410 Fix Basic Authentication test -* CB-3445: Allow build and run scripts to select APK by architecture -* CB-3445: Add environment variable 'BUILD_MULTIPLE_APKS' for splitting APKs based on architecture -* CB-3445: Ensure that JAR files in libs directory are included -* CB-7267 update RELEASENOTES for 3.5.1 -* CB-7410 clarify the title -* CB-7385 update cordova.js for testing prior to branch/tag -* CB-7410 add whitelist entries to get iframe/GoogleMaps working -* CB-7291 propogate change in method signature to the native tests -* CB-7291: Restrict meaning of "\*" in internal whitelist to just http and https -* CB-7291: Only add file, content and data URLs to internal whitelist -* CB-7291: Add defaults to external whitelist -* CB-7291: Add external-launch-whitelist and use it for filtering intent launches -* CB-3445: Read project.properties to configure gradle libraries -* CB-7325 Fix error message in android_sdk_version.js when missing SDK on windows -* CB-7335 Add a .gitignore to android project template -* CB-7330 Fix dangling function call in last commit (broke gradle builds) -* CB-7330 Don't run "android update" during creation -* CB-3445 Add gradle support clean command (plus some code cleanup) -* CB-7044 Fix typo in prev commit causing check_reqs to always fail. -* CB-3445 Copy gradle wrapper in build instead of create -* CB-3445 Add .gradle template files for "update" as well as "create" -* CB-7044 Add JAVA_HOME when not set. Be stricter about ANDROID_HOME -* CB-3445 Speed up gradle building (incremental builds go from 10s -> 1.5s for me) -* CB-3445: android: Copy Gradle wrapper from Android SDK rather than bundling a JAR -* CB-3445: Add which to checked-in node_modules -* CB-3445: Add option to build and install with gradle -* CB-3445: Add an initial set of Gradle build scripts -* CB-7321 Don't require ant for create script -* CB-7044, CB-7299 Fix up PATH problems when possible. +* [CB-7410](https://issues.apache.org/jira/browse/CB-7410) fix the menu test +* [CB-7410](https://issues.apache.org/jira/browse/CB-7410) Fix the errorUrl test +* [CB-7410](https://issues.apache.org/jira/browse/CB-7410) Fix Basic Authentication test +* [CB-3445](https://issues.apache.org/jira/browse/CB-3445) Allow build and run scripts to select APK by architecture +* [CB-3445](https://issues.apache.org/jira/browse/CB-3445) Add environment variable 'BUILD_MULTIPLE_APKS' for splitting APKs based on architecture +* [CB-3445](https://issues.apache.org/jira/browse/CB-3445) Ensure that JAR files in libs directory are included +* [CB-7267](https://issues.apache.org/jira/browse/CB-7267) update RELEASENOTES for 3.5.1 +* [CB-7410](https://issues.apache.org/jira/browse/CB-7410) clarify the title +* [CB-7385](https://issues.apache.org/jira/browse/CB-7385) update cordova.js for testing prior to branch/tag +* [CB-7410](https://issues.apache.org/jira/browse/CB-7410) add whitelist entries to get iframe/GoogleMaps working +* [CB-7291](https://issues.apache.org/jira/browse/CB-7291) propogate change in method signature to the native tests +* [CB-7291](https://issues.apache.org/jira/browse/CB-7291) Restrict meaning of "\*" in internal whitelist to just http and https +* [CB-7291](https://issues.apache.org/jira/browse/CB-7291) Only add file, content and data URLs to internal whitelist +* [CB-7291](https://issues.apache.org/jira/browse/CB-7291) Add defaults to external whitelist +* [CB-7291](https://issues.apache.org/jira/browse/CB-7291) Add external-launch-whitelist and use it for filtering intent launches +* [CB-3445](https://issues.apache.org/jira/browse/CB-3445) Read project.properties to configure gradle libraries +* [CB-7325](https://issues.apache.org/jira/browse/CB-7325) Fix error message in android_sdk_version.js when missing SDK on windows +* [CB-7335](https://issues.apache.org/jira/browse/CB-7335) Add a .gitignore to android project template +* [CB-7330](https://issues.apache.org/jira/browse/CB-7330) Fix dangling function call in last commit (broke gradle builds) +* [CB-7330](https://issues.apache.org/jira/browse/CB-7330) Don't run "android update" during creation +* [CB-3445](https://issues.apache.org/jira/browse/CB-3445) Add gradle support clean command (plus some code cleanup) +* [CB-7044](https://issues.apache.org/jira/browse/CB-7044) Fix typo in prev commit causing check_reqs to always fail. +* [CB-3445](https://issues.apache.org/jira/browse/CB-3445) Copy gradle wrapper in build instead of create +* [CB-3445](https://issues.apache.org/jira/browse/CB-3445) Add .gradle template files for "update" as well as "create" +* [CB-7044](https://issues.apache.org/jira/browse/CB-7044) Add JAVA_HOME when not set. Be stricter about ANDROID_HOME +* [CB-3445](https://issues.apache.org/jira/browse/CB-3445) Speed up gradle building (incremental builds go from 10s -> 1.5s for me) +* [CB-3445](https://issues.apache.org/jira/browse/CB-3445) android: Copy Gradle wrapper from Android SDK rather than bundling a JAR +* [CB-3445](https://issues.apache.org/jira/browse/CB-3445) Add which to checked-in node_modules +* [CB-3445](https://issues.apache.org/jira/browse/CB-3445) Add option to build and install with gradle +* [CB-3445](https://issues.apache.org/jira/browse/CB-3445) Add an initial set of Gradle build scripts +* [CB-7321](https://issues.apache.org/jira/browse/CB-7321) Don't require ant for create script +* CB-7044, [CB-7299](https://issues.apache.org/jira/browse/CB-7299) Fix up PATH problems when possible. * Change in test's AndroidManifest.xml needed for the test to run properly. Forgot the manifest. * Change in test's AndroidManifest.xml needed for the test to run properly * Adding tests related to 3.5.1 -* CB-7261 Fix setNativeToJsBridgeMode sometimes crashing when switching to ONLINE_EVENT -* CB-7265 Fix crash when navigating to custom protocol (introduced in 3.5.1) +* [CB-7261](https://issues.apache.org/jira/browse/CB-7261) Fix setNativeToJsBridgeMode sometimes crashing when switching to ONLINE_EVENT +* [CB-7265](https://issues.apache.org/jira/browse/CB-7265) Fix crash when navigating to custom protocol (introduced in 3.5.1) * Filter out non-launchable intents * Handle unsupported protocol errors in webview better -* CB-7238: I should have collapsed this, but Config.init() must go before the creation of CordovaWebView -* CB-7238: Minor band-aid to get tests running again, this has to go away before 3.6.0 is released, since this is an API change. +* [CB-7238](https://issues.apache.org/jira/browse/CB-7238) I should have collapsed this, but Config.init() must go before the creation of CordovaWebView +* [CB-7238](https://issues.apache.org/jira/browse/CB-7238) Minor band-aid to get tests running again, this has to go away before 3.6.0 is released, since this is an API change. * Extend whitelist to handle URLs without // chars -* CB-7172 Force window to have focus after resume -* CB-7159 Set background color of webView as well as its parent -* CB-7018 Fix setButtonPlumbedToJs never un-listening +* [CB-7172](https://issues.apache.org/jira/browse/CB-7172) Force window to have focus after resume +* [CB-7159](https://issues.apache.org/jira/browse/CB-7159) Set background color of webView as well as its parent +* [CB-7018](https://issues.apache.org/jira/browse/CB-7018) Fix setButtonPlumbedToJs never un-listening * Undeprecate some just-deprecated symbols in PluginManager. * @Deprecate methods of PluginManager that were never meant to be public * Move plugin instantiation and instance storing logic PluginEntry->PluginManager @@ -307,7 +342,7 @@ Changes For Plugin Developers: * Fix PluginManager.setPluginEntries not removing old entries * Move registration of App plugin from config.xml -> code * Make setWebViewClient an override instead of an overload. Delete Location-change JS->Native bridge mode (missed some of it). -* CB-4404 Revert setting android:windowSoftInputMode to "adjustPan" +* [CB-4404](https://issues.apache.org/jira/browse/CB-4404) Revert setting android:windowSoftInputMode to "adjustPan" * Refactor: Use ConfigXmlParser in activity. Adds CordovaWebView.init() * Deprecate some convenience methods on CordovaActivity * Fix CordovaPreferences not correctly parsing hex values (valueOf->decode) @@ -319,36 +354,36 @@ Changes For Plugin Developers: * Delete "CB-3064: The errorUrl is..." Log message left over from debugging presumably * Refactor Config into ConfigXmlParser, CordovaPreferences * Delete Location-change JS->Native bridge mode -* CB-5988 Allow exec() only from file: or start-up URL's domain -* CB-6761 Fix native->JS bridge ceasing to fire when page changes and online is set to false and the JS loads quickly +* [CB-5988](https://issues.apache.org/jira/browse/CB-5988) Allow exec() only from file: or start-up URL's domain +* [CB-6761](https://issues.apache.org/jira/browse/CB-6761) Fix native->JS bridge ceasing to fire when page changes and online is set to false and the JS loads quickly * Update the errorurl to no longer use intents * This breaks running the JUnit tests, we'll bring it back soon * Refactoring the URI handling on Cordova, removing dead code -* CB-7018 Clean up and deprecation of some button-related functions -* CB-7017 Fix onload=true being set on all subsequent plugins -* CB-5971: Fix package / project validation -* CB-5971: Add unit tests to cordova-android -* CB-5971: Factor out package/project name validation logic +* [CB-7018](https://issues.apache.org/jira/browse/CB-7018) Clean up and deprecation of some button-related functions +* [CB-7017](https://issues.apache.org/jira/browse/CB-7017) Fix onload=true being set on all subsequent plugins +* [CB-5971](https://issues.apache.org/jira/browse/CB-5971) Fix package / project validation +* [CB-5971](https://issues.apache.org/jira/browse/CB-5971) Add unit tests to cordova-android +* [CB-5971](https://issues.apache.org/jira/browse/CB-5971) Factor out package/project name validation logic * Delete explicit activity.finish() in back button handling. No change in behaviour. -* CB-5971: This would have been a good first bug, too bad -* CB-4404: Changing where android:windowSoftInputMode is in the manifest so it works +* [CB-5971](https://issues.apache.org/jira/browse/CB-5971) This would have been a good first bug, too bad +* [CB-4404](https://issues.apache.org/jira/browse/CB-4404) Changing where android:windowSoftInputMode is in the manifest so it works * Add documentation referencing other implementation. -* CB-6851 Deprecate WebView.sendJavascript() -* CB-6876 Show the correct executable name -* CB-6876 Fix the "print usage" +* [CB-6851](https://issues.apache.org/jira/browse/CB-6851) Deprecate WebView.sendJavascript() +* [CB-6876](https://issues.apache.org/jira/browse/CB-6876) Show the correct executable name +* [CB-6876](https://issues.apache.org/jira/browse/CB-6876) Fix the "print usage" * Trivial spelling fix in comments when reading CordovaResourceApi -* CB-6818: I want to remove this code, because Square didn't do their headers properly -* CB-6860 Add activity_name and launcher_name to AndroidManifest.xml & strings.xml +* [CB-6818](https://issues.apache.org/jira/browse/CB-6818) I want to remove this code, because Square didn't do their headers properly +* [CB-6860](https://issues.apache.org/jira/browse/CB-6860) Add activity_name and launcher_name to AndroidManifest.xml & strings.xml * Add a comment to custom_rules.xml saying why we move AndroidManifest.xml * Remove +x from README.md -* CB-6784 Add missing licenses -* CB-6784 Add license to CONTRIBUTING.md +* [CB-6784](https://issues.apache.org/jira/browse/CB-6784) Add missing licenses +* [CB-6784](https://issues.apache.org/jira/browse/CB-6784) Add license to CONTRIBUTING.md * Revert "defaults.xml: Add AndroidLaunchMode preference" * updated RELEASENOTES -* CB-6315: Wrapping this so it runs on the UI thread -* CB-6723 Update package name for Robotium -* CB-6707 Update minSdkVersion to 10 consistently -* CB-5652 make visible cordova version +* [CB-6315](https://issues.apache.org/jira/browse/CB-6315) Wrapping this so it runs on the UI thread +* [CB-6723](https://issues.apache.org/jira/browse/CB-6723) Update package name for Robotium +* [CB-6707](https://issues.apache.org/jira/browse/CB-6707) Update minSdkVersion to 10 consistently +* [CB-5652](https://issues.apache.org/jira/browse/CB-5652) make visible cordova version * Update JS snapshot to version 3.6.0-dev (via coho) * Update JS snapshot to version 3.6.0-dev (via coho) * Set VERSION to 3.6.0-dev (via coho) @@ -368,112 +403,112 @@ http://cordova.apache.org/announcements/2014/08/04/android-351.html * OkHttp has broken headers. Updating for ASF compliance. * Revert accidentally removed lines from NOTICE -* CB-6552: added top level package.json -* CB-6491 add CONTRIBUTING.md -* CB-6543 Fix cordova/run failure when no custom_rules.xml available +* [CB-6552](https://issues.apache.org/jira/browse/CB-6552) added top level package.json +* [CB-6491](https://issues.apache.org/jira/browse/CB-6491) add CONTRIBUTING.md +* [CB-6543](https://issues.apache.org/jira/browse/CB-6543) Fix cordova/run failure when no custom_rules.xml available * defaults.xml: Add AndroidLaunchMode preference * Add JavaDoc for CordovaResourceApi -* CB-6388: Handle binary data correctly in LOAD_URL bridge -* Fix CB-6048: Set launchMode=singleTop so tapping app icon does not always restart app +* [CB-6388](https://issues.apache.org/jira/browse/CB-6388) Handle binary data correctly in LOAD_URL bridge +* Fix [CB-6048](https://issues.apache.org/jira/browse/CB-6048) Set launchMode=singleTop so tapping app icon does not always restart app * Remove incorrect usage of AlertDialog.Builder.create * Catch uncaught exceptions in from plugins and turn them into error responses. * Add NOTICE file -* CB-6047 Fix online sometimes getting in a bad state on page transitions. +* [CB-6047](https://issues.apache.org/jira/browse/CB-6047) Fix online sometimes getting in a bad state on page transitions. * Add another convenience overload for CordovaResourceApi.copyResource * Update framework's .classpath to what Eclipse wants it to be. * README.md: `android update` to `android-19`. * Fix NPE when POLLING bridge mode is used. * Updating NOTICE to include Square for OkHttp -* CB-5398 Apply KitKat content URI fix to all content URIs -* CB-5398 Work-around for KitKat content: URLs not rendering in tags -* CB-5908: add splascreen images to template -* CB-5395: Make scheme and host (but not path) case-insensitive in whitelist +* [CB-5398](https://issues.apache.org/jira/browse/CB-5398) Apply KitKat content URI fix to all content URIs +* [CB-5398](https://issues.apache.org/jira/browse/CB-5398) Work-around for KitKat content: URLs not rendering in tags +* [CB-5908](https://issues.apache.org/jira/browse/CB-5908) add splascreen images to template +* [CB-5395](https://issues.apache.org/jira/browse/CB-5395) Make scheme and host (but not path) case-insensitive in whitelist * Ignore multiple onPageFinished() callbacks & onReceivedError due to stopLoading() * Removing addJavascriptInterface support from all Android versions lower than 4.2 due to security vu -* CB-4984 Don't create on CordovaActivity name -* CB-5917 Add a loadUrlIntoView overload that doesn't recreate plugins. +* [CB-4984](https://issues.apache.org/jira/browse/CB-4984) Don't create on CordovaActivity name +* [CB-5917](https://issues.apache.org/jira/browse/CB-5917) Add a loadUrlIntoView overload that doesn't recreate plugins. * Use thread pool for load timeout. -* CB-5715 For CLI, hide assets/www and res/xml/config.xml by default -* CB-5793 ant builds: Rename AndroidManifest during -post-build to avoid Eclipse detecting ant-build/ -* CB-5889 Make update script find project name instead of using "null" for CordovaLib -* CB-5889 Add a message in the update script about needing to import CordovaLib when using an IDE. +* [CB-5715](https://issues.apache.org/jira/browse/CB-5715) For CLI, hide assets/www and res/xml/config.xml by default +* [CB-5793](https://issues.apache.org/jira/browse/CB-5793) ant builds: Rename AndroidManifest during -post-build to avoid Eclipse detecting ant-build/ +* [CB-5889](https://issues.apache.org/jira/browse/CB-5889) Make update script find project name instead of using "null" for CordovaLib +* [CB-5889](https://issues.apache.org/jira/browse/CB-5889) Add a message in the update script about needing to import CordovaLib when using an IDE. ### 3.4.0 (Feb 2014) ### 43 commits from 10 authors. Highlights include: * Removing addJavascriptInterface support from all Android versions lower than 4.2 due to security vulnerability -* CB-5917 Add a loadUrlIntoView overload that doesn't recreate plugins. -* CB-5889 Make update script find project name instead of using "null" for CordovaLib -* CB-5889 Add a message in the update script about needing to import CordovaLib when using an IDE. -* CB-5793 Don't clean before build and change output directory to ant-build to avoid conflicts with Eclipse. -* CB-5803 Fix cordova/emulate on windows. -* CB-5801 exec->spawn in build to make sure compile errors are shown. -* CB-5799 Update version of OkHTTP to 1.3 -* CB-4910 Update CLI project template to point to config.xml at the root now that it's not in www/ by default. -* CB-5504 Adding onDestroy to app plugin to deregister telephonyReceiver -* CB-5715 Add Eclipse .project file to create template. For CLI projects, it adds refs for root www/ & config.xml and hides platform versions -* CB-5447 Removed android:debuggable=“true” from project template. -* CB-5714 Fix of android build when too big output stops build with error due to buffer overflow. -* CB-5592 Set MIME type for openExternal when scheme is file: +* [CB-5917](https://issues.apache.org/jira/browse/CB-5917) Add a loadUrlIntoView overload that doesn't recreate plugins. +* [CB-5889](https://issues.apache.org/jira/browse/CB-5889) Make update script find project name instead of using "null" for CordovaLib +* [CB-5889](https://issues.apache.org/jira/browse/CB-5889) Add a message in the update script about needing to import CordovaLib when using an IDE. +* [CB-5793](https://issues.apache.org/jira/browse/CB-5793) Don't clean before build and change output directory to ant-build to avoid conflicts with Eclipse. +* [CB-5803](https://issues.apache.org/jira/browse/CB-5803) Fix cordova/emulate on windows. +* [CB-5801](https://issues.apache.org/jira/browse/CB-5801) exec->spawn in build to make sure compile errors are shown. +* [CB-5799](https://issues.apache.org/jira/browse/CB-5799) Update version of OkHTTP to 1.3 +* [CB-4910](https://issues.apache.org/jira/browse/CB-4910) Update CLI project template to point to config.xml at the root now that it's not in www/ by default. +* [CB-5504](https://issues.apache.org/jira/browse/CB-5504) Adding onDestroy to app plugin to deregister telephonyReceiver +* [CB-5715](https://issues.apache.org/jira/browse/CB-5715) Add Eclipse .project file to create template. For CLI projects, it adds refs for root www/ & config.xml and hides platform versions +* [CB-5447](https://issues.apache.org/jira/browse/CB-5447) Removed android:debuggable=“true” from project template. +* [CB-5714](https://issues.apache.org/jira/browse/CB-5714) Fix of android build when too big output stops build with error due to buffer overflow. +* [CB-5592](https://issues.apache.org/jira/browse/CB-5592) Set MIME type for openExternal when scheme is file: ### 3.3.0 (Dec 2013) ### 41 commits from 11 authors. Highlights include: -* CB-5481 Fix for Cordova trying to get config.xml from the wrong namespace -* CB-5487 Enable Remote Debugging when your Android app is debuggable. -* CB-5445 Adding onScrollChanged and the ScrollEvent object -* CB-5422 Don't require JAVA_HOME to be defined -* CB-5490 Add javadoc target to ant script -* CB-5471 Deprecated DroidGap class -* CB-5255 Prefer Google API targets over android-## targets when building. -* CB-5232 Change create script to use Cordova as a Library Project instead of a .jar -* CB-5302 Massive movement to get tests working again -* CB-4996 Fix paths with spaces while launching on emulator and device -* CB-5209 Cannot build Android app if project path contains spaces +* [CB-5481](https://issues.apache.org/jira/browse/CB-5481) Fix for Cordova trying to get config.xml from the wrong namespace +* [CB-5487](https://issues.apache.org/jira/browse/CB-5487) Enable Remote Debugging when your Android app is debuggable. +* [CB-5445](https://issues.apache.org/jira/browse/CB-5445) Adding onScrollChanged and the ScrollEvent object +* [CB-5422](https://issues.apache.org/jira/browse/CB-5422) Don't require JAVA_HOME to be defined +* [CB-5490](https://issues.apache.org/jira/browse/CB-5490) Add javadoc target to ant script +* [CB-5471](https://issues.apache.org/jira/browse/CB-5471) Deprecated DroidGap class +* [CB-5255](https://issues.apache.org/jira/browse/CB-5255) Prefer Google API targets over android-## targets when building. +* [CB-5232](https://issues.apache.org/jira/browse/CB-5232) Change create script to use Cordova as a Library Project instead of a .jar +* [CB-5302](https://issues.apache.org/jira/browse/CB-5302) Massive movement to get tests working again +* [CB-4996](https://issues.apache.org/jira/browse/CB-4996) Fix paths with spaces while launching on emulator and device +* [CB-5209](https://issues.apache.org/jira/browse/CB-5209) Cannot build Android app if project path contains spaces ### 3.2.0 (Nov 2013) ### 27 commits from 7 authors. Highlights include: -* CB-5193 Fix Android WebSQL sometime throwing SECURITY_ERR. -* CB-5191 Deprecate +* [CB-5193](https://issues.apache.org/jira/browse/CB-5193) Fix Android WebSQL sometime throwing SECURITY_ERR. +* [CB-5191](https://issues.apache.org/jira/browse/CB-5191) Deprecate * Updating shelljs to 0.2.6. Copy now preserves mode bits. -* CB-4872 Added android version scripts (android_sdk_version, etc) -* CB-5117 Output confirmation message if check_reqs passes. -* CB-5080 Find resources in a way that works with aapt's --rename-manifest-package -* CB-4527 Don't delete .bat files even when on non-windows platform -* CB-4892 Fix create script only escaping the first space instead of all spaces. +* [CB-4872](https://issues.apache.org/jira/browse/CB-4872) Added android version scripts (android_sdk_version, etc) +* [CB-5117](https://issues.apache.org/jira/browse/CB-5117) Output confirmation message if check_reqs passes. +* [CB-5080](https://issues.apache.org/jira/browse/CB-5080) Find resources in a way that works with aapt's --rename-manifest-package +* [CB-4527](https://issues.apache.org/jira/browse/CB-4527) Don't delete .bat files even when on non-windows platform +* [CB-4892](https://issues.apache.org/jira/browse/CB-4892) Fix create script only escaping the first space instead of all spaces. ### 3.1.0 (Sept 2013) ### 55 commits from 9 authors. Highlights include: -* [CB-4817] Remove unused assets in project template. +* [CB-4817](https://issues.apache.org/jira/browse/CB-4817) Remove unused assets in project template. * Fail fast in create script if package name is not com.foo.bar. -* [CB-4782] Convert ApplicationInfo.java -> appinfo.js -* [CB-4766] Deprecated JSONUtils.java (moved into plugins) -* [CB-4765] Deprecated ExifHelper.java (moved into plugins) -* [CB-4764] Deprecated DirectoryManager.java (moved into plugins) -* [CB-4763] Deprecated FileHelper.java (moved into plugins), Move getMimeType() into CordovaResourceApi. -* [CB-4725] Add CordovaWebView.CORDOVA_VERSION constant +* [CB-4782](https://issues.apache.org/jira/browse/CB-4782) Convert ApplicationInfo.java -> appinfo.js +* [CB-4766](https://issues.apache.org/jira/browse/CB-4766) Deprecated JSONUtils.java (moved into plugins) +* [CB-4765](https://issues.apache.org/jira/browse/CB-4765) Deprecated ExifHelper.java (moved into plugins) +* [CB-4764](https://issues.apache.org/jira/browse/CB-4764) Deprecated DirectoryManager.java (moved into plugins) +* [CB-4763](https://issues.apache.org/jira/browse/CB-4763) Deprecated FileHelper.java (moved into plugins), Move getMimeType() into CordovaResourceApi. +* [CB-4725](https://issues.apache.org/jira/browse/CB-4725) Add CordovaWebView.CORDOVA_VERSION constant * Incrementing version check for Android 4.3 API Level 18 -* [CB-3542] rewrote cli tooling scripts in node +* [CB-3542](https://issues.apache.org/jira/browse/CB-3542) rewrote cli tooling scripts in node * Allow CordovaChromeClient subclasses access to CordovaInterface and CordovaWebView members * Refactor CordovaActivity.init so that subclasses can easily override factory methods for webview objects -* [CB-4652] Allow default project template to be overridden on create +* [CB-4652](https://issues.apache.org/jira/browse/CB-4652) Allow default project template to be overridden on create * Tweak the online bridge to not send excess online events. -* [CB-4495] Modify start-emulator script to exit immediately on a fatal emulator error. +* [CB-4495](https://issues.apache.org/jira/browse/CB-4495) Modify start-emulator script to exit immediately on a fatal emulator error. * Log WebView IOExceptions only when they are not 404s * Use a higher threshold for slow exec() warnings when debugger is attached. * Fix data URI decoding in CordovaResourceApi -* [CB-3819] Made it easier to set SplashScreen delay. -* [CB-4013] Fixed loadUrlTimeoutValue preference. +* [CB-3819](https://issues.apache.org/jira/browse/CB-3819) Made it easier to set SplashScreen delay. +* [CB-4013](https://issues.apache.org/jira/browse/CB-4013) Fixed loadUrlTimeoutValue preference. * Upgrading project to Android 4.3 -* [CB-4198] bin/create script should be better at handling non-word characters in activity name. Patched windows script as well. -* [CB-4198] bin/create should handle spaces in activity better. -* [CB-4096] Implemented new unified whitelist for android -* [CB-3384] Fix thread assertion when plugins remap URIs +* [CB-4198](https://issues.apache.org/jira/browse/CB-4198) bin/create script should be better at handling non-word characters in activity name. Patched windows script as well. +* [CB-4198](https://issues.apache.org/jira/browse/CB-4198) bin/create should handle spaces in activity better. +* [CB-4096](https://issues.apache.org/jira/browse/CB-4096) Implemented new unified whitelist for android +* [CB-3384](https://issues.apache.org/jira/browse/CB-3384) Fix thread assertion when plugins remap URIs diff --git a/package.json b/package.json index 44bf44c7a..825dae27e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cordova-android", - "version": "5.2.0-dev", + "version": "5.2.0", "description": "cordova-android release", "bin": { "create": "bin/create" From b32b8c89c6061ffe86161f4ab641cbab605a7aba Mon Sep 17 00:00:00 2001 From: Steve Gill Date: Wed, 29 Jun 2016 12:51:05 -0700 Subject: [PATCH 02/14] Update JS snapshot to version 5.2.0 (via coho) --- bin/templates/project/assets/www/cordova.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/templates/project/assets/www/cordova.js b/bin/templates/project/assets/www/cordova.js index bf1231f42..c21b67b52 100644 --- a/bin/templates/project/assets/www/cordova.js +++ b/bin/templates/project/assets/www/cordova.js @@ -1,5 +1,5 @@ // Platform: android -// c517ca811b4948b630e0b74dbae6c9637939da24 +// 2fd4bcb84048415922d13d80d35b8d1668e8e150 /* 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.2.0-dev'; +var PLATFORM_VERSION_BUILD_LABEL = '5.2.0'; // file: src/scripts/require.js /*jshint -W079 */ From 97ce7dd417ea0e5baf0348d8a267ef3d723bb1a8 Mon Sep 17 00:00:00 2001 From: Steve Gill Date: Wed, 29 Jun 2016 12:51:05 -0700 Subject: [PATCH 03/14] Set VERSION to 5.2.0 (via coho) --- VERSION | 2 +- bin/templates/cordova/version | 2 +- framework/src/org/apache/cordova/CordovaWebView.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 1daf456ae..91ff57278 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.2.0-dev +5.2.0 diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version index b77247fb0..ff7f2a272 100755 --- a/bin/templates/cordova/version +++ b/bin/templates/cordova/version @@ -20,7 +20,7 @@ */ // Coho updates this line: -var VERSION = "5.2.0-dev"; +var VERSION = "5.2.0"; module.exports.version = VERSION; diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java index 65d53664a..49d4d53c2 100644 --- a/framework/src/org/apache/cordova/CordovaWebView.java +++ b/framework/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.2.0-dev"; + public static final String CORDOVA_VERSION = "5.2.0"; void init(CordovaInterface cordova, List pluginEntries, CordovaPreferences preferences); From 8416c4e5e9908aeee1445a107bb89decd69954b3 Mon Sep 17 00:00:00 2001 From: Vivek Kiran Date: Fri, 24 Jun 2016 10:38:23 +0530 Subject: [PATCH 04/14] CB-11481: android-library is deprecated use com.android.library instead --- bin/templates/cordova/lib/plugin-build.gradle | 2 +- framework/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/templates/cordova/lib/plugin-build.gradle b/bin/templates/cordova/lib/plugin-build.gradle index b345b90ac..f3e9eada2 100644 --- a/bin/templates/cordova/lib/plugin-build.gradle +++ b/bin/templates/cordova/lib/plugin-build.gradle @@ -42,7 +42,7 @@ buildscript { } } -apply plugin: 'android-library' +apply plugin: 'com.android.library' dependencies { compile fileTree(dir: 'libs', include: '*.jar') diff --git a/framework/build.gradle b/framework/build.gradle index 4615ceeb5..ee0b776b7 100644 --- a/framework/build.gradle +++ b/framework/build.gradle @@ -29,7 +29,7 @@ buildscript { } -apply plugin: 'android-library' +apply plugin: 'com.android.library' ext { apply from: 'cordova.gradle' From 40d3cdc0d646364c2d118758049f73b78503c68f Mon Sep 17 00:00:00 2001 From: Alexander Sorokin Date: Wed, 6 Jul 2016 15:12:36 +0300 Subject: [PATCH 05/14] CB-9489 Fixed "endless waiting for emulator" issue --- bin/templates/cordova/lib/emulator.js | 84 +++++++++++++++++---------- 1 file changed, 52 insertions(+), 32 deletions(-) diff --git a/bin/templates/cordova/lib/emulator.js b/bin/templates/cordova/lib/emulator.js index 56247dd75..ff1e261ce 100644 --- a/bin/templates/cordova/lib/emulator.js +++ b/bin/templates/cordova/lib/emulator.js @@ -147,6 +147,25 @@ module.exports.list_targets = function() { }); }; +/* + * Gets unused port for android emulator, between 5554 and 5584 + * Returns a promise. + */ +module.exports.get_available_port = function () { + var self = this; + + return self.list_started() + .then(function (emulators) { + for (var p = 5584; p >= 5554; p-=2) { + if (emulators.indexOf('emulator-' + p) === -1) { + events.emit('verbose', 'Found available port: ' + p); + return p; + } + } + throw new CordovaError('Could not find an available avd port'); + }); +}; + /* * Starts an emulator with the given ID, * and returns the started ID of that emulator. @@ -178,17 +197,18 @@ module.exports.start = function(emulator_ID, boot_timeout) { 'HINT: For a faster emulator, use an Intel System Image and install the HAXM device driver\n')); }); }).then(function(emulatorId) { - var uuid = 'cordova_emulator_' + new Date().getTime(); - var uuidProp = 'emu.uuid=' + uuid; - var args = ['-avd', emulatorId, '-prop', uuidProp]; - // Don't wait for it to finish, since the emulator will probably keep running for a long time. - child_process - .spawn('emulator', args, { stdio: 'inherit', detached: true }) - .unref(); - - // wait for emulator to start - events.emit('log', 'Waiting for emulator to start...'); - return self.wait_for_emulator(uuid); + return self.get_available_port() + .then(function (port) { + var args = ['-avd', emulatorId, '-port', port]; + // Don't wait for it to finish, since the emulator will probably keep running for a long time. + child_process + .spawn('emulator', args, { stdio: 'inherit', detached: true }) + .unref(); + + // wait for emulator to start + events.emit('log', 'Waiting for emulator to start...'); + return self.wait_for_emulator(port); + }); }).then(function(emulatorId) { if (!emulatorId) return Q.reject(new CordovaError('Failed to start emulator')); @@ -214,29 +234,29 @@ module.exports.start = function(emulator_ID, boot_timeout) { }; /* - * Waits for an emulator with given uuid to apear on the started-emulator list. - * Returns a promise with this emulator's ID. + * Waits for an emulator to boot on a given port. + * Returns this emulator's ID in a promise. */ -module.exports.wait_for_emulator = function(uuid) { +module.exports.wait_for_emulator = function(port) { var self = this; - return self.list_started() - .then(function(new_started) { - var emulator_id = null; - var promises = []; - - new_started.forEach(function (emulator) { - promises.push( - Adb.shell(emulator, 'getprop emu.uuid') - .then(function (output) { - if (output.indexOf(uuid) >= 0) { - emulator_id = emulator; - } - }) - ); - }); - - return Q.all(promises).then(function () { - return emulator_id || self.wait_for_emulator(uuid); + return Q().then(function() { + var emulator_id = 'emulator-' + port; + return Adb.shell(emulator_id, 'getprop dev.bootcomplete') + .then(function (output) { + if (output.indexOf('1') >= 0) { + return emulator_id; + } + return self.wait_for_emulator(port); + }, function (error) { + if (error && error.message && + (error.message.indexOf('not found') > -1) || + error.message.indexOf('device offline') > -1) { + // emulator not yet started, continue waiting + return self.wait_for_emulator(port); + } else { + // something unexpected has happened + throw error; + } }); }); }; From 89a00c02a40cae162708fd20e93c958ecaa3dbf9 Mon Sep 17 00:00:00 2001 From: Vladimir Kotikov Date: Mon, 11 Jul 2016 13:41:00 +0300 Subject: [PATCH 06/14] CB-11550 Updated and checked-in node_modules --- node_modules/abbrev/.npmignore | 4 - node_modules/abbrev/.travis.yml | 5 - node_modules/abbrev/CONTRIBUTING.md | 3 - node_modules/abbrev/package.json | 58 +- node_modules/abbrev/test.js | 47 -- node_modules/ansi/package.json | 33 +- node_modules/balanced-match/package.json | 33 +- node_modules/base64-js/package.json | 39 +- node_modules/big-integer/package.json | 31 +- node_modules/bplist-parser/package.json | 31 +- node_modules/brace-expansion/.npmignore | 3 - node_modules/brace-expansion/example.js | 8 - node_modules/brace-expansion/package.json | 59 +- node_modules/concat-map/package.json | 55 +- node_modules/cordova-common/package.json | 51 +- .../cordova-registry-mapper/package.json | 29 +- node_modules/elementtree/package.json | 35 +- node_modules/glob/package.json | 29 +- node_modules/inflight/package.json | 41 +- node_modules/inherits/package.json | 27 +- node_modules/lodash/package.json | 55 +- node_modules/minimatch/README.md | 11 +- node_modules/minimatch/minimatch.js | 18 +- node_modules/minimatch/package.json | 53 +- node_modules/nopt/package.json | 37 +- node_modules/once/package.json | 29 +- node_modules/os-homedir/package.json | 29 +- node_modules/os-tmpdir/package.json | 29 +- node_modules/osenv/package.json | 41 +- node_modules/path-is-absolute/package.json | 29 +- node_modules/plist/package.json | 47 +- node_modules/properties-parser/package.json | 29 +- node_modules/q/package.json | 39 +- node_modules/sax/package.json | 61 +- node_modules/semver/.npmignore | 4 - node_modules/semver/.travis.yml | 5 - node_modules/semver/README.md | 35 +- node_modules/semver/package.json | 58 +- node_modules/semver/range.bnf | 2 +- node_modules/semver/semver.js | 8 +- node_modules/semver/test/big-numbers.js | 31 - node_modules/semver/test/clean.js | 29 - node_modules/semver/test/gtr.js | 173 ----- node_modules/semver/test/index.js | 698 ------------------ node_modules/semver/test/ltr.js | 181 ----- node_modules/semver/test/major-minor-patch.js | 72 -- node_modules/shelljs/package.json | 31 +- node_modules/underscore/package.json | 31 +- node_modules/unorm/package.json | 45 +- node_modules/util-deprecate/package.json | 29 +- node_modules/wrappy/package.json | 33 +- node_modules/xmlbuilder/package.json | 31 +- node_modules/xmldom/package.json | 59 +- 53 files changed, 888 insertions(+), 1795 deletions(-) delete mode 100644 node_modules/abbrev/.npmignore delete mode 100644 node_modules/abbrev/.travis.yml delete mode 100644 node_modules/abbrev/CONTRIBUTING.md delete mode 100644 node_modules/abbrev/test.js delete mode 100644 node_modules/brace-expansion/.npmignore delete mode 100644 node_modules/brace-expansion/example.js delete mode 100644 node_modules/semver/.npmignore delete mode 100644 node_modules/semver/.travis.yml delete mode 100644 node_modules/semver/test/big-numbers.js delete mode 100644 node_modules/semver/test/clean.js delete mode 100644 node_modules/semver/test/gtr.js delete mode 100644 node_modules/semver/test/index.js delete mode 100644 node_modules/semver/test/ltr.js delete mode 100644 node_modules/semver/test/major-minor-patch.js diff --git a/node_modules/abbrev/.npmignore b/node_modules/abbrev/.npmignore deleted file mode 100644 index 9d6cd2f02..000000000 --- a/node_modules/abbrev/.npmignore +++ /dev/null @@ -1,4 +0,0 @@ -.nyc_output -nyc_output -node_modules -coverage diff --git a/node_modules/abbrev/.travis.yml b/node_modules/abbrev/.travis.yml deleted file mode 100644 index 991d04b6e..000000000 --- a/node_modules/abbrev/.travis.yml +++ /dev/null @@ -1,5 +0,0 @@ -language: node_js -node_js: - - '0.10' - - '0.12' - - 'iojs' diff --git a/node_modules/abbrev/CONTRIBUTING.md b/node_modules/abbrev/CONTRIBUTING.md deleted file mode 100644 index 2f302612f..000000000 --- a/node_modules/abbrev/CONTRIBUTING.md +++ /dev/null @@ -1,3 +0,0 @@ - To get started, sign the - Contributor License Agreement. diff --git a/node_modules/abbrev/package.json b/node_modules/abbrev/package.json index 343fa3b81..c3c22be5b 100644 --- a/node_modules/abbrev/package.json +++ b/node_modules/abbrev/package.json @@ -1,41 +1,54 @@ { "_args": [ [ - "abbrev@1", - "D:\\Cordova\\cordova-android\\node_modules\\nopt" + { + "raw": "abbrev@1", + "scope": null, + "escapedName": "abbrev", + "name": "abbrev", + "rawSpec": "1", + "spec": ">=1.0.0 <2.0.0", + "type": "range" + }, + "d:\\cordova\\cordova-android\\node_modules\\nopt" ] ], "_from": "abbrev@>=1.0.0 <2.0.0", - "_id": "abbrev@1.0.7", + "_id": "abbrev@1.0.9", "_inCache": true, "_installable": true, "_location": "/abbrev", - "_nodeVersion": "2.0.1", + "_nodeVersion": "4.4.4", + "_npmOperationalInternal": { + "host": "packages-16-east.internal.npmjs.com", + "tmp": "tmp/abbrev-1.0.9.tgz_1466016055839_0.7825860097073019" + }, "_npmUser": { - "email": "isaacs@npmjs.com", - "name": "isaacs" + "name": "isaacs", + "email": "i@izs.me" }, - "_npmVersion": "2.10.1", + "_npmVersion": "3.9.1", "_phantomChildren": {}, "_requested": { - "name": "abbrev", "raw": "abbrev@1", - "rawSpec": "1", "scope": null, + "escapedName": "abbrev", + "name": "abbrev", + "rawSpec": "1", "spec": ">=1.0.0 <2.0.0", "type": "range" }, "_requiredBy": [ "/nopt" ], - "_resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz", - "_shasum": "5b6035b2ee9d4fb5cf859f08a9be81b208491843", + "_resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", + "_shasum": "91b4792588a7738c25f35dd6f63752a2f8776135", "_shrinkwrap": null, "_spec": "abbrev@1", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\nopt", + "_where": "d:\\cordova\\cordova-android\\node_modules\\nopt", "author": { - "email": "i@izs.me", - "name": "Isaac Z. Schlueter" + "name": "Isaac Z. Schlueter", + "email": "i@izs.me" }, "bugs": { "url": "https://github.com/isaacs/abbrev-js/issues" @@ -43,21 +56,24 @@ "dependencies": {}, "description": "Like ruby's abbrev module, but in js", "devDependencies": { - "tap": "^1.2.0" + "tap": "^5.7.2" }, "directories": {}, "dist": { - "shasum": "5b6035b2ee9d4fb5cf859f08a9be81b208491843", - "tarball": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz" + "shasum": "91b4792588a7738c25f35dd6f63752a2f8776135", + "tarball": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz" }, - "gitHead": "821d09ce7da33627f91bbd8ed631497ed6f760c2", + "files": [ + "abbrev.js" + ], + "gitHead": "c386cd9dbb1d8d7581718c54d4ba944cc9298d6f", "homepage": "https://github.com/isaacs/abbrev-js#readme", "license": "ISC", "main": "abbrev.js", "maintainers": [ { - "email": "i@izs.me", - "name": "isaacs" + "name": "isaacs", + "email": "i@izs.me" } ], "name": "abbrev", @@ -70,5 +86,5 @@ "scripts": { "test": "tap test.js --cov" }, - "version": "1.0.7" + "version": "1.0.9" } diff --git a/node_modules/abbrev/test.js b/node_modules/abbrev/test.js deleted file mode 100644 index eb30e421c..000000000 --- a/node_modules/abbrev/test.js +++ /dev/null @@ -1,47 +0,0 @@ -var abbrev = require('./abbrev.js') -var assert = require("assert") -var util = require("util") - -console.log("TAP version 13") -var count = 0 - -function test (list, expect) { - count++ - var actual = abbrev(list) - assert.deepEqual(actual, expect, - "abbrev("+util.inspect(list)+") === " + util.inspect(expect) + "\n"+ - "actual: "+util.inspect(actual)) - actual = abbrev.apply(exports, list) - assert.deepEqual(abbrev.apply(exports, list), expect, - "abbrev("+list.map(JSON.stringify).join(",")+") === " + util.inspect(expect) + "\n"+ - "actual: "+util.inspect(actual)) - console.log('ok - ' + list.join(' ')) -} - -test([ "ruby", "ruby", "rules", "rules", "rules" ], -{ rub: 'ruby' -, ruby: 'ruby' -, rul: 'rules' -, rule: 'rules' -, rules: 'rules' -}) -test(["fool", "foom", "pool", "pope"], -{ fool: 'fool' -, foom: 'foom' -, poo: 'pool' -, pool: 'pool' -, pop: 'pope' -, pope: 'pope' -}) -test(["a", "ab", "abc", "abcd", "abcde", "acde"], -{ a: 'a' -, ab: 'ab' -, abc: 'abc' -, abcd: 'abcd' -, abcde: 'abcde' -, ac: 'acde' -, acd: 'acde' -, acde: 'acde' -}) - -console.log("1..%d", count) diff --git a/node_modules/ansi/package.json b/node_modules/ansi/package.json index 7e3d6aae6..157ed2dc0 100644 --- a/node_modules/ansi/package.json +++ b/node_modules/ansi/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "ansi@^0.3.1", - "D:\\Cordova\\cordova-android\\node_modules\\cordova-common" + { + "raw": "ansi@^0.3.1", + "scope": null, + "escapedName": "ansi", + "name": "ansi", + "rawSpec": "^0.3.1", + "spec": ">=0.3.1 <0.4.0", + "type": "range" + }, + "d:\\cordova\\cordova-android\\node_modules\\cordova-common" ] ], "_from": "ansi@>=0.3.1 <0.4.0", @@ -12,16 +20,17 @@ "_location": "/ansi", "_nodeVersion": "5.3.0", "_npmUser": { - "email": "nathan@tootallnate.net", - "name": "tootallnate" + "name": "tootallnate", + "email": "nathan@tootallnate.net" }, "_npmVersion": "3.3.12", "_phantomChildren": {}, "_requested": { - "name": "ansi", "raw": "ansi@^0.3.1", - "rawSpec": "^0.3.1", "scope": null, + "escapedName": "ansi", + "name": "ansi", + "rawSpec": "^0.3.1", "spec": ">=0.3.1 <0.4.0", "type": "range" }, @@ -32,10 +41,10 @@ "_shasum": "0c42d4fb17160d5a9af1e484bace1c66922c1b21", "_shrinkwrap": null, "_spec": "ansi@^0.3.1", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\cordova-common", + "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common", "author": { - "email": "nathan@tootallnate.net", "name": "Nathan Rajlich", + "email": "nathan@tootallnate.net", "url": "http://tootallnate.net" }, "bugs": { @@ -65,12 +74,12 @@ "main": "./lib/ansi.js", "maintainers": [ { - "email": "nathan@tootallnate.net", - "name": "TooTallNate" + "name": "TooTallNate", + "email": "nathan@tootallnate.net" }, { - "email": "nathan@tootallnate.net", - "name": "tootallnate" + "name": "tootallnate", + "email": "nathan@tootallnate.net" } ], "name": "ansi", diff --git a/node_modules/balanced-match/package.json b/node_modules/balanced-match/package.json index 5044b4ed8..dd4d2ba5b 100644 --- a/node_modules/balanced-match/package.json +++ b/node_modules/balanced-match/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "balanced-match@^0.4.1", - "D:\\Cordova\\cordova-android\\node_modules\\brace-expansion" + { + "raw": "balanced-match@^0.4.1", + "scope": null, + "escapedName": "balanced-match", + "name": "balanced-match", + "rawSpec": "^0.4.1", + "spec": ">=0.4.1 <0.5.0", + "type": "range" + }, + "d:\\cordova\\cordova-android\\node_modules\\brace-expansion" ] ], "_from": "balanced-match@>=0.4.1 <0.5.0", @@ -16,16 +24,17 @@ "tmp": "tmp/balanced-match-0.4.1.tgz_1462129663650_0.39764496590942144" }, "_npmUser": { - "email": "julian@juliangruber.com", - "name": "juliangruber" + "name": "juliangruber", + "email": "julian@juliangruber.com" }, "_npmVersion": "3.8.6", "_phantomChildren": {}, "_requested": { - "name": "balanced-match", "raw": "balanced-match@^0.4.1", - "rawSpec": "^0.4.1", "scope": null, + "escapedName": "balanced-match", + "name": "balanced-match", + "rawSpec": "^0.4.1", "spec": ">=0.4.1 <0.5.0", "type": "range" }, @@ -36,10 +45,10 @@ "_shasum": "19053e2e0748eadb379da6c09d455cf5e1039335", "_shrinkwrap": null, "_spec": "balanced-match@^0.4.1", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\brace-expansion", + "_where": "d:\\cordova\\cordova-android\\node_modules\\brace-expansion", "author": { - "email": "mail@juliangruber.com", "name": "Julian Gruber", + "email": "mail@juliangruber.com", "url": "http://juliangruber.com" }, "bugs": { @@ -68,8 +77,8 @@ "main": "index.js", "maintainers": [ { - "email": "julian@juliangruber.com", - "name": "juliangruber" + "name": "juliangruber", + "email": "julian@juliangruber.com" } ], "name": "balanced-match", @@ -83,6 +92,7 @@ "test": "make test" }, "testling": { + "files": "test/*.js", "browsers": [ "ie/8..latest", "firefox/20..latest", @@ -95,8 +105,7 @@ "ipad/6.0..latest", "iphone/6.0..latest", "android-browser/4.2..latest" - ], - "files": "test/*.js" + ] }, "version": "0.4.1" } diff --git a/node_modules/base64-js/package.json b/node_modules/base64-js/package.json index 5f21386ec..772e83f41 100644 --- a/node_modules/base64-js/package.json +++ b/node_modules/base64-js/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "base64-js@0.0.8", - "D:\\Cordova\\cordova-android\\node_modules\\plist" + { + "raw": "base64-js@0.0.8", + "scope": null, + "escapedName": "base64-js", + "name": "base64-js", + "rawSpec": "0.0.8", + "spec": "0.0.8", + "type": "version" + }, + "d:\\cordova\\cordova-android\\node_modules\\plist" ] ], "_from": "base64-js@0.0.8", @@ -12,16 +20,17 @@ "_location": "/base64-js", "_nodeVersion": "0.10.35", "_npmUser": { - "email": "feross@feross.org", - "name": "feross" + "name": "feross", + "email": "feross@feross.org" }, "_npmVersion": "2.1.16", "_phantomChildren": {}, "_requested": { - "name": "base64-js", "raw": "base64-js@0.0.8", - "rawSpec": "0.0.8", "scope": null, + "escapedName": "base64-js", + "name": "base64-js", + "rawSpec": "0.0.8", "spec": "0.0.8", "type": "version" }, @@ -32,10 +41,10 @@ "_shasum": "1101e9544f4a76b1bc3b26d452ca96d7a35e7978", "_shrinkwrap": null, "_spec": "base64-js@0.0.8", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\plist", + "_where": "d:\\cordova\\cordova-android\\node_modules\\plist", "author": { - "email": "t.jameson.little@gmail.com", - "name": "T. Jameson Little" + "name": "T. Jameson Little", + "email": "t.jameson.little@gmail.com" }, "bugs": { "url": "https://github.com/beatgammit/base64-js/issues" @@ -59,12 +68,12 @@ "main": "lib/b64.js", "maintainers": [ { - "email": "t.jameson.little@gmail.com", - "name": "beatgammit" + "name": "beatgammit", + "email": "t.jameson.little@gmail.com" }, { - "email": "feross@feross.org", - "name": "feross" + "name": "feross", + "email": "feross@feross.org" } ], "name": "base64-js", @@ -78,6 +87,7 @@ "test": "tape test/*.js" }, "testling": { + "files": "test/*.js", "browsers": [ "ie/6..latest", "chrome/4..latest", @@ -86,8 +96,7 @@ "opera/11.0..latest", "iphone/6", "ipad/6" - ], - "files": "test/*.js" + ] }, "version": "0.0.8" } diff --git a/node_modules/big-integer/package.json b/node_modules/big-integer/package.json index c0f37fb7f..b353a4dc9 100644 --- a/node_modules/big-integer/package.json +++ b/node_modules/big-integer/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "big-integer@^1.6.7", - "D:\\Cordova\\cordova-android\\node_modules\\bplist-parser" + { + "raw": "big-integer@^1.6.7", + "scope": null, + "escapedName": "big-integer", + "name": "big-integer", + "rawSpec": "^1.6.7", + "spec": ">=1.6.7 <2.0.0", + "type": "range" + }, + "d:\\cordova\\cordova-android\\node_modules\\bplist-parser" ] ], "_from": "big-integer@>=1.6.7 <2.0.0", @@ -16,16 +24,17 @@ "tmp": "tmp/big-integer-1.6.15.tgz_1460079231162_0.7087579960934818" }, "_npmUser": { - "email": "peter.e.c.olson+npm@gmail.com", - "name": "peterolson" + "name": "peterolson", + "email": "peter.e.c.olson+npm@gmail.com" }, "_npmVersion": "2.9.1", "_phantomChildren": {}, "_requested": { - "name": "big-integer", "raw": "big-integer@^1.6.7", - "rawSpec": "^1.6.7", "scope": null, + "escapedName": "big-integer", + "name": "big-integer", + "rawSpec": "^1.6.7", "spec": ">=1.6.7 <2.0.0", "type": "range" }, @@ -36,10 +45,10 @@ "_shasum": "33d27d3b7388dfcc4b86d3130c10740cec01fb9e", "_shrinkwrap": null, "_spec": "big-integer@^1.6.7", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\bplist-parser", + "_where": "d:\\cordova\\cordova-android\\node_modules\\bplist-parser", "author": { - "email": "peter.e.c.olson+npm@gmail.com", - "name": "Peter Olson" + "name": "Peter Olson", + "email": "peter.e.c.olson+npm@gmail.com" }, "bin": {}, "bugs": { @@ -82,8 +91,8 @@ "main": "./BigInteger", "maintainers": [ { - "email": "peter.e.c.olson+npm@gmail.com", - "name": "peterolson" + "name": "peterolson", + "email": "peter.e.c.olson+npm@gmail.com" } ], "name": "big-integer", diff --git a/node_modules/bplist-parser/package.json b/node_modules/bplist-parser/package.json index eaae4d589..e4f7e41ee 100644 --- a/node_modules/bplist-parser/package.json +++ b/node_modules/bplist-parser/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "bplist-parser@^0.1.0", - "D:\\Cordova\\cordova-android\\node_modules\\cordova-common" + { + "raw": "bplist-parser@^0.1.0", + "scope": null, + "escapedName": "bplist-parser", + "name": "bplist-parser", + "rawSpec": "^0.1.0", + "spec": ">=0.1.0 <0.2.0", + "type": "range" + }, + "d:\\cordova\\cordova-android\\node_modules\\cordova-common" ] ], "_from": "bplist-parser@>=0.1.0 <0.2.0", @@ -12,16 +20,17 @@ "_location": "/bplist-parser", "_nodeVersion": "5.1.0", "_npmUser": { - "email": "joe@fernsroth.com", - "name": "joeferner" + "name": "joeferner", + "email": "joe@fernsroth.com" }, "_npmVersion": "3.4.0", "_phantomChildren": {}, "_requested": { - "name": "bplist-parser", "raw": "bplist-parser@^0.1.0", - "rawSpec": "^0.1.0", "scope": null, + "escapedName": "bplist-parser", + "name": "bplist-parser", + "rawSpec": "^0.1.0", "spec": ">=0.1.0 <0.2.0", "type": "range" }, @@ -32,10 +41,10 @@ "_shasum": "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6", "_shrinkwrap": null, "_spec": "bplist-parser@^0.1.0", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\cordova-common", + "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common", "author": { - "email": "joe.ferner@nearinfinity.com", - "name": "Joe Ferner" + "name": "Joe Ferner", + "email": "joe.ferner@nearinfinity.com" }, "bugs": { "url": "https://github.com/nearinfinity/node-bplist-parser/issues" @@ -63,8 +72,8 @@ "main": "bplistParser.js", "maintainers": [ { - "email": "joe@fernsroth.com", - "name": "joeferner" + "name": "joeferner", + "email": "joe@fernsroth.com" } ], "name": "bplist-parser", diff --git a/node_modules/brace-expansion/.npmignore b/node_modules/brace-expansion/.npmignore deleted file mode 100644 index 353546af2..000000000 --- a/node_modules/brace-expansion/.npmignore +++ /dev/null @@ -1,3 +0,0 @@ -test -.gitignore -.travis.yml diff --git a/node_modules/brace-expansion/example.js b/node_modules/brace-expansion/example.js deleted file mode 100644 index 60ecfc74d..000000000 --- a/node_modules/brace-expansion/example.js +++ /dev/null @@ -1,8 +0,0 @@ -var expand = require('./'); - -console.log(expand('http://any.org/archive{1996..1999}/vol{1..4}/part{a,b,c}.html')); -console.log(expand('http://www.numericals.com/file{1..100..10}.txt')); -console.log(expand('http://www.letters.com/file{a..z..2}.txt')); -console.log(expand('mkdir /usr/local/src/bash/{old,new,dist,bugs}')); -console.log(expand('chown root /usr/{ucb/{ex,edit},lib/{ex?.?*,how_ex}}')); - diff --git a/node_modules/brace-expansion/package.json b/node_modules/brace-expansion/package.json index 55f42814f..08cea7feb 100644 --- a/node_modules/brace-expansion/package.json +++ b/node_modules/brace-expansion/package.json @@ -1,45 +1,54 @@ { "_args": [ [ - "brace-expansion@^1.0.0", - "D:\\Cordova\\cordova-android\\node_modules\\minimatch" + { + "raw": "brace-expansion@^1.0.0", + "scope": null, + "escapedName": "brace-expansion", + "name": "brace-expansion", + "rawSpec": "^1.0.0", + "spec": ">=1.0.0 <2.0.0", + "type": "range" + }, + "d:\\cordova\\cordova-android\\node_modules\\minimatch" ] ], "_from": "brace-expansion@>=1.0.0 <2.0.0", - "_id": "brace-expansion@1.1.4", + "_id": "brace-expansion@1.1.5", "_inCache": true, "_installable": true, "_location": "/brace-expansion", - "_nodeVersion": "6.0.0", + "_nodeVersion": "4.4.5", "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/brace-expansion-1.1.4.tgz_1462130058897_0.14984136167913675" + "host": "packages-16-east.internal.npmjs.com", + "tmp": "tmp/brace-expansion-1.1.5.tgz_1465989660138_0.34528115345165133" }, "_npmUser": { - "email": "julian@juliangruber.com", - "name": "juliangruber" + "name": "juliangruber", + "email": "julian@juliangruber.com" }, - "_npmVersion": "3.8.6", + "_npmVersion": "2.15.5", "_phantomChildren": {}, "_requested": { - "name": "brace-expansion", "raw": "brace-expansion@^1.0.0", - "rawSpec": "^1.0.0", "scope": null, + "escapedName": "brace-expansion", + "name": "brace-expansion", + "rawSpec": "^1.0.0", "spec": ">=1.0.0 <2.0.0", "type": "range" }, "_requiredBy": [ "/minimatch" ], - "_resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.4.tgz", - "_shasum": "464a204c77f482c085c2a36c456bbfbafb67a127", + "_resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.5.tgz", + "_shasum": "f5b4ad574e2cb7ccc1eb83e6fe79b8ecadf7a526", "_shrinkwrap": null, "_spec": "brace-expansion@^1.0.0", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\minimatch", + "_where": "d:\\cordova\\cordova-android\\node_modules\\minimatch", "author": { - "email": "mail@juliangruber.com", "name": "Julian Gruber", + "email": "mail@juliangruber.com", "url": "http://juliangruber.com" }, "bugs": { @@ -55,22 +64,22 @@ }, "directories": {}, "dist": { - "shasum": "464a204c77f482c085c2a36c456bbfbafb67a127", - "tarball": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.4.tgz" + "shasum": "f5b4ad574e2cb7ccc1eb83e6fe79b8ecadf7a526", + "tarball": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.5.tgz" }, - "gitHead": "1660b75d0bf03b022e7888b576cd5a4080692c1d", + "gitHead": "ff31acab078f1bb696ac4c55ca56ea24e6495fb6", "homepage": "https://github.com/juliangruber/brace-expansion", "keywords": [], "license": "MIT", "main": "index.js", "maintainers": [ { - "email": "julian@juliangruber.com", - "name": "juliangruber" + "name": "juliangruber", + "email": "julian@juliangruber.com" }, { - "email": "isaacs@npmjs.com", - "name": "isaacs" + "name": "isaacs", + "email": "isaacs@npmjs.com" } ], "name": "brace-expansion", @@ -85,6 +94,7 @@ "test": "tape test/*.js" }, "testling": { + "files": "test/*.js", "browsers": [ "ie/8..latest", "firefox/20..latest", @@ -97,8 +107,7 @@ "ipad/6.0..latest", "iphone/6.0..latest", "android-browser/4.2..latest" - ], - "files": "test/*.js" + ] }, - "version": "1.1.4" + "version": "1.1.5" } diff --git a/node_modules/concat-map/package.json b/node_modules/concat-map/package.json index a011e1cee..c02ce03b9 100644 --- a/node_modules/concat-map/package.json +++ b/node_modules/concat-map/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "concat-map@0.0.1", - "D:\\Cordova\\cordova-android\\node_modules\\brace-expansion" + { + "raw": "concat-map@0.0.1", + "scope": null, + "escapedName": "concat-map", + "name": "concat-map", + "rawSpec": "0.0.1", + "spec": "0.0.1", + "type": "version" + }, + "d:\\cordova\\cordova-android\\node_modules\\brace-expansion" ] ], "_from": "concat-map@0.0.1", @@ -11,16 +19,17 @@ "_installable": true, "_location": "/concat-map", "_npmUser": { - "email": "mail@substack.net", - "name": "substack" + "name": "substack", + "email": "mail@substack.net" }, "_npmVersion": "1.3.21", "_phantomChildren": {}, "_requested": { - "name": "concat-map", "raw": "concat-map@0.0.1", - "rawSpec": "0.0.1", "scope": null, + "escapedName": "concat-map", + "name": "concat-map", + "rawSpec": "0.0.1", "spec": "0.0.1", "type": "version" }, @@ -31,10 +40,10 @@ "_shasum": "d8a96bd77fd68df7793a73036a3ba0d5405d477b", "_shrinkwrap": null, "_spec": "concat-map@0.0.1", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\brace-expansion", + "_where": "d:\\cordova\\cordova-android\\node_modules\\brace-expansion", "author": { - "email": "mail@substack.net", "name": "James Halliday", + "email": "mail@substack.net", "url": "http://substack.net" }, "bugs": { @@ -65,8 +74,8 @@ "main": "index.js", "maintainers": [ { - "email": "mail@substack.net", - "name": "substack" + "name": "substack", + "email": "mail@substack.net" } ], "name": "concat-map", @@ -80,30 +89,30 @@ "test": "tape test/*.js" }, "testling": { + "files": "test/*.js", "browsers": { - "chrome": [ - 10, - 22 - ], - "ff": [ - 3.5, - 10, - 15 - ], "ie": [ 6, 7, 8, 9 ], - "opera": [ - 12 + "ff": [ + 3.5, + 10, + 15 + ], + "chrome": [ + 10, + 22 ], "safari": [ 5.1 + ], + "opera": [ + 12 ] - }, - "files": "test/*.js" + } }, "version": "0.0.1" } diff --git a/node_modules/cordova-common/package.json b/node_modules/cordova-common/package.json index d4dddc4fd..0c2350b2d 100644 --- a/node_modules/cordova-common/package.json +++ b/node_modules/cordova-common/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "cordova-common@^1.3.0", - "D:\\Cordova\\cordova-android" + { + "raw": "cordova-common@^1.3.0", + "scope": null, + "escapedName": "cordova-common", + "name": "cordova-common", + "rawSpec": "^1.3.0", + "spec": ">=1.3.0 <2.0.0", + "type": "range" + }, + "d:\\cordova\\cordova-android" ] ], "_from": "cordova-common@>=1.3.0 <2.0.0", @@ -16,16 +24,17 @@ "tmp": "tmp/cordova-common-1.3.0.tgz_1464130094288_0.48495062021538615" }, "_npmUser": { - "email": "stevengill97@gmail.com", - "name": "stevegill" + "name": "stevegill", + "email": "stevengill97@gmail.com" }, "_npmVersion": "3.9.0", "_phantomChildren": {}, "_requested": { - "name": "cordova-common", "raw": "cordova-common@^1.3.0", - "rawSpec": "^1.3.0", "scope": null, + "escapedName": "cordova-common", + "name": "cordova-common", + "rawSpec": "^1.3.0", "spec": ">=1.3.0 <2.0.0", "type": "range" }, @@ -36,13 +45,13 @@ "_shasum": "f75161f6aa7cef5486fd5d69a3b0a1f628334491", "_shrinkwrap": null, "_spec": "cordova-common@^1.3.0", - "_where": "D:\\Cordova\\cordova-android", + "_where": "d:\\cordova\\cordova-android", "author": { "name": "Apache Software Foundation" }, "bugs": { - "email": "dev@cordova.apache.org", - "url": "https://issues.apache.org/jira/browse/CB" + "url": "https://issues.apache.org/jira/browse/CB", + "email": "dev@cordova.apache.org" }, "contributors": [], "dependencies": { @@ -81,28 +90,28 @@ "main": "cordova-common.js", "maintainers": [ { - "email": "bowserj@apache.org", - "name": "bowserj" + "name": "bowserj", + "email": "bowserj@apache.org" }, { - "email": "kotikov.vladimir@gmail.com", - "name": "kotikov.vladimir" + "name": "kotikov.vladimir", + "email": "kotikov.vladimir@gmail.com" }, { - "email": "purplecabbage@gmail.com", - "name": "purplecabbage" + "name": "purplecabbage", + "email": "purplecabbage@gmail.com" }, { - "email": "shazron@gmail.com", - "name": "shazron" + "name": "shazron", + "email": "shazron@gmail.com" }, { - "email": "stevengill97@gmail.com", - "name": "stevegill" + "name": "stevegill", + "email": "stevengill97@gmail.com" }, { - "email": "npmjs@barhams.info", - "name": "timbarham" + "name": "timbarham", + "email": "npmjs@barhams.info" } ], "name": "cordova-common", diff --git a/node_modules/cordova-registry-mapper/package.json b/node_modules/cordova-registry-mapper/package.json index d9c832456..2b8af74a2 100644 --- a/node_modules/cordova-registry-mapper/package.json +++ b/node_modules/cordova-registry-mapper/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "cordova-registry-mapper@^1.1.8", - "D:\\Cordova\\cordova-android\\node_modules\\cordova-common" + { + "raw": "cordova-registry-mapper@^1.1.8", + "scope": null, + "escapedName": "cordova-registry-mapper", + "name": "cordova-registry-mapper", + "rawSpec": "^1.1.8", + "spec": ">=1.1.8 <2.0.0", + "type": "range" + }, + "d:\\cordova\\cordova-android\\node_modules\\cordova-common" ] ], "_from": "cordova-registry-mapper@>=1.1.8 <2.0.0", @@ -12,16 +20,17 @@ "_location": "/cordova-registry-mapper", "_nodeVersion": "5.4.1", "_npmUser": { - "email": "stevengill97@gmail.com", - "name": "stevegill" + "name": "stevegill", + "email": "stevengill97@gmail.com" }, "_npmVersion": "3.5.3", "_phantomChildren": {}, "_requested": { - "name": "cordova-registry-mapper", "raw": "cordova-registry-mapper@^1.1.8", - "rawSpec": "^1.1.8", "scope": null, + "escapedName": "cordova-registry-mapper", + "name": "cordova-registry-mapper", + "rawSpec": "^1.1.8", "spec": ">=1.1.8 <2.0.0", "type": "range" }, @@ -32,7 +41,7 @@ "_shasum": "e244b9185b8175473bff6079324905115f83dc7c", "_shrinkwrap": null, "_spec": "cordova-registry-mapper@^1.1.8", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\cordova-common", + "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common", "author": { "name": "Steve Gill" }, @@ -47,7 +56,7 @@ "directories": {}, "dist": { "shasum": "e244b9185b8175473bff6079324905115f83dc7c", - "tarball": "http://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz" + "tarball": "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz" }, "gitHead": "00af0f028ec94154a364eeabe38b8e22320647bd", "homepage": "https://github.com/stevengill/cordova-registry-mapper#readme", @@ -59,8 +68,8 @@ "main": "index.js", "maintainers": [ { - "email": "stevengill97@gmail.com", - "name": "stevegill" + "name": "stevegill", + "email": "stevengill97@gmail.com" } ], "name": "cordova-registry-mapper", diff --git a/node_modules/elementtree/package.json b/node_modules/elementtree/package.json index eadd6a465..58a417381 100644 --- a/node_modules/elementtree/package.json +++ b/node_modules/elementtree/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "elementtree@^0.1.6", - "D:\\Cordova\\cordova-android" + { + "raw": "elementtree@^0.1.6", + "scope": null, + "escapedName": "elementtree", + "name": "elementtree", + "rawSpec": "^0.1.6", + "spec": ">=0.1.6 <0.2.0", + "type": "range" + }, + "d:\\cordova\\cordova-android" ] ], "_from": "elementtree@>=0.1.6 <0.2.0", @@ -11,16 +19,17 @@ "_installable": true, "_location": "/elementtree", "_npmUser": { - "email": "ryan@trolocsis.com", - "name": "rphillips" + "name": "rphillips", + "email": "ryan@trolocsis.com" }, "_npmVersion": "1.3.24", "_phantomChildren": {}, "_requested": { - "name": "elementtree", "raw": "elementtree@^0.1.6", - "rawSpec": "^0.1.6", "scope": null, + "escapedName": "elementtree", + "name": "elementtree", + "rawSpec": "^0.1.6", "spec": ">=0.1.6 <0.2.0", "type": "range" }, @@ -32,7 +41,7 @@ "_shasum": "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c", "_shrinkwrap": null, "_spec": "elementtree@^0.1.6", - "_where": "D:\\Cordova\\cordova-android", + "_where": "d:\\cordova\\cordova-android", "author": { "name": "Rackspace US, Inc." }, @@ -41,12 +50,12 @@ }, "contributors": [ { - "email": "paul.querna@rackspace.com", - "name": "Paul Querna" + "name": "Paul Querna", + "email": "paul.querna@rackspace.com" }, { - "email": "tomaz.muraus@rackspace.com", - "name": "Tomaz Muraus" + "name": "Tomaz Muraus", + "email": "tomaz.muraus@rackspace.com" } ], "dependencies": { @@ -83,8 +92,8 @@ "main": "lib/elementtree.js", "maintainers": [ { - "email": "ryan@trolocsis.com", - "name": "rphillips" + "name": "rphillips", + "email": "ryan@trolocsis.com" } ], "name": "elementtree", diff --git a/node_modules/glob/package.json b/node_modules/glob/package.json index 03aeb13e1..1f1cec6de 100644 --- a/node_modules/glob/package.json +++ b/node_modules/glob/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "glob@^5.0.13", - "D:\\Cordova\\cordova-android\\node_modules\\cordova-common" + { + "raw": "glob@^5.0.13", + "scope": null, + "escapedName": "glob", + "name": "glob", + "rawSpec": "^5.0.13", + "spec": ">=5.0.13 <6.0.0", + "type": "range" + }, + "d:\\cordova\\cordova-android\\node_modules\\cordova-common" ] ], "_from": "glob@>=5.0.13 <6.0.0", @@ -12,16 +20,17 @@ "_location": "/glob", "_nodeVersion": "4.0.0", "_npmUser": { - "email": "isaacs@npmjs.com", - "name": "isaacs" + "name": "isaacs", + "email": "isaacs@npmjs.com" }, "_npmVersion": "3.3.2", "_phantomChildren": {}, "_requested": { - "name": "glob", "raw": "glob@^5.0.13", - "rawSpec": "^5.0.13", "scope": null, + "escapedName": "glob", + "name": "glob", + "rawSpec": "^5.0.13", "spec": ">=5.0.13 <6.0.0", "type": "range" }, @@ -32,10 +41,10 @@ "_shasum": "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1", "_shrinkwrap": null, "_spec": "glob@^5.0.13", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\cordova-common", + "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common", "author": { - "email": "i@izs.me", "name": "Isaac Z. Schlueter", + "email": "i@izs.me", "url": "http://blog.izs.me/" }, "bugs": { @@ -74,8 +83,8 @@ "main": "glob.js", "maintainers": [ { - "email": "i@izs.me", - "name": "isaacs" + "name": "isaacs", + "email": "i@izs.me" } ], "name": "glob", diff --git a/node_modules/inflight/package.json b/node_modules/inflight/package.json index 1a9acb193..734e580a6 100644 --- a/node_modules/inflight/package.json +++ b/node_modules/inflight/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "inflight@^1.0.4", - "D:\\Cordova\\cordova-android\\node_modules\\glob" + { + "raw": "inflight@^1.0.4", + "scope": null, + "escapedName": "inflight", + "name": "inflight", + "rawSpec": "^1.0.4", + "spec": ">=1.0.4 <2.0.0", + "type": "range" + }, + "d:\\cordova\\cordova-android\\node_modules\\glob" ] ], "_from": "inflight@>=1.0.4 <2.0.0", @@ -16,16 +24,17 @@ "tmp": "tmp/inflight-1.0.5.tgz_1463529611443_0.00041943578980863094" }, "_npmUser": { - "email": "kat@sykosomatic.org", - "name": "zkat" + "name": "zkat", + "email": "kat@sykosomatic.org" }, "_npmVersion": "3.9.1", "_phantomChildren": {}, "_requested": { - "name": "inflight", "raw": "inflight@^1.0.4", - "rawSpec": "^1.0.4", "scope": null, + "escapedName": "inflight", + "name": "inflight", + "rawSpec": "^1.0.4", "spec": ">=1.0.4 <2.0.0", "type": "range" }, @@ -36,10 +45,10 @@ "_shasum": "db3204cd5a9de2e6cd890b85c6e2f66bcf4f620a", "_shrinkwrap": null, "_spec": "inflight@^1.0.4", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\glob", + "_where": "d:\\cordova\\cordova-android\\node_modules\\glob", "author": { - "email": "i@izs.me", "name": "Isaac Z. Schlueter", + "email": "i@izs.me", "url": "http://blog.izs.me/" }, "bugs": { @@ -67,20 +76,20 @@ "main": "inflight.js", "maintainers": [ { - "email": "me@re-becca.org", - "name": "iarna" + "name": "iarna", + "email": "me@re-becca.org" }, { - "email": "i@izs.me", - "name": "isaacs" + "name": "isaacs", + "email": "i@izs.me" }, { - "email": "ogd@aoaioxxysz.net", - "name": "othiym23" + "name": "othiym23", + "email": "ogd@aoaioxxysz.net" }, { - "email": "kat@sykosomatic.org", - "name": "zkat" + "name": "zkat", + "email": "kat@sykosomatic.org" } ], "name": "inflight", diff --git a/node_modules/inherits/package.json b/node_modules/inherits/package.json index c41eaf2ee..7a8df25d0 100644 --- a/node_modules/inherits/package.json +++ b/node_modules/inherits/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "inherits@2", - "D:\\Cordova\\cordova-android\\node_modules\\glob" + { + "raw": "inherits@2", + "scope": null, + "escapedName": "inherits", + "name": "inherits", + "rawSpec": "2", + "spec": ">=2.0.0 <3.0.0", + "type": "range" + }, + "d:\\cordova\\cordova-android\\node_modules\\glob" ] ], "_from": "inherits@>=2.0.0 <3.0.0", @@ -11,16 +19,17 @@ "_installable": true, "_location": "/inherits", "_npmUser": { - "email": "i@izs.me", - "name": "isaacs" + "name": "isaacs", + "email": "i@izs.me" }, "_npmVersion": "1.3.8", "_phantomChildren": {}, "_requested": { - "name": "inherits", "raw": "inherits@2", - "rawSpec": "2", "scope": null, + "escapedName": "inherits", + "name": "inherits", + "rawSpec": "2", "spec": ">=2.0.0 <3.0.0", "type": "range" }, @@ -31,7 +40,7 @@ "_shasum": "b17d08d326b4423e568eff719f91b0b1cbdf69f1", "_shrinkwrap": null, "_spec": "inherits@2", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\glob", + "_where": "d:\\cordova\\cordova-android\\node_modules\\glob", "browser": "./inherits_browser.js", "bugs": { "url": "https://github.com/isaacs/inherits/issues" @@ -59,8 +68,8 @@ "main": "./inherits.js", "maintainers": [ { - "email": "i@izs.me", - "name": "isaacs" + "name": "isaacs", + "email": "i@izs.me" } ], "name": "inherits", diff --git a/node_modules/lodash/package.json b/node_modules/lodash/package.json index 4112d9ffd..d4de5b96d 100644 --- a/node_modules/lodash/package.json +++ b/node_modules/lodash/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "lodash@^3.5.0", - "D:\\Cordova\\cordova-android\\node_modules\\xmlbuilder" + { + "raw": "lodash@^3.5.0", + "scope": null, + "escapedName": "lodash", + "name": "lodash", + "rawSpec": "^3.5.0", + "spec": ">=3.5.0 <4.0.0", + "type": "range" + }, + "d:\\cordova\\cordova-android\\node_modules\\xmlbuilder" ] ], "_from": "lodash@>=3.5.0 <4.0.0", @@ -12,16 +20,17 @@ "_location": "/lodash", "_nodeVersion": "0.12.5", "_npmUser": { - "email": "john.david.dalton@gmail.com", - "name": "jdalton" + "name": "jdalton", + "email": "john.david.dalton@gmail.com" }, "_npmVersion": "2.13.1", "_phantomChildren": {}, "_requested": { - "name": "lodash", "raw": "lodash@^3.5.0", - "rawSpec": "^3.5.0", "scope": null, + "escapedName": "lodash", + "name": "lodash", + "rawSpec": "^3.5.0", "spec": ">=3.5.0 <4.0.0", "type": "range" }, @@ -32,10 +41,10 @@ "_shasum": "5bf45e8e49ba4189e17d482789dfd15bd140b7b6", "_shrinkwrap": null, "_spec": "lodash@^3.5.0", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\xmlbuilder", + "_where": "d:\\cordova\\cordova-android\\node_modules\\xmlbuilder", "author": { - "email": "john.david.dalton@gmail.com", "name": "John-David Dalton", + "email": "john.david.dalton@gmail.com", "url": "http://allyoucanleet.com/" }, "bugs": { @@ -43,28 +52,28 @@ }, "contributors": [ { - "email": "john.david.dalton@gmail.com", "name": "John-David Dalton", + "email": "john.david.dalton@gmail.com", "url": "http://allyoucanleet.com/" }, { - "email": "demoneaux@gmail.com", "name": "Benjamin Tan", + "email": "demoneaux@gmail.com", "url": "https://d10.github.io/" }, { - "email": "blaine@iceddev.com", "name": "Blaine Bublitz", + "email": "blaine@iceddev.com", "url": "http://www.iceddev.com/" }, { - "email": "github@kitcambridge.be", "name": "Kit Cambridge", + "email": "github@kitcambridge.be", "url": "http://kitcambridge.be/" }, { - "email": "mathias@qiwi.be", "name": "Mathias Bynens", + "email": "mathias@qiwi.be", "url": "https://mathiasbynens.be/" } ], @@ -87,24 +96,24 @@ "main": "index.js", "maintainers": [ { - "email": "john.david.dalton@gmail.com", - "name": "jdalton" + "name": "jdalton", + "email": "john.david.dalton@gmail.com" }, { - "email": "mathias@qiwi.be", - "name": "mathias" + "name": "mathias", + "email": "mathias@qiwi.be" }, { - "email": "blaine@iceddev.com", - "name": "phated" + "name": "phated", + "email": "blaine@iceddev.com" }, { - "email": "github@kitcambridge.be", - "name": "kitcambridge" + "name": "kitcambridge", + "email": "github@kitcambridge.be" }, { - "email": "demoneaux@gmail.com", - "name": "d10" + "name": "d10", + "email": "demoneaux@gmail.com" } ], "name": "lodash", diff --git a/node_modules/minimatch/README.md b/node_modules/minimatch/README.md index d458bc2e0..ad72b8133 100644 --- a/node_modules/minimatch/README.md +++ b/node_modules/minimatch/README.md @@ -2,7 +2,7 @@ A minimal matching utility. -[![Build Status](https://secure.travis-ci.org/isaacs/minimatch.png)](http://travis-ci.org/isaacs/minimatch) +[![Build Status](https://secure.travis-ci.org/isaacs/minimatch.svg)](http://travis-ci.org/isaacs/minimatch) This is the matching library used internally by npm. @@ -37,7 +37,7 @@ See: ## Minimatch Class -Create a minimatch object by instanting the `minimatch.Minimatch` class. +Create a minimatch object by instantiating the `minimatch.Minimatch` class. ```javascript var Minimatch = require("minimatch").Minimatch @@ -82,13 +82,6 @@ var mm = new Minimatch(pattern, options) All other methods are internal, and will be called as necessary. -## Functions - -The top-level exported function has a `cache` property, which is an LRU -cache set to store 100 items. So, calling these methods repeatedly -with the same pattern and options will use the same Minimatch object, -saving the cost of parsing it multiple times. - ### minimatch(path, pattern, options) Main export. Tests a path against the pattern using the options. diff --git a/node_modules/minimatch/minimatch.js b/node_modules/minimatch/minimatch.js index ec4c05c57..830a27246 100644 --- a/node_modules/minimatch/minimatch.js +++ b/node_modules/minimatch/minimatch.js @@ -235,7 +235,7 @@ function braceExpand (pattern, options) { ? this.pattern : pattern if (typeof pattern === 'undefined') { - throw new Error('undefined pattern') + throw new TypeError('undefined pattern') } if (options.nobrace || @@ -261,6 +261,10 @@ function braceExpand (pattern, options) { Minimatch.prototype.parse = parse var SUBPARSE = {} function parse (pattern, isSub) { + if (pattern.length > 1024 * 64) { + throw new TypeError('pattern is too long') + } + var options = this.options // shortcuts @@ -518,7 +522,7 @@ function parse (pattern, isSub) { for (pl = patternListStack.pop(); pl; pl = patternListStack.pop()) { var tail = re.slice(pl.reStart + 3) // maybe some even number of \, then maybe 1 \, followed by a | - tail = tail.replace(/((?:\\{2})*)(\\?)\|/g, function (_, $1, $2) { + tail = tail.replace(/((?:\\{2}){0,64})(\\?)\|/g, function (_, $1, $2) { if (!$2) { // the | isn't already escaped, so escape it. $2 = '\\' @@ -615,7 +619,15 @@ function parse (pattern, isSub) { } var flags = options.nocase ? 'i' : '' - var regExp = new RegExp('^' + re + '$', flags) + try { + var regExp = new RegExp('^' + re + '$', flags) + } catch (er) { + // If it was an invalid regular expression, then it can't match + // anything. This trick looks for a character after the end of + // the string, which is of course impossible, except in multi-line + // mode, but it's not a /m regex. + return new RegExp('$.') + } regExp._glob = pattern regExp._src = re diff --git a/node_modules/minimatch/package.json b/node_modules/minimatch/package.json index 9bbea2527..beed60634 100644 --- a/node_modules/minimatch/package.json +++ b/node_modules/minimatch/package.json @@ -1,27 +1,40 @@ { "_args": [ [ - "minimatch@^3.0.0", - "D:\\Cordova\\cordova-android\\node_modules\\cordova-common" + { + "raw": "minimatch@^3.0.0", + "scope": null, + "escapedName": "minimatch", + "name": "minimatch", + "rawSpec": "^3.0.0", + "spec": ">=3.0.0 <4.0.0", + "type": "range" + }, + "d:\\cordova\\cordova-android\\node_modules\\cordova-common" ] ], "_from": "minimatch@>=3.0.0 <4.0.0", - "_id": "minimatch@3.0.0", + "_id": "minimatch@3.0.2", "_inCache": true, "_installable": true, "_location": "/minimatch", - "_nodeVersion": "4.0.0", + "_nodeVersion": "4.4.4", + "_npmOperationalInternal": { + "host": "packages-16-east.internal.npmjs.com", + "tmp": "tmp/minimatch-3.0.2.tgz_1466194379770_0.11417287751100957" + }, "_npmUser": { - "email": "isaacs@npmjs.com", - "name": "isaacs" + "name": "isaacs", + "email": "i@izs.me" }, - "_npmVersion": "3.3.2", + "_npmVersion": "3.9.1", "_phantomChildren": {}, "_requested": { - "name": "minimatch", "raw": "minimatch@^3.0.0", - "rawSpec": "^3.0.0", "scope": null, + "escapedName": "minimatch", + "name": "minimatch", + "rawSpec": "^3.0.0", "spec": ">=3.0.0 <4.0.0", "type": "range" }, @@ -29,14 +42,14 @@ "/cordova-common", "/glob" ], - "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz", - "_shasum": "5236157a51e4f004c177fb3c527ff7dd78f0ef83", + "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz", + "_shasum": "0f398a7300ea441e9c348c83d98ab8c9dbf9c40a", "_shrinkwrap": null, "_spec": "minimatch@^3.0.0", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\cordova-common", + "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common", "author": { - "email": "i@izs.me", "name": "Isaac Z. Schlueter", + "email": "i@izs.me", "url": "http://blog.izs.me" }, "bugs": { @@ -48,12 +61,12 @@ "description": "a glob matcher in javascript", "devDependencies": { "standard": "^3.7.2", - "tap": "^1.2.0" + "tap": "^5.6.0" }, "directories": {}, "dist": { - "shasum": "5236157a51e4f004c177fb3c527ff7dd78f0ef83", - "tarball": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz" + "shasum": "0f398a7300ea441e9c348c83d98ab8c9dbf9c40a", + "tarball": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz" }, "engines": { "node": "*" @@ -61,14 +74,14 @@ "files": [ "minimatch.js" ], - "gitHead": "270dbea567f0af6918cb18103e98c612aa717a20", + "gitHead": "81edb7c763abd31ba981c87ec5e835f178786be0", "homepage": "https://github.com/isaacs/minimatch#readme", "license": "ISC", "main": "minimatch.js", "maintainers": [ { - "email": "i@izs.me", - "name": "isaacs" + "name": "isaacs", + "email": "i@izs.me" } ], "name": "minimatch", @@ -82,5 +95,5 @@ "posttest": "standard minimatch.js test/*.js", "test": "tap test/*.js" }, - "version": "3.0.0" + "version": "3.0.2" } diff --git a/node_modules/nopt/package.json b/node_modules/nopt/package.json index 7311054f8..84b9ff656 100644 --- a/node_modules/nopt/package.json +++ b/node_modules/nopt/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "nopt@^3.0.1", - "D:\\Cordova\\cordova-android" + { + "raw": "nopt@^3.0.1", + "scope": null, + "escapedName": "nopt", + "name": "nopt", + "rawSpec": "^3.0.1", + "spec": ">=3.0.1 <4.0.0", + "type": "range" + }, + "d:\\cordova\\cordova-android" ] ], "_from": "nopt@>=3.0.1 <4.0.0", @@ -12,16 +20,17 @@ "_location": "/nopt", "_nodeVersion": "4.2.1", "_npmUser": { - "email": "ogd@aoaioxxysz.net", - "name": "othiym23" + "name": "othiym23", + "email": "ogd@aoaioxxysz.net" }, "_npmVersion": "2.14.10", "_phantomChildren": {}, "_requested": { - "name": "nopt", "raw": "nopt@^3.0.1", - "rawSpec": "^3.0.1", "scope": null, + "escapedName": "nopt", + "name": "nopt", + "rawSpec": "^3.0.1", "spec": ">=3.0.1 <4.0.0", "type": "range" }, @@ -32,10 +41,10 @@ "_shasum": "c6465dbf08abcd4db359317f79ac68a646b28ff9", "_shrinkwrap": null, "_spec": "nopt@^3.0.1", - "_where": "D:\\Cordova\\cordova-android", + "_where": "d:\\cordova\\cordova-android", "author": { - "email": "i@izs.me", "name": "Isaac Z. Schlueter", + "email": "i@izs.me", "url": "http://blog.izs.me/" }, "bin": { @@ -62,16 +71,16 @@ "main": "lib/nopt.js", "maintainers": [ { - "email": "i@izs.me", - "name": "isaacs" + "name": "isaacs", + "email": "i@izs.me" }, { - "email": "ogd@aoaioxxysz.net", - "name": "othiym23" + "name": "othiym23", + "email": "ogd@aoaioxxysz.net" }, { - "email": "kat@sykosomatic.org", - "name": "zkat" + "name": "zkat", + "email": "kat@sykosomatic.org" } ], "name": "nopt", diff --git a/node_modules/once/package.json b/node_modules/once/package.json index 3555a6f84..4a9cde3dc 100644 --- a/node_modules/once/package.json +++ b/node_modules/once/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "once@^1.3.0", - "D:\\Cordova\\cordova-android\\node_modules\\glob" + { + "raw": "once@^1.3.0", + "scope": null, + "escapedName": "once", + "name": "once", + "rawSpec": "^1.3.0", + "spec": ">=1.3.0 <2.0.0", + "type": "range" + }, + "d:\\cordova\\cordova-android\\node_modules\\glob" ] ], "_from": "once@>=1.3.0 <2.0.0", @@ -12,16 +20,17 @@ "_location": "/once", "_nodeVersion": "4.0.0", "_npmUser": { - "email": "i@izs.me", - "name": "isaacs" + "name": "isaacs", + "email": "i@izs.me" }, "_npmVersion": "3.3.2", "_phantomChildren": {}, "_requested": { - "name": "once", "raw": "once@^1.3.0", - "rawSpec": "^1.3.0", "scope": null, + "escapedName": "once", + "name": "once", + "rawSpec": "^1.3.0", "spec": ">=1.3.0 <2.0.0", "type": "range" }, @@ -33,10 +42,10 @@ "_shasum": "b2e261557ce4c314ec8304f3fa82663e4297ca20", "_shrinkwrap": null, "_spec": "once@^1.3.0", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\glob", + "_where": "d:\\cordova\\cordova-android\\node_modules\\glob", "author": { - "email": "i@izs.me", "name": "Isaac Z. Schlueter", + "email": "i@izs.me", "url": "http://blog.izs.me/" }, "bugs": { @@ -71,8 +80,8 @@ "main": "once.js", "maintainers": [ { - "email": "i@izs.me", - "name": "isaacs" + "name": "isaacs", + "email": "i@izs.me" } ], "name": "once", diff --git a/node_modules/os-homedir/package.json b/node_modules/os-homedir/package.json index b5d73b1ae..98e05867f 100644 --- a/node_modules/os-homedir/package.json +++ b/node_modules/os-homedir/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "os-homedir@^1.0.0", - "D:\\Cordova\\cordova-android\\node_modules\\osenv" + { + "raw": "os-homedir@^1.0.0", + "scope": null, + "escapedName": "os-homedir", + "name": "os-homedir", + "rawSpec": "^1.0.0", + "spec": ">=1.0.0 <2.0.0", + "type": "range" + }, + "d:\\cordova\\cordova-android\\node_modules\\osenv" ] ], "_from": "os-homedir@>=1.0.0 <2.0.0", @@ -12,16 +20,17 @@ "_location": "/os-homedir", "_nodeVersion": "0.12.5", "_npmUser": { - "email": "sindresorhus@gmail.com", - "name": "sindresorhus" + "name": "sindresorhus", + "email": "sindresorhus@gmail.com" }, "_npmVersion": "2.11.2", "_phantomChildren": {}, "_requested": { - "name": "os-homedir", "raw": "os-homedir@^1.0.0", - "rawSpec": "^1.0.0", "scope": null, + "escapedName": "os-homedir", + "name": "os-homedir", + "rawSpec": "^1.0.0", "spec": ">=1.0.0 <2.0.0", "type": "range" }, @@ -32,10 +41,10 @@ "_shasum": "0d62bdf44b916fd3bbdcf2cab191948fb094f007", "_shrinkwrap": null, "_spec": "os-homedir@^1.0.0", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\osenv", + "_where": "d:\\cordova\\cordova-android\\node_modules\\osenv", "author": { - "email": "sindresorhus@gmail.com", "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", "url": "sindresorhus.com" }, "bugs": { @@ -78,8 +87,8 @@ "license": "MIT", "maintainers": [ { - "email": "sindresorhus@gmail.com", - "name": "sindresorhus" + "name": "sindresorhus", + "email": "sindresorhus@gmail.com" } ], "name": "os-homedir", diff --git a/node_modules/os-tmpdir/package.json b/node_modules/os-tmpdir/package.json index d1510c48c..a043645a2 100644 --- a/node_modules/os-tmpdir/package.json +++ b/node_modules/os-tmpdir/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "os-tmpdir@^1.0.0", - "D:\\Cordova\\cordova-android\\node_modules\\osenv" + { + "raw": "os-tmpdir@^1.0.0", + "scope": null, + "escapedName": "os-tmpdir", + "name": "os-tmpdir", + "rawSpec": "^1.0.0", + "spec": ">=1.0.0 <2.0.0", + "type": "range" + }, + "d:\\cordova\\cordova-android\\node_modules\\osenv" ] ], "_from": "os-tmpdir@>=1.0.0 <2.0.0", @@ -12,16 +20,17 @@ "_location": "/os-tmpdir", "_nodeVersion": "0.12.3", "_npmUser": { - "email": "sindresorhus@gmail.com", - "name": "sindresorhus" + "name": "sindresorhus", + "email": "sindresorhus@gmail.com" }, "_npmVersion": "2.9.1", "_phantomChildren": {}, "_requested": { - "name": "os-tmpdir", "raw": "os-tmpdir@^1.0.0", - "rawSpec": "^1.0.0", "scope": null, + "escapedName": "os-tmpdir", + "name": "os-tmpdir", + "rawSpec": "^1.0.0", "spec": ">=1.0.0 <2.0.0", "type": "range" }, @@ -32,10 +41,10 @@ "_shasum": "e9b423a1edaf479882562e92ed71d7743a071b6e", "_shrinkwrap": null, "_spec": "os-tmpdir@^1.0.0", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\osenv", + "_where": "d:\\cordova\\cordova-android\\node_modules\\osenv", "author": { - "email": "sindresorhus@gmail.com", "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", "url": "sindresorhus.com" }, "bugs": { @@ -78,8 +87,8 @@ "license": "MIT", "maintainers": [ { - "email": "sindresorhus@gmail.com", - "name": "sindresorhus" + "name": "sindresorhus", + "email": "sindresorhus@gmail.com" } ], "name": "os-tmpdir", diff --git a/node_modules/osenv/package.json b/node_modules/osenv/package.json index 88d4dcbeb..5b64a32d1 100644 --- a/node_modules/osenv/package.json +++ b/node_modules/osenv/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "osenv@^0.1.3", - "D:\\Cordova\\cordova-android\\node_modules\\cordova-common" + { + "raw": "osenv@^0.1.3", + "scope": null, + "escapedName": "osenv", + "name": "osenv", + "rawSpec": "^0.1.3", + "spec": ">=0.1.3 <0.2.0", + "type": "range" + }, + "d:\\cordova\\cordova-android\\node_modules\\cordova-common" ] ], "_from": "osenv@>=0.1.3 <0.2.0", @@ -12,16 +20,17 @@ "_location": "/osenv", "_nodeVersion": "2.2.1", "_npmUser": { - "email": "isaacs@npmjs.com", - "name": "isaacs" + "name": "isaacs", + "email": "isaacs@npmjs.com" }, "_npmVersion": "3.0.0", "_phantomChildren": {}, "_requested": { - "name": "osenv", "raw": "osenv@^0.1.3", - "rawSpec": "^0.1.3", "scope": null, + "escapedName": "osenv", + "name": "osenv", + "rawSpec": "^0.1.3", "spec": ">=0.1.3 <0.2.0", "type": "range" }, @@ -32,10 +41,10 @@ "_shasum": "83cf05c6d6458fc4d5ac6362ea325d92f2754217", "_shrinkwrap": null, "_spec": "osenv@^0.1.3", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\cordova-common", + "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common", "author": { - "email": "i@izs.me", "name": "Isaac Z. Schlueter", + "email": "i@izs.me", "url": "http://blog.izs.me/" }, "bugs": { @@ -71,20 +80,20 @@ "main": "osenv.js", "maintainers": [ { - "email": "i@izs.me", - "name": "isaacs" + "name": "isaacs", + "email": "i@izs.me" }, { - "email": "rok@kowalski.gd", - "name": "robertkowalski" + "name": "robertkowalski", + "email": "rok@kowalski.gd" }, { - "email": "ogd@aoaioxxysz.net", - "name": "othiym23" + "name": "othiym23", + "email": "ogd@aoaioxxysz.net" }, { - "email": "me@re-becca.org", - "name": "iarna" + "name": "iarna", + "email": "me@re-becca.org" } ], "name": "osenv", diff --git a/node_modules/path-is-absolute/package.json b/node_modules/path-is-absolute/package.json index 54cb86826..17d2e1c4b 100644 --- a/node_modules/path-is-absolute/package.json +++ b/node_modules/path-is-absolute/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "path-is-absolute@^1.0.0", - "D:\\Cordova\\cordova-android\\node_modules\\glob" + { + "raw": "path-is-absolute@^1.0.0", + "scope": null, + "escapedName": "path-is-absolute", + "name": "path-is-absolute", + "rawSpec": "^1.0.0", + "spec": ">=1.0.0 <2.0.0", + "type": "range" + }, + "d:\\cordova\\cordova-android\\node_modules\\glob" ] ], "_from": "path-is-absolute@>=1.0.0 <2.0.0", @@ -12,16 +20,17 @@ "_location": "/path-is-absolute", "_nodeVersion": "0.12.0", "_npmUser": { - "email": "sindresorhus@gmail.com", - "name": "sindresorhus" + "name": "sindresorhus", + "email": "sindresorhus@gmail.com" }, "_npmVersion": "2.5.1", "_phantomChildren": {}, "_requested": { - "name": "path-is-absolute", "raw": "path-is-absolute@^1.0.0", - "rawSpec": "^1.0.0", "scope": null, + "escapedName": "path-is-absolute", + "name": "path-is-absolute", + "rawSpec": "^1.0.0", "spec": ">=1.0.0 <2.0.0", "type": "range" }, @@ -32,10 +41,10 @@ "_shasum": "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912", "_shrinkwrap": null, "_spec": "path-is-absolute@^1.0.0", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\glob", + "_where": "d:\\cordova\\cordova-android\\node_modules\\glob", "author": { - "email": "sindresorhus@gmail.com", "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", "url": "sindresorhus.com" }, "bugs": { @@ -79,8 +88,8 @@ "license": "MIT", "maintainers": [ { - "email": "sindresorhus@gmail.com", - "name": "sindresorhus" + "name": "sindresorhus", + "email": "sindresorhus@gmail.com" } ], "name": "path-is-absolute", diff --git a/node_modules/plist/package.json b/node_modules/plist/package.json index 246883be4..b2031f07b 100644 --- a/node_modules/plist/package.json +++ b/node_modules/plist/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "plist@^1.2.0", - "D:\\Cordova\\cordova-android\\node_modules\\cordova-common" + { + "raw": "plist@^1.2.0", + "scope": null, + "escapedName": "plist", + "name": "plist", + "rawSpec": "^1.2.0", + "spec": ">=1.2.0 <2.0.0", + "type": "range" + }, + "d:\\cordova\\cordova-android\\node_modules\\cordova-common" ] ], "_from": "plist@>=1.2.0 <2.0.0", @@ -12,16 +20,17 @@ "_location": "/plist", "_nodeVersion": "5.0.0", "_npmUser": { - "email": "reinstein.mike@gmail.com", - "name": "mreinstein" + "name": "mreinstein", + "email": "reinstein.mike@gmail.com" }, "_npmVersion": "3.3.11", "_phantomChildren": {}, "_requested": { - "name": "plist", "raw": "plist@^1.2.0", - "rawSpec": "^1.2.0", "scope": null, + "escapedName": "plist", + "name": "plist", + "rawSpec": "^1.2.0", "spec": ">=1.2.0 <2.0.0", "type": "range" }, @@ -32,25 +41,25 @@ "_shasum": "084b5093ddc92506e259f874b8d9b1afb8c79593", "_shrinkwrap": null, "_spec": "plist@^1.2.0", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\cordova-common", + "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common", "author": { - "email": "nathan@tootallnate.net", - "name": "Nathan Rajlich" + "name": "Nathan Rajlich", + "email": "nathan@tootallnate.net" }, "bugs": { "url": "https://github.com/TooTallNate/node-plist/issues" }, "contributors": [ { - "email": "hans.huebner@gmail.com", - "name": "Hans Huebner" + "name": "Hans Huebner", + "email": "hans.huebner@gmail.com" }, { "name": "Pierre Metrailler" }, { - "email": "reinstein.mike@gmail.com", - "name": "Mike Reinstein" + "name": "Mike Reinstein", + "email": "reinstein.mike@gmail.com" }, { "name": "Vladimir Tsvang" @@ -91,16 +100,16 @@ "main": "lib/plist.js", "maintainers": [ { - "email": "nathan@tootallnate.net", - "name": "TooTallNate" + "name": "TooTallNate", + "email": "nathan@tootallnate.net" }, { - "email": "nathan@tootallnate.net", - "name": "tootallnate" + "name": "tootallnate", + "email": "nathan@tootallnate.net" }, { - "email": "reinstein.mike@gmail.com", - "name": "mreinstein" + "name": "mreinstein", + "email": "reinstein.mike@gmail.com" } ], "name": "plist", diff --git a/node_modules/properties-parser/package.json b/node_modules/properties-parser/package.json index a8dc2d592..7582f58dc 100644 --- a/node_modules/properties-parser/package.json +++ b/node_modules/properties-parser/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "properties-parser@^0.2.3", - "D:\\Cordova\\cordova-android" + { + "raw": "properties-parser@^0.2.3", + "scope": null, + "escapedName": "properties-parser", + "name": "properties-parser", + "rawSpec": "^0.2.3", + "spec": ">=0.2.3 <0.3.0", + "type": "range" + }, + "d:\\cordova\\cordova-android" ] ], "_from": "properties-parser@>=0.2.3 <0.3.0", @@ -11,16 +19,17 @@ "_installable": true, "_location": "/properties-parser", "_npmUser": { - "email": "xavi.rmz@gmail.com", - "name": "xavi" + "name": "xavi", + "email": "xavi.rmz@gmail.com" }, "_npmVersion": "1.3.23", "_phantomChildren": {}, "_requested": { - "name": "properties-parser", "raw": "properties-parser@^0.2.3", - "rawSpec": "^0.2.3", "scope": null, + "escapedName": "properties-parser", + "name": "properties-parser", + "rawSpec": "^0.2.3", "spec": ">=0.2.3 <0.3.0", "type": "range" }, @@ -31,7 +40,7 @@ "_shasum": "f7591255f707abbff227c7b56b637dbb0373a10f", "_shrinkwrap": null, "_spec": "properties-parser@^0.2.3", - "_where": "D:\\Cordova\\cordova-android", + "_where": "d:\\cordova\\cordova-android", "bugs": { "url": "https://github.com/xavi-/node-properties-parser/issues" }, @@ -41,7 +50,7 @@ "directories": {}, "dist": { "shasum": "f7591255f707abbff227c7b56b637dbb0373a10f", - "tarball": "http://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz" + "tarball": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz" }, "engines": { "node": ">= 0.3.1" @@ -58,8 +67,8 @@ "main": "./index.js", "maintainers": [ { - "email": "xavi.rmz@gmail.com", - "name": "xavi" + "name": "xavi", + "email": "xavi.rmz@gmail.com" } ], "name": "properties-parser", diff --git a/node_modules/q/package.json b/node_modules/q/package.json index 68a33d7b3..3eb1e8924 100644 --- a/node_modules/q/package.json +++ b/node_modules/q/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "q@^1.4.1", - "D:\\Cordova\\cordova-android" + { + "raw": "q@^1.4.1", + "scope": null, + "escapedName": "q", + "name": "q", + "rawSpec": "^1.4.1", + "spec": ">=1.4.1 <2.0.0", + "type": "range" + }, + "d:\\cordova\\cordova-android" ] ], "_from": "q@>=1.4.1 <2.0.0", @@ -12,16 +20,17 @@ "_location": "/q", "_nodeVersion": "1.8.1", "_npmUser": { - "email": "kris.kowal@cixar.com", - "name": "kriskowal" + "name": "kriskowal", + "email": "kris.kowal@cixar.com" }, "_npmVersion": "2.8.3", "_phantomChildren": {}, "_requested": { - "name": "q", "raw": "q@^1.4.1", - "rawSpec": "^1.4.1", "scope": null, + "escapedName": "q", + "name": "q", + "rawSpec": "^1.4.1", "spec": ">=1.4.1 <2.0.0", "type": "range" }, @@ -33,10 +42,10 @@ "_shasum": "55705bcd93c5f3673530c2c2cbc0c2b3addc286e", "_shrinkwrap": null, "_spec": "q@^1.4.1", - "_where": "D:\\Cordova\\cordova-android", + "_where": "d:\\cordova\\cordova-android", "author": { - "email": "kris@cixar.com", "name": "Kris Kowal", + "email": "kris@cixar.com", "url": "https://github.com/kriskowal" }, "bugs": { @@ -44,18 +53,18 @@ }, "contributors": [ { - "email": "kris@cixar.com", "name": "Kris Kowal", + "email": "kris@cixar.com", "url": "https://github.com/kriskowal" }, { - "email": "rfobic@gmail.com", "name": "Irakli Gozalishvili", + "email": "rfobic@gmail.com", "url": "http://jeditoolkit.com" }, { - "email": "domenic@domenicdenicola.com", "name": "Domenic Denicola", + "email": "domenic@domenicdenicola.com", "url": "http://domenicdenicola.com" } ], @@ -111,12 +120,12 @@ "main": "q.js", "maintainers": [ { - "email": "kris.kowal@cixar.com", - "name": "kriskowal" + "name": "kriskowal", + "email": "kris.kowal@cixar.com" }, { - "email": "domenic@domenicdenicola.com", - "name": "domenic" + "name": "domenic", + "email": "domenic@domenicdenicola.com" } ], "name": "q", diff --git a/node_modules/sax/package.json b/node_modules/sax/package.json index 11d37abe0..f36e6211c 100644 --- a/node_modules/sax/package.json +++ b/node_modules/sax/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "sax@0.3.5", - "D:\\Cordova\\cordova-android\\node_modules\\elementtree" + { + "raw": "sax@0.3.5", + "scope": null, + "escapedName": "sax", + "name": "sax", + "rawSpec": "0.3.5", + "spec": "0.3.5", + "type": "version" + }, + "d:\\cordova\\cordova-android\\node_modules\\elementtree" ] ], "_defaultsLoaded": true, @@ -14,16 +22,17 @@ "_location": "/sax", "_nodeVersion": "v0.6.7-pre", "_npmUser": { - "email": "i@izs.me", - "name": "isaacs" + "name": "isaacs", + "email": "i@izs.me" }, "_npmVersion": "1.1.0-beta-7", "_phantomChildren": {}, "_requested": { - "name": "sax", "raw": "sax@0.3.5", - "rawSpec": "0.3.5", "scope": null, + "escapedName": "sax", + "name": "sax", + "rawSpec": "0.3.5", "spec": "0.3.5", "type": "version" }, @@ -34,10 +43,10 @@ "_shasum": "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d", "_shrinkwrap": null, "_spec": "sax@0.3.5", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\elementtree", + "_where": "d:\\cordova\\cordova-android\\node_modules\\elementtree", "author": { - "email": "i@izs.me", "name": "Isaac Z. Schlueter", + "email": "i@izs.me", "url": "http://blog.izs.me/" }, "bugs": { @@ -45,36 +54,36 @@ }, "contributors": [ { - "email": "i@izs.me", - "name": "Isaac Z. Schlueter" + "name": "Isaac Z. Schlueter", + "email": "i@izs.me" }, { - "email": "stein@hustad.com", - "name": "Stein Martin Hustad" + "name": "Stein Martin Hustad", + "email": "stein@hustad.com" }, { - "email": "mikeal.rogers@gmail.com", - "name": "Mikeal Rogers" + "name": "Mikeal Rogers", + "email": "mikeal.rogers@gmail.com" }, { - "email": "laurie@holoweb.net", - "name": "Laurie Harper" + "name": "Laurie Harper", + "email": "laurie@holoweb.net" }, { - "email": "jann@Jann-PC.fritz.box", - "name": "Jann Horn" + "name": "Jann Horn", + "email": "jann@Jann-PC.fritz.box" }, { - "email": "tmpvar@gmail.com", - "name": "Elijah Insua" + "name": "Elijah Insua", + "email": "tmpvar@gmail.com" }, { - "email": "henryr@schakra.com", - "name": "Henry Rawas" + "name": "Henry Rawas", + "email": "henryr@schakra.com" }, { - "email": "jmpublic@makeig.com", - "name": "Justin Makeig" + "name": "Justin Makeig", + "email": "jmpublic@makeig.com" } ], "dependencies": {}, @@ -96,8 +105,8 @@ "main": "lib/sax.js", "maintainers": [ { - "email": "i@izs.me", - "name": "isaacs" + "name": "isaacs", + "email": "i@izs.me" } ], "name": "sax", diff --git a/node_modules/semver/.npmignore b/node_modules/semver/.npmignore deleted file mode 100644 index 534108e3f..000000000 --- a/node_modules/semver/.npmignore +++ /dev/null @@ -1,4 +0,0 @@ -node_modules/ -coverage/ -.nyc_output/ -nyc_output/ diff --git a/node_modules/semver/.travis.yml b/node_modules/semver/.travis.yml deleted file mode 100644 index 991d04b6e..000000000 --- a/node_modules/semver/.travis.yml +++ /dev/null @@ -1,5 +0,0 @@ -language: node_js -node_js: - - '0.10' - - '0.12' - - 'iojs' diff --git a/node_modules/semver/README.md b/node_modules/semver/README.md index 0b14a7e81..27b044ecd 100644 --- a/node_modules/semver/README.md +++ b/node_modules/semver/README.md @@ -16,18 +16,35 @@ As a command-line utility: $ semver -h - Usage: semver [ [...]] [-r | -i | --preid | -l | -rv] - Test if version(s) satisfy the supplied range(s), and sort them. + SemVer 5.1.0 - Multiple versions or ranges may be supplied, unless increment - option is specified. In that case, only a single version may - be used, and it is incremented by the specified level + A JavaScript implementation of the http://semver.org/ specification + Copyright Isaac Z. Schlueter + + Usage: semver [options] [ [...]] + Prints valid versions sorted by SemVer precedence + + Options: + -r --range + Print versions that match the specified range. + + -i --increment [] + Increment a version by the specified level. Level can + be one of: major, minor, patch, premajor, preminor, + prepatch, or prerelease. Default level is 'patch'. + Only one version may be specified. + + --preid + Identifier to be used to prefix premajor, preminor, + prepatch or prerelease version increments. + + -l --loose + Interpret versions and ranges loosely Program exits successfully if any valid version satisfies all supplied ranges, and prints all satisfying versions. - If no versions are valid, or ranges are not satisfied, - then exits failure. + If no satisfying versions are found, then exits failure. Versions are printed in ascending order, so supplying multiple versions to the utility will just sort them. @@ -242,7 +259,7 @@ simple ::= primitive | partial | tilde | caret primitive ::= ( '<' | '>' | '>=' | '<=' | '=' | ) partial partial ::= xr ( '.' xr ( '.' xr qualifier ? )? )? xr ::= 'x' | 'X' | '*' | nr -nr ::= '0' | ['1'-'9']['0'-'9']+ +nr ::= '0' | ['1'-'9'] ( ['0'-'9'] ) * tilde ::= '~' partial caret ::= '^' partial qualifier ::= ( '-' pre )? ( '+' build )? @@ -272,6 +289,8 @@ strings that they parse. same as `prepatch`. It increments the patch version, then makes a prerelease. If the input version is already a prerelease it simply increments it. +* `prerelease(v)`: Returns an array of prerelease components, or null + if none exist. Example: `prerelease('1.2.3-alpha.1') -> ['alpha', 1]` * `major(v)`: Return the major version number. * `minor(v)`: Return the minor version number. * `patch(v)`: Return the patch version number. diff --git a/node_modules/semver/package.json b/node_modules/semver/package.json index a27cc877c..aba476575 100644 --- a/node_modules/semver/package.json +++ b/node_modules/semver/package.json @@ -1,38 +1,51 @@ { "_args": [ [ - "semver@^5.0.1", - "D:\\Cordova\\cordova-android\\node_modules\\cordova-common" + { + "raw": "semver@^5.0.1", + "scope": null, + "escapedName": "semver", + "name": "semver", + "rawSpec": "^5.0.1", + "spec": ">=5.0.1 <6.0.0", + "type": "range" + }, + "d:\\cordova\\cordova-android\\node_modules\\cordova-common" ] ], "_from": "semver@>=5.0.1 <6.0.0", - "_id": "semver@5.1.0", + "_id": "semver@5.2.0", "_inCache": true, "_installable": true, "_location": "/semver", - "_nodeVersion": "4.0.0", + "_nodeVersion": "4.4.4", + "_npmOperationalInternal": { + "host": "packages-12-west.internal.npmjs.com", + "tmp": "tmp/semver-5.2.0.tgz_1467136841238_0.2250258030835539" + }, "_npmUser": { - "email": "i@izs.me", - "name": "isaacs" + "name": "isaacs", + "email": "i@izs.me" }, - "_npmVersion": "3.3.2", + "_npmVersion": "3.10.2", "_phantomChildren": {}, "_requested": { - "name": "semver", "raw": "semver@^5.0.1", - "rawSpec": "^5.0.1", "scope": null, + "escapedName": "semver", + "name": "semver", + "rawSpec": "^5.0.1", "spec": ">=5.0.1 <6.0.0", "type": "range" }, "_requiredBy": [ "/cordova-common" ], - "_resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz", - "_shasum": "85f2cf8550465c4df000cf7d86f6b054106ab9e5", + "_resolved": "https://registry.npmjs.org/semver/-/semver-5.2.0.tgz", + "_shasum": "281995b80c1448209415ddbc4cf50c269cef55c5", "_shrinkwrap": null, "_spec": "semver@^5.0.1", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\cordova-common", + "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common", "bin": { "semver": "./bin/semver" }, @@ -46,21 +59,26 @@ }, "directories": {}, "dist": { - "shasum": "85f2cf8550465c4df000cf7d86f6b054106ab9e5", - "tarball": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz" + "shasum": "281995b80c1448209415ddbc4cf50c269cef55c5", + "tarball": "https://registry.npmjs.org/semver/-/semver-5.2.0.tgz" }, - "gitHead": "8e33a30e62e40e4983d1c5f55e794331b861aadc", + "files": [ + "bin", + "range.bnf", + "semver.js" + ], + "gitHead": "f7fef36765c53ebe237bf415c3ea002f24aa5621", "homepage": "https://github.com/npm/node-semver#readme", "license": "ISC", "main": "semver.js", "maintainers": [ { - "email": "isaacs@npmjs.com", - "name": "isaacs" + "name": "isaacs", + "email": "isaacs@npmjs.com" }, { - "email": "ogd@aoaioxxysz.net", - "name": "othiym23" + "name": "othiym23", + "email": "ogd@aoaioxxysz.net" } ], "name": "semver", @@ -73,5 +91,5 @@ "scripts": { "test": "tap test/*.js" }, - "version": "5.1.0" + "version": "5.2.0" } diff --git a/node_modules/semver/range.bnf b/node_modules/semver/range.bnf index 000df923a..25ebd5c83 100644 --- a/node_modules/semver/range.bnf +++ b/node_modules/semver/range.bnf @@ -6,7 +6,7 @@ simple ::= primitive | partial | tilde | caret primitive ::= ( '<' | '>' | '>=' | '<=' | '=' | ) partial partial ::= xr ( '.' xr ( '.' xr qualifier ? )? )? xr ::= 'x' | 'X' | '*' | nr -nr ::= '0' | ['1'-'9']['0'-'9']+ +nr ::= '0' | ['1'-'9'] ( ['0'-'9'] ) * tilde ::= '~' partial caret ::= '^' partial qualifier ::= ( '-' pre )? ( '+' build )? diff --git a/node_modules/semver/semver.js b/node_modules/semver/semver.js index 71795f6f0..b2d7298c6 100644 --- a/node_modules/semver/semver.js +++ b/node_modules/semver/semver.js @@ -836,7 +836,7 @@ function replaceTilde(comp, loose) { else if (isX(m)) ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0'; else if (isX(p)) - // ~1.2 == >=1.2.0- <1.3.0- + // ~1.2 == >=1.2.0 <1.3.0 ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0'; else if (pr) { debug('replaceTilde pr', pr); @@ -1186,3 +1186,9 @@ function outside(version, range, hilo, loose) { } return true; } + +exports.prerelease = prerelease; +function prerelease(version, loose) { + var parsed = parse(version, loose); + return (parsed && parsed.prerelease.length) ? parsed.prerelease : null; +} diff --git a/node_modules/semver/test/big-numbers.js b/node_modules/semver/test/big-numbers.js deleted file mode 100644 index c051864bc..000000000 --- a/node_modules/semver/test/big-numbers.js +++ /dev/null @@ -1,31 +0,0 @@ -var test = require('tap').test -var semver = require('../') - -test('long version is too long', function (t) { - var v = '1.2.' + new Array(256).join('1') - t.throws(function () { - new semver.SemVer(v) - }) - t.equal(semver.valid(v, false), null) - t.equal(semver.valid(v, true), null) - t.equal(semver.inc(v, 'patch'), null) - t.end() -}) - -test('big number is like too long version', function (t) { - var v = '1.2.' + new Array(100).join('1') - t.throws(function () { - new semver.SemVer(v) - }) - t.equal(semver.valid(v, false), null) - t.equal(semver.valid(v, true), null) - t.equal(semver.inc(v, 'patch'), null) - t.end() -}) - -test('parsing null does not throw', function (t) { - t.equal(semver.parse(null), null) - t.equal(semver.parse({}), null) - t.equal(semver.parse(new semver.SemVer('1.2.3')).version, '1.2.3') - t.end() -}) diff --git a/node_modules/semver/test/clean.js b/node_modules/semver/test/clean.js deleted file mode 100644 index 9e268de95..000000000 --- a/node_modules/semver/test/clean.js +++ /dev/null @@ -1,29 +0,0 @@ -var tap = require('tap'); -var test = tap.test; -var semver = require('../semver.js'); -var clean = semver.clean; - -test('\nclean tests', function(t) { - // [range, version] - // Version should be detectable despite extra characters - [ - ['1.2.3', '1.2.3'], - [' 1.2.3 ', '1.2.3'], - [' 1.2.3-4 ', '1.2.3-4'], - [' 1.2.3-pre ', '1.2.3-pre'], - [' =v1.2.3 ', '1.2.3'], - ['v1.2.3', '1.2.3'], - [' v1.2.3 ', '1.2.3'], - ['\t1.2.3', '1.2.3'], - ['>1.2.3', null], - ['~1.2.3', null], - ['<=1.2.3', null], - ['1.2.x', null] - ].forEach(function(tuple) { - var range = tuple[0]; - var version = tuple[1]; - var msg = 'clean(' + range + ') = ' + version; - t.equal(clean(range), version, msg); - }); - t.end(); -}); diff --git a/node_modules/semver/test/gtr.js b/node_modules/semver/test/gtr.js deleted file mode 100644 index bbb87896c..000000000 --- a/node_modules/semver/test/gtr.js +++ /dev/null @@ -1,173 +0,0 @@ -var tap = require('tap'); -var test = tap.test; -var semver = require('../semver.js'); -var gtr = semver.gtr; - -test('\ngtr tests', function(t) { - // [range, version, loose] - // Version should be greater than range - [ - ['~1.2.2', '1.3.0'], - ['~0.6.1-1', '0.7.1-1'], - ['1.0.0 - 2.0.0', '2.0.1'], - ['1.0.0', '1.0.1-beta1'], - ['1.0.0', '2.0.0'], - ['<=2.0.0', '2.1.1'], - ['<=2.0.0', '3.2.9'], - ['<2.0.0', '2.0.0'], - ['0.1.20 || 1.2.4', '1.2.5'], - ['2.x.x', '3.0.0'], - ['1.2.x', '1.3.0'], - ['1.2.x || 2.x', '3.0.0'], - ['2.*.*', '5.0.1'], - ['1.2.*', '1.3.3'], - ['1.2.* || 2.*', '4.0.0'], - ['2', '3.0.0'], - ['2.3', '2.4.2'], - ['~2.4', '2.5.0'], // >=2.4.0 <2.5.0 - ['~2.4', '2.5.5'], - ['~>3.2.1', '3.3.0'], // >=3.2.1 <3.3.0 - ['~1', '2.2.3'], // >=1.0.0 <2.0.0 - ['~>1', '2.2.4'], - ['~> 1', '3.2.3'], - ['~1.0', '1.1.2'], // >=1.0.0 <1.1.0 - ['~ 1.0', '1.1.0'], - ['<1.2', '1.2.0'], - ['< 1.2', '1.2.1'], - ['1', '2.0.0beta', true], - ['~v0.5.4-pre', '0.6.0'], - ['~v0.5.4-pre', '0.6.1-pre'], - ['=0.7.x', '0.8.0'], - ['=0.7.x', '0.8.0-asdf'], - ['<0.7.x', '0.7.0'], - ['~1.2.2', '1.3.0'], - ['1.0.0 - 2.0.0', '2.2.3'], - ['1.0.0', '1.0.1'], - ['<=2.0.0', '3.0.0'], - ['<=2.0.0', '2.9999.9999'], - ['<=2.0.0', '2.2.9'], - ['<2.0.0', '2.9999.9999'], - ['<2.0.0', '2.2.9'], - ['2.x.x', '3.1.3'], - ['1.2.x', '1.3.3'], - ['1.2.x || 2.x', '3.1.3'], - ['2.*.*', '3.1.3'], - ['1.2.*', '1.3.3'], - ['1.2.* || 2.*', '3.1.3'], - ['2', '3.1.2'], - ['2.3', '2.4.1'], - ['~2.4', '2.5.0'], // >=2.4.0 <2.5.0 - ['~>3.2.1', '3.3.2'], // >=3.2.1 <3.3.0 - ['~1', '2.2.3'], // >=1.0.0 <2.0.0 - ['~>1', '2.2.3'], - ['~1.0', '1.1.0'], // >=1.0.0 <1.1.0 - ['<1', '1.0.0'], - ['1', '2.0.0beta', true], - ['<1', '1.0.0beta', true], - ['< 1', '1.0.0beta', true], - ['=0.7.x', '0.8.2'], - ['<0.7.x', '0.7.2'] - ].forEach(function(tuple) { - var range = tuple[0]; - var version = tuple[1]; - var loose = tuple[2] || false; - var msg = 'gtr(' + version + ', ' + range + ', ' + loose + ')'; - t.ok(gtr(version, range, loose), msg); - }); - t.end(); -}); - -test('\nnegative gtr tests', function(t) { - // [range, version, loose] - // Version should NOT be greater than range - [ - ['~0.6.1-1', '0.6.1-1'], - ['1.0.0 - 2.0.0', '1.2.3'], - ['1.0.0 - 2.0.0', '0.9.9'], - ['1.0.0', '1.0.0'], - ['>=*', '0.2.4'], - ['', '1.0.0', true], - ['*', '1.2.3'], - ['*', 'v1.2.3-foo'], - ['>=1.0.0', '1.0.0'], - ['>=1.0.0', '1.0.1'], - ['>=1.0.0', '1.1.0'], - ['>1.0.0', '1.0.1'], - ['>1.0.0', '1.1.0'], - ['<=2.0.0', '2.0.0'], - ['<=2.0.0', '1.9999.9999'], - ['<=2.0.0', '0.2.9'], - ['<2.0.0', '1.9999.9999'], - ['<2.0.0', '0.2.9'], - ['>= 1.0.0', '1.0.0'], - ['>= 1.0.0', '1.0.1'], - ['>= 1.0.0', '1.1.0'], - ['> 1.0.0', '1.0.1'], - ['> 1.0.0', '1.1.0'], - ['<= 2.0.0', '2.0.0'], - ['<= 2.0.0', '1.9999.9999'], - ['<= 2.0.0', '0.2.9'], - ['< 2.0.0', '1.9999.9999'], - ['<\t2.0.0', '0.2.9'], - ['>=0.1.97', 'v0.1.97'], - ['>=0.1.97', '0.1.97'], - ['0.1.20 || 1.2.4', '1.2.4'], - ['0.1.20 || >1.2.4', '1.2.4'], - ['0.1.20 || 1.2.4', '1.2.3'], - ['0.1.20 || 1.2.4', '0.1.20'], - ['>=0.2.3 || <0.0.1', '0.0.0'], - ['>=0.2.3 || <0.0.1', '0.2.3'], - ['>=0.2.3 || <0.0.1', '0.2.4'], - ['||', '1.3.4'], - ['2.x.x', '2.1.3'], - ['1.2.x', '1.2.3'], - ['1.2.x || 2.x', '2.1.3'], - ['1.2.x || 2.x', '1.2.3'], - ['x', '1.2.3'], - ['2.*.*', '2.1.3'], - ['1.2.*', '1.2.3'], - ['1.2.* || 2.*', '2.1.3'], - ['1.2.* || 2.*', '1.2.3'], - ['1.2.* || 2.*', '1.2.3'], - ['*', '1.2.3'], - ['2', '2.1.2'], - ['2.3', '2.3.1'], - ['~2.4', '2.4.0'], // >=2.4.0 <2.5.0 - ['~2.4', '2.4.5'], - ['~>3.2.1', '3.2.2'], // >=3.2.1 <3.3.0 - ['~1', '1.2.3'], // >=1.0.0 <2.0.0 - ['~>1', '1.2.3'], - ['~> 1', '1.2.3'], - ['~1.0', '1.0.2'], // >=1.0.0 <1.1.0 - ['~ 1.0', '1.0.2'], - ['>=1', '1.0.0'], - ['>= 1', '1.0.0'], - ['<1.2', '1.1.1'], - ['< 1.2', '1.1.1'], - ['1', '1.0.0beta', true], - ['~v0.5.4-pre', '0.5.5'], - ['~v0.5.4-pre', '0.5.4'], - ['=0.7.x', '0.7.2'], - ['>=0.7.x', '0.7.2'], - ['=0.7.x', '0.7.0-asdf'], - ['>=0.7.x', '0.7.0-asdf'], - ['<=0.7.x', '0.6.2'], - ['>0.2.3 >0.2.4 <=0.2.5', '0.2.5'], - ['>=0.2.3 <=0.2.4', '0.2.4'], - ['1.0.0 - 2.0.0', '2.0.0'], - ['^1', '0.0.0-0'], - ['^3.0.0', '2.0.0'], - ['^1.0.0 || ~2.0.1', '2.0.0'], - ['^0.1.0 || ~3.0.1 || 5.0.0', '3.2.0'], - ['^0.1.0 || ~3.0.1 || 5.0.0', '1.0.0beta', true], - ['^0.1.0 || ~3.0.1 || 5.0.0', '5.0.0-0', true], - ['^0.1.0 || ~3.0.1 || >4 <=5.0.0', '3.5.0'] - ].forEach(function(tuple) { - var range = tuple[0]; - var version = tuple[1]; - var loose = tuple[2] || false; - var msg = '!gtr(' + version + ', ' + range + ', ' + loose + ')'; - t.notOk(gtr(version, range, loose), msg); - }); - t.end(); -}); diff --git a/node_modules/semver/test/index.js b/node_modules/semver/test/index.js deleted file mode 100644 index 47c3f5f95..000000000 --- a/node_modules/semver/test/index.js +++ /dev/null @@ -1,698 +0,0 @@ -'use strict'; - -var tap = require('tap'); -var test = tap.test; -var semver = require('../semver.js'); -var eq = semver.eq; -var gt = semver.gt; -var lt = semver.lt; -var neq = semver.neq; -var cmp = semver.cmp; -var gte = semver.gte; -var lte = semver.lte; -var satisfies = semver.satisfies; -var validRange = semver.validRange; -var inc = semver.inc; -var diff = semver.diff; -var replaceStars = semver.replaceStars; -var toComparators = semver.toComparators; -var SemVer = semver.SemVer; -var Range = semver.Range; - -test('\ncomparison tests', function(t) { - // [version1, version2] - // version1 should be greater than version2 - [['0.0.0', '0.0.0-foo'], - ['0.0.1', '0.0.0'], - ['1.0.0', '0.9.9'], - ['0.10.0', '0.9.0'], - ['0.99.0', '0.10.0'], - ['2.0.0', '1.2.3'], - ['v0.0.0', '0.0.0-foo', true], - ['v0.0.1', '0.0.0', true], - ['v1.0.0', '0.9.9', true], - ['v0.10.0', '0.9.0', true], - ['v0.99.0', '0.10.0', true], - ['v2.0.0', '1.2.3', true], - ['0.0.0', 'v0.0.0-foo', true], - ['0.0.1', 'v0.0.0', true], - ['1.0.0', 'v0.9.9', true], - ['0.10.0', 'v0.9.0', true], - ['0.99.0', 'v0.10.0', true], - ['2.0.0', 'v1.2.3', true], - ['1.2.3', '1.2.3-asdf'], - ['1.2.3', '1.2.3-4'], - ['1.2.3', '1.2.3-4-foo'], - ['1.2.3-5-foo', '1.2.3-5'], - ['1.2.3-5', '1.2.3-4'], - ['1.2.3-5-foo', '1.2.3-5-Foo'], - ['3.0.0', '2.7.2+asdf'], - ['1.2.3-a.10', '1.2.3-a.5'], - ['1.2.3-a.b', '1.2.3-a.5'], - ['1.2.3-a.b', '1.2.3-a'], - ['1.2.3-a.b.c.10.d.5', '1.2.3-a.b.c.5.d.100'], - ['1.2.3-r2', '1.2.3-r100'], - ['1.2.3-r100', '1.2.3-R2'] - ].forEach(function(v) { - var v0 = v[0]; - var v1 = v[1]; - var loose = v[2]; - t.ok(gt(v0, v1, loose), "gt('" + v0 + "', '" + v1 + "')"); - t.ok(lt(v1, v0, loose), "lt('" + v1 + "', '" + v0 + "')"); - t.ok(!gt(v1, v0, loose), "!gt('" + v1 + "', '" + v0 + "')"); - t.ok(!lt(v0, v1, loose), "!lt('" + v0 + "', '" + v1 + "')"); - t.ok(eq(v0, v0, loose), "eq('" + v0 + "', '" + v0 + "')"); - t.ok(eq(v1, v1, loose), "eq('" + v1 + "', '" + v1 + "')"); - t.ok(neq(v0, v1, loose), "neq('" + v0 + "', '" + v1 + "')"); - t.ok(cmp(v1, '==', v1, loose), "cmp('" + v1 + "' == '" + v1 + "')"); - t.ok(cmp(v0, '>=', v1, loose), "cmp('" + v0 + "' >= '" + v1 + "')"); - t.ok(cmp(v1, '<=', v0, loose), "cmp('" + v1 + "' <= '" + v0 + "')"); - t.ok(cmp(v0, '!=', v1, loose), "cmp('" + v0 + "' != '" + v1 + "')"); - }); - t.end(); -}); - -test('\nequality tests', function(t) { - // [version1, version2] - // version1 should be equivalent to version2 - [['1.2.3', 'v1.2.3', true], - ['1.2.3', '=1.2.3', true], - ['1.2.3', 'v 1.2.3', true], - ['1.2.3', '= 1.2.3', true], - ['1.2.3', ' v1.2.3', true], - ['1.2.3', ' =1.2.3', true], - ['1.2.3', ' v 1.2.3', true], - ['1.2.3', ' = 1.2.3', true], - ['1.2.3-0', 'v1.2.3-0', true], - ['1.2.3-0', '=1.2.3-0', true], - ['1.2.3-0', 'v 1.2.3-0', true], - ['1.2.3-0', '= 1.2.3-0', true], - ['1.2.3-0', ' v1.2.3-0', true], - ['1.2.3-0', ' =1.2.3-0', true], - ['1.2.3-0', ' v 1.2.3-0', true], - ['1.2.3-0', ' = 1.2.3-0', true], - ['1.2.3-1', 'v1.2.3-1', true], - ['1.2.3-1', '=1.2.3-1', true], - ['1.2.3-1', 'v 1.2.3-1', true], - ['1.2.3-1', '= 1.2.3-1', true], - ['1.2.3-1', ' v1.2.3-1', true], - ['1.2.3-1', ' =1.2.3-1', true], - ['1.2.3-1', ' v 1.2.3-1', true], - ['1.2.3-1', ' = 1.2.3-1', true], - ['1.2.3-beta', 'v1.2.3-beta', true], - ['1.2.3-beta', '=1.2.3-beta', true], - ['1.2.3-beta', 'v 1.2.3-beta', true], - ['1.2.3-beta', '= 1.2.3-beta', true], - ['1.2.3-beta', ' v1.2.3-beta', true], - ['1.2.3-beta', ' =1.2.3-beta', true], - ['1.2.3-beta', ' v 1.2.3-beta', true], - ['1.2.3-beta', ' = 1.2.3-beta', true], - ['1.2.3-beta+build', ' = 1.2.3-beta+otherbuild', true], - ['1.2.3+build', ' = 1.2.3+otherbuild', true], - ['1.2.3-beta+build', '1.2.3-beta+otherbuild'], - ['1.2.3+build', '1.2.3+otherbuild'], - [' v1.2.3+build', '1.2.3+otherbuild'] - ].forEach(function(v) { - var v0 = v[0]; - var v1 = v[1]; - var loose = v[2]; - t.ok(eq(v0, v1, loose), "eq('" + v0 + "', '" + v1 + "')"); - t.ok(!neq(v0, v1, loose), "!neq('" + v0 + "', '" + v1 + "')"); - t.ok(cmp(v0, '==', v1, loose), 'cmp(' + v0 + '==' + v1 + ')'); - t.ok(!cmp(v0, '!=', v1, loose), '!cmp(' + v0 + '!=' + v1 + ')'); - t.ok(!cmp(v0, '===', v1, loose), '!cmp(' + v0 + '===' + v1 + ')'); - t.ok(cmp(v0, '!==', v1, loose), 'cmp(' + v0 + '!==' + v1 + ')'); - t.ok(!gt(v0, v1, loose), "!gt('" + v0 + "', '" + v1 + "')"); - t.ok(gte(v0, v1, loose), "gte('" + v0 + "', '" + v1 + "')"); - t.ok(!lt(v0, v1, loose), "!lt('" + v0 + "', '" + v1 + "')"); - t.ok(lte(v0, v1, loose), "lte('" + v0 + "', '" + v1 + "')"); - }); - t.end(); -}); - - -test('\nrange tests', function(t) { - // [range, version] - // version should be included by range - [['1.0.0 - 2.0.0', '1.2.3'], - ['^1.2.3+build', '1.2.3'], - ['^1.2.3+build', '1.3.0'], - ['1.2.3-pre+asdf - 2.4.3-pre+asdf', '1.2.3'], - ['1.2.3pre+asdf - 2.4.3-pre+asdf', '1.2.3', true], - ['1.2.3-pre+asdf - 2.4.3pre+asdf', '1.2.3', true], - ['1.2.3pre+asdf - 2.4.3pre+asdf', '1.2.3', true], - ['1.2.3-pre+asdf - 2.4.3-pre+asdf', '1.2.3-pre.2'], - ['1.2.3-pre+asdf - 2.4.3-pre+asdf', '2.4.3-alpha'], - ['1.2.3+asdf - 2.4.3+asdf', '1.2.3'], - ['1.0.0', '1.0.0'], - ['>=*', '0.2.4'], - ['', '1.0.0'], - ['*', '1.2.3'], - ['*', 'v1.2.3', true], - ['>=1.0.0', '1.0.0'], - ['>=1.0.0', '1.0.1'], - ['>=1.0.0', '1.1.0'], - ['>1.0.0', '1.0.1'], - ['>1.0.0', '1.1.0'], - ['<=2.0.0', '2.0.0'], - ['<=2.0.0', '1.9999.9999'], - ['<=2.0.0', '0.2.9'], - ['<2.0.0', '1.9999.9999'], - ['<2.0.0', '0.2.9'], - ['>= 1.0.0', '1.0.0'], - ['>= 1.0.0', '1.0.1'], - ['>= 1.0.0', '1.1.0'], - ['> 1.0.0', '1.0.1'], - ['> 1.0.0', '1.1.0'], - ['<= 2.0.0', '2.0.0'], - ['<= 2.0.0', '1.9999.9999'], - ['<= 2.0.0', '0.2.9'], - ['< 2.0.0', '1.9999.9999'], - ['<\t2.0.0', '0.2.9'], - ['>=0.1.97', 'v0.1.97', true], - ['>=0.1.97', '0.1.97'], - ['0.1.20 || 1.2.4', '1.2.4'], - ['>=0.2.3 || <0.0.1', '0.0.0'], - ['>=0.2.3 || <0.0.1', '0.2.3'], - ['>=0.2.3 || <0.0.1', '0.2.4'], - ['||', '1.3.4'], - ['2.x.x', '2.1.3'], - ['1.2.x', '1.2.3'], - ['1.2.x || 2.x', '2.1.3'], - ['1.2.x || 2.x', '1.2.3'], - ['x', '1.2.3'], - ['2.*.*', '2.1.3'], - ['1.2.*', '1.2.3'], - ['1.2.* || 2.*', '2.1.3'], - ['1.2.* || 2.*', '1.2.3'], - ['*', '1.2.3'], - ['2', '2.1.2'], - ['2.3', '2.3.1'], - ['~2.4', '2.4.0'], // >=2.4.0 <2.5.0 - ['~2.4', '2.4.5'], - ['~>3.2.1', '3.2.2'], // >=3.2.1 <3.3.0, - ['~1', '1.2.3'], // >=1.0.0 <2.0.0 - ['~>1', '1.2.3'], - ['~> 1', '1.2.3'], - ['~1.0', '1.0.2'], // >=1.0.0 <1.1.0, - ['~ 1.0', '1.0.2'], - ['~ 1.0.3', '1.0.12'], - ['>=1', '1.0.0'], - ['>= 1', '1.0.0'], - ['<1.2', '1.1.1'], - ['< 1.2', '1.1.1'], - ['~v0.5.4-pre', '0.5.5'], - ['~v0.5.4-pre', '0.5.4'], - ['=0.7.x', '0.7.2'], - ['<=0.7.x', '0.7.2'], - ['>=0.7.x', '0.7.2'], - ['<=0.7.x', '0.6.2'], - ['~1.2.1 >=1.2.3', '1.2.3'], - ['~1.2.1 =1.2.3', '1.2.3'], - ['~1.2.1 1.2.3', '1.2.3'], - ['~1.2.1 >=1.2.3 1.2.3', '1.2.3'], - ['~1.2.1 1.2.3 >=1.2.3', '1.2.3'], - ['~1.2.1 1.2.3', '1.2.3'], - ['>=1.2.1 1.2.3', '1.2.3'], - ['1.2.3 >=1.2.1', '1.2.3'], - ['>=1.2.3 >=1.2.1', '1.2.3'], - ['>=1.2.1 >=1.2.3', '1.2.3'], - ['>=1.2', '1.2.8'], - ['^1.2.3', '1.8.1'], - ['^0.1.2', '0.1.2'], - ['^0.1', '0.1.2'], - ['^1.2', '1.4.2'], - ['^1.2 ^1', '1.4.2'], - ['^1.2.3-alpha', '1.2.3-pre'], - ['^1.2.0-alpha', '1.2.0-pre'], - ['^0.0.1-alpha', '0.0.1-beta'] - ].forEach(function(v) { - var range = v[0]; - var ver = v[1]; - var loose = v[2]; - t.ok(satisfies(ver, range, loose), range + ' satisfied by ' + ver); - }); - t.end(); -}); - -test('\nnegative range tests', function(t) { - // [range, version] - // version should not be included by range - [['1.0.0 - 2.0.0', '2.2.3'], - ['1.2.3+asdf - 2.4.3+asdf', '1.2.3-pre.2'], - ['1.2.3+asdf - 2.4.3+asdf', '2.4.3-alpha'], - ['^1.2.3+build', '2.0.0'], - ['^1.2.3+build', '1.2.0'], - ['^1.2.3', '1.2.3-pre'], - ['^1.2', '1.2.0-pre'], - ['>1.2', '1.3.0-beta'], - ['<=1.2.3', '1.2.3-beta'], - ['^1.2.3', '1.2.3-beta'], - ['=0.7.x', '0.7.0-asdf'], - ['>=0.7.x', '0.7.0-asdf'], - ['1', '1.0.0beta', true], - ['<1', '1.0.0beta', true], - ['< 1', '1.0.0beta', true], - ['1.0.0', '1.0.1'], - ['>=1.0.0', '0.0.0'], - ['>=1.0.0', '0.0.1'], - ['>=1.0.0', '0.1.0'], - ['>1.0.0', '0.0.1'], - ['>1.0.0', '0.1.0'], - ['<=2.0.0', '3.0.0'], - ['<=2.0.0', '2.9999.9999'], - ['<=2.0.0', '2.2.9'], - ['<2.0.0', '2.9999.9999'], - ['<2.0.0', '2.2.9'], - ['>=0.1.97', 'v0.1.93', true], - ['>=0.1.97', '0.1.93'], - ['0.1.20 || 1.2.4', '1.2.3'], - ['>=0.2.3 || <0.0.1', '0.0.3'], - ['>=0.2.3 || <0.0.1', '0.2.2'], - ['2.x.x', '1.1.3'], - ['2.x.x', '3.1.3'], - ['1.2.x', '1.3.3'], - ['1.2.x || 2.x', '3.1.3'], - ['1.2.x || 2.x', '1.1.3'], - ['2.*.*', '1.1.3'], - ['2.*.*', '3.1.3'], - ['1.2.*', '1.3.3'], - ['1.2.* || 2.*', '3.1.3'], - ['1.2.* || 2.*', '1.1.3'], - ['2', '1.1.2'], - ['2.3', '2.4.1'], - ['~2.4', '2.5.0'], // >=2.4.0 <2.5.0 - ['~2.4', '2.3.9'], - ['~>3.2.1', '3.3.2'], // >=3.2.1 <3.3.0 - ['~>3.2.1', '3.2.0'], // >=3.2.1 <3.3.0 - ['~1', '0.2.3'], // >=1.0.0 <2.0.0 - ['~>1', '2.2.3'], - ['~1.0', '1.1.0'], // >=1.0.0 <1.1.0 - ['<1', '1.0.0'], - ['>=1.2', '1.1.1'], - ['1', '2.0.0beta', true], - ['~v0.5.4-beta', '0.5.4-alpha'], - ['=0.7.x', '0.8.2'], - ['>=0.7.x', '0.6.2'], - ['<0.7.x', '0.7.2'], - ['<1.2.3', '1.2.3-beta'], - ['=1.2.3', '1.2.3-beta'], - ['>1.2', '1.2.8'], - ['^1.2.3', '2.0.0-alpha'], - ['^1.2.3', '1.2.2'], - ['^1.2', '1.1.9'], - ['*', 'v1.2.3-foo', true], - // invalid ranges never satisfied! - ['blerg', '1.2.3'], - ['git+https://user:password0123@github.com/foo', '123.0.0', true], - ['^1.2.3', '2.0.0-pre'] - ].forEach(function(v) { - var range = v[0]; - var ver = v[1]; - var loose = v[2]; - var found = satisfies(ver, range, loose); - t.ok(!found, ver + ' not satisfied by ' + range); - }); - t.end(); -}); - -test('\nincrement versions test', function(t) { -// [version, inc, result, identifier] -// inc(version, inc) -> result - [['1.2.3', 'major', '2.0.0'], - ['1.2.3', 'minor', '1.3.0'], - ['1.2.3', 'patch', '1.2.4'], - ['1.2.3tag', 'major', '2.0.0', true], - ['1.2.3-tag', 'major', '2.0.0'], - ['1.2.3', 'fake', null], - ['1.2.0-0', 'patch', '1.2.0'], - ['fake', 'major', null], - ['1.2.3-4', 'major', '2.0.0'], - ['1.2.3-4', 'minor', '1.3.0'], - ['1.2.3-4', 'patch', '1.2.3'], - ['1.2.3-alpha.0.beta', 'major', '2.0.0'], - ['1.2.3-alpha.0.beta', 'minor', '1.3.0'], - ['1.2.3-alpha.0.beta', 'patch', '1.2.3'], - ['1.2.4', 'prerelease', '1.2.5-0'], - ['1.2.3-0', 'prerelease', '1.2.3-1'], - ['1.2.3-alpha.0', 'prerelease', '1.2.3-alpha.1'], - ['1.2.3-alpha.1', 'prerelease', '1.2.3-alpha.2'], - ['1.2.3-alpha.2', 'prerelease', '1.2.3-alpha.3'], - ['1.2.3-alpha.0.beta', 'prerelease', '1.2.3-alpha.1.beta'], - ['1.2.3-alpha.1.beta', 'prerelease', '1.2.3-alpha.2.beta'], - ['1.2.3-alpha.2.beta', 'prerelease', '1.2.3-alpha.3.beta'], - ['1.2.3-alpha.10.0.beta', 'prerelease', '1.2.3-alpha.10.1.beta'], - ['1.2.3-alpha.10.1.beta', 'prerelease', '1.2.3-alpha.10.2.beta'], - ['1.2.3-alpha.10.2.beta', 'prerelease', '1.2.3-alpha.10.3.beta'], - ['1.2.3-alpha.10.beta.0', 'prerelease', '1.2.3-alpha.10.beta.1'], - ['1.2.3-alpha.10.beta.1', 'prerelease', '1.2.3-alpha.10.beta.2'], - ['1.2.3-alpha.10.beta.2', 'prerelease', '1.2.3-alpha.10.beta.3'], - ['1.2.3-alpha.9.beta', 'prerelease', '1.2.3-alpha.10.beta'], - ['1.2.3-alpha.10.beta', 'prerelease', '1.2.3-alpha.11.beta'], - ['1.2.3-alpha.11.beta', 'prerelease', '1.2.3-alpha.12.beta'], - ['1.2.0', 'prepatch', '1.2.1-0'], - ['1.2.0-1', 'prepatch', '1.2.1-0'], - ['1.2.0', 'preminor', '1.3.0-0'], - ['1.2.3-1', 'preminor', '1.3.0-0'], - ['1.2.0', 'premajor', '2.0.0-0'], - ['1.2.3-1', 'premajor', '2.0.0-0'], - ['1.2.0-1', 'minor', '1.2.0'], - ['1.0.0-1', 'major', '1.0.0'], - - ['1.2.3', 'major', '2.0.0', false, 'dev'], - ['1.2.3', 'minor', '1.3.0', false, 'dev'], - ['1.2.3', 'patch', '1.2.4', false, 'dev'], - ['1.2.3tag', 'major', '2.0.0', true, 'dev'], - ['1.2.3-tag', 'major', '2.0.0', false, 'dev'], - ['1.2.3', 'fake', null, false, 'dev'], - ['1.2.0-0', 'patch', '1.2.0', false, 'dev'], - ['fake', 'major', null, false, 'dev'], - ['1.2.3-4', 'major', '2.0.0', false, 'dev'], - ['1.2.3-4', 'minor', '1.3.0', false, 'dev'], - ['1.2.3-4', 'patch', '1.2.3', false, 'dev'], - ['1.2.3-alpha.0.beta', 'major', '2.0.0', false, 'dev'], - ['1.2.3-alpha.0.beta', 'minor', '1.3.0', false, 'dev'], - ['1.2.3-alpha.0.beta', 'patch', '1.2.3', false, 'dev'], - ['1.2.4', 'prerelease', '1.2.5-dev.0', false, 'dev'], - ['1.2.3-0', 'prerelease', '1.2.3-dev.0', false, 'dev'], - ['1.2.3-alpha.0', 'prerelease', '1.2.3-dev.0', false, 'dev'], - ['1.2.3-alpha.0', 'prerelease', '1.2.3-alpha.1', false, 'alpha'], - ['1.2.3-alpha.0.beta', 'prerelease', '1.2.3-dev.0', false, 'dev'], - ['1.2.3-alpha.0.beta', 'prerelease', '1.2.3-alpha.1.beta', false, 'alpha'], - ['1.2.3-alpha.10.0.beta', 'prerelease', '1.2.3-dev.0', false, 'dev'], - ['1.2.3-alpha.10.0.beta', 'prerelease', '1.2.3-alpha.10.1.beta', false, 'alpha'], - ['1.2.3-alpha.10.1.beta', 'prerelease', '1.2.3-alpha.10.2.beta', false, 'alpha'], - ['1.2.3-alpha.10.2.beta', 'prerelease', '1.2.3-alpha.10.3.beta', false, 'alpha'], - ['1.2.3-alpha.10.beta.0', 'prerelease', '1.2.3-dev.0', false, 'dev'], - ['1.2.3-alpha.10.beta.0', 'prerelease', '1.2.3-alpha.10.beta.1', false, 'alpha'], - ['1.2.3-alpha.10.beta.1', 'prerelease', '1.2.3-alpha.10.beta.2', false, 'alpha'], - ['1.2.3-alpha.10.beta.2', 'prerelease', '1.2.3-alpha.10.beta.3', false, 'alpha'], - ['1.2.3-alpha.9.beta', 'prerelease', '1.2.3-dev.0', false, 'dev'], - ['1.2.3-alpha.9.beta', 'prerelease', '1.2.3-alpha.10.beta', false, 'alpha'], - ['1.2.3-alpha.10.beta', 'prerelease', '1.2.3-alpha.11.beta', false, 'alpha'], - ['1.2.3-alpha.11.beta', 'prerelease', '1.2.3-alpha.12.beta', false, 'alpha'], - ['1.2.0', 'prepatch', '1.2.1-dev.0', false, 'dev'], - ['1.2.0-1', 'prepatch', '1.2.1-dev.0', false, 'dev'], - ['1.2.0', 'preminor', '1.3.0-dev.0', false, 'dev'], - ['1.2.3-1', 'preminor', '1.3.0-dev.0', false, 'dev'], - ['1.2.0', 'premajor', '2.0.0-dev.0', false, 'dev'], - ['1.2.3-1', 'premajor', '2.0.0-dev.0', false, 'dev'], - ['1.2.0-1', 'minor', '1.2.0', false, 'dev'], - ['1.0.0-1', 'major', '1.0.0', false, 'dev'], - ['1.2.3-dev.bar', 'prerelease', '1.2.3-dev.0', false, 'dev'] - - ].forEach(function(v) { - var pre = v[0]; - var what = v[1]; - var wanted = v[2]; - var loose = v[3]; - var id = v[4]; - var found = inc(pre, what, loose, id); - var cmd = 'inc(' + pre + ', ' + what + ', ' + id + ')'; - t.equal(found, wanted, cmd + ' === ' + wanted); - - var parsed = semver.parse(pre, loose); - if (wanted) { - parsed.inc(what, id); - t.equal(parsed.version, wanted, cmd + ' object version updated'); - t.equal(parsed.raw, wanted, cmd + ' object raw field updated'); - } else if (parsed) { - t.throws(function () { - parsed.inc(what, id) - }) - } else { - t.equal(parsed, null) - } - }); - - t.end(); -}); - -test('\ndiff versions test', function(t) { -// [version1, version2, result] -// diff(version1, version2) -> result - [['1.2.3', '0.2.3', 'major'], - ['1.4.5', '0.2.3', 'major'], - ['1.2.3', '2.0.0-pre', 'premajor'], - ['1.2.3', '1.3.3', 'minor'], - ['1.0.1', '1.1.0-pre', 'preminor'], - ['1.2.3', '1.2.4', 'patch'], - ['1.2.3', '1.2.4-pre', 'prepatch'], - ['0.0.1', '0.0.1-pre', 'prerelease'], - ['0.0.1', '0.0.1-pre-2', 'prerelease'], - ['1.1.0', '1.1.0-pre', 'prerelease'], - ['1.1.0-pre-1', '1.1.0-pre-2', 'prerelease'], - ['1.0.0', '1.0.0', null] - - ].forEach(function(v) { - var version1 = v[0]; - var version2 = v[1]; - var wanted = v[2]; - var found = diff(version1, version2); - var cmd = 'diff(' + version1 + ', ' + version2 + ')'; - t.equal(found, wanted, cmd + ' === ' + wanted); - }); - - t.end(); -}); - -test('\nvalid range test', function(t) { - // [range, result] - // validRange(range) -> result - // translate ranges into their canonical form - [['1.0.0 - 2.0.0', '>=1.0.0 <=2.0.0'], - ['1.0.0', '1.0.0'], - ['>=*', '*'], - ['', '*'], - ['*', '*'], - ['*', '*'], - ['>=1.0.0', '>=1.0.0'], - ['>1.0.0', '>1.0.0'], - ['<=2.0.0', '<=2.0.0'], - ['1', '>=1.0.0 <2.0.0'], - ['<=2.0.0', '<=2.0.0'], - ['<=2.0.0', '<=2.0.0'], - ['<2.0.0', '<2.0.0'], - ['<2.0.0', '<2.0.0'], - ['>= 1.0.0', '>=1.0.0'], - ['>= 1.0.0', '>=1.0.0'], - ['>= 1.0.0', '>=1.0.0'], - ['> 1.0.0', '>1.0.0'], - ['> 1.0.0', '>1.0.0'], - ['<= 2.0.0', '<=2.0.0'], - ['<= 2.0.0', '<=2.0.0'], - ['<= 2.0.0', '<=2.0.0'], - ['< 2.0.0', '<2.0.0'], - ['< 2.0.0', '<2.0.0'], - ['>=0.1.97', '>=0.1.97'], - ['>=0.1.97', '>=0.1.97'], - ['0.1.20 || 1.2.4', '0.1.20||1.2.4'], - ['>=0.2.3 || <0.0.1', '>=0.2.3||<0.0.1'], - ['>=0.2.3 || <0.0.1', '>=0.2.3||<0.0.1'], - ['>=0.2.3 || <0.0.1', '>=0.2.3||<0.0.1'], - ['||', '||'], - ['2.x.x', '>=2.0.0 <3.0.0'], - ['1.2.x', '>=1.2.0 <1.3.0'], - ['1.2.x || 2.x', '>=1.2.0 <1.3.0||>=2.0.0 <3.0.0'], - ['1.2.x || 2.x', '>=1.2.0 <1.3.0||>=2.0.0 <3.0.0'], - ['x', '*'], - ['2.*.*', '>=2.0.0 <3.0.0'], - ['1.2.*', '>=1.2.0 <1.3.0'], - ['1.2.* || 2.*', '>=1.2.0 <1.3.0||>=2.0.0 <3.0.0'], - ['*', '*'], - ['2', '>=2.0.0 <3.0.0'], - ['2.3', '>=2.3.0 <2.4.0'], - ['~2.4', '>=2.4.0 <2.5.0'], - ['~2.4', '>=2.4.0 <2.5.0'], - ['~>3.2.1', '>=3.2.1 <3.3.0'], - ['~1', '>=1.0.0 <2.0.0'], - ['~>1', '>=1.0.0 <2.0.0'], - ['~> 1', '>=1.0.0 <2.0.0'], - ['~1.0', '>=1.0.0 <1.1.0'], - ['~ 1.0', '>=1.0.0 <1.1.0'], - ['^0', '>=0.0.0 <1.0.0'], - ['^ 1', '>=1.0.0 <2.0.0'], - ['^0.1', '>=0.1.0 <0.2.0'], - ['^1.0', '>=1.0.0 <2.0.0'], - ['^1.2', '>=1.2.0 <2.0.0'], - ['^0.0.1', '>=0.0.1 <0.0.2'], - ['^0.0.1-beta', '>=0.0.1-beta <0.0.2'], - ['^0.1.2', '>=0.1.2 <0.2.0'], - ['^1.2.3', '>=1.2.3 <2.0.0'], - ['^1.2.3-beta.4', '>=1.2.3-beta.4 <2.0.0'], - ['<1', '<1.0.0'], - ['< 1', '<1.0.0'], - ['>=1', '>=1.0.0'], - ['>= 1', '>=1.0.0'], - ['<1.2', '<1.2.0'], - ['< 1.2', '<1.2.0'], - ['1', '>=1.0.0 <2.0.0'], - ['>01.02.03', '>1.2.3', true], - ['>01.02.03', null], - ['~1.2.3beta', '>=1.2.3-beta <1.3.0', true], - ['~1.2.3beta', null], - ['^ 1.2 ^ 1', '>=1.2.0 <2.0.0 >=1.0.0 <2.0.0'] - ].forEach(function(v) { - var pre = v[0]; - var wanted = v[1]; - var loose = v[2]; - var found = validRange(pre, loose); - - t.equal(found, wanted, 'validRange(' + pre + ') === ' + wanted); - }); - - t.end(); -}); - -test('\ncomparators test', function(t) { - // [range, comparators] - // turn range into a set of individual comparators - [['1.0.0 - 2.0.0', [['>=1.0.0', '<=2.0.0']]], - ['1.0.0', [['1.0.0']]], - ['>=*', [['']]], - ['', [['']]], - ['*', [['']]], - ['*', [['']]], - ['>=1.0.0', [['>=1.0.0']]], - ['>=1.0.0', [['>=1.0.0']]], - ['>=1.0.0', [['>=1.0.0']]], - ['>1.0.0', [['>1.0.0']]], - ['>1.0.0', [['>1.0.0']]], - ['<=2.0.0', [['<=2.0.0']]], - ['1', [['>=1.0.0', '<2.0.0']]], - ['<=2.0.0', [['<=2.0.0']]], - ['<=2.0.0', [['<=2.0.0']]], - ['<2.0.0', [['<2.0.0']]], - ['<2.0.0', [['<2.0.0']]], - ['>= 1.0.0', [['>=1.0.0']]], - ['>= 1.0.0', [['>=1.0.0']]], - ['>= 1.0.0', [['>=1.0.0']]], - ['> 1.0.0', [['>1.0.0']]], - ['> 1.0.0', [['>1.0.0']]], - ['<= 2.0.0', [['<=2.0.0']]], - ['<= 2.0.0', [['<=2.0.0']]], - ['<= 2.0.0', [['<=2.0.0']]], - ['< 2.0.0', [['<2.0.0']]], - ['<\t2.0.0', [['<2.0.0']]], - ['>=0.1.97', [['>=0.1.97']]], - ['>=0.1.97', [['>=0.1.97']]], - ['0.1.20 || 1.2.4', [['0.1.20'], ['1.2.4']]], - ['>=0.2.3 || <0.0.1', [['>=0.2.3'], ['<0.0.1']]], - ['>=0.2.3 || <0.0.1', [['>=0.2.3'], ['<0.0.1']]], - ['>=0.2.3 || <0.0.1', [['>=0.2.3'], ['<0.0.1']]], - ['||', [[''], ['']]], - ['2.x.x', [['>=2.0.0', '<3.0.0']]], - ['1.2.x', [['>=1.2.0', '<1.3.0']]], - ['1.2.x || 2.x', [['>=1.2.0', '<1.3.0'], ['>=2.0.0', '<3.0.0']]], - ['1.2.x || 2.x', [['>=1.2.0', '<1.3.0'], ['>=2.0.0', '<3.0.0']]], - ['x', [['']]], - ['2.*.*', [['>=2.0.0', '<3.0.0']]], - ['1.2.*', [['>=1.2.0', '<1.3.0']]], - ['1.2.* || 2.*', [['>=1.2.0', '<1.3.0'], ['>=2.0.0', '<3.0.0']]], - ['1.2.* || 2.*', [['>=1.2.0', '<1.3.0'], ['>=2.0.0', '<3.0.0']]], - ['*', [['']]], - ['2', [['>=2.0.0', '<3.0.0']]], - ['2.3', [['>=2.3.0', '<2.4.0']]], - ['~2.4', [['>=2.4.0', '<2.5.0']]], - ['~2.4', [['>=2.4.0', '<2.5.0']]], - ['~>3.2.1', [['>=3.2.1', '<3.3.0']]], - ['~1', [['>=1.0.0', '<2.0.0']]], - ['~>1', [['>=1.0.0', '<2.0.0']]], - ['~> 1', [['>=1.0.0', '<2.0.0']]], - ['~1.0', [['>=1.0.0', '<1.1.0']]], - ['~ 1.0', [['>=1.0.0', '<1.1.0']]], - ['~ 1.0.3', [['>=1.0.3', '<1.1.0']]], - ['~> 1.0.3', [['>=1.0.3', '<1.1.0']]], - ['<1', [['<1.0.0']]], - ['< 1', [['<1.0.0']]], - ['>=1', [['>=1.0.0']]], - ['>= 1', [['>=1.0.0']]], - ['<1.2', [['<1.2.0']]], - ['< 1.2', [['<1.2.0']]], - ['1', [['>=1.0.0', '<2.0.0']]], - ['1 2', [['>=1.0.0', '<2.0.0', '>=2.0.0', '<3.0.0']]], - ['1.2 - 3.4.5', [['>=1.2.0', '<=3.4.5']]], - ['1.2.3 - 3.4', [['>=1.2.3', '<3.5.0']]], - ['1.2.3 - 3', [['>=1.2.3', '<4.0.0']]], - ['>*', [['<0.0.0']]], - ['<*', [['<0.0.0']]] - ].forEach(function(v) { - var pre = v[0]; - var wanted = v[1]; - var found = toComparators(v[0]); - var jw = JSON.stringify(wanted); - t.equivalent(found, wanted, 'toComparators(' + pre + ') === ' + jw); - }); - - t.end(); -}); - -test('\ninvalid version numbers', function(t) { - ['1.2.3.4', - 'NOT VALID', - 1.2, - null, - 'Infinity.NaN.Infinity' - ].forEach(function(v) { - t.throws(function() { - new SemVer(v); - }, {name:'TypeError', message:'Invalid Version: ' + v}); - }); - - t.end(); -}); - -test('\nstrict vs loose version numbers', function(t) { - [['=1.2.3', '1.2.3'], - ['01.02.03', '1.2.3'], - ['1.2.3-beta.01', '1.2.3-beta.1'], - [' =1.2.3', '1.2.3'], - ['1.2.3foo', '1.2.3-foo'] - ].forEach(function(v) { - var loose = v[0]; - var strict = v[1]; - t.throws(function() { - new SemVer(loose); - }); - var lv = new SemVer(loose, true); - t.equal(lv.version, strict); - t.ok(eq(loose, strict, true)); - t.throws(function() { - eq(loose, strict); - }); - t.throws(function() { - new SemVer(strict).compare(loose); - }); - }); - t.end(); -}); - -test('\nstrict vs loose ranges', function(t) { - [['>=01.02.03', '>=1.2.3'], - ['~1.02.03beta', '>=1.2.3-beta <1.3.0'] - ].forEach(function(v) { - var loose = v[0]; - var comps = v[1]; - t.throws(function() { - new Range(loose); - }); - t.equal(new Range(loose, true).range, comps); - }); - t.end(); -}); - -test('\nmax satisfying', function(t) { - [[['1.2.3', '1.2.4'], '1.2', '1.2.4'], - [['1.2.4', '1.2.3'], '1.2', '1.2.4'], - [['1.2.3', '1.2.4', '1.2.5', '1.2.6'], '~1.2.3', '1.2.6'], - [['1.1.0', '1.2.0', '1.2.1', '1.3.0', '2.0.0b1', '2.0.0b2', '2.0.0b3', '2.0.0', '2.1.0'], '~2.0.0', '2.0.0', true] - ].forEach(function(v) { - var versions = v[0]; - var range = v[1]; - var expect = v[2]; - var loose = v[3]; - var actual = semver.maxSatisfying(versions, range, loose); - t.equal(actual, expect); - }); - t.end(); -}); diff --git a/node_modules/semver/test/ltr.js b/node_modules/semver/test/ltr.js deleted file mode 100644 index 0f7167d65..000000000 --- a/node_modules/semver/test/ltr.js +++ /dev/null @@ -1,181 +0,0 @@ -var tap = require('tap'); -var test = tap.test; -var semver = require('../semver.js'); -var ltr = semver.ltr; - -test('\nltr tests', function(t) { - // [range, version, loose] - // Version should be less than range - [ - ['~1.2.2', '1.2.1'], - ['~0.6.1-1', '0.6.1-0'], - ['1.0.0 - 2.0.0', '0.0.1'], - ['1.0.0-beta.2', '1.0.0-beta.1'], - ['1.0.0', '0.0.0'], - ['>=2.0.0', '1.1.1'], - ['>=2.0.0', '1.2.9'], - ['>2.0.0', '2.0.0'], - ['0.1.20 || 1.2.4', '0.1.5'], - ['2.x.x', '1.0.0'], - ['1.2.x', '1.1.0'], - ['1.2.x || 2.x', '1.0.0'], - ['2.*.*', '1.0.1'], - ['1.2.*', '1.1.3'], - ['1.2.* || 2.*', '1.1.9999'], - ['2', '1.0.0'], - ['2.3', '2.2.2'], - ['~2.4', '2.3.0'], // >=2.4.0 <2.5.0 - ['~2.4', '2.3.5'], - ['~>3.2.1', '3.2.0'], // >=3.2.1 <3.3.0 - ['~1', '0.2.3'], // >=1.0.0 <2.0.0 - ['~>1', '0.2.4'], - ['~> 1', '0.2.3'], - ['~1.0', '0.1.2'], // >=1.0.0 <1.1.0 - ['~ 1.0', '0.1.0'], - ['>1.2', '1.2.0'], - ['> 1.2', '1.2.1'], - ['1', '0.0.0beta', true], - ['~v0.5.4-pre', '0.5.4-alpha'], - ['~v0.5.4-pre', '0.5.4-alpha'], - ['=0.7.x', '0.6.0'], - ['=0.7.x', '0.6.0-asdf'], - ['>=0.7.x', '0.6.0'], - ['~1.2.2', '1.2.1'], - ['1.0.0 - 2.0.0', '0.2.3'], - ['1.0.0', '0.0.1'], - ['>=2.0.0', '1.0.0'], - ['>=2.0.0', '1.9999.9999'], - ['>=2.0.0', '1.2.9'], - ['>2.0.0', '2.0.0'], - ['>2.0.0', '1.2.9'], - ['2.x.x', '1.1.3'], - ['1.2.x', '1.1.3'], - ['1.2.x || 2.x', '1.1.3'], - ['2.*.*', '1.1.3'], - ['1.2.*', '1.1.3'], - ['1.2.* || 2.*', '1.1.3'], - ['2', '1.9999.9999'], - ['2.3', '2.2.1'], - ['~2.4', '2.3.0'], // >=2.4.0 <2.5.0 - ['~>3.2.1', '2.3.2'], // >=3.2.1 <3.3.0 - ['~1', '0.2.3'], // >=1.0.0 <2.0.0 - ['~>1', '0.2.3'], - ['~1.0', '0.0.0'], // >=1.0.0 <1.1.0 - ['>1', '1.0.0'], - ['2', '1.0.0beta', true], - ['>1', '1.0.0beta', true], - ['> 1', '1.0.0beta', true], - ['=0.7.x', '0.6.2'], - ['=0.7.x', '0.7.0-asdf'], - ['^1', '1.0.0-0'], - ['>=0.7.x', '0.7.0-asdf'], - ['1', '1.0.0beta', true], - ['>=0.7.x', '0.6.2'], - ['>1.2.3', '1.3.0-alpha'] - ].forEach(function(tuple) { - var range = tuple[0]; - var version = tuple[1]; - var loose = tuple[2] || false; - var msg = 'ltr(' + version + ', ' + range + ', ' + loose + ')'; - t.ok(ltr(version, range, loose), msg); - }); - t.end(); -}); - -test('\nnegative ltr tests', function(t) { - // [range, version, loose] - // Version should NOT be less than range - [ - ['~ 1.0', '1.1.0'], - ['~0.6.1-1', '0.6.1-1'], - ['1.0.0 - 2.0.0', '1.2.3'], - ['1.0.0 - 2.0.0', '2.9.9'], - ['1.0.0', '1.0.0'], - ['>=*', '0.2.4'], - ['', '1.0.0', true], - ['*', '1.2.3'], - ['>=1.0.0', '1.0.0'], - ['>=1.0.0', '1.0.1'], - ['>=1.0.0', '1.1.0'], - ['>1.0.0', '1.0.1'], - ['>1.0.0', '1.1.0'], - ['<=2.0.0', '2.0.0'], - ['<=2.0.0', '1.9999.9999'], - ['<=2.0.0', '0.2.9'], - ['<2.0.0', '1.9999.9999'], - ['<2.0.0', '0.2.9'], - ['>= 1.0.0', '1.0.0'], - ['>= 1.0.0', '1.0.1'], - ['>= 1.0.0', '1.1.0'], - ['> 1.0.0', '1.0.1'], - ['> 1.0.0', '1.1.0'], - ['<= 2.0.0', '2.0.0'], - ['<= 2.0.0', '1.9999.9999'], - ['<= 2.0.0', '0.2.9'], - ['< 2.0.0', '1.9999.9999'], - ['<\t2.0.0', '0.2.9'], - ['>=0.1.97', 'v0.1.97'], - ['>=0.1.97', '0.1.97'], - ['0.1.20 || 1.2.4', '1.2.4'], - ['0.1.20 || >1.2.4', '1.2.4'], - ['0.1.20 || 1.2.4', '1.2.3'], - ['0.1.20 || 1.2.4', '0.1.20'], - ['>=0.2.3 || <0.0.1', '0.0.0'], - ['>=0.2.3 || <0.0.1', '0.2.3'], - ['>=0.2.3 || <0.0.1', '0.2.4'], - ['||', '1.3.4'], - ['2.x.x', '2.1.3'], - ['1.2.x', '1.2.3'], - ['1.2.x || 2.x', '2.1.3'], - ['1.2.x || 2.x', '1.2.3'], - ['x', '1.2.3'], - ['2.*.*', '2.1.3'], - ['1.2.*', '1.2.3'], - ['1.2.* || 2.*', '2.1.3'], - ['1.2.* || 2.*', '1.2.3'], - ['1.2.* || 2.*', '1.2.3'], - ['*', '1.2.3'], - ['2', '2.1.2'], - ['2.3', '2.3.1'], - ['~2.4', '2.4.0'], // >=2.4.0 <2.5.0 - ['~2.4', '2.4.5'], - ['~>3.2.1', '3.2.2'], // >=3.2.1 <3.3.0 - ['~1', '1.2.3'], // >=1.0.0 <2.0.0 - ['~>1', '1.2.3'], - ['~> 1', '1.2.3'], - ['~1.0', '1.0.2'], // >=1.0.0 <1.1.0 - ['~ 1.0', '1.0.2'], - ['>=1', '1.0.0'], - ['>= 1', '1.0.0'], - ['<1.2', '1.1.1'], - ['< 1.2', '1.1.1'], - ['~v0.5.4-pre', '0.5.5'], - ['~v0.5.4-pre', '0.5.4'], - ['=0.7.x', '0.7.2'], - ['>=0.7.x', '0.7.2'], - ['<=0.7.x', '0.6.2'], - ['>0.2.3 >0.2.4 <=0.2.5', '0.2.5'], - ['>=0.2.3 <=0.2.4', '0.2.4'], - ['1.0.0 - 2.0.0', '2.0.0'], - ['^3.0.0', '4.0.0'], - ['^1.0.0 || ~2.0.1', '2.0.0'], - ['^0.1.0 || ~3.0.1 || 5.0.0', '3.2.0'], - ['^0.1.0 || ~3.0.1 || 5.0.0', '1.0.0beta', true], - ['^0.1.0 || ~3.0.1 || 5.0.0', '5.0.0-0', true], - ['^0.1.0 || ~3.0.1 || >4 <=5.0.0', '3.5.0'], - ['^1.0.0alpha', '1.0.0beta', true], - ['~1.0.0alpha', '1.0.0beta', true], - ['^1.0.0-alpha', '1.0.0beta', true], - ['~1.0.0-alpha', '1.0.0beta', true], - ['^1.0.0-alpha', '1.0.0-beta'], - ['~1.0.0-alpha', '1.0.0-beta'], - ['=0.1.0', '1.0.0'] - ].forEach(function(tuple) { - var range = tuple[0]; - var version = tuple[1]; - var loose = tuple[2] || false; - var msg = '!ltr(' + version + ', ' + range + ', ' + loose + ')'; - t.notOk(ltr(version, range, loose), msg); - }); - t.end(); -}); diff --git a/node_modules/semver/test/major-minor-patch.js b/node_modules/semver/test/major-minor-patch.js deleted file mode 100644 index e9d4039c8..000000000 --- a/node_modules/semver/test/major-minor-patch.js +++ /dev/null @@ -1,72 +0,0 @@ -var tap = require('tap'); -var test = tap.test; -var semver = require('../semver.js'); - -test('\nmajor tests', function(t) { - // [range, version] - // Version should be detectable despite extra characters - [ - ['1.2.3', 1], - [' 1.2.3 ', 1], - [' 2.2.3-4 ', 2], - [' 3.2.3-pre ', 3], - ['v5.2.3', 5], - [' v8.2.3 ', 8], - ['\t13.2.3', 13], - ['=21.2.3', 21, true], - ['v=34.2.3', 34, true] - ].forEach(function(tuple) { - var range = tuple[0]; - var version = tuple[1]; - var loose = tuple[2] || false; - var msg = 'major(' + range + ') = ' + version; - t.equal(semver.major(range, loose), version, msg); - }); - t.end(); -}); - -test('\nminor tests', function(t) { - // [range, version] - // Version should be detectable despite extra characters - [ - ['1.1.3', 1], - [' 1.1.3 ', 1], - [' 1.2.3-4 ', 2], - [' 1.3.3-pre ', 3], - ['v1.5.3', 5], - [' v1.8.3 ', 8], - ['\t1.13.3', 13], - ['=1.21.3', 21, true], - ['v=1.34.3', 34, true] - ].forEach(function(tuple) { - var range = tuple[0]; - var version = tuple[1]; - var loose = tuple[2] || false; - var msg = 'minor(' + range + ') = ' + version; - t.equal(semver.minor(range, loose), version, msg); - }); - t.end(); -}); - -test('\npatch tests', function(t) { - // [range, version] - // Version should be detectable despite extra characters - [ - ['1.2.1', 1], - [' 1.2.1 ', 1], - [' 1.2.2-4 ', 2], - [' 1.2.3-pre ', 3], - ['v1.2.5', 5], - [' v1.2.8 ', 8], - ['\t1.2.13', 13], - ['=1.2.21', 21, true], - ['v=1.2.34', 34, true] - ].forEach(function(tuple) { - var range = tuple[0]; - var version = tuple[1]; - var loose = tuple[2] || false; - var msg = 'patch(' + range + ') = ' + version; - t.equal(semver.patch(range, loose), version, msg); - }); - t.end(); -}); diff --git a/node_modules/shelljs/package.json b/node_modules/shelljs/package.json index c959b63e8..a5ede860e 100644 --- a/node_modules/shelljs/package.json +++ b/node_modules/shelljs/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "shelljs@^0.5.3", - "D:\\Cordova\\cordova-android" + { + "raw": "shelljs@^0.5.3", + "scope": null, + "escapedName": "shelljs", + "name": "shelljs", + "rawSpec": "^0.5.3", + "spec": ">=0.5.3 <0.6.0", + "type": "range" + }, + "d:\\cordova\\cordova-android" ] ], "_from": "shelljs@>=0.5.3 <0.6.0", @@ -12,16 +20,17 @@ "_location": "/shelljs", "_nodeVersion": "1.2.0", "_npmUser": { - "email": "arturadib@gmail.com", - "name": "artur" + "name": "artur", + "email": "arturadib@gmail.com" }, "_npmVersion": "2.5.1", "_phantomChildren": {}, "_requested": { - "name": "shelljs", "raw": "shelljs@^0.5.3", - "rawSpec": "^0.5.3", "scope": null, + "escapedName": "shelljs", + "name": "shelljs", + "rawSpec": "^0.5.3", "spec": ">=0.5.3 <0.6.0", "type": "range" }, @@ -33,10 +42,10 @@ "_shasum": "c54982b996c76ef0c1e6b59fbdc5825f5b713113", "_shrinkwrap": null, "_spec": "shelljs@^0.5.3", - "_where": "D:\\Cordova\\cordova-android", + "_where": "d:\\cordova\\cordova-android", "author": { - "email": "arturadib@gmail.com", - "name": "Artur Adib" + "name": "Artur Adib", + "email": "arturadib@gmail.com" }, "bin": { "shjs": "./bin/shjs" @@ -71,8 +80,8 @@ "main": "./shell.js", "maintainers": [ { - "email": "arturadib@gmail.com", - "name": "artur" + "name": "artur", + "email": "arturadib@gmail.com" } ], "name": "shelljs", diff --git a/node_modules/underscore/package.json b/node_modules/underscore/package.json index 157290143..cee029f5c 100644 --- a/node_modules/underscore/package.json +++ b/node_modules/underscore/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "underscore@^1.8.3", - "D:\\Cordova\\cordova-android\\node_modules\\cordova-common" + { + "raw": "underscore@^1.8.3", + "scope": null, + "escapedName": "underscore", + "name": "underscore", + "rawSpec": "^1.8.3", + "spec": ">=1.8.3 <2.0.0", + "type": "range" + }, + "d:\\cordova\\cordova-android\\node_modules\\cordova-common" ] ], "_from": "underscore@>=1.8.3 <2.0.0", @@ -11,16 +19,17 @@ "_installable": true, "_location": "/underscore", "_npmUser": { - "email": "jashkenas@gmail.com", - "name": "jashkenas" + "name": "jashkenas", + "email": "jashkenas@gmail.com" }, "_npmVersion": "1.4.28", "_phantomChildren": {}, "_requested": { - "name": "underscore", "raw": "underscore@^1.8.3", - "rawSpec": "^1.8.3", "scope": null, + "escapedName": "underscore", + "name": "underscore", + "rawSpec": "^1.8.3", "spec": ">=1.8.3 <2.0.0", "type": "range" }, @@ -31,10 +40,10 @@ "_shasum": "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022", "_shrinkwrap": null, "_spec": "underscore@^1.8.3", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\cordova-common", + "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common", "author": { - "email": "jeremy@documentcloud.org", - "name": "Jeremy Ashkenas" + "name": "Jeremy Ashkenas", + "email": "jeremy@documentcloud.org" }, "bugs": { "url": "https://github.com/jashkenas/underscore/issues" @@ -73,8 +82,8 @@ "main": "underscore.js", "maintainers": [ { - "email": "jashkenas@gmail.com", - "name": "jashkenas" + "name": "jashkenas", + "email": "jashkenas@gmail.com" } ], "name": "underscore", diff --git a/node_modules/unorm/package.json b/node_modules/unorm/package.json index 776a8b8c0..3eb0155ed 100644 --- a/node_modules/unorm/package.json +++ b/node_modules/unorm/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "unorm@^1.3.3", - "D:\\Cordova\\cordova-android\\node_modules\\cordova-common" + { + "raw": "unorm@^1.3.3", + "scope": null, + "escapedName": "unorm", + "name": "unorm", + "rawSpec": "^1.3.3", + "spec": ">=1.3.3 <2.0.0", + "type": "range" + }, + "d:\\cordova\\cordova-android\\node_modules\\cordova-common" ] ], "_from": "unorm@>=1.3.3 <2.0.0", @@ -11,16 +19,17 @@ "_installable": true, "_location": "/unorm", "_npmUser": { - "email": "bwp@bwp.dk", - "name": "walling" + "name": "walling", + "email": "bwp@bwp.dk" }, "_npmVersion": "1.4.28", "_phantomChildren": {}, "_requested": { - "name": "unorm", "raw": "unorm@^1.3.3", - "rawSpec": "^1.3.3", "scope": null, + "escapedName": "unorm", + "name": "unorm", + "rawSpec": "^1.3.3", "spec": ">=1.3.3 <2.0.0", "type": "range" }, @@ -31,26 +40,26 @@ "_shasum": "364200d5f13646ca8bcd44490271335614792300", "_shrinkwrap": null, "_spec": "unorm@^1.3.3", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\cordova-common", + "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common", "author": { - "email": "bwp@bwp.dk", - "name": "Bjarke Walling" + "name": "Bjarke Walling", + "email": "bwp@bwp.dk" }, "bugs": { "url": "https://github.com/walling/unorm/issues" }, "contributors": [ { - "email": "bwp@bwp.dk", - "name": "Bjarke Walling" + "name": "Bjarke Walling", + "email": "bwp@bwp.dk" }, { - "email": "oleg.grenrus@iki.fi", - "name": "Oleg Grenrus" + "name": "Oleg Grenrus", + "email": "oleg.grenrus@iki.fi" }, { - "email": "matsuza@gmail.com", - "name": "Matsuza" + "name": "Matsuza", + "email": "matsuza@gmail.com" } ], "dependencies": {}, @@ -66,7 +75,7 @@ "directories": {}, "dist": { "shasum": "364200d5f13646ca8bcd44490271335614792300", - "tarball": "http://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz" + "tarball": "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz" }, "engines": { "node": ">= 0.4.0" @@ -77,8 +86,8 @@ "main": "./lib/unorm.js", "maintainers": [ { - "email": "bwp@bwp.dk", - "name": "walling" + "name": "walling", + "email": "bwp@bwp.dk" } ], "name": "unorm", diff --git a/node_modules/util-deprecate/package.json b/node_modules/util-deprecate/package.json index 2dc52a690..cd43f2426 100644 --- a/node_modules/util-deprecate/package.json +++ b/node_modules/util-deprecate/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "util-deprecate@1.0.2", - "D:\\Cordova\\cordova-android\\node_modules\\plist" + { + "raw": "util-deprecate@1.0.2", + "scope": null, + "escapedName": "util-deprecate", + "name": "util-deprecate", + "rawSpec": "1.0.2", + "spec": "1.0.2", + "type": "version" + }, + "d:\\cordova\\cordova-android\\node_modules\\plist" ] ], "_from": "util-deprecate@1.0.2", @@ -12,16 +20,17 @@ "_location": "/util-deprecate", "_nodeVersion": "4.1.2", "_npmUser": { - "email": "nathan@tootallnate.net", - "name": "tootallnate" + "name": "tootallnate", + "email": "nathan@tootallnate.net" }, "_npmVersion": "2.14.4", "_phantomChildren": {}, "_requested": { - "name": "util-deprecate", "raw": "util-deprecate@1.0.2", - "rawSpec": "1.0.2", "scope": null, + "escapedName": "util-deprecate", + "name": "util-deprecate", + "rawSpec": "1.0.2", "spec": "1.0.2", "type": "version" }, @@ -32,10 +41,10 @@ "_shasum": "450d4dc9fa70de732762fbd2d4a28981419a0ccf", "_shrinkwrap": null, "_spec": "util-deprecate@1.0.2", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\plist", + "_where": "d:\\cordova\\cordova-android\\node_modules\\plist", "author": { - "email": "nathan@tootallnate.net", "name": "Nathan Rajlich", + "email": "nathan@tootallnate.net", "url": "http://n8.io/" }, "browser": "browser.js", @@ -63,8 +72,8 @@ "main": "node.js", "maintainers": [ { - "email": "nathan@tootallnate.net", - "name": "tootallnate" + "name": "tootallnate", + "email": "nathan@tootallnate.net" } ], "name": "util-deprecate", diff --git a/node_modules/wrappy/package.json b/node_modules/wrappy/package.json index 90c5fc6af..1494a5a59 100644 --- a/node_modules/wrappy/package.json +++ b/node_modules/wrappy/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "wrappy@1", - "D:\\Cordova\\cordova-android\\node_modules\\inflight" + { + "raw": "wrappy@1", + "scope": null, + "escapedName": "wrappy", + "name": "wrappy", + "rawSpec": "1", + "spec": ">=1.0.0 <2.0.0", + "type": "range" + }, + "d:\\cordova\\cordova-android\\node_modules\\inflight" ] ], "_from": "wrappy@>=1.0.0 <2.0.0", @@ -16,16 +24,17 @@ "tmp": "tmp/wrappy-1.0.2.tgz_1463527848281_0.037129373755306005" }, "_npmUser": { - "email": "kat@sykosomatic.org", - "name": "zkat" + "name": "zkat", + "email": "kat@sykosomatic.org" }, "_npmVersion": "3.9.1", "_phantomChildren": {}, "_requested": { - "name": "wrappy", "raw": "wrappy@1", - "rawSpec": "1", "scope": null, + "escapedName": "wrappy", + "name": "wrappy", + "rawSpec": "1", "spec": ">=1.0.0 <2.0.0", "type": "range" }, @@ -37,10 +46,10 @@ "_shasum": "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f", "_shrinkwrap": null, "_spec": "wrappy@1", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\inflight", + "_where": "d:\\cordova\\cordova-android\\node_modules\\inflight", "author": { - "email": "i@izs.me", "name": "Isaac Z. Schlueter", + "email": "i@izs.me", "url": "http://blog.izs.me/" }, "bugs": { @@ -67,12 +76,12 @@ "main": "wrappy.js", "maintainers": [ { - "email": "i@izs.me", - "name": "isaacs" + "name": "isaacs", + "email": "i@izs.me" }, { - "email": "kat@sykosomatic.org", - "name": "zkat" + "name": "zkat", + "email": "kat@sykosomatic.org" } ], "name": "wrappy", diff --git a/node_modules/xmlbuilder/package.json b/node_modules/xmlbuilder/package.json index 38d70c5ba..2beac9ee1 100644 --- a/node_modules/xmlbuilder/package.json +++ b/node_modules/xmlbuilder/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "xmlbuilder@4.0.0", - "D:\\Cordova\\cordova-android\\node_modules\\plist" + { + "raw": "xmlbuilder@4.0.0", + "scope": null, + "escapedName": "xmlbuilder", + "name": "xmlbuilder", + "rawSpec": "4.0.0", + "spec": "4.0.0", + "type": "version" + }, + "d:\\cordova\\cordova-android\\node_modules\\plist" ] ], "_from": "xmlbuilder@4.0.0", @@ -11,16 +19,17 @@ "_installable": true, "_location": "/xmlbuilder", "_npmUser": { - "email": "oozcitak@gmail.com", - "name": "oozcitak" + "name": "oozcitak", + "email": "oozcitak@gmail.com" }, "_npmVersion": "1.4.28", "_phantomChildren": {}, "_requested": { - "name": "xmlbuilder", "raw": "xmlbuilder@4.0.0", - "rawSpec": "4.0.0", "scope": null, + "escapedName": "xmlbuilder", + "name": "xmlbuilder", + "rawSpec": "4.0.0", "spec": "4.0.0", "type": "version" }, @@ -31,10 +40,10 @@ "_shasum": "98b8f651ca30aa624036f127d11cc66dc7b907a3", "_shrinkwrap": null, "_spec": "xmlbuilder@4.0.0", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\plist", + "_where": "d:\\cordova\\cordova-android\\node_modules\\plist", "author": { - "email": "oozcitak@gmail.com", - "name": "Ozgur Ozcitak" + "name": "Ozgur Ozcitak", + "email": "oozcitak@gmail.com" }, "bugs": { "url": "http://github.com/oozcitak/xmlbuilder-js/issues" @@ -69,8 +78,8 @@ "main": "./lib/index", "maintainers": [ { - "email": "oozcitak@gmail.com", - "name": "oozcitak" + "name": "oozcitak", + "email": "oozcitak@gmail.com" } ], "name": "xmlbuilder", diff --git a/node_modules/xmldom/package.json b/node_modules/xmldom/package.json index 0fd31adfb..3282fc312 100644 --- a/node_modules/xmldom/package.json +++ b/node_modules/xmldom/package.json @@ -1,8 +1,16 @@ { "_args": [ [ - "xmldom@0.1.x", - "D:\\Cordova\\cordova-android\\node_modules\\plist" + { + "raw": "xmldom@0.1.x", + "scope": null, + "escapedName": "xmldom", + "name": "xmldom", + "rawSpec": "0.1.x", + "spec": ">=0.1.0 <0.2.0", + "type": "range" + }, + "d:\\cordova\\cordova-android\\node_modules\\plist" ] ], "_from": "xmldom@>=0.1.0 <0.2.0", @@ -12,16 +20,17 @@ "_location": "/xmldom", "_nodeVersion": "5.5.0", "_npmUser": { - "email": "jindw@xidea.org", - "name": "jindw" + "name": "jindw", + "email": "jindw@xidea.org" }, "_npmVersion": "3.3.12", "_phantomChildren": {}, "_requested": { - "name": "xmldom", "raw": "xmldom@0.1.x", - "rawSpec": "0.1.x", "scope": null, + "escapedName": "xmldom", + "name": "xmldom", + "rawSpec": "0.1.x", "spec": ">=0.1.0 <0.2.0", "type": "range" }, @@ -32,30 +41,30 @@ "_shasum": "10de4e5e964981f03c8cc72fadc08d14b6c3aa26", "_shrinkwrap": null, "_spec": "xmldom@0.1.x", - "_where": "D:\\Cordova\\cordova-android\\node_modules\\plist", + "_where": "d:\\cordova\\cordova-android\\node_modules\\plist", "author": { - "email": "jindw@xidea.org", "name": "jindw", + "email": "jindw@xidea.org", "url": "http://www.xidea.org" }, "bugs": { - "email": "jindw@xidea.org", - "url": "http://github.com/jindw/xmldom/issues" + "url": "http://github.com/jindw/xmldom/issues", + "email": "jindw@xidea.org" }, "contributors": [ { - "email": "yaronn01@gmail.com", "name": "Yaron Naveh", + "email": "yaronn01@gmail.com", "url": "http://webservices20.blogspot.com/" }, { - "email": "amirjanyan@gmail.com", "name": "Harutyun Amirjanyan", + "email": "amirjanyan@gmail.com", "url": "https://github.com/nightwing" }, { - "email": "alan@prettyrobots.com", "name": "Alan Gutierrez", + "email": "alan@prettyrobots.com", "url": "http://www.prettyrobots.com/" } ], @@ -85,32 +94,32 @@ ], "licenses": [ { - "MIT": "http://opensource.org/licenses/MIT", "type": "LGPL", - "url": "http://www.gnu.org/licenses/lgpl.html" + "url": "http://www.gnu.org/licenses/lgpl.html", + "MIT": "http://opensource.org/licenses/MIT" } ], "main": "./dom-parser.js", "maintainers": [ { - "email": "jindw@xidea.org", - "name": "jindw" + "name": "jindw", + "email": "jindw@xidea.org" }, { - "email": "yaronn01@gmail.com", - "name": "yaron" + "name": "yaron", + "email": "yaronn01@gmail.com" }, { - "email": "alan@prettyrobots.com", - "name": "bigeasy" + "name": "bigeasy", + "email": "alan@prettyrobots.com" }, { - "email": "kethinov@gmail.com", - "name": "kethinov" + "name": "kethinov", + "email": "kethinov@gmail.com" }, { - "email": "jinyun.jin@gmail.com", - "name": "jinjinyun" + "name": "jinjinyun", + "email": "jinyun.jin@gmail.com" } ], "name": "xmldom", From 81b2bccd977b4237ad2ac10c5e89c9051969b311 Mon Sep 17 00:00:00 2001 From: Vladimir Kotikov Date: Mon, 11 Jul 2016 13:41:30 +0300 Subject: [PATCH 07/14] CB-11550 Update JS snapshot to version 5.2.1 (via coho) --- bin/templates/project/assets/www/cordova.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/templates/project/assets/www/cordova.js b/bin/templates/project/assets/www/cordova.js index c21b67b52..5d20c15da 100644 --- a/bin/templates/project/assets/www/cordova.js +++ b/bin/templates/project/assets/www/cordova.js @@ -19,7 +19,7 @@ under the License. */ ;(function() { -var PLATFORM_VERSION_BUILD_LABEL = '5.2.0'; +var PLATFORM_VERSION_BUILD_LABEL = '5.2.1'; // file: src/scripts/require.js /*jshint -W079 */ @@ -330,7 +330,7 @@ module.exports = cordova; }); -// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/android/nativeapiprovider.js +// file: D:/cordova/cordova-android/cordova-js-src/android/nativeapiprovider.js define("cordova/android/nativeapiprovider", function(require, exports, module) { /** @@ -353,7 +353,7 @@ module.exports = { }); -// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/android/promptbasednativeapi.js +// file: D:/cordova/cordova-android/cordova-js-src/android/promptbasednativeapi.js define("cordova/android/promptbasednativeapi", function(require, exports, module) { /** @@ -862,7 +862,7 @@ module.exports = channel; }); -// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/exec.js +// file: D:/cordova/cordova-android/cordova-js-src/exec.js define("cordova/exec", function(require, exports, module) { /** @@ -1611,7 +1611,7 @@ exports.reset(); }); -// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/platform.js +// file: D:/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. @@ -1721,7 +1721,7 @@ function onMessageFromNative(msg) { }); -// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/plugin/android/app.js +// file: D:/cordova/cordova-android/cordova-js-src/plugin/android/app.js define("cordova/plugin/android/app", function(require, exports, module) { var exec = require('cordova/exec'); From cbed234069080331084689bfff3354d3b26dbf32 Mon Sep 17 00:00:00 2001 From: Vladimir Kotikov Date: Mon, 11 Jul 2016 13:41:31 +0300 Subject: [PATCH 08/14] CB-11550 Set VERSION to 5.2.1 (via coho) --- VERSION | 2 +- bin/templates/cordova/version | 2 +- framework/src/org/apache/cordova/CordovaWebView.java | 2 +- package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index 91ff57278..26d99a283 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.2.0 +5.2.1 diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version index ff7f2a272..416904111 100755 --- a/bin/templates/cordova/version +++ b/bin/templates/cordova/version @@ -20,7 +20,7 @@ */ // Coho updates this line: -var VERSION = "5.2.0"; +var VERSION = "5.2.1"; module.exports.version = VERSION; diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java index 49d4d53c2..85a800daf 100644 --- a/framework/src/org/apache/cordova/CordovaWebView.java +++ b/framework/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.2.0"; + public static final String CORDOVA_VERSION = "5.2.1"; void init(CordovaInterface cordova, List pluginEntries, CordovaPreferences preferences); diff --git a/package.json b/package.json index 825dae27e..504218a76 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cordova-android", - "version": "5.2.0", + "version": "5.2.1", "description": "cordova-android release", "bin": { "create": "bin/create" From 35dfdece12aa0791a081c33af75dbc3f8d4b0c76 Mon Sep 17 00:00:00 2001 From: Vladimir Kotikov Date: Mon, 11 Jul 2016 13:43:38 +0300 Subject: [PATCH 09/14] CB-11550 Updated RELEASENOTES for release 5.2.1 --- RELEASENOTES.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 1f9974130..5507e742e 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -20,6 +20,10 @@ --> ## Release Notes for Cordova (Android) ## +### 5.2.1 (Jul 11, 2016) +* [CB-9489](https://issues.apache.org/jira/browse/CB-9489) Fixed "endless waiting for emulator" issue +* [CB-11481](https://issues.apache.org/jira/browse/CB-11481) android-library is deprecated use com.android.library instead + ### 5.2.0 (Jun 29, 2016) * [CB-11383](https://issues.apache.org/jira/browse/CB-11383) Update to gradle for using `jcenter` and correct Application plugin * [CB-11365](https://issues.apache.org/jira/browse/CB-11365) fixed plugin rm issue with emit being `undefined` @@ -68,7 +72,7 @@ * [CB-10443](https://issues.apache.org/jira/browse/CB-10443) Fix `this.root` null reference * [CB-10421](https://issues.apache.org/jira/browse/CB-10421) Fixes exception when calling run script with `--help` option * updated `.gitignore` -* [CB-10406](https://issues.apache.org/jira/browse/CB-10406) Fixes an exception, thrown when building using Ant. +* [CB-10406](https://issues.apache.org/jira/browse/CB-10406) Fixes an exception, thrown when building using Ant. * [CB-10157](https://issues.apache.org/jira/browse/CB-10157) Uninstall app from device/emulator only when signed apk is already installed ### 5.1.0 (Jan 19, 2016) @@ -78,7 +82,7 @@ * Update theme to `Theme.DeviceDefault.NoActionBar` * [CB-10014](https://issues.apache.org/jira/browse/CB-10014) Set gradle `applicationId` to `package name`. * [CB-9949](https://issues.apache.org/jira/browse/CB-9949) Fixing menu button event not fired in **Android** -* [CB-9479](https://issues.apache.org/jira/browse/CB-9479) Fixing the conditionals again, we should +* [CB-9479](https://issues.apache.org/jira/browse/CB-9479) Fixing the conditionals again, we should * [CB-8917](https://issues.apache.org/jira/browse/CB-8917) New Plugin API for passing results on resume after Activity destruction * [CB-9971](https://issues.apache.org/jira/browse/CB-9971) Suppress `gradlew _JAVA_OPTIONS` output during build * [CB-9836](https://issues.apache.org/jira/browse/CB-9836) Add `.gitattributes` to prevent `CRLF` line endings in repos @@ -95,7 +99,7 @@ * Adds licence header to Adb to pass rat audit * [CB-9835](https://issues.apache.org/jira/browse/CB-9835) Downgrade `properties-parser` to prevent failures in Node < 4.x * [CB-9782](https://issues.apache.org/jira/browse/CB-9782) Implements PlatformApi contract for Android platform. -* [CB-9826](https://issues.apache.org/jira/browse/CB-9826) Fixed `test-build` script on windows. +* [CB-9826](https://issues.apache.org/jira/browse/CB-9826) Fixed `test-build` script on windows. * Refactor of the Cordova Plugin/Permissions API * Manually updating version to 5.0.0-dev for engine tags * Bump up to API level 23 @@ -110,7 +114,7 @@ * [CB-9172](https://issues.apache.org/jira/browse/CB-9172) Improved emulator deploy stability. This closes #188. * [CB-9404](https://issues.apache.org/jira/browse/CB-9404) Fixed an exception when path contained -debug or -release * [CB-8320](https://issues.apache.org/jira/browse/CB-8320) Setting up gradle so we can use CordovaLib as a standard Android Library -* [CB-9185](https://issues.apache.org/jira/browse/CB-9185) Fixed an issue when unsigned apks couldn't be found. +* [CB-9185](https://issues.apache.org/jira/browse/CB-9185) Fixed an issue when unsigned apks couldn't be found. * [CB-9397](https://issues.apache.org/jira/browse/CB-9397) Fixes minor issues with `cordova requirements android` * [CB-9389](https://issues.apache.org/jira/browse/CB-9389) Fixes build/check_reqs hang @@ -177,7 +181,7 @@ * Removed Intent Functionality from Preferences - Preferences can no longer be set by intents -### Release 4.0.1 (April 2015) ### +### Release 4.0.1 (April 2015) ### * Bug fixed where platform failed to install on a version downgrade From 81e5179021dcde4053050762d739b52e9e3457b9 Mon Sep 17 00:00:00 2001 From: Joe Bowser Date: Mon, 11 Jul 2016 14:26:36 -0700 Subject: [PATCH 10/14] Updaing the gradle for the tests to the latest --- test/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/build.gradle b/test/build.gradle index b523aa81a..33d95b725 100644 --- a/test/build.gradle +++ b/test/build.gradle @@ -25,7 +25,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0' + classpath 'com.android.tools.build:gradle:2.1.2' } } From a5a8868d385460975c2bd5832cc796b756d69089 Mon Sep 17 00:00:00 2001 From: Steve Gill Date: Fri, 22 Jul 2016 12:24:27 -0700 Subject: [PATCH 11/14] updated cordoova-common to 1.4.0 --- node_modules/.bin/nopt | 16 +-- node_modules/.bin/nopt.cmd | 7 - node_modules/.bin/semver | 16 +-- node_modules/.bin/semver.cmd | 7 - node_modules/.bin/shjs | 16 +-- node_modules/.bin/shjs.cmd | 7 - node_modules/abbrev/package.json | 6 +- node_modules/ansi/package.json | 6 +- node_modules/balanced-match/README.md | 4 +- node_modules/balanced-match/index.js | 2 +- node_modules/balanced-match/package.json | 28 ++-- node_modules/base64-js/package.json | 6 +- node_modules/big-integer/package.json | 6 +- node_modules/bplist-parser/package.json | 6 +- node_modules/brace-expansion/index.js | 10 ++ node_modules/brace-expansion/package.json | 26 ++-- node_modules/concat-map/package.json | 6 +- node_modules/cordova-common/README.md | 14 +- node_modules/cordova-common/RELEASENOTES.md | 3 + node_modules/cordova-common/package.json | 42 +++--- .../src/ConfigChanges/ConfigChanges.js | 108 +++++++++++++-- .../src/ConfigChanges/ConfigFile.js | 20 ++- .../src/ConfigChanges/munge-util.js | 3 + .../cordova-common/src/PlatformJson.js | 5 +- .../src/PluginInfo/PluginInfo.js | 18 ++- .../cordova-common/src/PluginManager.js | 2 +- .../cordova-common/src/util/xml-helpers.js | 124 +++++++++++++----- .../cordova-registry-mapper/package.json | 6 +- node_modules/elementtree/package.json | 6 +- node_modules/glob/package.json | 6 +- node_modules/inflight/package.json | 6 +- node_modules/inherits/package.json | 6 +- node_modules/lodash/package.json | 6 +- node_modules/minimatch/package.json | 6 +- node_modules/nopt/package.json | 6 +- node_modules/once/package.json | 6 +- node_modules/os-homedir/package.json | 6 +- node_modules/os-tmpdir/package.json | 6 +- node_modules/osenv/package.json | 6 +- node_modules/path-is-absolute/package.json | 6 +- node_modules/plist/package.json | 6 +- node_modules/properties-parser/package.json | 6 +- node_modules/q/package.json | 6 +- node_modules/sax/package.json | 6 +- node_modules/semver/README.md | 4 + node_modules/semver/package.json | 22 ++-- node_modules/semver/semver.js | 19 ++- node_modules/shelljs/package.json | 6 +- node_modules/underscore/package.json | 6 +- node_modules/unorm/package.json | 6 +- node_modules/util-deprecate/package.json | 6 +- node_modules/wrappy/package.json | 6 +- node_modules/xmlbuilder/package.json | 6 +- node_modules/xmldom/package.json | 6 +- package.json | 2 +- 55 files changed, 426 insertions(+), 279 deletions(-) delete mode 100644 node_modules/.bin/nopt.cmd delete mode 100644 node_modules/.bin/semver.cmd delete mode 100644 node_modules/.bin/shjs.cmd diff --git a/node_modules/.bin/nopt b/node_modules/.bin/nopt index 714334ea2..6b6566ea7 120000 --- a/node_modules/.bin/nopt +++ b/node_modules/.bin/nopt @@ -1,15 +1 @@ -#!/bin/sh -basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") - -case `uname` in - *CYGWIN*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - "$basedir/node" "$basedir/../nopt/bin/nopt.js" "$@" - ret=$? -else - node "$basedir/../nopt/bin/nopt.js" "$@" - ret=$? -fi -exit $ret +../nopt/bin/nopt.js \ No newline at end of file diff --git a/node_modules/.bin/nopt.cmd b/node_modules/.bin/nopt.cmd deleted file mode 100644 index 1626454b2..000000000 --- a/node_modules/.bin/nopt.cmd +++ /dev/null @@ -1,7 +0,0 @@ -@IF EXIST "%~dp0\node.exe" ( - "%~dp0\node.exe" "%~dp0\..\nopt\bin\nopt.js" %* -) ELSE ( - @SETLOCAL - @SET PATHEXT=%PATHEXT:;.JS;=;% - node "%~dp0\..\nopt\bin\nopt.js" %* -) \ No newline at end of file diff --git a/node_modules/.bin/semver b/node_modules/.bin/semver index d592e6930..317eb293d 120000 --- a/node_modules/.bin/semver +++ b/node_modules/.bin/semver @@ -1,15 +1 @@ -#!/bin/sh -basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") - -case `uname` in - *CYGWIN*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - "$basedir/node" "$basedir/../semver/bin/semver" "$@" - ret=$? -else - node "$basedir/../semver/bin/semver" "$@" - ret=$? -fi -exit $ret +../semver/bin/semver \ No newline at end of file diff --git a/node_modules/.bin/semver.cmd b/node_modules/.bin/semver.cmd deleted file mode 100644 index 37c00a46d..000000000 --- a/node_modules/.bin/semver.cmd +++ /dev/null @@ -1,7 +0,0 @@ -@IF EXIST "%~dp0\node.exe" ( - "%~dp0\node.exe" "%~dp0\..\semver\bin\semver" %* -) ELSE ( - @SETLOCAL - @SET PATHEXT=%PATHEXT:;.JS;=;% - node "%~dp0\..\semver\bin\semver" %* -) \ No newline at end of file diff --git a/node_modules/.bin/shjs b/node_modules/.bin/shjs index 1d45691be..a0449975b 120000 --- a/node_modules/.bin/shjs +++ b/node_modules/.bin/shjs @@ -1,15 +1 @@ -#!/bin/sh -basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") - -case `uname` in - *CYGWIN*) basedir=`cygpath -w "$basedir"`;; -esac - -if [ -x "$basedir/node" ]; then - "$basedir/node" "$basedir/../shelljs/bin/shjs" "$@" - ret=$? -else - node "$basedir/../shelljs/bin/shjs" "$@" - ret=$? -fi -exit $ret +../shelljs/bin/shjs \ No newline at end of file diff --git a/node_modules/.bin/shjs.cmd b/node_modules/.bin/shjs.cmd deleted file mode 100644 index 3d98b0bc5..000000000 --- a/node_modules/.bin/shjs.cmd +++ /dev/null @@ -1,7 +0,0 @@ -@IF EXIST "%~dp0\node.exe" ( - "%~dp0\node.exe" "%~dp0\..\shelljs\bin\shjs" %* -) ELSE ( - @SETLOCAL - @SET PATHEXT=%PATHEXT:;.JS;=;% - node "%~dp0\..\shelljs\bin\shjs" %* -) \ No newline at end of file diff --git a/node_modules/abbrev/package.json b/node_modules/abbrev/package.json index c3c22be5b..38e7f25c8 100644 --- a/node_modules/abbrev/package.json +++ b/node_modules/abbrev/package.json @@ -10,7 +10,7 @@ "spec": ">=1.0.0 <2.0.0", "type": "range" }, - "d:\\cordova\\cordova-android\\node_modules\\nopt" + "/Users/steveng/repo/cordova/cordova-android/node_modules/nopt" ] ], "_from": "abbrev@>=1.0.0 <2.0.0", @@ -41,11 +41,11 @@ "_requiredBy": [ "/nopt" ], - "_resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", + "_resolved": "http://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", "_shasum": "91b4792588a7738c25f35dd6f63752a2f8776135", "_shrinkwrap": null, "_spec": "abbrev@1", - "_where": "d:\\cordova\\cordova-android\\node_modules\\nopt", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/nopt", "author": { "name": "Isaac Z. Schlueter", "email": "i@izs.me" diff --git a/node_modules/ansi/package.json b/node_modules/ansi/package.json index 157ed2dc0..556964273 100644 --- a/node_modules/ansi/package.json +++ b/node_modules/ansi/package.json @@ -10,7 +10,7 @@ "spec": ">=0.3.1 <0.4.0", "type": "range" }, - "d:\\cordova\\cordova-android\\node_modules\\cordova-common" + "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common" ] ], "_from": "ansi@>=0.3.1 <0.4.0", @@ -37,11 +37,11 @@ "_requiredBy": [ "/cordova-common" ], - "_resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz", + "_resolved": "http://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz", "_shasum": "0c42d4fb17160d5a9af1e484bace1c66922c1b21", "_shrinkwrap": null, "_spec": "ansi@^0.3.1", - "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common", "author": { "name": "Nathan Rajlich", "email": "nathan@tootallnate.net", diff --git a/node_modules/balanced-match/README.md b/node_modules/balanced-match/README.md index d6880b2f3..08e918c0d 100644 --- a/node_modules/balanced-match/README.md +++ b/node_modules/balanced-match/README.md @@ -47,7 +47,7 @@ object with those keys: If there's no match, `undefined` will be returned. -If the `str` contains more `a` than `b` / there are unmatched pairs, the first match that was closed will be used. For example, `{{a}` will match `['{', 'a', '']`. +If the `str` contains more `a` than `b` / there are unmatched pairs, the first match that was closed will be used. For example, `{{a}` will match `['{', 'a', '']` and `{a}}` will match `['', 'a', '}']`. ### var r = balanced.range(a, b, str) @@ -56,7 +56,7 @@ array with indexes: `[ , ]`. If there's no match, `undefined` will be returned. -If the `str` contains more `a` than `b` / there are unmatched pairs, the first match that was closed will be used. For example, `{{a}` will match `[ 1, 3 ]`. +If the `str` contains more `a` than `b` / there are unmatched pairs, the first match that was closed will be used. For example, `{{a}` will match `[ 1, 3 ]` and `{a}}` will match `[0, 2]`. ## Installation diff --git a/node_modules/balanced-match/index.js b/node_modules/balanced-match/index.js index 4670f7f79..e8d858702 100644 --- a/node_modules/balanced-match/index.js +++ b/node_modules/balanced-match/index.js @@ -30,7 +30,7 @@ function range(a, b, str) { begs = []; left = str.length; - while (i < str.length && i >= 0 && ! result) { + while (i >= 0 && !result) { if (i == ai) { begs.push(i); ai = str.indexOf(a, i + 1); diff --git a/node_modules/balanced-match/package.json b/node_modules/balanced-match/package.json index dd4d2ba5b..25e4fa81c 100644 --- a/node_modules/balanced-match/package.json +++ b/node_modules/balanced-match/package.json @@ -10,24 +10,24 @@ "spec": ">=0.4.1 <0.5.0", "type": "range" }, - "d:\\cordova\\cordova-android\\node_modules\\brace-expansion" + "/Users/steveng/repo/cordova/cordova-android/node_modules/brace-expansion" ] ], "_from": "balanced-match@>=0.4.1 <0.5.0", - "_id": "balanced-match@0.4.1", + "_id": "balanced-match@0.4.2", "_inCache": true, "_installable": true, "_location": "/balanced-match", - "_nodeVersion": "6.0.0", + "_nodeVersion": "4.4.7", "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/balanced-match-0.4.1.tgz_1462129663650_0.39764496590942144" + "host": "packages-16-east.internal.npmjs.com", + "tmp": "tmp/balanced-match-0.4.2.tgz_1468834991581_0.6590619895141572" }, "_npmUser": { "name": "juliangruber", "email": "julian@juliangruber.com" }, - "_npmVersion": "3.8.6", + "_npmVersion": "2.15.8", "_phantomChildren": {}, "_requested": { "raw": "balanced-match@^0.4.1", @@ -41,11 +41,11 @@ "_requiredBy": [ "/brace-expansion" ], - "_resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.1.tgz", - "_shasum": "19053e2e0748eadb379da6c09d455cf5e1039335", + "_resolved": "http://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", + "_shasum": "cb3f3e3c732dc0f01ee70b403f302e61d7709838", "_shrinkwrap": null, "_spec": "balanced-match@^0.4.1", - "_where": "d:\\cordova\\cordova-android\\node_modules\\brace-expansion", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/brace-expansion", "author": { "name": "Julian Gruber", "email": "mail@juliangruber.com", @@ -57,14 +57,14 @@ "dependencies": {}, "description": "Match balanced character pairs, like \"{\" and \"}\"", "devDependencies": { - "tape": "~4.5.0" + "tape": "^4.6.0" }, "directories": {}, "dist": { - "shasum": "19053e2e0748eadb379da6c09d455cf5e1039335", - "tarball": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.1.tgz" + "shasum": "cb3f3e3c732dc0f01ee70b403f302e61d7709838", + "tarball": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz" }, - "gitHead": "7004b289baaaab6a832f4901735e29d37cc2a863", + "gitHead": "57c2ea29d89a2844ae3bdcc637c6e2cbb73725e2", "homepage": "https://github.com/juliangruber/balanced-match", "keywords": [ "match", @@ -107,5 +107,5 @@ "android-browser/4.2..latest" ] }, - "version": "0.4.1" + "version": "0.4.2" } diff --git a/node_modules/base64-js/package.json b/node_modules/base64-js/package.json index 772e83f41..61922bff8 100644 --- a/node_modules/base64-js/package.json +++ b/node_modules/base64-js/package.json @@ -10,7 +10,7 @@ "spec": "0.0.8", "type": "version" }, - "d:\\cordova\\cordova-android\\node_modules\\plist" + "/Users/steveng/repo/cordova/cordova-android/node_modules/plist" ] ], "_from": "base64-js@0.0.8", @@ -37,11 +37,11 @@ "_requiredBy": [ "/plist" ], - "_resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz", + "_resolved": "http://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz", "_shasum": "1101e9544f4a76b1bc3b26d452ca96d7a35e7978", "_shrinkwrap": null, "_spec": "base64-js@0.0.8", - "_where": "d:\\cordova\\cordova-android\\node_modules\\plist", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/plist", "author": { "name": "T. Jameson Little", "email": "t.jameson.little@gmail.com" diff --git a/node_modules/big-integer/package.json b/node_modules/big-integer/package.json index b353a4dc9..5e9e0dd2d 100644 --- a/node_modules/big-integer/package.json +++ b/node_modules/big-integer/package.json @@ -10,7 +10,7 @@ "spec": ">=1.6.7 <2.0.0", "type": "range" }, - "d:\\cordova\\cordova-android\\node_modules\\bplist-parser" + "/Users/steveng/repo/cordova/cordova-android/node_modules/bplist-parser" ] ], "_from": "big-integer@>=1.6.7 <2.0.0", @@ -41,11 +41,11 @@ "_requiredBy": [ "/bplist-parser" ], - "_resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.15.tgz", + "_resolved": "http://registry.npmjs.org/big-integer/-/big-integer-1.6.15.tgz", "_shasum": "33d27d3b7388dfcc4b86d3130c10740cec01fb9e", "_shrinkwrap": null, "_spec": "big-integer@^1.6.7", - "_where": "d:\\cordova\\cordova-android\\node_modules\\bplist-parser", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/bplist-parser", "author": { "name": "Peter Olson", "email": "peter.e.c.olson+npm@gmail.com" diff --git a/node_modules/bplist-parser/package.json b/node_modules/bplist-parser/package.json index e4f7e41ee..88655395b 100644 --- a/node_modules/bplist-parser/package.json +++ b/node_modules/bplist-parser/package.json @@ -10,7 +10,7 @@ "spec": ">=0.1.0 <0.2.0", "type": "range" }, - "d:\\cordova\\cordova-android\\node_modules\\cordova-common" + "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common" ] ], "_from": "bplist-parser@>=0.1.0 <0.2.0", @@ -37,11 +37,11 @@ "_requiredBy": [ "/cordova-common" ], - "_resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz", + "_resolved": "http://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz", "_shasum": "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6", "_shrinkwrap": null, "_spec": "bplist-parser@^0.1.0", - "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common", "author": { "name": "Joe Ferner", "email": "joe.ferner@nearinfinity.com" diff --git a/node_modules/brace-expansion/index.js b/node_modules/brace-expansion/index.js index 932718f92..955f27c81 100644 --- a/node_modules/brace-expansion/index.js +++ b/node_modules/brace-expansion/index.js @@ -66,6 +66,16 @@ function expandTop(str) { if (!str) return []; + // I don't know why Bash 4.3 does this, but it does. + // Anything starting with {} will have the first two bytes preserved + // but *only* at the top level, so {},a}b will not expand to anything, + // but a{},b}c will be expanded to [a}c,abc]. + // One could argue that this is a bug in Bash, but since the goal of + // this module is to match Bash's rules, we escape a leading {} + if (str.substr(0, 2) === '{}') { + str = '\\{\\}' + str.substr(2); + } + return expand(escapeBraces(str), true).map(unescapeBraces); } diff --git a/node_modules/brace-expansion/package.json b/node_modules/brace-expansion/package.json index 08cea7feb..33a4d0848 100644 --- a/node_modules/brace-expansion/package.json +++ b/node_modules/brace-expansion/package.json @@ -10,24 +10,24 @@ "spec": ">=1.0.0 <2.0.0", "type": "range" }, - "d:\\cordova\\cordova-android\\node_modules\\minimatch" + "/Users/steveng/repo/cordova/cordova-android/node_modules/minimatch" ] ], "_from": "brace-expansion@>=1.0.0 <2.0.0", - "_id": "brace-expansion@1.1.5", + "_id": "brace-expansion@1.1.6", "_inCache": true, "_installable": true, "_location": "/brace-expansion", - "_nodeVersion": "4.4.5", + "_nodeVersion": "4.4.7", "_npmOperationalInternal": { "host": "packages-16-east.internal.npmjs.com", - "tmp": "tmp/brace-expansion-1.1.5.tgz_1465989660138_0.34528115345165133" + "tmp": "tmp/brace-expansion-1.1.6.tgz_1469047715600_0.9362958471756428" }, "_npmUser": { "name": "juliangruber", "email": "julian@juliangruber.com" }, - "_npmVersion": "2.15.5", + "_npmVersion": "2.15.8", "_phantomChildren": {}, "_requested": { "raw": "brace-expansion@^1.0.0", @@ -41,11 +41,11 @@ "_requiredBy": [ "/minimatch" ], - "_resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.5.tgz", - "_shasum": "f5b4ad574e2cb7ccc1eb83e6fe79b8ecadf7a526", + "_resolved": "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", + "_shasum": "7197d7eaa9b87e648390ea61fc66c84427420df9", "_shrinkwrap": null, "_spec": "brace-expansion@^1.0.0", - "_where": "d:\\cordova\\cordova-android\\node_modules\\minimatch", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/minimatch", "author": { "name": "Julian Gruber", "email": "mail@juliangruber.com", @@ -60,14 +60,14 @@ }, "description": "Brace expansion as known from sh/bash", "devDependencies": { - "tape": "4.5.1" + "tape": "^4.6.0" }, "directories": {}, "dist": { - "shasum": "f5b4ad574e2cb7ccc1eb83e6fe79b8ecadf7a526", - "tarball": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.5.tgz" + "shasum": "7197d7eaa9b87e648390ea61fc66c84427420df9", + "tarball": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz" }, - "gitHead": "ff31acab078f1bb696ac4c55ca56ea24e6495fb6", + "gitHead": "791262fa06625e9c5594cde529a21d82086af5f2", "homepage": "https://github.com/juliangruber/brace-expansion", "keywords": [], "license": "MIT", @@ -109,5 +109,5 @@ "android-browser/4.2..latest" ] }, - "version": "1.1.5" + "version": "1.1.6" } diff --git a/node_modules/concat-map/package.json b/node_modules/concat-map/package.json index c02ce03b9..fcb5849f0 100644 --- a/node_modules/concat-map/package.json +++ b/node_modules/concat-map/package.json @@ -10,7 +10,7 @@ "spec": "0.0.1", "type": "version" }, - "d:\\cordova\\cordova-android\\node_modules\\brace-expansion" + "/Users/steveng/repo/cordova/cordova-android/node_modules/brace-expansion" ] ], "_from": "concat-map@0.0.1", @@ -36,11 +36,11 @@ "_requiredBy": [ "/brace-expansion" ], - "_resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "_resolved": "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "_shasum": "d8a96bd77fd68df7793a73036a3ba0d5405d477b", "_shrinkwrap": null, "_spec": "concat-map@0.0.1", - "_where": "d:\\cordova\\cordova-android\\node_modules\\brace-expansion", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/brace-expansion", "author": { "name": "James Halliday", "email": "mail@substack.net", diff --git a/node_modules/cordova-common/README.md b/node_modules/cordova-common/README.md index 6454481a8..c5dcfd5c9 100644 --- a/node_modules/cordova-common/README.md +++ b/node_modules/cordova-common/README.md @@ -28,7 +28,7 @@ Expoeses shared functionality used by [cordova-lib](https://github.com/apache/co Represents special instance of NodeJS EventEmitter which is intended to be used to post events to cordova-lib and cordova-cli Usage: -``` +```js var events = require('cordova-common').events; events.emit('warn', 'Some warning message') ``` @@ -41,7 +41,7 @@ An error class used by Cordova to throw cordova-specific errors. The CordovaErro Usage: -``` +```js var CordovaError = require('cordova-common').CordovaError; throw new CordovaError('Some error message', SOME_ERR_CODE); ``` @@ -53,7 +53,7 @@ See [CordovaError](src/CordovaError/CordovaError.js) for supported error codes. Exposes functionality to deal with cordova project `config.xml` files. For ConfigParser API reference check [ConfigParser Readme](src/ConfigParser/README.md). Usage: -``` +```js var ConfigParser = require('cordova-common').ConfigParser; var appConfig = new ConfigParser('path/to/cordova-app/config.xml'); console.log(appconfig.name() + ':' + appConfig.version()); @@ -64,7 +64,7 @@ console.log(appconfig.name() + ':' + appConfig.version()); `PluginInfo` is a wrapper for cordova plugins' `plugin.xml` files. This class may be instantiated directly or via `PluginInfoProvider`. The difference is that `PluginInfoProvider` caches `PluginInfo` instances based on plugin source directory. Usage: -``` +```js var PluginInfo: require('cordova-common').PluginInfo; var PluginInfoProvider: require('cordova-common').PluginInfoProvider; @@ -80,7 +80,7 @@ console.log('The plugin ' + plugin1.id + ' has version ' + plugin1.version) Utility module for dealing with sequential tasks. Provides a set of tasks that are needed to be done and reverts all tasks that are already completed if one of those tasks fail to complete. Used internally by cordova-lib and platform's plugin installation routines. Usage: -``` +```js var ActionStack = require('cordova-common').ActionStack; var stack = new ActionStack() @@ -104,7 +104,7 @@ stack.process() Module for spawning child processes with some advanced logic. Usage: -``` +```js var superspawn = require('cordova-common').superspawn; superspawn.spawn('adb', ['devices']) .progress(function(data){ @@ -121,7 +121,7 @@ superspawn.spawn('adb', ['devices']) A set of utility methods for dealing with xml files. Usage: -``` +```js var xml = require('cordova-common').xmlHelpers; var xmlDoc1 = xml.parseElementtreeSync('some/xml/file'); diff --git a/node_modules/cordova-common/RELEASENOTES.md b/node_modules/cordova-common/RELEASENOTES.md index 7a99cc911..71ad1ea50 100644 --- a/node_modules/cordova-common/RELEASENOTES.md +++ b/node_modules/cordova-common/RELEASENOTES.md @@ -20,6 +20,9 @@ --> # Cordova-common Release Notes +### 1.4.0 (Jul 12, 2016) +* [CB-11023](https://issues.apache.org/jira/browse/CB-11023) Add edit-config functionality + ### 1.3.0 (May 12, 2016) * [CB-11259](https://issues.apache.org/jira/browse/CB-11259): Improving prepare and build logging * [CB-11194](https://issues.apache.org/jira/browse/CB-11194) Improve cordova load time diff --git a/node_modules/cordova-common/package.json b/node_modules/cordova-common/package.json index 0c2350b2d..f71b56945 100644 --- a/node_modules/cordova-common/package.json +++ b/node_modules/cordova-common/package.json @@ -2,50 +2,50 @@ "_args": [ [ { - "raw": "cordova-common@^1.3.0", + "raw": "cordova-common@^1.4.0", "scope": null, "escapedName": "cordova-common", "name": "cordova-common", - "rawSpec": "^1.3.0", - "spec": ">=1.3.0 <2.0.0", + "rawSpec": "^1.4.0", + "spec": ">=1.4.0 <2.0.0", "type": "range" }, - "d:\\cordova\\cordova-android" + "/Users/steveng/repo/cordova/cordova-android" ] ], - "_from": "cordova-common@>=1.3.0 <2.0.0", - "_id": "cordova-common@1.3.0", + "_from": "cordova-common@>=1.4.0 <2.0.0", + "_id": "cordova-common@1.4.0", "_inCache": true, "_installable": true, "_location": "/cordova-common", - "_nodeVersion": "5.4.1", + "_nodeVersion": "6.3.0", "_npmOperationalInternal": { "host": "packages-16-east.internal.npmjs.com", - "tmp": "tmp/cordova-common-1.3.0.tgz_1464130094288_0.48495062021538615" + "tmp": "tmp/cordova-common-1.4.0.tgz_1469092638680_0.9961137105710804" }, "_npmUser": { - "name": "stevegill", - "email": "stevengill97@gmail.com" + "name": "kotikov.vladimir", + "email": "kotikov.vladimir@gmail.com" }, - "_npmVersion": "3.9.0", + "_npmVersion": "3.10.5", "_phantomChildren": {}, "_requested": { - "raw": "cordova-common@^1.3.0", + "raw": "cordova-common@^1.4.0", "scope": null, "escapedName": "cordova-common", "name": "cordova-common", - "rawSpec": "^1.3.0", - "spec": ">=1.3.0 <2.0.0", + "rawSpec": "^1.4.0", + "spec": ">=1.4.0 <2.0.0", "type": "range" }, "_requiredBy": [ "/" ], - "_resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-1.3.0.tgz", - "_shasum": "f75161f6aa7cef5486fd5d69a3b0a1f628334491", + "_resolved": "http://registry.npmjs.org/cordova-common/-/cordova-common-1.4.0.tgz", + "_shasum": "b3ba73595caa34fe8250ac11f20a4ed44e7c84e4", "_shrinkwrap": null, - "_spec": "cordova-common@^1.3.0", - "_where": "d:\\cordova\\cordova-android", + "_spec": "cordova-common@^1.4.0", + "_where": "/Users/steveng/repo/cordova/cordova-android", "author": { "name": "Apache Software Foundation" }, @@ -79,8 +79,8 @@ }, "directories": {}, "dist": { - "shasum": "f75161f6aa7cef5486fd5d69a3b0a1f628334491", - "tarball": "https://registry.npmjs.org/cordova-common/-/cordova-common-1.3.0.tgz" + "shasum": "b3ba73595caa34fe8250ac11f20a4ed44e7c84e4", + "tarball": "https://registry.npmjs.org/cordova-common/-/cordova-common-1.4.0.tgz" }, "engineStrict": true, "engines": { @@ -127,5 +127,5 @@ "jshint": "node node_modules/jshint/bin/jshint src && node node_modules/jshint/bin/jshint spec", "test": "npm run jshint && npm run jasmine" }, - "version": "1.3.0" + "version": "1.4.0" } diff --git a/node_modules/cordova-common/src/ConfigChanges/ConfigChanges.js b/node_modules/cordova-common/src/ConfigChanges/ConfigChanges.js index a914fc80e..a395c6da4 100644 --- a/node_modules/cordova-common/src/ConfigChanges/ConfigChanges.js +++ b/node_modules/cordova-common/src/ConfigChanges/ConfigChanges.js @@ -36,9 +36,11 @@ var fs = require('fs'), et = require('elementtree'), semver = require('semver'), events = require('../events'), - ConfigKeeper = require('./ConfigKeeper'); + ConfigKeeper = require('./ConfigKeeper'), + CordovaLogger = require('../CordovaLogger'); var mungeutil = require('./munge-util'); +var xml_helpers = require('../util/xml-helpers'); exports.PlatformMunger = PlatformMunger; @@ -95,9 +97,10 @@ function remove_plugin_changes(pluginInfo, is_top_level) { var plugin_vars = is_top_level ? platform_config.installed_plugins[pluginInfo.id] : platform_config.dependent_plugins[pluginInfo.id]; + var edit_config_changes = pluginInfo.getEditConfigs(self.platform); // get config munge, aka how did this plugin change various config files - var config_munge = self.generate_plugin_config_munge(pluginInfo, plugin_vars); + var config_munge = self.generate_plugin_config_munge(pluginInfo, plugin_vars, edit_config_changes); // global munge looks at all plugins' changes to config files var global_munge = platform_config.config_munge; var munge = mungeutil.decrement_munge(global_munge, config_munge); @@ -125,12 +128,40 @@ function remove_plugin_changes(pluginInfo, is_top_level) { PlatformMunger.prototype.add_plugin_changes = add_plugin_changes; -function add_plugin_changes(pluginInfo, plugin_vars, is_top_level, should_increment) { +function add_plugin_changes(pluginInfo, plugin_vars, is_top_level, should_increment, plugin_force) { var self = this; var platform_config = self.platformJson.root; + var edit_config_changes = pluginInfo.getEditConfigs(self.platform); + var config_munge; - // get config munge, aka how should this plugin change various config files - var config_munge = self.generate_plugin_config_munge(pluginInfo, plugin_vars); + if (!edit_config_changes || edit_config_changes.length === 0) { + // get config munge, aka how should this plugin change various config files + config_munge = self.generate_plugin_config_munge(pluginInfo, plugin_vars); + } + else { + var isConflictingInfo = is_conflicting(edit_config_changes, platform_config.config_munge, self, plugin_force); + if (plugin_force) { + CordovaLogger.get().log(CordovaLogger.WARN, '--force is used. edit-config will overwrite conflicts if any. Conflicting plugins may not work as expected.'); + + // remove conflicting munges + var conflict_munge = mungeutil.decrement_munge(platform_config.config_munge, isConflictingInfo.conflictingMunge); + for (var conflict_file in conflict_munge.files) { + self.apply_file_munge(conflict_file, conflict_munge.files[conflict_file], /* remove = */ true); + } + + // force add new munges + config_munge = self.generate_plugin_config_munge(pluginInfo, plugin_vars, edit_config_changes); + } + else if(isConflictingInfo.conflictFound) { + throw new Error('There was a conflict trying to modify attributes with in plugin ' + pluginInfo.id + + '. The conflicting plugin, ' + isConflictingInfo.conflictingPlugin + ', already modified the same attributes. The conflict must be resolved before ' + + pluginInfo.id + ' can be added. You may use --force to add the plugin and overwrite the conflicting attributes.'); + } + else { + // no conflicts, will handle edit-config + config_munge = self.generate_plugin_config_munge(pluginInfo, plugin_vars, edit_config_changes); + } + } // global munge looks at all plugins' changes to config files // TODO: The should_increment param is only used by cordova-cli and is going away soon. @@ -186,13 +217,17 @@ function reapply_global_munge () { // generate_plugin_config_munge // Generate the munge object from plugin.xml + vars PlatformMunger.prototype.generate_plugin_config_munge = generate_plugin_config_munge; -function generate_plugin_config_munge(pluginInfo, vars) { +function generate_plugin_config_munge(pluginInfo, vars, edit_config_changes) { var self = this; vars = vars || {}; var munge = { files: {} }; var changes = pluginInfo.getConfigFiles(self.platform); + if(edit_config_changes) { + Array.prototype.push.apply(changes, edit_config_changes); + } + // Demux 'package.appxmanifest' into relevant platform-specific appx manifests. // Only spend the cycles if there are version-specific plugin settings if (self.platform === 'windows' && @@ -291,12 +326,69 @@ function generate_plugin_config_munge(pluginInfo, vars) { }); } // 2. add into munge - mungeutil.deep_add(munge, change.target, change.parent, { xml: stringified, count: 1, after: change.after }); + if (change.mode) { + mungeutil.deep_add(munge, change.file, change.target, { xml: stringified, count: 1, mode: change.mode, plugin: pluginInfo.id }); + } + else { + mungeutil.deep_add(munge, change.target, change.parent, { xml: stringified, count: 1, after: change.after }); + } }); }); return munge; } +function is_conflicting(editchanges, config_munge, self, force) { + var files = config_munge.files; + var conflictFound = false; + var conflictingMunge = { files: {} }; + var conflictingParent; + var conflictingPlugin; + + editchanges.forEach(function(editchange) { + if (files[editchange.file]) { + var parents = files[editchange.file].parents; + var target = parents[editchange.target]; + + // Check if the edit target will resolve to an existing target + if (!target || target.length === 0) { + var file_xml = self.config_keeper.get(self.project_dir, self.platform, editchange.file).data; + var resolveEditTarget = xml_helpers.resolveParent(file_xml, editchange.target); + var resolveTarget; + + if (resolveEditTarget) { + for (var parent in parents) { + resolveTarget = xml_helpers.resolveParent(file_xml, parent); + if (resolveEditTarget === resolveTarget) { + conflictingParent = parent; + target = parents[parent]; + break; + } + } + } + } + else { + conflictingParent = editchange.target; + } + + if (target.length !== 0) { + // conflict has been found, exit and throw an error + conflictFound = true; + if (!force) { + // since there has been modifications to the attributes at this target, + // the current plugin should not modify the attributes + conflictingPlugin = target[0].plugin; + return; + } + + // need to find all conflicts when --force is used, track conflicting munges + mungeutil.deep_add(conflictingMunge, editchange.file, conflictingParent, target[0]); + } + } + }); + + return {conflictFound: conflictFound, conflictingPlugin: conflictingPlugin, conflictingMunge: conflictingMunge}; +} + // Go over the prepare queue and apply the config munges for each plugin // that has been (un)installed. PlatformMunger.prototype.process = PlatformMunger_process; @@ -313,7 +405,7 @@ function PlatformMunger_process(plugins_dir) { // Now handle installation platform_config.prepare_queue.installed.forEach(function(u) { var pluginInfo = self.pluginInfoProvider.get(path.join(plugins_dir, u.plugin)); - self.add_plugin_changes(pluginInfo, u.vars, u.topLevel, true); + self.add_plugin_changes(pluginInfo, u.vars, u.topLevel, true, u.force); }); // Empty out installed/ uninstalled queues. diff --git a/node_modules/cordova-common/src/ConfigChanges/ConfigFile.js b/node_modules/cordova-common/src/ConfigChanges/ConfigFile.js index 9c540b9da..179d54d14 100644 --- a/node_modules/cordova-common/src/ConfigChanges/ConfigFile.js +++ b/node_modules/cordova-common/src/ConfigChanges/ConfigFile.js @@ -103,7 +103,16 @@ ConfigFile.prototype.graft_child = function ConfigFile_graft_child(selector, xml var result; if (self.type === 'xml') { var xml_to_graft = [modules.et.XML(xml_child.xml)]; - result = modules.xml_helpers.graftXML(self.data, xml_to_graft, selector, xml_child.after); + switch (xml_child.mode) { + case 'merge': + result = modules.xml_helpers.graftXMLMerge(self.data, xml_to_graft, selector, xml_child); + break; + case 'overwrite': + result = modules.xml_helpers.graftXMLOverwrite(self.data, xml_to_graft, selector, xml_child); + break; + default: + result = modules.xml_helpers.graftXML(self.data, xml_to_graft, selector, xml_child.after); + } if ( !result) { throw new Error('Unable to graft xml at selector "' + selector + '" from "' + filepath + '" during config install'); } @@ -123,7 +132,14 @@ ConfigFile.prototype.prune_child = function ConfigFile_prune_child(selector, xml var result; if (self.type === 'xml') { var xml_to_graft = [modules.et.XML(xml_child.xml)]; - result = modules.xml_helpers.pruneXML(self.data, xml_to_graft, selector); + switch (xml_child.mode) { + case 'merge': + case 'overwrite': + result = modules.xml_helpers.pruneXMLRestore(self.data, selector, xml_child); + break; + default: + result = modules.xml_helpers.pruneXML(self.data, xml_to_graft, selector); + } } else { // plist file result = modules.plist_helpers.prunePLIST(self.data, xml_child.xml, selector); diff --git a/node_modules/cordova-common/src/ConfigChanges/munge-util.js b/node_modules/cordova-common/src/ConfigChanges/munge-util.js index 307b3c1c9..0149bab77 100644 --- a/node_modules/cordova-common/src/ConfigChanges/munge-util.js +++ b/node_modules/cordova-common/src/ConfigChanges/munge-util.js @@ -52,6 +52,9 @@ exports.deep_remove = function deep_remove(obj, keys /* or key1, key2 .... */ ) return element.xml == k.xml; }); if (found) { + if (parentArray[index].oldAttrib) { + k.oldAttrib = _.extend({}, parentArray[index].oldAttrib); + } found.count -= k.count; if (found.count > 0) { return false; diff --git a/node_modules/cordova-common/src/PlatformJson.js b/node_modules/cordova-common/src/PlatformJson.js index 4e2b2874d..ab94b5fd9 100644 --- a/node_modules/cordova-common/src/PlatformJson.js +++ b/node_modules/cordova-common/src/PlatformJson.js @@ -162,8 +162,8 @@ PlatformJson.prototype.removePluginMetadata = function (pluginInfo) { return this; }; -PlatformJson.prototype.addInstalledPluginToPrepareQueue = function(pluginDirName, vars, is_top_level) { - this.root.prepare_queue.installed.push({'plugin':pluginDirName, 'vars':vars, 'topLevel':is_top_level}); +PlatformJson.prototype.addInstalledPluginToPrepareQueue = function(pluginDirName, vars, is_top_level, force) { + this.root.prepare_queue.installed.push({'plugin':pluginDirName, 'vars':vars, 'topLevel':is_top_level, 'force':force}); }; PlatformJson.prototype.addUninstalledPluginToPrepareQueue = function(pluginId, is_top_level) { @@ -276,4 +276,3 @@ function ModuleMetadata (pluginId, jsModule) { } module.exports = PlatformJson; - diff --git a/node_modules/cordova-common/src/PluginInfo/PluginInfo.js b/node_modules/cordova-common/src/PluginInfo/PluginInfo.js index 77199ec15..bf1f75b58 100644 --- a/node_modules/cordova-common/src/PluginInfo/PluginInfo.js +++ b/node_modules/cordova-common/src/PluginInfo/PluginInfo.js @@ -146,6 +146,22 @@ function PluginInfo(dirname) { return configFile; } + self.getEditConfigs = getEditConfigs; + function getEditConfigs(platform) { + var editConfigs = _getTags(self._et, 'edit-config', platform, _parseEditConfigs); + return editConfigs; + } + + function _parseEditConfigs(tag) { + var editConfig = + { file : tag.attrib['file'] + , target : tag.attrib['target'] + , mode : tag.attrib['mode'] + , xmls : tag.getchildren() + }; + return editConfig; + } + // tags, both global and within a // TODO (kamrik): Do we ever use under ? Example wanted. self.getInfo = getInfo; @@ -382,7 +398,7 @@ function _getTags(pelem, tag, platform, transform) { return tags; } -// Same as _getTags() but only looks inside a platfrom section. +// Same as _getTags() but only looks inside a platform section. function _getTagsInPlatform(pelem, tag, platform, transform) { var platformTag = pelem.find('./platform[@name="' + platform + '"]'); var tags = platformTag ? platformTag.findall(tag) : []; diff --git a/node_modules/cordova-common/src/PluginManager.js b/node_modules/cordova-common/src/PluginManager.js index c3a29fc40..e8968f10c 100644 --- a/node_modules/cordova-common/src/PluginManager.js +++ b/node_modules/cordova-common/src/PluginManager.js @@ -123,7 +123,7 @@ PluginManager.prototype.doOperation = function (operation, plugin, options) { if (operation === PluginManager.INSTALL) { // Ignore passed `is_top_level` option since platform itself doesn't know // anything about managing dependencies - it's responsibility of caller. - self.munger.add_plugin_changes(plugin, options.variables, /*is_top_level=*/true, /*should_increment=*/true); + self.munger.add_plugin_changes(plugin, options.variables, /*is_top_level=*/true, /*should_increment=*/true, options.force); self.munger.platformJson.addPluginMetadata(plugin); } else { self.munger.remove_plugin_changes(plugin, /*is_top_level=*/true); diff --git a/node_modules/cordova-common/src/util/xml-helpers.js b/node_modules/cordova-common/src/util/xml-helpers.js index 6366af968..f16eaaf2d 100644 --- a/node_modules/cordova-common/src/util/xml-helpers.js +++ b/node_modules/cordova-common/src/util/xml-helpers.js @@ -29,6 +29,9 @@ var fs = require('fs') , et = require('elementtree') ; + var ROOT = /^\/([^\/]*)/, + ABSOLUTE = /^\/([^\/]*)\/(.*)/; + module.exports = { // compare two et.XML nodes, see if they match // compares tagName, text, attributes and children (recursively) @@ -68,7 +71,7 @@ module.exports = { // adds node to doc at selector, creating parent if it doesn't exist graftXML: function(doc, nodes, selector, after) { - var parent = resolveParent(doc, selector); + var parent = module.exports.resolveParent(doc, selector); if (!parent) { //Try to create the parent recursively if necessary try { @@ -79,7 +82,7 @@ module.exports = { } catch (e) { return false; } - parent = resolveParent(doc, selector); + parent = module.exports.resolveParent(doc, selector); if (!parent) return false; } @@ -97,9 +100,54 @@ module.exports = { return true; }, + // adds new attributes to doc at selector + // Will only merge if attribute has not been modified already or --force is used + graftXMLMerge: function(doc, nodes, selector, xml) { + var target = module.exports.resolveParent(doc, selector); + if (!target) return false; + + // saves the attributes of the original xml before making changes + xml.oldAttrib = _.extend({}, target.attrib); + + nodes.forEach(function (node) { + var attributes = node.attrib; + for (var attribute in attributes) { + target.attrib[attribute] = node.attrib[attribute]; + } + }); + + return true; + }, + + // overwrite all attributes to doc at selector with new attributes + // Will only overwrite if attribute has not been modified already or --force is used + graftXMLOverwrite: function(doc, nodes, selector, xml) { + var target = module.exports.resolveParent(doc, selector); + if (!target) return false; + + // saves the attributes of the original xml before making changes + xml.oldAttrib = _.extend({}, target.attrib); + + // remove old attributes from target + var targetAttributes = target.attrib; + for (var targetAttribute in targetAttributes) { + delete targetAttributes[targetAttribute]; + } + + // add new attributes to target + nodes.forEach(function (node) { + var attributes = node.attrib; + for (var attribute in attributes) { + target.attrib[attribute] = node.attrib[attribute]; + } + }); + + return true; + }, + // removes node from doc at selector pruneXML: function(doc, nodes, selector) { - var parent = resolveParent(doc, selector); + var parent = module.exports.resolveParent(doc, selector); if (!parent) return false; nodes.forEach(function (node) { @@ -114,6 +162,19 @@ module.exports = { return true; }, + // restores attributes from doc at selector + pruneXMLRestore: function(doc, selector, xml) { + var target = module.exports.resolveParent(doc, selector); + if (!target) return false; + + if (xml.oldAttrib) { + target.attrib = _.extend({}, xml.oldAttrib); + } + + return true; + }, + + parseElementtreeSync: function (filename) { var contents = fs.readFileSync(filename, 'utf-8'); if(contents) { @@ -121,6 +182,30 @@ module.exports = { contents = contents.substring(contents.indexOf('<')); } return new et.ElementTree(et.XML(contents)); + }, + + resolveParent: function (doc, selector) { + var parent, tagName, subSelector; + + // handle absolute selector (which elementtree doesn't like) + if (ROOT.test(selector)) { + tagName = selector.match(ROOT)[1]; + // test for wildcard "any-tag" root selector + if (tagName == '*' || tagName === doc._root.tag) { + parent = doc._root; + + // could be an absolute path, but not selecting the root + if (ABSOLUTE.test(selector)) { + subSelector = selector.match(ABSOLUTE)[2]; + parent = parent.find(subSelector); + } + } else { + return false; + } + } else { + parent = doc.find(selector); + } + return parent; } }; @@ -152,33 +237,6 @@ function uniqueChild(node, parent) { } } -var ROOT = /^\/([^\/]*)/, - ABSOLUTE = /^\/([^\/]*)\/(.*)/; - -function resolveParent(doc, selector) { - var parent, tagName, subSelector; - - // handle absolute selector (which elementtree doesn't like) - if (ROOT.test(selector)) { - tagName = selector.match(ROOT)[1]; - // test for wildcard "any-tag" root selector - if (tagName == '*' || tagName === doc._root.tag) { - parent = doc._root; - - // could be an absolute path, but not selecting the root - if (ABSOLUTE.test(selector)) { - subSelector = selector.match(ABSOLUTE)[2]; - parent = parent.find(subSelector); - } - } else { - return false; - } - } else { - parent = doc.find(selector); - } - return parent; -} - // Find the index at which to insert an entry. After is a ;-separated priority list // of tags after which the insertion should be made. E.g. If we need to // insert an element C, and the rule is that the order of children has to be @@ -257,19 +315,19 @@ function mergeXml(src, dest, platform, clobber) { dest.append(destChild); } } - + function removeDuplicatePreferences(xml) { // reduce preference tags to a hashtable to remove dupes var prefHash = xml.findall('preference[@name][@value]').reduce(function(previousValue, currentValue) { previousValue[ currentValue.attrib.name ] = currentValue.attrib.value; return previousValue; }, {}); - + // remove all preferences xml.findall('preference[@name][@value]').forEach(function(pref) { xml.remove(pref); }); - + // write new preferences Object.keys(prefHash).forEach(function(key, index) { var element = et.SubElement(xml, 'preference'); diff --git a/node_modules/cordova-registry-mapper/package.json b/node_modules/cordova-registry-mapper/package.json index 2b8af74a2..f83519676 100644 --- a/node_modules/cordova-registry-mapper/package.json +++ b/node_modules/cordova-registry-mapper/package.json @@ -10,7 +10,7 @@ "spec": ">=1.1.8 <2.0.0", "type": "range" }, - "d:\\cordova\\cordova-android\\node_modules\\cordova-common" + "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common" ] ], "_from": "cordova-registry-mapper@>=1.1.8 <2.0.0", @@ -37,11 +37,11 @@ "_requiredBy": [ "/cordova-common" ], - "_resolved": "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz", + "_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": "d:\\cordova\\cordova-android\\node_modules\\cordova-common", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common", "author": { "name": "Steve Gill" }, diff --git a/node_modules/elementtree/package.json b/node_modules/elementtree/package.json index 58a417381..5a8ff6573 100644 --- a/node_modules/elementtree/package.json +++ b/node_modules/elementtree/package.json @@ -10,7 +10,7 @@ "spec": ">=0.1.6 <0.2.0", "type": "range" }, - "d:\\cordova\\cordova-android" + "/Users/steveng/repo/cordova/cordova-android" ] ], "_from": "elementtree@>=0.1.6 <0.2.0", @@ -37,11 +37,11 @@ "/", "/cordova-common" ], - "_resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz", + "_resolved": "http://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz", "_shasum": "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c", "_shrinkwrap": null, "_spec": "elementtree@^0.1.6", - "_where": "d:\\cordova\\cordova-android", + "_where": "/Users/steveng/repo/cordova/cordova-android", "author": { "name": "Rackspace US, Inc." }, diff --git a/node_modules/glob/package.json b/node_modules/glob/package.json index 1f1cec6de..e7d40047b 100644 --- a/node_modules/glob/package.json +++ b/node_modules/glob/package.json @@ -10,7 +10,7 @@ "spec": ">=5.0.13 <6.0.0", "type": "range" }, - "d:\\cordova\\cordova-android\\node_modules\\cordova-common" + "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common" ] ], "_from": "glob@>=5.0.13 <6.0.0", @@ -37,11 +37,11 @@ "_requiredBy": [ "/cordova-common" ], - "_resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "_resolved": "http://registry.npmjs.org/glob/-/glob-5.0.15.tgz", "_shasum": "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1", "_shrinkwrap": null, "_spec": "glob@^5.0.13", - "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common", "author": { "name": "Isaac Z. Schlueter", "email": "i@izs.me", diff --git a/node_modules/inflight/package.json b/node_modules/inflight/package.json index 734e580a6..5a67ac8f5 100644 --- a/node_modules/inflight/package.json +++ b/node_modules/inflight/package.json @@ -10,7 +10,7 @@ "spec": ">=1.0.4 <2.0.0", "type": "range" }, - "d:\\cordova\\cordova-android\\node_modules\\glob" + "/Users/steveng/repo/cordova/cordova-android/node_modules/glob" ] ], "_from": "inflight@>=1.0.4 <2.0.0", @@ -41,11 +41,11 @@ "_requiredBy": [ "/glob" ], - "_resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz", + "_resolved": "http://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz", "_shasum": "db3204cd5a9de2e6cd890b85c6e2f66bcf4f620a", "_shrinkwrap": null, "_spec": "inflight@^1.0.4", - "_where": "d:\\cordova\\cordova-android\\node_modules\\glob", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/glob", "author": { "name": "Isaac Z. Schlueter", "email": "i@izs.me", diff --git a/node_modules/inherits/package.json b/node_modules/inherits/package.json index 7a8df25d0..44dcb9a42 100644 --- a/node_modules/inherits/package.json +++ b/node_modules/inherits/package.json @@ -10,7 +10,7 @@ "spec": ">=2.0.0 <3.0.0", "type": "range" }, - "d:\\cordova\\cordova-android\\node_modules\\glob" + "/Users/steveng/repo/cordova/cordova-android/node_modules/glob" ] ], "_from": "inherits@>=2.0.0 <3.0.0", @@ -36,11 +36,11 @@ "_requiredBy": [ "/glob" ], - "_resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "_resolved": "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", "_shasum": "b17d08d326b4423e568eff719f91b0b1cbdf69f1", "_shrinkwrap": null, "_spec": "inherits@2", - "_where": "d:\\cordova\\cordova-android\\node_modules\\glob", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/glob", "browser": "./inherits_browser.js", "bugs": { "url": "https://github.com/isaacs/inherits/issues" diff --git a/node_modules/lodash/package.json b/node_modules/lodash/package.json index d4de5b96d..2c0132678 100644 --- a/node_modules/lodash/package.json +++ b/node_modules/lodash/package.json @@ -10,7 +10,7 @@ "spec": ">=3.5.0 <4.0.0", "type": "range" }, - "d:\\cordova\\cordova-android\\node_modules\\xmlbuilder" + "/Users/steveng/repo/cordova/cordova-android/node_modules/xmlbuilder" ] ], "_from": "lodash@>=3.5.0 <4.0.0", @@ -37,11 +37,11 @@ "_requiredBy": [ "/xmlbuilder" ], - "_resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "_resolved": "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", "_shasum": "5bf45e8e49ba4189e17d482789dfd15bd140b7b6", "_shrinkwrap": null, "_spec": "lodash@^3.5.0", - "_where": "d:\\cordova\\cordova-android\\node_modules\\xmlbuilder", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/xmlbuilder", "author": { "name": "John-David Dalton", "email": "john.david.dalton@gmail.com", diff --git a/node_modules/minimatch/package.json b/node_modules/minimatch/package.json index beed60634..03885fe74 100644 --- a/node_modules/minimatch/package.json +++ b/node_modules/minimatch/package.json @@ -10,7 +10,7 @@ "spec": ">=3.0.0 <4.0.0", "type": "range" }, - "d:\\cordova\\cordova-android\\node_modules\\cordova-common" + "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common" ] ], "_from": "minimatch@>=3.0.0 <4.0.0", @@ -42,11 +42,11 @@ "/cordova-common", "/glob" ], - "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz", + "_resolved": "http://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz", "_shasum": "0f398a7300ea441e9c348c83d98ab8c9dbf9c40a", "_shrinkwrap": null, "_spec": "minimatch@^3.0.0", - "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common", "author": { "name": "Isaac Z. Schlueter", "email": "i@izs.me", diff --git a/node_modules/nopt/package.json b/node_modules/nopt/package.json index 84b9ff656..e0e7cba6a 100644 --- a/node_modules/nopt/package.json +++ b/node_modules/nopt/package.json @@ -10,7 +10,7 @@ "spec": ">=3.0.1 <4.0.0", "type": "range" }, - "d:\\cordova\\cordova-android" + "/Users/steveng/repo/cordova/cordova-android" ] ], "_from": "nopt@>=3.0.1 <4.0.0", @@ -37,11 +37,11 @@ "_requiredBy": [ "/" ], - "_resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "_resolved": "http://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", "_shasum": "c6465dbf08abcd4db359317f79ac68a646b28ff9", "_shrinkwrap": null, "_spec": "nopt@^3.0.1", - "_where": "d:\\cordova\\cordova-android", + "_where": "/Users/steveng/repo/cordova/cordova-android", "author": { "name": "Isaac Z. Schlueter", "email": "i@izs.me", diff --git a/node_modules/once/package.json b/node_modules/once/package.json index 4a9cde3dc..18f3d69b4 100644 --- a/node_modules/once/package.json +++ b/node_modules/once/package.json @@ -10,7 +10,7 @@ "spec": ">=1.3.0 <2.0.0", "type": "range" }, - "d:\\cordova\\cordova-android\\node_modules\\glob" + "/Users/steveng/repo/cordova/cordova-android/node_modules/glob" ] ], "_from": "once@>=1.3.0 <2.0.0", @@ -38,11 +38,11 @@ "/glob", "/inflight" ], - "_resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", + "_resolved": "http://registry.npmjs.org/once/-/once-1.3.3.tgz", "_shasum": "b2e261557ce4c314ec8304f3fa82663e4297ca20", "_shrinkwrap": null, "_spec": "once@^1.3.0", - "_where": "d:\\cordova\\cordova-android\\node_modules\\glob", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/glob", "author": { "name": "Isaac Z. Schlueter", "email": "i@izs.me", diff --git a/node_modules/os-homedir/package.json b/node_modules/os-homedir/package.json index 98e05867f..d4a14644c 100644 --- a/node_modules/os-homedir/package.json +++ b/node_modules/os-homedir/package.json @@ -10,7 +10,7 @@ "spec": ">=1.0.0 <2.0.0", "type": "range" }, - "d:\\cordova\\cordova-android\\node_modules\\osenv" + "/Users/steveng/repo/cordova/cordova-android/node_modules/osenv" ] ], "_from": "os-homedir@>=1.0.0 <2.0.0", @@ -37,11 +37,11 @@ "_requiredBy": [ "/osenv" ], - "_resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz", + "_resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz", "_shasum": "0d62bdf44b916fd3bbdcf2cab191948fb094f007", "_shrinkwrap": null, "_spec": "os-homedir@^1.0.0", - "_where": "d:\\cordova\\cordova-android\\node_modules\\osenv", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/osenv", "author": { "name": "Sindre Sorhus", "email": "sindresorhus@gmail.com", diff --git a/node_modules/os-tmpdir/package.json b/node_modules/os-tmpdir/package.json index a043645a2..7ba6e21bf 100644 --- a/node_modules/os-tmpdir/package.json +++ b/node_modules/os-tmpdir/package.json @@ -10,7 +10,7 @@ "spec": ">=1.0.0 <2.0.0", "type": "range" }, - "d:\\cordova\\cordova-android\\node_modules\\osenv" + "/Users/steveng/repo/cordova/cordova-android/node_modules/osenv" ] ], "_from": "os-tmpdir@>=1.0.0 <2.0.0", @@ -37,11 +37,11 @@ "_requiredBy": [ "/osenv" ], - "_resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz", + "_resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz", "_shasum": "e9b423a1edaf479882562e92ed71d7743a071b6e", "_shrinkwrap": null, "_spec": "os-tmpdir@^1.0.0", - "_where": "d:\\cordova\\cordova-android\\node_modules\\osenv", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/osenv", "author": { "name": "Sindre Sorhus", "email": "sindresorhus@gmail.com", diff --git a/node_modules/osenv/package.json b/node_modules/osenv/package.json index 5b64a32d1..c83a5f1fc 100644 --- a/node_modules/osenv/package.json +++ b/node_modules/osenv/package.json @@ -10,7 +10,7 @@ "spec": ">=0.1.3 <0.2.0", "type": "range" }, - "d:\\cordova\\cordova-android\\node_modules\\cordova-common" + "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common" ] ], "_from": "osenv@>=0.1.3 <0.2.0", @@ -37,11 +37,11 @@ "_requiredBy": [ "/cordova-common" ], - "_resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz", + "_resolved": "http://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz", "_shasum": "83cf05c6d6458fc4d5ac6362ea325d92f2754217", "_shrinkwrap": null, "_spec": "osenv@^0.1.3", - "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common", "author": { "name": "Isaac Z. Schlueter", "email": "i@izs.me", diff --git a/node_modules/path-is-absolute/package.json b/node_modules/path-is-absolute/package.json index 17d2e1c4b..d296c78f0 100644 --- a/node_modules/path-is-absolute/package.json +++ b/node_modules/path-is-absolute/package.json @@ -10,7 +10,7 @@ "spec": ">=1.0.0 <2.0.0", "type": "range" }, - "d:\\cordova\\cordova-android\\node_modules\\glob" + "/Users/steveng/repo/cordova/cordova-android/node_modules/glob" ] ], "_from": "path-is-absolute@>=1.0.0 <2.0.0", @@ -37,11 +37,11 @@ "_requiredBy": [ "/glob" ], - "_resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz", + "_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": "d:\\cordova\\cordova-android\\node_modules\\glob", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/glob", "author": { "name": "Sindre Sorhus", "email": "sindresorhus@gmail.com", diff --git a/node_modules/plist/package.json b/node_modules/plist/package.json index b2031f07b..9dd0f0414 100644 --- a/node_modules/plist/package.json +++ b/node_modules/plist/package.json @@ -10,7 +10,7 @@ "spec": ">=1.2.0 <2.0.0", "type": "range" }, - "d:\\cordova\\cordova-android\\node_modules\\cordova-common" + "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common" ] ], "_from": "plist@>=1.2.0 <2.0.0", @@ -37,11 +37,11 @@ "_requiredBy": [ "/cordova-common" ], - "_resolved": "https://registry.npmjs.org/plist/-/plist-1.2.0.tgz", + "_resolved": "http://registry.npmjs.org/plist/-/plist-1.2.0.tgz", "_shasum": "084b5093ddc92506e259f874b8d9b1afb8c79593", "_shrinkwrap": null, "_spec": "plist@^1.2.0", - "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common", "author": { "name": "Nathan Rajlich", "email": "nathan@tootallnate.net" diff --git a/node_modules/properties-parser/package.json b/node_modules/properties-parser/package.json index 7582f58dc..9c3acabd3 100644 --- a/node_modules/properties-parser/package.json +++ b/node_modules/properties-parser/package.json @@ -10,7 +10,7 @@ "spec": ">=0.2.3 <0.3.0", "type": "range" }, - "d:\\cordova\\cordova-android" + "/Users/steveng/repo/cordova/cordova-android" ] ], "_from": "properties-parser@>=0.2.3 <0.3.0", @@ -36,11 +36,11 @@ "_requiredBy": [ "/" ], - "_resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz", + "_resolved": "http://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz", "_shasum": "f7591255f707abbff227c7b56b637dbb0373a10f", "_shrinkwrap": null, "_spec": "properties-parser@^0.2.3", - "_where": "d:\\cordova\\cordova-android", + "_where": "/Users/steveng/repo/cordova/cordova-android", "bugs": { "url": "https://github.com/xavi-/node-properties-parser/issues" }, diff --git a/node_modules/q/package.json b/node_modules/q/package.json index 3eb1e8924..f9fedc3ca 100644 --- a/node_modules/q/package.json +++ b/node_modules/q/package.json @@ -10,7 +10,7 @@ "spec": ">=1.4.1 <2.0.0", "type": "range" }, - "d:\\cordova\\cordova-android" + "/Users/steveng/repo/cordova/cordova-android" ] ], "_from": "q@>=1.4.1 <2.0.0", @@ -38,11 +38,11 @@ "/", "/cordova-common" ], - "_resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz", + "_resolved": "http://registry.npmjs.org/q/-/q-1.4.1.tgz", "_shasum": "55705bcd93c5f3673530c2c2cbc0c2b3addc286e", "_shrinkwrap": null, "_spec": "q@^1.4.1", - "_where": "d:\\cordova\\cordova-android", + "_where": "/Users/steveng/repo/cordova/cordova-android", "author": { "name": "Kris Kowal", "email": "kris@cixar.com", diff --git a/node_modules/sax/package.json b/node_modules/sax/package.json index f36e6211c..65a6be722 100644 --- a/node_modules/sax/package.json +++ b/node_modules/sax/package.json @@ -10,7 +10,7 @@ "spec": "0.3.5", "type": "version" }, - "d:\\cordova\\cordova-android\\node_modules\\elementtree" + "/Users/steveng/repo/cordova/cordova-android/node_modules/elementtree" ] ], "_defaultsLoaded": true, @@ -39,11 +39,11 @@ "_requiredBy": [ "/elementtree" ], - "_resolved": "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz", + "_resolved": "http://registry.npmjs.org/sax/-/sax-0.3.5.tgz", "_shasum": "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d", "_shrinkwrap": null, "_spec": "sax@0.3.5", - "_where": "d:\\cordova\\cordova-android\\node_modules\\elementtree", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/elementtree", "author": { "name": "Isaac Z. Schlueter", "email": "i@izs.me", diff --git a/node_modules/semver/README.md b/node_modules/semver/README.md index 27b044ecd..cbd956549 100644 --- a/node_modules/semver/README.md +++ b/node_modules/semver/README.md @@ -4,6 +4,8 @@ semver(1) -- The semantic versioner for npm ## Usage $ npm install semver + $ node + var semver = require('semver') semver.valid('1.2.3') // '1.2.3' semver.valid('a.b.c') // null @@ -325,6 +327,8 @@ strings that they parse. range. * `maxSatisfying(versions, range)`: Return the highest version in the list that satisfies the range, or `null` if none of them do. +* `minSatisfying(versions, range)`: Return the lowest version in the list + that satisfies the range, or `null` if none of them do. * `gtr(version, range)`: Return `true` if version is greater than all the versions possible in the range. * `ltr(version, range)`: Return `true` if version is less than all the diff --git a/node_modules/semver/package.json b/node_modules/semver/package.json index aba476575..08ca0f7c4 100644 --- a/node_modules/semver/package.json +++ b/node_modules/semver/package.json @@ -10,24 +10,24 @@ "spec": ">=5.0.1 <6.0.0", "type": "range" }, - "d:\\cordova\\cordova-android\\node_modules\\cordova-common" + "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common" ] ], "_from": "semver@>=5.0.1 <6.0.0", - "_id": "semver@5.2.0", + "_id": "semver@5.3.0", "_inCache": true, "_installable": true, "_location": "/semver", "_nodeVersion": "4.4.4", "_npmOperationalInternal": { "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/semver-5.2.0.tgz_1467136841238_0.2250258030835539" + "tmp": "tmp/semver-5.3.0.tgz_1468515166602_0.9155273644719273" }, "_npmUser": { "name": "isaacs", "email": "i@izs.me" }, - "_npmVersion": "3.10.2", + "_npmVersion": "3.10.6", "_phantomChildren": {}, "_requested": { "raw": "semver@^5.0.1", @@ -41,11 +41,11 @@ "_requiredBy": [ "/cordova-common" ], - "_resolved": "https://registry.npmjs.org/semver/-/semver-5.2.0.tgz", - "_shasum": "281995b80c1448209415ddbc4cf50c269cef55c5", + "_resolved": "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "_shasum": "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f", "_shrinkwrap": null, "_spec": "semver@^5.0.1", - "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common", "bin": { "semver": "./bin/semver" }, @@ -59,15 +59,15 @@ }, "directories": {}, "dist": { - "shasum": "281995b80c1448209415ddbc4cf50c269cef55c5", - "tarball": "https://registry.npmjs.org/semver/-/semver-5.2.0.tgz" + "shasum": "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f", + "tarball": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz" }, "files": [ "bin", "range.bnf", "semver.js" ], - "gitHead": "f7fef36765c53ebe237bf415c3ea002f24aa5621", + "gitHead": "d21444a0658224b152ce54965d02dbe0856afb84", "homepage": "https://github.com/npm/node-semver#readme", "license": "ISC", "main": "semver.js", @@ -91,5 +91,5 @@ "scripts": { "test": "tap test/*.js" }, - "version": "5.2.0" + "version": "5.3.0" } diff --git a/node_modules/semver/semver.js b/node_modules/semver/semver.js index b2d7298c6..5f1a3c5c9 100644 --- a/node_modules/semver/semver.js +++ b/node_modules/semver/semver.js @@ -314,9 +314,9 @@ function SemVer(version, loose) { else this.prerelease = m[4].split('.').map(function(id) { if (/^[0-9]+$/.test(id)) { - var num = +id + var num = +id; if (num >= 0 && num < MAX_SAFE_INTEGER) - return num + return num; } return id; }); @@ -966,11 +966,11 @@ function replaceXRange(comp, loose) { } else if (gtlt === '<=') { // <=0.7.x is actually <0.8.0, since any 0.7.x should // pass. Similarly, <=7.x is actually <8.0.0, etc. - gtlt = '<' + gtlt = '<'; if (xm) - M = +M + 1 + M = +M + 1; else - m = +m + 1 + m = +m + 1; } ret = gtlt + M + '.' + m + '.' + p; @@ -1094,6 +1094,15 @@ function maxSatisfying(versions, range, loose) { })[0] || null; } +exports.minSatisfying = minSatisfying; +function minSatisfying(versions, range, loose) { + return versions.filter(function(version) { + return satisfies(version, range, loose); + }).sort(function(a, b) { + return compare(a, b, loose); + })[0] || null; +} + exports.validRange = validRange; function validRange(range, loose) { try { diff --git a/node_modules/shelljs/package.json b/node_modules/shelljs/package.json index a5ede860e..ffd2b049b 100644 --- a/node_modules/shelljs/package.json +++ b/node_modules/shelljs/package.json @@ -10,7 +10,7 @@ "spec": ">=0.5.3 <0.6.0", "type": "range" }, - "d:\\cordova\\cordova-android" + "/Users/steveng/repo/cordova/cordova-android" ] ], "_from": "shelljs@>=0.5.3 <0.6.0", @@ -38,11 +38,11 @@ "/", "/cordova-common" ], - "_resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz", + "_resolved": "http://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz", "_shasum": "c54982b996c76ef0c1e6b59fbdc5825f5b713113", "_shrinkwrap": null, "_spec": "shelljs@^0.5.3", - "_where": "d:\\cordova\\cordova-android", + "_where": "/Users/steveng/repo/cordova/cordova-android", "author": { "name": "Artur Adib", "email": "arturadib@gmail.com" diff --git a/node_modules/underscore/package.json b/node_modules/underscore/package.json index cee029f5c..fb23b70e4 100644 --- a/node_modules/underscore/package.json +++ b/node_modules/underscore/package.json @@ -10,7 +10,7 @@ "spec": ">=1.8.3 <2.0.0", "type": "range" }, - "d:\\cordova\\cordova-android\\node_modules\\cordova-common" + "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common" ] ], "_from": "underscore@>=1.8.3 <2.0.0", @@ -36,11 +36,11 @@ "_requiredBy": [ "/cordova-common" ], - "_resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", + "_resolved": "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", "_shasum": "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022", "_shrinkwrap": null, "_spec": "underscore@^1.8.3", - "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common", "author": { "name": "Jeremy Ashkenas", "email": "jeremy@documentcloud.org" diff --git a/node_modules/unorm/package.json b/node_modules/unorm/package.json index 3eb0155ed..2244ca2ec 100644 --- a/node_modules/unorm/package.json +++ b/node_modules/unorm/package.json @@ -10,7 +10,7 @@ "spec": ">=1.3.3 <2.0.0", "type": "range" }, - "d:\\cordova\\cordova-android\\node_modules\\cordova-common" + "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common" ] ], "_from": "unorm@>=1.3.3 <2.0.0", @@ -36,11 +36,11 @@ "_requiredBy": [ "/cordova-common" ], - "_resolved": "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz", + "_resolved": "http://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz", "_shasum": "364200d5f13646ca8bcd44490271335614792300", "_shrinkwrap": null, "_spec": "unorm@^1.3.3", - "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common", "author": { "name": "Bjarke Walling", "email": "bwp@bwp.dk" diff --git a/node_modules/util-deprecate/package.json b/node_modules/util-deprecate/package.json index cd43f2426..1b68a68ad 100644 --- a/node_modules/util-deprecate/package.json +++ b/node_modules/util-deprecate/package.json @@ -10,7 +10,7 @@ "spec": "1.0.2", "type": "version" }, - "d:\\cordova\\cordova-android\\node_modules\\plist" + "/Users/steveng/repo/cordova/cordova-android/node_modules/plist" ] ], "_from": "util-deprecate@1.0.2", @@ -37,11 +37,11 @@ "_requiredBy": [ "/plist" ], - "_resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "_resolved": "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "_shasum": "450d4dc9fa70de732762fbd2d4a28981419a0ccf", "_shrinkwrap": null, "_spec": "util-deprecate@1.0.2", - "_where": "d:\\cordova\\cordova-android\\node_modules\\plist", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/plist", "author": { "name": "Nathan Rajlich", "email": "nathan@tootallnate.net", diff --git a/node_modules/wrappy/package.json b/node_modules/wrappy/package.json index 1494a5a59..b29e70cc4 100644 --- a/node_modules/wrappy/package.json +++ b/node_modules/wrappy/package.json @@ -10,7 +10,7 @@ "spec": ">=1.0.0 <2.0.0", "type": "range" }, - "d:\\cordova\\cordova-android\\node_modules\\inflight" + "/Users/steveng/repo/cordova/cordova-android/node_modules/inflight" ] ], "_from": "wrappy@>=1.0.0 <2.0.0", @@ -42,11 +42,11 @@ "/inflight", "/once" ], - "_resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "_resolved": "http://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "_shasum": "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f", "_shrinkwrap": null, "_spec": "wrappy@1", - "_where": "d:\\cordova\\cordova-android\\node_modules\\inflight", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/inflight", "author": { "name": "Isaac Z. Schlueter", "email": "i@izs.me", diff --git a/node_modules/xmlbuilder/package.json b/node_modules/xmlbuilder/package.json index 2beac9ee1..4b6bd5425 100644 --- a/node_modules/xmlbuilder/package.json +++ b/node_modules/xmlbuilder/package.json @@ -10,7 +10,7 @@ "spec": "4.0.0", "type": "version" }, - "d:\\cordova\\cordova-android\\node_modules\\plist" + "/Users/steveng/repo/cordova/cordova-android/node_modules/plist" ] ], "_from": "xmlbuilder@4.0.0", @@ -36,11 +36,11 @@ "_requiredBy": [ "/plist" ], - "_resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz", + "_resolved": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz", "_shasum": "98b8f651ca30aa624036f127d11cc66dc7b907a3", "_shrinkwrap": null, "_spec": "xmlbuilder@4.0.0", - "_where": "d:\\cordova\\cordova-android\\node_modules\\plist", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/plist", "author": { "name": "Ozgur Ozcitak", "email": "oozcitak@gmail.com" diff --git a/node_modules/xmldom/package.json b/node_modules/xmldom/package.json index 3282fc312..7d55dd306 100644 --- a/node_modules/xmldom/package.json +++ b/node_modules/xmldom/package.json @@ -10,7 +10,7 @@ "spec": ">=0.1.0 <0.2.0", "type": "range" }, - "d:\\cordova\\cordova-android\\node_modules\\plist" + "/Users/steveng/repo/cordova/cordova-android/node_modules/plist" ] ], "_from": "xmldom@>=0.1.0 <0.2.0", @@ -37,11 +37,11 @@ "_requiredBy": [ "/plist" ], - "_resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz", + "_resolved": "http://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz", "_shasum": "10de4e5e964981f03c8cc72fadc08d14b6c3aa26", "_shrinkwrap": null, "_spec": "xmldom@0.1.x", - "_where": "d:\\cordova\\cordova-android\\node_modules\\plist", + "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/plist", "author": { "name": "jindw", "email": "jindw@xidea.org", diff --git a/package.json b/package.json index 504218a76..27ab72747 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "author": "Apache Software Foundation", "license": "Apache-2.0", "dependencies": { - "cordova-common": "^1.3.0", + "cordova-common": "^1.4.0", "elementtree": "^0.1.6", "nopt": "^3.0.1", "properties-parser": "^0.2.3", From 15e0b49aaec1e26728e68cd6ecdc6bdc7235965c Mon Sep 17 00:00:00 2001 From: Steve Gill Date: Tue, 26 Jul 2016 13:06:08 -0700 Subject: [PATCH 12/14] CB-11626 Updated RELEASENOTES and Version for release 5.2.2 --- RELEASENOTES.md | 3 +++ package.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 5507e742e..102286936 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -20,6 +20,9 @@ --> ## Release Notes for Cordova (Android) ## +### 5.2.2 (Jul 26, 2016) +* [CB-11615](https://issues.apache.org/jira/browse/CB-11615) updated `cordoova-common` to `1.4.0` + ### 5.2.1 (Jul 11, 2016) * [CB-9489](https://issues.apache.org/jira/browse/CB-9489) Fixed "endless waiting for emulator" issue * [CB-11481](https://issues.apache.org/jira/browse/CB-11481) android-library is deprecated use com.android.library instead diff --git a/package.json b/package.json index 27ab72747..6b81b07f1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cordova-android", - "version": "5.2.1", + "version": "5.2.2", "description": "cordova-android release", "bin": { "create": "bin/create" From 75663f59aa992b66b29ee6c52aa7cb499fdb3055 Mon Sep 17 00:00:00 2001 From: Steve Gill Date: Tue, 26 Jul 2016 14:57:28 -0700 Subject: [PATCH 13/14] Update JS snapshot to version 5.2.2 (via coho) --- bin/templates/project/assets/www/cordova.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/templates/project/assets/www/cordova.js b/bin/templates/project/assets/www/cordova.js index 5d20c15da..a445128db 100644 --- a/bin/templates/project/assets/www/cordova.js +++ b/bin/templates/project/assets/www/cordova.js @@ -1,5 +1,5 @@ // Platform: android -// 2fd4bcb84048415922d13d80d35b8d1668e8e150 +// d403ce434788ffe1937711d6ebcbcc837fcbcb14 /* 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.2.1'; +var PLATFORM_VERSION_BUILD_LABEL = '5.2.2'; // file: src/scripts/require.js /*jshint -W079 */ @@ -330,7 +330,7 @@ module.exports = cordova; }); -// file: D:/cordova/cordova-android/cordova-js-src/android/nativeapiprovider.js +// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/android/nativeapiprovider.js define("cordova/android/nativeapiprovider", function(require, exports, module) { /** @@ -353,7 +353,7 @@ module.exports = { }); -// file: D:/cordova/cordova-android/cordova-js-src/android/promptbasednativeapi.js +// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/android/promptbasednativeapi.js define("cordova/android/promptbasednativeapi", function(require, exports, module) { /** @@ -862,7 +862,7 @@ module.exports = channel; }); -// file: D:/cordova/cordova-android/cordova-js-src/exec.js +// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/exec.js define("cordova/exec", function(require, exports, module) { /** @@ -1611,7 +1611,7 @@ exports.reset(); }); -// file: D:/cordova/cordova-android/cordova-js-src/platform.js +// 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. @@ -1721,7 +1721,7 @@ function onMessageFromNative(msg) { }); -// file: D:/cordova/cordova-android/cordova-js-src/plugin/android/app.js +// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/plugin/android/app.js define("cordova/plugin/android/app", function(require, exports, module) { var exec = require('cordova/exec'); @@ -2083,7 +2083,7 @@ utils.clone = function(obj) { retVal = {}; for(i in obj){ - if(!(i in retVal) || retVal[i] != obj[i]) { + if((!(i in retVal) || retVal[i] != obj[i]) && typeof obj[i] != 'undefined') { retVal[i] = utils.clone(obj[i]); } } From 6c80f58e2a0febb67b45a4596f4ad6145e742717 Mon Sep 17 00:00:00 2001 From: Steve Gill Date: Tue, 26 Jul 2016 14:57:28 -0700 Subject: [PATCH 14/14] Set VERSION to 5.2.2 (via coho) --- VERSION | 2 +- bin/templates/cordova/version | 2 +- framework/src/org/apache/cordova/CordovaWebView.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 26d99a283..ce7f2b425 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.2.1 +5.2.2 diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version index 416904111..bc45a46c1 100755 --- a/bin/templates/cordova/version +++ b/bin/templates/cordova/version @@ -20,7 +20,7 @@ */ // Coho updates this line: -var VERSION = "5.2.1"; +var VERSION = "5.2.2"; module.exports.version = VERSION; diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java index 85a800daf..6052418bf 100644 --- a/framework/src/org/apache/cordova/CordovaWebView.java +++ b/framework/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.2.1"; + public static final String CORDOVA_VERSION = "5.2.2"; void init(CordovaInterface cordova, List pluginEntries, CordovaPreferences preferences);