You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2015/10/31 00:58:06 UTC

[6/6] cordova-lib git commit: Merge branch '5.3.x'

Merge branch '5.3.x'


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/92dcd3ad
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/92dcd3ad
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/92dcd3ad

Branch: refs/heads/master
Commit: 92dcd3ad4553b0642f8919c43da6f9a66dde9554
Parents: 94eec05 932ad57
Author: Steve Gill <st...@gmail.com>
Authored: Fri Oct 30 16:57:47 2015 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Fri Oct 30 16:57:47 2015 -0700

----------------------------------------------------------------------
 cordova-lib/RELEASENOTES.md                          | 5 ++++-
 cordova-lib/package.json                             | 2 +-
 cordova-lib/spec-cordova/metadata/ios_parser.spec.js | 6 ++++++
 3 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/92dcd3ad/cordova-lib/RELEASENOTES.md
----------------------------------------------------------------------
diff --cc cordova-lib/RELEASENOTES.md
index 7635d31,88400a5..0fb6389
--- a/cordova-lib/RELEASENOTES.md
+++ b/cordova-lib/RELEASENOTES.md
@@@ -20,53 -20,10 +20,56 @@@
  -->
  # Cordova-lib Release Notes
  
 +### 5.4.0 (Oct 30, 2015)
 +* CB-9834 Introduce compat map for hook requires
 +* CB-9902 Fix broken `cordova run --list`
 +* CB-9872 Fixed save.spec.11 failure
 +* CB-9800 Fixing contribute link.
 +* CB-9736 Extra main activity generated when an android package name is specified
 +* CB-9675 OSX App Icons are not properly copied.
 +* CB-9758 Mobilespec crashes adding plugins on OS X
 +* CB-9782 Update create/update signatures for PlatformApi polyfill
 +* CB-9815 Engine name="cordova" should check tools version, not platforms. This closes #324
 +* CB-9824 removed plugin download counter code from lib
 +* CB-9821 Fix EventEmitter incorrect trace level usages
 +* CB-9813 Keep module-to-plugin mapping at hand.
 +* CB-9598 Fixes broken `require` for FFOS plugin handler
 +* Update 'serve' to use 'express' implementation of cordova-serve.
 +* CB-9712 CLI 5.3 breaks with node 3.3.3
 +* CB-9598 Fixies broken require calls that aren't covered by tests
 +* CB-9589 added more warnings and added conversion step to fetch.js
 +* CB-9589 auto convert old plugin ids to new npm ids
 +* Pick ConfigParser changes from apache@0c3614e
 +* CB-9743 Removes system frameworks handling from ConfigChanges
 +* CB-9598 Cleans out code which has been moved to `cordova-common`
 +* CB-9598 Switches LIB to use `cordova-common`
 +* CB-9569 Support <access> and <allow-navigation> tag translation to Application Transport Security (ATS) Info.plist directives.
 +* CB-9737 (save flag) unit test failures for spec.14
 +* CB-8914 when project is renamed, remove userdata otherwise project is un-usable in xcode
 +* CB-9665 Support .xcassets for icons and splashscreens in the CLI
 +* CB-9407 Fixes incorrect applying of plugin-provided config changes.
 +* CB-8198 Unified console output logic for core platforms
 +* CB-9408 Added support for `windows-packageVersion` on `<widget>`
 +* CB-9588 Plugman. Add support for <resource-file> on Windows
 +* CB-8615 Improves plugman tests for Windows
 +* CB-8615 **Windows** .winmd files with the same names are not added properly when using framework tag with target attribute
 +* CB-9297 Parse xcode project syncronously to avoid issues with node v4
 +* CB-9617 Do not restore plugins after plugin removal.
 +* CB-9631 Save plugin to config.xml only if installation succeeds
 +* CB-9601 Fix <framework>.versions support on Windows after semver update
 +* CB-9617 Fixes incorrect project state after adding/removing plugins
 +* CB-9560 Issue using plugin restore for plugins with common dependencies 
 +* CB-8993 Plugin restore ignores search path
 +* CB-9587 Check if browser platform added properly before creating parser. 
 +* CB-9604 Fix error adding browser platform with PlatformApi polyfill.
 +* CB-9597 Initial Implementation of PlatformApiPoly
 +* CB-9354 Fix array merging with complex items
 +* CB-9556 Don't uninstall dependent plugin if it was installed as a top-level after
 +
- ### 5.3.0 (Aug 28, 2015)
+ ### 5.3.2 (Sep 17, 2015)
+ * CB-9297 Parse xcode project syncronously to avoid issues with node v4
+ 
+ ### 5.3.1 (Aug 28, 2015)
  * pinned blackberry@3.8.0 in prepartion for its release
  * pinned browser@4.0.0 and windows@4.1.0 
  * CB-9559 Adding a plugin with caret in version results in an error

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/92dcd3ad/cordova-lib/package.json
----------------------------------------------------------------------
diff --cc cordova-lib/package.json
index c240bcd,f522caf..5edf8f9
--- a/cordova-lib/package.json
+++ b/cordova-lib/package.json
@@@ -18,14 -18,14 +18,14 @@@
    "engineStrict": true,
    "dependencies": {
      "aliasify": "^1.7.2",
 -    "bplist-parser": "0.0.6",
 -    "cordova-app-hello-world": "3.9.0",
 -    "cordova-js": "4.1.1",
 +    "cordova-app-hello-world": "3.10.0",
 +    "cordova-common": "1.0.x",
 +    "cordova-js": "4.1.2",
      "cordova-registry-mapper": "1.x",
 -    "cordova-serve": "^0.1.3",
 +    "cordova-serve": "^1.0.0",
      "dep-graph": "1.1.0",
      "elementtree": "0.1.6",
-     "glob": "4.0.6",
+     "glob": "^5.0.3",
      "init-package-json": "^1.2.0",
      "npm": "^2.10.x",
      "npmconf": "^2.1.x",

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/92dcd3ad/cordova-lib/spec-cordova/metadata/ios_parser.spec.js
----------------------------------------------------------------------
diff --cc cordova-lib/spec-cordova/metadata/ios_parser.spec.js
index 330d1e1,33b0653..1ded49e
--- a/cordova-lib/spec-cordova/metadata/ios_parser.spec.js
+++ b/cordova-lib/spec-cordova/metadata/ios_parser.spec.js
@@@ -26,14 -26,14 +26,20 @@@ var iosParser = require('../../src/cord
      Q = require('q'),
      config = require('../../src/cordova/config'),
      Parser = require('../../src/cordova/metadata/parser'),
 -    ConfigParser = require('../../src/configparser/ConfigParser');
 +    ConfigParser = require('cordova-common').ConfigParser;
 +
 +var iosProjectFixture = path.join(__dirname, '../fixtures/projects/ios');
 +var proj = path.join(__dirname, 'some/path');
 +var ios_proj = path.join(proj, 'platforms/ios');
 +
 +shell.config.silent = true;
  
+ var iosProjectFixture = path.join(__dirname, '../fixtures/projects/ios');
+ var proj = path.join(__dirname, 'some/path');
+ var ios_proj = path.join(proj, 'platforms/ios');
+ 
+ shell.config.silent = true;
+ 
  // Create a real config object before mocking out everything.
  var cfg = new ConfigParser(path.join(__dirname, '..', 'test-config.xml'));
  


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org