Update dependencies

[email protected] [email protected] [email protected]
MobileChromeApps · Nov 10, 2015 · 9b65acc · bemasc · Nov 11, 2015 · agrieve
1 parent 6196f3a
commit 9b65acc
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/cordova/cordova-android b/cordova/cordova-android
diff --git a/cordova/cordova-ios b/cordova/cordova-ios
diff --git 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
@@ -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
@@ -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
@@ -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();