You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ni...@apache.org on 2015/07/20 19:15:55 UTC
[1/2] android commit: Set VERSION to 4.1.0 (via coho)
Repository: cordova-android
Updated Branches:
refs/heads/4.1.x [created] 4a7cbb5eb
Set VERSION to 4.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/4a7cbb5e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/4a7cbb5e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/4a7cbb5e
Branch: refs/heads/4.1.x
Commit: 4a7cbb5eb477c55f71a4a8bf346f5120cfccd051
Parents: bc91c55
Author: Nikhil Khandelwal <ni...@microsoft.com>
Authored: Mon Jul 20 09:52:13 2015 -0700
Committer: Nikhil Khandelwal <ni...@microsoft.com>
Committed: Mon Jul 20 09:52:13 2015 -0700
----------------------------------------------------------------------
VERSION | 2 +-
bin/templates/cordova/version | 2 +-
framework/src/org/apache/cordova/CordovaWebView.java | 2 +-
package.json | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/4a7cbb5e/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 4aa925d..ee74734 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.1.0-dev
+4.1.0
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/4a7cbb5e/bin/templates/cordova/version
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version
index 7039287..8a13bae 100755
--- a/bin/templates/cordova/version
+++ b/bin/templates/cordova/version
@@ -20,6 +20,6 @@
*/
// Coho updates this line:
-var VERSION = "4.1.0-dev";
+var VERSION = "4.1.0";
console.log(VERSION);
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/4a7cbb5e/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 518f5fb..24bc0f2 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 = "4.1.0-dev";
+ public static final String CORDOVA_VERSION = "4.1.0";
void init(CordovaInterface cordova, List<PluginEntry> pluginEntries, CordovaPreferences preferences);
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/4a7cbb5e/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 1f43c9f..9c5ee84 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-android",
- "version": "4.1.0-dev",
+ "version": "4.1.0",
"description": "cordova-android release",
"main": "bin/create",
"repository": {
---------------------------------------------------------------------
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 4.1.0 (via coho)
Posted by ni...@apache.org.
Update JS snapshot to version 4.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/bc91c554
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/bc91c554
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/bc91c554
Branch: refs/heads/4.1.x
Commit: bc91c554e6fa00ecd0ff64422213d7dac13d302d
Parents: dc94132
Author: Nikhil Khandelwal <ni...@microsoft.com>
Authored: Mon Jul 20 09:52:13 2015 -0700
Committer: Nikhil Khandelwal <ni...@microsoft.com>
Committed: Mon Jul 20 09:52:13 2015 -0700
----------------------------------------------------------------------
bin/templates/project/assets/www/cordova.js | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/bc91c554/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 dbc221f..9fddd15 100644
--- a/bin/templates/project/assets/www/cordova.js
+++ b/bin/templates/project/assets/www/cordova.js
@@ -1,5 +1,5 @@
// Platform: android
-// 23738581906992092a43ad2e643b1e0c43bba38a
+// a83e94b489774dc8e514671e81c6154eda650af1
/*
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 = '4.1.0-dev';
+var PLATFORM_VERSION_BUILD_LABEL = '4.1.0';
// file: src/scripts/require.js
/*jshint -W079 */
@@ -328,7 +328,7 @@ module.exports = cordova;
});
-// file: node_modules/cordova-android/cordova-js-src/android/nativeapiprovider.js
+// file: D:/cordova/cordova-android/cordova-js-src/android/nativeapiprovider.js
define("cordova/android/nativeapiprovider", function(require, exports, module) {
/**
@@ -351,7 +351,7 @@ module.exports = {
});
-// file: node_modules/cordova-android/cordova-js-src/android/promptbasednativeapi.js
+// file: D:/cordova/cordova-android/cordova-js-src/android/promptbasednativeapi.js
define("cordova/android/promptbasednativeapi", function(require, exports, module) {
/**
@@ -861,7 +861,7 @@ module.exports = channel;
});
-// file: node_modules/cordova-android/cordova-js-src/exec.js
+// file: D:/cordova/cordova-android/cordova-js-src/exec.js
define("cordova/exec", function(require, exports, module) {
/**
@@ -896,11 +896,7 @@ var cordova = require('cordova'),
// For the ONLINE_EVENT to be viable, it would need to intercept all event
// listeners (both through addEventListener and window.ononline) as well
// as set the navigator property itself.
- ONLINE_EVENT: 2,
- // Uses reflection to access private APIs of the WebView that can send JS
- // to be executed.
- // Requires Android 3.2.4 or above.
- PRIVATE_API: 3
+ ONLINE_EVENT: 2
},
jsToNativeBridgeMode, // Set lazily.
nativeToJsBridgeMode = nativeToJsModes.ONLINE_EVENT,
@@ -1504,7 +1500,7 @@ exports.reset();
});
-// file: node_modules/cordova-android/cordova-js-src/platform.js
+// file: D:/cordova/cordova-android/cordova-js-src/platform.js
define("cordova/platform", function(require, exports, module) {
module.exports = {
@@ -1580,7 +1576,7 @@ function onMessageFromNative(msg) {
});
-// file: node_modules/cordova-android/cordova-js-src/plugin/android/app.js
+// file: D:/cordova/cordova-android/cordova-js-src/plugin/android/app.js
define("cordova/plugin/android/app", function(require, exports, module) {
var exec = require('cordova/exec');
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org