Master

.gitignore

@@ -1,4 +1,3 @@
-.DS_Store
-**/node_modules
-/docs/generator/chrome_apps_on_mobile.html
-*.pyc
+/cca-manifest-logic/node_modules/
+/node_modules/
+/ChromeSpec/

.gitmodules

@@ -4,6 +4,3 @@
 [submodule "cordova/cordova-ios"]
 	path = cordova/cordova-ios
 	url = https://git-wip-us.apache.org/repos/asf/cordova-ios.git
-[submodule "cordova/cordova-crosswalk-engine"]
-	path = cordova/cordova-crosswalk-engine
-	url = https://github.com/MobileChromeApps/cordova-crosswalk-engine/

README.md

@@ -1,5 +1,5 @@
 # Create Chrome Apps for Mobile Using Apache Cordova
-_**The Chrome Apps for Mobile toolchain is in developer preview. We welcome your feedback on the [Github issue tracker](https://github.com/MobileChromeApps/mobile-chrome-apps/issues), the [Chrome Apps developer forum](http://groups.google.com/a/chromium.org/group/chromium-apps/topics), [Stack Overflow](http://stackoverflow.com/questions/tagged/google-chrome-app), and our [G+ Developers page](https://plus.google.com/+GoogleChromeDevelopers/).**_
+The Chrome Apps for Mobile Toolchain _**is no longer being actively developed**_. We intend to keep it functional, but do not intend on adding any new features.
 
 ![A Chrome App running on both desktop and mobile](docs/images/todomvc-chromebook.png)
 
@@ -15,16 +15,16 @@ For an overview and demo of hybrid development, Chrome Apps for Mobile, and our
 
 ![Using CDE, cca, and CADT to develop Chrome Apps for Mobile](docs/images/cde-cadt-diagram.png)
 
+### [The `cca` Command Line Tool](https://github.com/MobileChromeApps/mobile-chrome-apps/blob/master/docs/Installation.md#install-the-cca-command-line-tool)
+
+`cca` provides all the functionality you need to develop and package Chrome Apps for Mobile from the command line. Use it with Chrome App Developer Tool (below) to rapidly iterate on your code: live deploy allows you to instantly see your Chrome App running on a connected mobile device. When you are ready to publish your Chrome App for Mobile to the Apple App Store and Google Play Store, use `cca` to bundle up your Chrome App into the proper mobile packages.
+
 ### [Chrome App Developer Tool for Mobile (CADT)](https://github.com/MobileChromeApps/chrome-app-developer-tool/)
 
 CADT is an app for your mobile development device that makes it quick and easy to see your code in action. It provides the Cordova framework of Chrome Apps for Mobile so you can test your code by simply pushing your Chrome App assets to your mobile device (made easy with our tools), which is must faster than packaging up the entire mobile app. This is called **live deploy**.
 
 With CADT running on your mobile device, live deploy can be initiated from your development computer with either Chrome Dev Editor or the `cca` command line tool, allowing you to instantly preview the Chrome App you're editing, running right on Android or iOS. When you make a change to the code in your editor, you're a quick push away from seeing it straight on your device.
 
-### [The `cca` Command Line Tool](https://github.com/MobileChromeApps/mobile-chrome-apps/blob/master/docs/Installation.md#install-the-cca-command-line-tool)
-
-`cca` provides all the functionality you need to develop and package Chrome Apps for Mobile from the command line. Use it with CADT to rapidly iterate on your code: live deploy allows you to instantly see your Chrome App running on a connected mobile device. When you are ready to publish your Chrome App for Mobile to the Apple App Store and Google Play Store, use `cca` to bundle up your Chrome App into the proper mobile packages.
-
 ### [Chrome Dev Editor (CDE)](https://github.com/dart-lang/chromedeveditor)
 
 CDE is an IDE built specifically for Chrome Apps. Use it with CADT for live deploy.
@@ -45,13 +45,19 @@ Try out Chrome Apps for Mobile by following these steps:
 
 It's also a good idea to go through our [codelab](https://github.com/MobileChromeApps/workshop-cca-eh), where you will learn to use `chrome.gcm` and `chrome.notifications` to build a simple chat app.
 
-## Notes and Resources
+## Things to Know
+
+* The Chrome Apps for Mobile project is built on top of [Apache Cordova](http://cordova.apache.org), the open source mobile development framework for building mobile apps with native capabilities using HTML, CSS and JavaScript.
+
+* `cca` projects *are* Cordova projects.
+
+* By default, Chrome Apps built with `cca` use [Crosswalk](http://crosswalk-project.org/), ([advantages and tradeoffs](docs/Crosswalk.md)).
 
-* The Chrome Apps for Mobile project is built on top of [Apache Cordova](http://cordova.apache.org), the open source mobile development framework for building mobile apps with native capabilities using HTML, CSS and JavaScript. By default, Chrome Apps for Mobile leverage an embeddable Chromium WebView provided by the [Crosswalk](http://crosswalk-project.org/) project by default, which has both [advantages and some tradeoffs](docs/Crosswalk.md).
+* Most Cordova plugins that provide `chrome.*` APIs work with regular Cordova projects.
 
-* There are a few special considerations that you should keep in mind when developing with Cordova. We've listed them in the [considerations section](https://github.com/MobileChromeApps/mobile-chrome-apps/blob/master/docs/CordovaConsiderations.md).
+* There is a [List of Chrome App APIs](https://github.com/MobileChromeApps/mobile-chrome-apps/blob/master/docs/APIsAndLibraries.md) that are supported on mobile.
 
-* To view which Chrome APIs and other libraries are supported on mobile, visit the [APIs and Libraries page](https://github.com/MobileChromeApps/mobile-chrome-apps/blob/master/docs/APIsAndLibraries.md).
+* For even more, see the [FAQ](https://github.com/MobileChromeApps/mobile-chrome-apps/blob/master/docs/faq.md).
 
 ## Let's get started
 

RELEASENOTES.md

@@ -4,6 +4,71 @@ For detailed release notes for plugins, refer to each plugin's `README.md`.
 
 For Android / iOS detailed release notes, refer to `RELEASENOTES.md` with `cordova/cordova-android` and `cordova/cordova-ios`
 
+### v0.8.0 (Nov 10, 2015)
+* Upgrade to [email protected] (fixes errors with newer versions of npm / nodejs)
+* Upgrade cordova-android to v5.0.0 (support for Marshmallow)
+* Upgrade cordova-ios to v3.9.2
+* Adds experimental support for `chrome.proxy` permission on Android
+
+### v0.7.4 (Aug 6, 2015)
+* Add blob: to default CSP (fixes #589)
+
+### v0.7.3 (Jul 27, 2015)
+* Fixed 0.7.2 release being broken
+
+### v0.7.2 (Jul 27, 2015)
+* Switch from chrome-extension: to gopher: to fix apps being broken on latest Andrew WebView (http://crbug.com/513352)
+
+### v0.7.1 (June 26, 2015)
+* Pin cordova-plugin-whitelist to v1.0.0 to avoid iOS breakage
+* Fix cca push on OS X when shell is not bash
+
+### v0.7.0 (May 05, 2015)
+* Big! Rewrite of `cordova-plugin-background-app` so that `android:theme=translucent` is no longer needed (#322)
+* Add support for `chrome.usb`
+* All plugins are now hosted on npm
+* Update crosswalk plugin to 1.2.0 (Crosswalk 13)
+* Allow setting "webview": "crosswalk@version"
+* Update notifier and crypto-js module deps
+* Update to official cordova-android to 4.0.0 release!
+* Android: CB-8834 Don't fail to install on VERSION_DOWNGRADE
+* Android: CB-8829 Set targetSdk to 22
+
+### v0.6.0 (Mar 17, 2015)
+* Updated cordova-android to use latest 4.0.0-dev version
+* Updated cordova-ios to 3.8.0 (Fixes `exec()` bridge `<iframe>` explosion bug)
+* Updated Crosswalk to version 11
+* Android now sets target-sdk=21 (Lollipop)
+* Content-Security-Policy now works and enabled by default (can be disabled though)
+* `cca` is now smarter about not adding iOS when building for Android (and vice-versa)
+* Pin major version of bootstrap, i18n, and navigation plugins (`cca` will no longer break when plugins are updated)
+* Generate `<icon>` within `config.xml` rather than copy files directly (Fixes iPhone 6+ issues)
+* Android builds now work the same when built via Android Studio vs. command-line
+* No longer rename `_locales` -> `CCA_locales`
+* Ignore `<!-- html -->` when parsing main page (fixes #510)
+* Add `cca build --android-minSdkVersion` flag
+* Add `cca run --list` to list available deploy targets
+* Add `cca run --link` to link rather than copy native source files (useful when developing plugins)
+* `cca push` now works on node 0.12
+* Don't build multi-arch apks when `--webview=system` is used.
+* Added "new version of cca available" logic via `update-notifier` module
+* New publishing instructions on how to use Crosswalk for pre-L Android, and system webview for L+
+
+### 0.5.1 (Dec 16, 2014)
+* Fix #412 #448 Warn when adding plugins explicitly when you need a manifest permission
+* Fix #455 Support setting androidTheme in manifest.mobile
+* Fix HTMLImports not working with imports polyfill (#450)
+* Android: Look for Android SDK in Android Studio 1.0's default location
+* Android: CB-7881 Android tooling shouldn't lock application directory
+* Android: CB-3679 Move splashscreen logic into splashscreen plugin
+* Android: CB-8143 Use the correct Android Gradle plugin for the installed Gradle version
+* Android: Revert Gradle distributionUrlRegex cleanup.
+* Android: CB-8119 Restart adb when we detect it's hung
+* Android: CB-8112 Turn off mediaPlaybackRequiresUserGesture
+* Android: CB-6153 Add a preference for controlling hardware button audio stream (DefaultVolumeStream)
+* Android: CB-8081 Allow gradle builds to use Java 6 instead of requiring 7
+* Android: CB-8031 Fix race condition that shows as ConcurrentModificationException
+
 ### v0.5.0 (Nov 18, 2014)
 * Bumping cordova-ios version to 3.7.0
 * Update cordova-android and cordova-crosswalk-engine submodules

cca-manifest-logic/README.md

@@ -10,7 +10,38 @@ and published when publishing cca.
 
 ## Using from chrome-app-developer-tool
 
-When developing changes, npm link cca-manifest-logic, install CADT and then run `gulp`
+When developing changes, npm link cca-manifest-logic, install CADT and then run gulp`
 whenever files change. When happy with change, publish a new version to npm so that
 chrome-app-deleloper-tool always works without needing to `npm link` in this module.
 
+# Release Notes
+
+# 1.1.5 (Nov 10, 2015)
+- Add chrome.proxy to list of plugins
+
+# 1.1.4 (Aug 6, 2015)
+- Add blob: to default CSP (fixes #589)
+
+# 1.1.3 (July 27, 2015)
+- Add gopher: to default Content-Security-Policy (http://crbug.com/513352)
+
+# 1.1.2 (June 26, 2015)
+* Pin cordova-plugin-whitelist to v1.0.0 to avoid breakage in following version
+
+# 1.1.1 (May 4, 2015)
+* Add background-app to default plugin list
+
+# 1.1.0 (May 4, 2015)
+* Update plugin IDs of polyfills and google.payments plugins
+* Remove obsolete plugin from defaults
+* Use NPM plugin ids
+* Allow setting "webview": "crosswalk@version"
+* Remove mapping for obsolete syncFileSystem plugin
+* Add chrome.usb plugin to manifest logic
+
+# 1.0.0 (March 17, 2015)
+* Added `createCspString` to `analyse-manifest`
+* Generate `<icon>` within `config.xml` rather than copy files directly (fixes #404, fixes #403)
+* Depend on `cordova-plugin-whitelist`
+* Rename crosswalk engine plugin ID to not have "apache" in it
+* Automatically install the bluetooth plugins

cca-manifest-logic/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cca-manifest-logic",
   "author": "The Chrome Team",
-  "version": "0.0.5",
+  "version": "1.1.6-dev",
   "description": "Shared logic between cca and chrome-app-developer-tool",
   "main": "main.js",
   "license": "Apache version 2.0",

cca-manifest-logic/src/analyse-manifest.js

@@ -54,8 +54,8 @@ function mapPermissionsToPlugins(knownPermissionsMap, requestedPermissionsList)
     ret.toUninstall = ret.toUninstall.concat(knownPermissionsMap[permission]);
   });
   // Final step, bit of a hack, remove duplicate plugins from toUninstall list that exist in toInstall
-  // e.g. syncFS depends on identity.  So, even if identity isn't in your manifest, don't uninstal it if you have syncFS
-  // The way we handle this is to add org.chromium.identity to the list of plugins to install for the syncFS permission
+  // e.g. syncFS depends on identity.  So, even if identity isn't in your manifest, don't uninstall it if you have syncFS
+  // The way we handle this is to add identity to the list of plugins to install for the syncFS permission
   // so, the last thing to do is subtract the plugins to install from the plugins to not install, since there can be overlap.
   ret.toUninstall = ret.toUninstall.filter(function(plugin) {
     return ret.toInstall.indexOf(plugin) == -1;
@@ -93,7 +93,10 @@ module.exports = function analyseManifest(manifest, options) {
   });
 
   var pluginsForPermissions = mapPermissionsToPlugins(PLUGIN_MAP, ret.permissions);
-  var pluginsForEngines = mapPermissionsToPlugins(ENGINE_MAP, [options.webview || manifest.webview || "crosswalk"]);
+  var engineSpec = options.webview || manifest.webview || "crosswalk";
+  ret.engineName = engineSpec.replace(/@.*/, '');
+  ret.engineVer = engineSpec.slice(ret.engineName.length + 1);
+  var pluginsForEngines = mapPermissionsToPlugins(ENGINE_MAP, [ret.engineName]);
   var pluginsForSockets = mapPermissionsToPlugins(SOCKETS_MAP, Object.keys(manifest.sockets || {}));
 
   ret.pluginsToBeInstalled = [].concat.apply([], [
@@ -110,6 +113,35 @@ module.exports = function analyseManifest(manifest, options) {
     ]);
   ret.pluginsNotRecognized = pluginsForPermissions.unknown.concat(pluginsForSockets.unknown);
 
+  // Special case for bluetooth, since it uses boolean flags and not just the existance of keys.
+  if (manifest.bluetooth && typeof manifest.bluetooth === 'object') {
+    ret.pluginsToBeInstalled.push('cordova-plugin-chrome-apps-bluetooth');
+    (manifest.bluetooth.low_energy ? ret.pluginsToBeInstalled : ret.pluginsToBeNotInstalled).push('cordova-plugin-chrome-apps-bluetoothlowenergy');
+    (manifest.bluetooth.socket ? ret.pluginsToBeInstalled : ret.pluginsToBeNotInstalled).push('cordova-plugin-chrome-apps-bluetoothsocket');
+  } else {
+    ret.pluginsToBeNotInstalled = ret.pluginsToBeNotInstalled.concat([
+      'cordova-plugin-chrome-apps-bluetoothlowenergy',
+      'cordova-plugin-chrome-apps-bluetoothsocket',
+      'cordova-plugin-chrome-apps-bluetooth'
+    ]);
+  }
+
+  // This next filter seems needless, but it happens when we still want plugins installed for which there are missing permissions, e.g. chrome.storage
+  ret.pluginsToBeNotInstalled = ret.pluginsToBeNotInstalled.filter(function(plugin) {
+    return ret.pluginsToBeInstalled.indexOf(plugin) == -1;
+  });
+
+  // Take only unique values
+  ret.pluginsToBeInstalled = ret.pluginsToBeInstalled.sort().filter(function(value, index, self) {
+    return self.indexOf(value) === index;
+  });
+  ret.pluginsToBeNotInstalled = ret.pluginsToBeNotInstalled.sort().filter(function(value, index, self) {
+    return self.indexOf(value) === index;
+  });
+  ret.pluginsNotRecognized = ret.pluginsNotRecognized.sort().filter(function(value, index, self) {
+    return self.indexOf(value) === index;
+  });
+
   // This should happen rarely
   pluginsForEngines.unknown.forEach(function(unknownEngine) {
     console.warn('Engine not supported by cca: ' + unknownEngine + ' (skipping)');
@@ -123,3 +155,31 @@ module.exports = function analyseManifest(manifest, options) {
 
   return ret;
 };
+
+function createCspString(manifest, platform) {
+  // Allow apps to define their own CSP.
+  if (manifest.csp) {
+    return manifest.csp;
+  }
+  var defaultSrc = 'file: data: blob: chrome-extension: gopher:';
+  if (platform == 'ios') {
+    defaultSrc += ' gap:';
+  } else if (platform == 'android') {
+    // Required for TalkBack
+    defaultSrc += ' https://ssl.gstatic.com';
+  }
+  if (manifest.cspUnsafeEval) {
+    defaultSrc += " 'unsafe-eval'";
+  }
+  if (manifest.cspUnsafeInline) {
+    defaultSrc += " 'unsafe-inline'";
+  }
+  var ret = 'default-src ' + defaultSrc + ';';
+  ret += ' connect-src *; media-src *;';
+  if (!manifest.cspUnsafeInline) {
+    ret += ' style-src ' + defaultSrc + " 'unsafe-inline';";
+  }
+  return ret;
+}
+module.exports.createCspString = createCspString;
+