Set VERSION to 3.1.0 (via coho)

Update JS snapshot to version 3.1.0 (via coho)
CB-4961: shell.js returns the full path on ls, rebuilding the full path isn't really needed
2026-01-30 00:05:28 +08:00 · 2013-10-02 12:40:50 -04:00 · 2013-10-02 12:40:49 -04:00 · 2013-09-30 16:01:59 -07:00 · 2013-09-23 10:17:14 +02:00
5 changed files with 8 additions and 7 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-3.1.0-rc1
+3.1.0
--- a/bin/lib/create.js
+++ b/bin/lib/create.js
@@ -69,7 +69,8 @@ function copyJsAndJar(projectPath, version) {
    // Don't fail if there are no old jars.
    setShellFatal(false, function() {
        shell.ls(path.join(projectPath, 'libs', 'cordova-*.jar')).forEach(function(oldJar) {
-            shell.rm('-f', path.join(projectPath, 'libs', oldJar));
+            console.log("Deleting " + oldJar);
+            shell.rm('-f', path.join(oldJar));
        });
    });
    shell.cp('-f', path.join(ROOT, 'framework', 'cordova-' + version + '.jar'), path.join(projectPath, 'libs', 'cordova-' + version + '.jar'));
@@ -123,7 +124,7 @@ exports.createProject = function(project_path, package_name, project_name, proje
                           project_template_dir : 
                           path.join(ROOT, 'bin', 'templates', 'project');

-    var safe_activity_name = project_name.replace(/\W/, '');
+    var safe_activity_name = project_name.replace(/\W/g, '');
    var package_as_path = package_name.replace(/\./g, path.sep);
    var activity_dir    = path.join(project_path, 'src', package_as_path);
    var activity_path   = path.join(activity_dir, safe_activity_name + '.java');
--- a/bin/templates/cordova/version
+++ b/bin/templates/cordova/version
@@ -20,6 +20,6 @@
 */

 // Coho updates this line:
-var VERSION = "3.1.0-rc1";
+var VERSION = "3.1.0";

 console.log(VERSION);
--- a/framework/assets/www/cordova.js
+++ b/framework/assets/www/cordova.js
@@ -1,5 +1,5 @@
 // Platform: android
-// 3.1.0-rc1
+// 3.1.0
 /*
 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 CORDOVA_JS_BUILD_LABEL = '3.1.0-rc1';
+var CORDOVA_JS_BUILD_LABEL = '3.1.0';
 // file: lib/scripts/require.js

 var require,
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -61,7 +61,7 @@ public class CordovaWebView extends WebView {
    
    public static final String TAG = "CordovaWebView";
    
-    public static final String CORDOVA_VERSION = "3.1.0-rc1";
+    public static final String CORDOVA_VERSION = "3.1.0";

    private ArrayList<Integer> keyDownCodes = new ArrayList<Integer>();
    private ArrayList<Integer> keyUpCodes = new ArrayList<Integer>();
Author	SHA1	Message	Date
Andrew Grieve	e5b0157971	Set VERSION to 3.1.0 (via coho)	2013-10-02 12:40:50 -04:00
Andrew Grieve	847b6fe7c9	Update JS snapshot to version 3.1.0 (via coho)	2013-10-02 12:40:49 -04:00
Joe Bowser	133c2dc902	CB-4961: shell.js returns the full path on ls, rebuilding the full path isn't really needed	2013-09-30 16:01:59 -07:00
Andrew Grieve	5592765f04	[CB-4892] Fix create script only escaping the first space instead of all spaces. (cherry picked from commit `2d88a726b7`)	2013-09-23 10:17:14 +02:00