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 2016/07/27 01:03:55 UTC
[1/3] android commit: CB-11626 Updated RELEASENOTES and Version for
release 5.2.2
Repository: cordova-android
Updated Branches:
refs/heads/master 081637134 -> 74ae6651c
CB-11626 Updated RELEASENOTES and Version for release 5.2.2
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/39c17e71
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/39c17e71
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/39c17e71
Branch: refs/heads/master
Commit: 39c17e71efab1b30cc7c2e568d63196668ccd475
Parents: 0816371
Author: Steve Gill <st...@gmail.com>
Authored: Tue Jul 26 13:06:08 2016 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Tue Jul 26 13:06:08 2016 -0700
----------------------------------------------------------------------
RELEASENOTES.md | 3 +++
package.json | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/39c17e71/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 5507e74..1022869 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,6 +20,9 @@
-->
## Release Notes for Cordova (Android) ##
+### 5.2.2 (Jul 26, 2016)
+* [CB-11615](https://issues.apache.org/jira/browse/CB-11615) updated `cordoova-common` to `1.4.0`
+
### 5.2.1 (Jul 11, 2016)
* [CB-9489](https://issues.apache.org/jira/browse/CB-9489) Fixed "endless waiting for emulator" issue
* [CB-11481](https://issues.apache.org/jira/browse/CB-11481) android-library is deprecated use com.android.library instead
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/39c17e71/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 170d4c0..6b81b07 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-android",
- "version": "5.3.0-dev",
+ "version": "5.2.2",
"description": "cordova-android release",
"bin": {
"create": "bin/create"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[3/3] android commit: Update JS snapshot to version 5.3.0-dev (via
coho)
Posted by st...@apache.org.
Update JS snapshot to version 5.3.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/74ae6651
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/74ae6651
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/74ae6651
Branch: refs/heads/master
Commit: 74ae6651c8f1752c487cd7e6461d931909305127
Parents: f33f352
Author: Steve Gill <st...@gmail.com>
Authored: Tue Jul 26 14:57:29 2016 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Tue Jul 26 14:57:29 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/74ae6651/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 de4341e..cbfaed7 100644
--- a/bin/templates/project/assets/www/cordova.js
+++ b/bin/templates/project/assets/www/cordova.js
@@ -1,5 +1,5 @@
// Platform: android
-// 2fd4bcb84048415922d13d80d35b8d1668e8e150
+// d403ce434788ffe1937711d6ebcbcc837fcbcb14
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -2083,7 +2083,7 @@ utils.clone = function(obj) {
retVal = {};
for(i in obj){
- if(!(i in retVal) || retVal[i] != obj[i]) {
+ if((!(i in retVal) || retVal[i] != obj[i]) && typeof obj[i] != 'undefined') {
retVal[i] = utils.clone(obj[i]);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/3] android commit: Set VERSION to 5.3.0-dev (via coho)
Posted by st...@apache.org.
Set VERSION to 5.3.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/f33f3525
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/f33f3525
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/f33f3525
Branch: refs/heads/master
Commit: f33f352501a2de9116b78c0c000c9cf8e3aff736
Parents: 39c17e7
Author: Steve Gill <st...@gmail.com>
Authored: Tue Jul 26 14:57:28 2016 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Tue Jul 26 14:57:28 2016 -0700
----------------------------------------------------------------------
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/f33f3525/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 6b81b07..170d4c0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-android",
- "version": "5.2.2",
+ "version": "5.3.0-dev",
"description": "cordova-android release",
"bin": {
"create": "bin/create"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org