You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2013/09/17 17:15:20 UTC

[1/2] android commit: Set VERSION to 3.1.0-rc1 (via coho)

Updated Branches:
  refs/heads/3.1.x 52d0a4fa7 -> 495ca45f7


Set VERSION to 3.1.0-rc1 (via coho)


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/495ca45f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/495ca45f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/495ca45f

Branch: refs/heads/3.1.x
Commit: 495ca45f7646884515503b4d52cbaa9d314e5e47
Parents: 42a6e79
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Sep 17 11:03:50 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Sep 17 11:03:50 2013 -0400

----------------------------------------------------------------------
 bin/templates/cordova/version                        | 2 +-
 framework/src/org/apache/cordova/CordovaWebView.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/495ca45f/bin/templates/cordova/version
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version
index 04e734c..42bab55 100755
--- a/bin/templates/cordova/version
+++ b/bin/templates/cordova/version
@@ -20,6 +20,6 @@
 */
 
 // Coho updates this line:
-var VERSION = '3.1.0-dev';
+var VERSION = "3.1.0-rc1";
 
 console.log(VERSION);

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/495ca45f/framework/src/org/apache/cordova/CordovaWebView.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index beb41ac..b1fc5e8 100755
--- 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-dev";
+    public static final String CORDOVA_VERSION = "3.1.0-rc1";
 
     private ArrayList<Integer> keyDownCodes = new ArrayList<Integer>();
     private ArrayList<Integer> keyUpCodes = new ArrayList<Integer>();


[2/2] android commit: Update JS snapshot to version 3.1.0-rc1 (via coho)

Posted by ag...@apache.org.
Update JS snapshot to version 3.1.0-rc1 (via coho)


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/42a6e797
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/42a6e797
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/42a6e797

Branch: refs/heads/3.1.x
Commit: 42a6e7972a5277c841415713ca776a2d5c65e98f
Parents: 52d0a4f
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Sep 17 11:03:50 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Sep 17 11:03:50 2013 -0400

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


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/42a6e797/framework/assets/www/cordova.js
----------------------------------------------------------------------
diff --git a/framework/assets/www/cordova.js b/framework/assets/www/cordova.js
index 5f0ac0d..a7f1025 100644
--- a/framework/assets/www/cordova.js
+++ b/framework/assets/www/cordova.js
@@ -1,5 +1,5 @@
 // Platform: android
-// 3.1.0-rc1-0-g0d70465
+// 3.1.0-rc1
 /*
  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-0-g0d70465';
+var CORDOVA_JS_BUILD_LABEL = '3.1.0-rc1';
 // file: lib/scripts/require.js
 
 var require,