From 9b65acca6757d534c361ed9b6c5977d5da78041d Mon Sep 17 00:00:00 2001
From: Andrew Grieve <agrieve@chromium.org>
Date: Tue, 10 Nov 2015 14:22:33 -0500
Subject: [PATCH] Update dependencies

cordova-android@5.0.0
cordova-ios@3.9.2
cordova@5.4.0
---
 cordova/cordova-android | 2 +-
 cordova/cordova-ios     | 2 +-
 dev-bin/git-up.js       | 1 +
 package.json            | 8 ++++----
 src/cca.js              | 2 ++
 src/pre-prepare.js      | 5 +++--
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/cordova/cordova-android b/cordova/cordova-android
index f224b1f2d..59a018971 160000
--- a/cordova/cordova-android
+++ b/cordova/cordova-android
@@ -1 +1 @@
-Subproject commit f224b1f2d4d22f4eabb7434140ee16daad34165e
+Subproject commit 59a0189719da4e0a81e60bb3349d709510698602
diff --git a/cordova/cordova-ios b/cordova/cordova-ios
index d4d0c382b..d712fb082 160000
--- a/cordova/cordova-ios
+++ b/cordova/cordova-ios
@@ -1 +1 @@
-Subproject commit d4d0c382b642b19c5042abfee2b5511e4fcb8868
+Subproject commit d712fb0827671c83952cd75d9c190f7b083167b0
diff --git a/dev-bin/git-up.js b/dev-bin/git-up.js
index 308184155..0c089e646 100755
--- a/dev-bin/git-up.js
+++ b/dev-bin/git-up.js
@@ -108,6 +108,7 @@ function updateAllPlugins() {
     'cordova-plugin-chrome-apps-iosSocketsCommon',
     'cordova-plugin-chrome-apps-notifications',
     'cordova-plugin-chrome-apps-power',
+    'cordova-plugin-chrome-apps-proxy',
     'cordova-plugin-chrome-apps-pushMessaging',
     'cordova-plugin-chrome-apps-socket',
     'cordova-plugin-chrome-apps-sockets-tcp',
diff --git a/package.json b/package.json
index 6b7e9fe30..6299701ef 100644
--- a/package.json
+++ b/package.json
@@ -15,15 +15,15 @@
   },
   "main": "src/cca.js",
   "man": "./docs/man/cca.7",
-  "license": "Apache version 2.0",
+  "license": "Apache-2.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/MobileChromeApps/mobile-chrome-apps.git"
   },
   "dependencies": {
-    "cca-manifest-logic": "^1.1.4",
+    "cca-manifest-logic": "^1.1.5",
     "chrome-app-developer-tool-client": "^0.0.5",
-    "cordova": "^5.0.0",
+    "cordova": "^5.4.0",
     "crypto-js": "^3.1.4",
     "debounce": "^1.0.0",
     "elementtree": "0.1.6",
@@ -35,7 +35,7 @@
     "semver": "^4.1.0",
     "shelljs": "^0.4.0",
     "underscore": "^1.7.0",
-    "update-notifier": "^0.4.0",
+    "update-notifier": "^0.5.0",
     "xmldom": "^0.1.19"
   },
   "files": [
diff --git a/src/cca.js b/src/cca.js
index 842951bf2..77a190fbb 100755
--- a/src/cca.js
+++ b/src/cca.js
@@ -38,6 +38,8 @@ var cordovaLib = cordova.cordova_lib;
 var hooks = require('./hooks');
 
 function main() {
+  cordovaLib.binname = 'cca';
+
   var commandLineFlags = require('./parse-command-line')();
   utils.exit.pause_on_exit = commandLineFlags.pause_on_exit;
 
diff --git a/src/pre-prepare.js b/src/pre-prepare.js
index b173177f8..2209987ab 100644
--- a/src/pre-prepare.js
+++ b/src/pre-prepare.js
@@ -84,8 +84,9 @@ module.exports = exports = function prePrepareCommand(context) {
     var hasIos = fs.existsSync(path.join('platforms', 'ios'));
     if (hasIos) {
       var platforms = cordovaLib.cordova_platforms;
-      var parser = new platforms.ios.parser(path.join('platforms','ios'));
-      var infoPlistPath = path.join('platforms', 'ios', parser.originalName, parser.originalName + '-Info.plist');
+      var parser = platforms.getPlatformApi('ios');
+      var infoPlistPath = path.join('platforms', 'ios', parser._parser.originalName, parser._parser.originalName + '-Info.plist');
+      console.log('adsf')
       var infoPlistXml = et.parse(fs.readFileSync(infoPlistPath, 'utf-8'));
 
       var rootPlistElement = infoPlistXml.getroot();