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:35:57 UTC
[1/2] android commit: Set VERSION to 3.7.0-dev (via coho)
Repository: cordova-android
Updated Branches:
refs/heads/master 0cde8819c -> f20708a5e
Set VERSION to 3.7.0-dev (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/91cf78f1
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/91cf78f1
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/91cf78f1
Branch: refs/heads/master
Commit: 91cf78f183ebd692c47a6f745cbf0fdc4f3d4273
Parents: 0cde881
Author: Steven Gill <st...@gmail.com>
Authored: Fri Aug 29 16:34:12 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Fri Aug 29 16:34:12 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/91cf78f1/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 86bab9c..a4ce38e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.6.0-dev
+3.7.0-dev
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/91cf78f1/bin/templates/cordova/version
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version
index ac3bb54..2e1ade7 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.7.0-dev";
console.log(VERSION);
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/91cf78f1/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..f7a94ae 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.7.0-dev";
private HashSet<Integer> boundKeyCodes = new HashSet<Integer>();
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/91cf78f1/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index ed01458..8a6ab09 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.7.0-dev",
+ "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
[2/2] android commit: Update JS snapshot to version 3.7.0-dev (via
coho)
Posted by st...@apache.org.
Update JS snapshot to version 3.7.0-dev (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/f20708a5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/f20708a5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/f20708a5
Branch: refs/heads/master
Commit: f20708a5e732f550436394aa84bf309e769e7d23
Parents: 91cf78f
Author: Steven Gill <st...@gmail.com>
Authored: Fri Aug 29 16:34:17 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Fri Aug 29 16:34:17 2014 -0700
----------------------------------------------------------------------
framework/assets/www/cordova.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/f20708a5/framework/assets/www/cordova.js
----------------------------------------------------------------------
diff --git a/framework/assets/www/cordova.js b/framework/assets/www/cordova.js
index 73ec0fe..3838e63 100644
--- a/framework/assets/www/cordova.js
+++ b/framework/assets/www/cordova.js
@@ -1,5 +1,5 @@
// Platform: android
-// 3.6.3
+// 3.7.0-dev-8f41e8d
/*
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.6.3';
+var CORDOVA_JS_BUILD_LABEL = '3.7.0-dev-8f41e8d';
// file: src/scripts/require.js
/*jshint -W079 */