You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2014/08/30 01:36:00 UTC

android commit: Set VERSION to 3.6.0 (via coho)

Repository: cordova-android
Updated Branches:
  refs/heads/3.6.x [created] 014327c59


Set VERSION to 3.6.0 (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/014327c5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/014327c5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/014327c5

Branch: refs/heads/3.6.x
Commit: 014327c59a6e10a6673c52c3431712adf897df7e
Parents: 0cde881
Author: Steven Gill <st...@gmail.com>
Authored: Fri Aug 29 16:34:11 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Fri Aug 29 16:34:11 2014 -0700

----------------------------------------------------------------------
 VERSION                                         |  2 +-
 bin/templates/cordova/version                   |  2 +-
 .../src/org/apache/cordova/CordovaWebView.java  |  2 +-
 package.json                                    | 54 ++++++++++----------
 4 files changed, 30 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/014327c5/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 86bab9c..40c341b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.6.0-dev
+3.6.0

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/014327c5/bin/templates/cordova/version
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version
index ac3bb54..63a737d 100755
--- a/bin/templates/cordova/version
+++ b/bin/templates/cordova/version
@@ -20,6 +20,6 @@
 */
 
 // Coho updates this line:
-var VERSION = "3.6.0-dev";
+var VERSION = "3.6.0";
 
 console.log(VERSION);

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/014327c5/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 403a7ae..64e6ded 100755
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -61,7 +61,7 @@ import android.widget.FrameLayout;
 public class CordovaWebView extends WebView {
 
     public static final String TAG = "CordovaWebView";
-    public static final String CORDOVA_VERSION = "3.6.0-dev";
+    public static final String CORDOVA_VERSION = "3.6.0";
 
     private HashSet<Integer> boundKeyCodes = new HashSet<Integer>();
 

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/014327c5/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index ed01458..a162094 100644
--- a/package.json
+++ b/package.json
@@ -1,28 +1,28 @@
 {
-  "name": "cordova-android",
-  "version": "3.4.0",
-  "description": "cordova-android release",
-  "main": "bin/create",
-  "repository": {
-    "type": "git",
-    "url": "https://git-wip-us.apache.org/repos/asf/cordova-android.git"
-  },
-  "keywords": [
-    "android",
-    "cordova",
-    "apache"
-  ],
-  "scripts": {
-    "test": "jasmine-node --color spec"
-  },
-  "author": "Apache Software Foundation",
-  "license": "Apache version 2.0",
-  "dependencies": {
-    "q": "^0.9.0",
-    "shelljs": "^0.2.6"
-  },
-  "devDependencies": {
-    "jasmine-node": "~1",
-    "promise-matchers": "~0"
-  }
-}
+    "name": "cordova-android",
+    "version": "3.6.0",
+    "description": "cordova-android release",
+    "main": "bin/create",
+    "repository": {
+        "type": "git",
+        "url": "https://git-wip-us.apache.org/repos/asf/cordova-android.git"
+    },
+    "keywords": [
+        "android",
+        "cordova",
+        "apache"
+    ],
+    "scripts": {
+        "test": "jasmine-node --color spec"
+    },
+    "author": "Apache Software Foundation",
+    "license": "Apache version 2.0",
+    "dependencies": {
+        "q": "^0.9.0",
+        "shelljs": "^0.2.6"
+    },
+    "devDependencies": {
+        "jasmine-node": "~1",
+        "promise-matchers": "~0"
+    }
+}
\ No newline at end of file