From 4b8069f5ec09e4414e0ca274321dd09b1ec8c513 Mon Sep 17 00:00:00 2001
From: Joe Bowser <bowserj@apache.org>
Date: Mon, 12 Jan 2015 14:55:48 -0800
Subject: [PATCH 1/3] Set VERSION to 3.8.0-dev (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 a4ce38eb..d4da33bc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.7.0-dev
+3.8.0-dev
diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version
index 2e1ade7b..e6acd80f 100755
--- a/bin/templates/cordova/version
+++ b/bin/templates/cordova/version
@@ -20,6 +20,6 @@
 */
 
 // Coho updates this line:
-var VERSION = "3.7.0-dev";
+var VERSION = "3.8.0-dev";
 
 console.log(VERSION);
diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index 8c6e4712..3825be96 100755
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -62,7 +62,7 @@ import android.widget.FrameLayout;
 public class CordovaWebView extends WebView {
 
     public static final String TAG = "CordovaWebView";
-    public static final String CORDOVA_VERSION = "3.7.0-dev";
+    public static final String CORDOVA_VERSION = "3.8.0-dev";
 
     private HashSet<Integer> boundKeyCodes = new HashSet<Integer>();
 
diff --git a/package.json b/package.json
index a152ceb6..808f67f1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "cordova-android",
-    "version": "3.7.0-dev",
+    "version": "3.8.0-dev",
     "description": "cordova-android release",
     "main": "bin/create",
     "repository": {

From 0e5d72dc5d5933c985ca14edd5b91700f3061481 Mon Sep 17 00:00:00 2001
From: Joe Bowser <bowserj@apache.org>
Date: Mon, 12 Jan 2015 14:55:49 -0800
Subject: [PATCH 2/3] Update JS snapshot to version 3.8.0-dev (via coho)

---
 framework/assets/www/cordova.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/assets/www/cordova.js b/framework/assets/www/cordova.js
index 2fcf2469..a5667339 100644
--- a/framework/assets/www/cordova.js
+++ b/framework/assets/www/cordova.js
@@ -1,5 +1,5 @@
 // Platform: android
-// ee7b91f28e3780afb44222a2d950ccc1bebd0b87
+// 24ab6855470f2dc0662624b597c98585e56a1666
 /*
  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 = '3.7.0-dev';
+var PLATFORM_VERSION_BUILD_LABEL = '3.8.0-dev';
 // file: src/scripts/require.js
 
 /*jshint -W079 */

From 8e5c93a31fb88108f1d97e933816584ecbbb939f Mon Sep 17 00:00:00 2001
From: Murat Sutunc <muratsu@microsoft.com>
Date: Mon, 12 Jan 2015 22:54:37 -0800
Subject: [PATCH 3/3] CB-4914 Fix build whitespace issue

---
 bin/templates/cordova/lib/spawn.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/bin/templates/cordova/lib/spawn.js b/bin/templates/cordova/lib/spawn.js
index d5b0dce1..3e500a09 100644
--- a/bin/templates/cordova/lib/spawn.js
+++ b/bin/templates/cordova/lib/spawn.js
@@ -26,13 +26,15 @@ var isWindows = process.platform.slice(0, 3) == 'win';
 // Takes a command and optional current working directory.
 module.exports = function(cmd, args, opt_cwd) {
     var d = Q.defer();
+    var opts = { cwd: opt_cwd, stdio: 'inherit' };
     try {
         // Work around spawn not being able to find .bat files.
         if (isWindows) {
-          args.unshift('/s', '/c', cmd);
-          cmd = 'cmd';
+            args = [['/s', '/c', '"' + [cmd].concat(args).map(function(a){if (/^[^"].* .*[^"]/.test(a)) return '"' + a + '"'; return a;}).join(' ')+'"'].join(' ')];
+            cmd = 'cmd';
+            opts.windowsVerbatimArguments = true;
         }
-        var child = child_process.spawn(cmd, args, {cwd: opt_cwd, stdio: 'inherit'});
+        var child = child_process.spawn(cmd, args, opts);
         child.on('exit', function(code) {
             if (code) {
                 d.reject('Error code ' + code + ' for command: ' + cmd + ' with args: ' + args);
@@ -45,5 +47,4 @@ module.exports = function(cmd, args, opt_cwd) {
         d.reject(e);
     }
     return d.promise;
-}
-
+};