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 2017/01/04 02:01:15 UTC
[1/3] android commit: CB-12314 Updated RELEASENOTES and Version for
release 6.1.1
Repository: cordova-android
Updated Branches:
refs/heads/6.1.x a51fc4b25 -> 96457effb
CB-12314 Updated RELEASENOTES and Version for release 6.1.1
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/0efa6cd7
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/0efa6cd7
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/0efa6cd7
Branch: refs/heads/6.1.x
Commit: 0efa6cd7664349a1cccea25abaa7eea33262d83a
Parents: a51fc4b
Author: Steve Gill <st...@gmail.com>
Authored: Tue Jan 3 17:42:13 2017 -0800
Committer: Steve Gill <st...@gmail.com>
Committed: Tue Jan 3 17:42:13 2017 -0800
----------------------------------------------------------------------
RELEASENOTES.md | 5 +++++
package.json | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/0efa6cd7/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index b9413e5..c38a1e9 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,6 +20,11 @@
-->
## Release Notes for Cordova (Android) ##
+### 6.1.1 (Jan 03, 2017)
+* [CB-12159](https://issues.apache.org/jira/browse/CB-12159) **Android** Keystore password prompt won't show up
+* [CB-12169](https://issues.apache.org/jira/browse/CB-12169) Check for build directory before running a clean
+* Fixed `AndroidStudio` tests to actually run, removed `app/src/main/assets/` as a requirement and added `app/src/main/res` instead, added placeholder for `build/` folder, Removed dupe `gitignore`
+
### 6.1.0 (Nov 02, 2016)
* [CB-12108](https://issues.apache.org/jira/browse/CB-12108) Updating gradle files to work with the latest version of Android Studio
* [CB-12102](https://issues.apache.org/jira/browse/CB-12102) Bump travis to build to API 25
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/0efa6cd7/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index e2f0f04..9eaedaa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-android",
- "version": "6.1.0",
+ "version": "6.1.1",
"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: Set VERSION to 6.1.1 (via coho)
Posted by st...@apache.org.
Set VERSION to 6.1.1 (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/96457eff
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/96457eff
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/96457eff
Branch: refs/heads/6.1.x
Commit: 96457effbccbec7e40fc162375cb42bd29fa79ee
Parents: 67e7980
Author: Steve Gill <st...@gmail.com>
Authored: Tue Jan 3 17:45:53 2017 -0800
Committer: Steve Gill <st...@gmail.com>
Committed: Tue Jan 3 17:45:53 2017 -0800
----------------------------------------------------------------------
VERSION | 2 +-
bin/templates/cordova/version | 2 +-
framework/src/org/apache/cordova/CordovaWebView.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/96457eff/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index dfda3e0..f3b5af3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.1.0
+6.1.1
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/96457eff/bin/templates/cordova/version
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version
index 7bfb4b7..1c28df5 100755
--- a/bin/templates/cordova/version
+++ b/bin/templates/cordova/version
@@ -20,7 +20,7 @@
*/
// Coho updates this line:
-var VERSION = "6.1.0";
+var VERSION = "6.1.1";
module.exports.version = VERSION;
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/96457eff/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 131b519..15adbc5 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";
+ public static final String CORDOVA_VERSION = "6.1.1";
void init(CordovaInterface cordova, List<PluginEntry> pluginEntries, CordovaPreferences preferences);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/3] android commit: Update JS snapshot to version 6.1.1 (via coho)
Posted by st...@apache.org.
Update JS snapshot to version 6.1.1 (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/67e7980e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/67e7980e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/67e7980e
Branch: refs/heads/6.1.x
Commit: 67e7980ebac9e75aa72c97f1beee0002458bbdab
Parents: 0efa6cd
Author: Steve Gill <st...@gmail.com>
Authored: Tue Jan 3 17:45:53 2017 -0800
Committer: Steve Gill <st...@gmail.com>
Committed: Tue Jan 3 17:45:53 2017 -0800
----------------------------------------------------------------------
bin/templates/project/assets/www/cordova.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/67e7980e/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 939eacf..3878a5b 100644
--- a/bin/templates/project/assets/www/cordova.js
+++ b/bin/templates/project/assets/www/cordova.js
@@ -19,7 +19,7 @@
under the License.
*/
;(function() {
-var PLATFORM_VERSION_BUILD_LABEL = '6.1.0';
+var PLATFORM_VERSION_BUILD_LABEL = '6.1.1';
// file: src/scripts/require.js
/*jshint -W079 */
@@ -330,7 +330,7 @@ module.exports = cordova;
});
-// file: /Users/jbowser/cordova/cordova-android/cordova-js-src/android/nativeapiprovider.js
+// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/android/nativeapiprovider.js
define("cordova/android/nativeapiprovider", function(require, exports, module) {
/**
@@ -353,7 +353,7 @@ module.exports = {
});
-// file: /Users/jbowser/cordova/cordova-android/cordova-js-src/android/promptbasednativeapi.js
+// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/android/promptbasednativeapi.js
define("cordova/android/promptbasednativeapi", function(require, exports, module) {
/**
@@ -886,7 +886,7 @@ module.exports = channel;
});
-// file: /Users/jbowser/cordova/cordova-android/cordova-js-src/exec.js
+// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/exec.js
define("cordova/exec", function(require, exports, module) {
/**
@@ -1649,7 +1649,7 @@ exports.reset();
});
-// file: /Users/jbowser/cordova/cordova-android/cordova-js-src/platform.js
+// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/platform.js
define("cordova/platform", function(require, exports, module) {
// The last resume event that was received that had the result of a plugin call.
@@ -1759,7 +1759,7 @@ function onMessageFromNative(msg) {
});
-// file: /Users/jbowser/cordova/cordova-android/cordova-js-src/plugin/android/app.js
+// file: /Users/steveng/repo/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