You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2016/11/03 17:25:41 UTC
[1/2] android commit: Set VERSION to 6.1.0 (via coho)
Repository: cordova-android
Updated Branches:
refs/heads/6.1.x [created] 7e54af75d
Set VERSION to 6.1.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/7e54af75
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/7e54af75
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/7e54af75
Branch: refs/heads/6.1.x
Commit: 7e54af75d85dd06393c8cf6d8ebfcc873523c98a
Parents: d95df96
Author: Joe Bowser <bo...@apache.org>
Authored: Wed Nov 2 16:32:15 2016 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed Nov 2 16:32:15 2016 -0700
----------------------------------------------------------------------
VERSION | 2 +-
bin/templates/cordova/version | 2 +-
.../src/org/apache/cordova/CordovaWebView.java | 2 +-
package.json | 94 ++++++++++----------
4 files changed, 50 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/7e54af75/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 4b740cb..dfda3e0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.1.0-dev
+6.1.0
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/7e54af75/bin/templates/cordova/version
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version
index 581ffe1..7bfb4b7 100755
--- a/bin/templates/cordova/version
+++ b/bin/templates/cordova/version
@@ -20,7 +20,7 @@
*/
// Coho updates this line:
-var VERSION = "6.1.0-dev";
+var VERSION = "6.1.0";
module.exports.version = VERSION;
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/7e54af75/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 f2a909b..131b519 100644
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -31,7 +31,7 @@ import android.webkit.WebChromeClient.CustomViewCallback;
* are not expected to implement it.
*/
public interface CordovaWebView {
- public static final String CORDOVA_VERSION = "6.1.0-dev";
+ public static final String CORDOVA_VERSION = "6.1.0";
void init(CordovaInterface cordova, List<PluginEntry> pluginEntries, CordovaPreferences preferences);
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/7e54af75/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index c1ceb47..e2f0f04 100644
--- a/package.json
+++ b/package.json
@@ -1,49 +1,49 @@
{
- "name": "cordova-android",
- "version": "6.1.0",
- "description": "cordova-android release",
- "bin": {
- "create": "bin/create"
- },
- "main": "bin/templates/cordova/Api.js",
- "repository": {
- "type": "git",
- "url": "https://git-wip-us.apache.org/repos/asf/cordova-android.git"
- },
- "keywords": [
- "android",
- "cordova",
- "apache"
- ],
- "scripts": {
- "test": "npm run jshint && jasmine-node --color spec/unit",
- "cover": "istanbul cover --root bin/templates/cordova --print detail node_modules/jasmine-node/bin/jasmine-node -- spec/unit",
- "test-build": "jasmine-node --captureExceptions --color spec/e2e",
- "jshint": "node node_modules/jshint/bin/jshint bin && node node_modules/jshint/bin/jshint spec"
- },
- "author": "Apache Software Foundation",
- "license": "Apache-2.0",
- "dependencies": {
- "cordova-common": "^1.5.0",
- "elementtree": "^0.1.6",
- "nopt": "^3.0.1",
- "properties-parser": "^0.2.3",
- "q": "^1.4.1",
- "shelljs": "^0.5.3"
- },
- "bundledDependencies": [
- "cordova-common",
- "elementtree",
- "nopt",
- "properties-parser",
- "q",
- "shelljs"
- ],
- "devDependencies": {
- "istanbul": "^0.4.2",
- "jasmine-node": "^1.14.5",
- "jshint": "^2.6.0",
- "promise-matchers": "~0",
- "rewire": "^2.1.3"
- }
+ "name": "cordova-android",
+ "version": "6.1.0",
+ "description": "cordova-android release",
+ "bin": {
+ "create": "bin/create"
+ },
+ "main": "bin/templates/cordova/Api.js",
+ "repository": {
+ "type": "git",
+ "url": "https://git-wip-us.apache.org/repos/asf/cordova-android.git"
+ },
+ "keywords": [
+ "android",
+ "cordova",
+ "apache"
+ ],
+ "scripts": {
+ "test": "npm run jshint && jasmine-node --color spec/unit",
+ "cover": "istanbul cover --root bin/templates/cordova --print detail node_modules/jasmine-node/bin/jasmine-node -- spec/unit",
+ "test-build": "jasmine-node --captureExceptions --color spec/e2e",
+ "jshint": "node node_modules/jshint/bin/jshint bin && node node_modules/jshint/bin/jshint spec"
+ },
+ "author": "Apache Software Foundation",
+ "license": "Apache-2.0",
+ "dependencies": {
+ "cordova-common": "^1.5.0",
+ "elementtree": "^0.1.6",
+ "nopt": "^3.0.1",
+ "properties-parser": "^0.2.3",
+ "q": "^1.4.1",
+ "shelljs": "^0.5.3"
+ },
+ "bundledDependencies": [
+ "cordova-common",
+ "elementtree",
+ "nopt",
+ "properties-parser",
+ "q",
+ "shelljs"
+ ],
+ "devDependencies": {
+ "istanbul": "^0.4.2",
+ "jasmine-node": "^1.14.5",
+ "jshint": "^2.6.0",
+ "promise-matchers": "~0",
+ "rewire": "^2.1.3"
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/2] android commit: Update JS snapshot to version 6.1.0 (via coho)
Posted by bo...@apache.org.
Update JS snapshot to version 6.1.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/d95df968
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/d95df968
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/d95df968
Branch: refs/heads/6.1.x
Commit: d95df968817c4f9df0224c141c68ed0ebeea3386
Parents: 36646eb
Author: Joe Bowser <bo...@apache.org>
Authored: Wed Nov 2 16:32:15 2016 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed Nov 2 16:32:15 2016 -0700
----------------------------------------------------------------------
bin/templates/project/assets/www/cordova.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/d95df968/bin/templates/project/assets/www/cordova.js
----------------------------------------------------------------------
diff --git a/bin/templates/project/assets/www/cordova.js b/bin/templates/project/assets/www/cordova.js
index 27e66d7..939eacf 100644
--- a/bin/templates/project/assets/www/cordova.js
+++ b/bin/templates/project/assets/www/cordova.js
@@ -1,5 +1,5 @@
// Platform: android
-// 53ea1913735222d326e65326e03391405df3cd4e
+// a3732cb71d9b1dd590338e8cf44196f366d46da3
/*
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 = '6.1.0-dev';
+var PLATFORM_VERSION_BUILD_LABEL = '6.1.0';
// file: src/scripts/require.js
/*jshint -W079 */
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org