Merged master --> 1.2.x branch
diff --git a/README.md b/README.md
index dab4540..89e95af 100644
--- a/README.md
+++ b/README.md
@@ -21,9 +21,9 @@
# under the License.
-->
-|Android 4.4|Android 5.1|iOS 9.3|iOS 10.0|Windows 10 Store|Travis CI|
-|:-:|:-:|:-:|:-:|:-:|:-:|
-|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-4.4,PLUGIN=cordova-plugin-battery-status/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-5.1,PLUGIN=cordova-plugin-battery-status/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios-9.3,PLUGIN=cordova-plugin-battery-status/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios-10.0,PLUGIN=cordova-plugin-battery-status/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=windows-10-store,PLUGIN=cordova-plugin-battery-status/)|[](https://travis-ci.org/apache/cordova-plugin-battery-status)|
+|Android 4.4|Android 5.1|Android 6.0|iOS 9.3|iOS 10.0|Windows 10 Store|Travis CI|
+|:-:|:-:|:-:|:-:|:-:|:-:|:-:|
+|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-4.4,PLUGIN=cordova-plugin-battery-status/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-5.1,PLUGIN=cordova-plugin-battery-status/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-6.0,PLUGIN=cordova-plugin-battery-status/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios-9.3,PLUGIN=cordova-plugin-battery-status/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios-10.0,PLUGIN=cordova-plugin-battery-status/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=windows-10-store,PLUGIN=cordova-plugin-battery-status/)|[](https://travis-ci.org/apache/cordova-plugin-battery-status)|
# cordova-plugin-battery-status
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 0fbb781..47fd4fc 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -21,6 +21,11 @@
# Release Notes
+### 1.2.4 (Apr 27, 2017)
+* [CB-12622](https://issues.apache.org/jira/browse/CB-12622) (Android) Added **Android 6.0** build badge
+* [CB-12685](https://issues.apache.org/jira/browse/CB-12685) added `package.json` to tests folder
+* [CB-12639](https://issues.apache.org/jira/browse/CB-12639) (all) Tests: console.err() -> console.error()
+
### 1.2.3 (Feb 28, 2017)
* [CB-12369](https://issues.apache.org/jira/browse/CB-12369) Add plugin typings from `DefinitelyTyped`
* [CB-12363](https://issues.apache.org/jira/browse/CB-12363) Added build badges for **iOS 9.3** and **iOS 10.0**
diff --git a/package.json b/package.json
index 6019cc9..21eb7e7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-battery-status",
- "version": "1.2.3",
+ "version": "1.2.4",
"description": "Cordova Battery Plugin",
"types": "./types/index.d.ts",
"cordova": {
diff --git a/plugin.xml b/plugin.xml
index 2af13d1..e932fe6 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -20,7 +20,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
id="cordova-plugin-battery-status"
- version="1.2.3">
+ version="1.2.4">
<name>Battery</name>
<description>Cordova Battery Plugin</description>
<license>Apache 2.0</license>
diff --git a/tests/package.json b/tests/package.json
new file mode 100644
index 0000000..24450c3
--- /dev/null
+++ b/tests/package.json
@@ -0,0 +1,14 @@
+{
+ "name": "cordova-plugin-battery-status-tests",
+ "version": "1.2.4-dev",
+ "description": "",
+ "cordova": {
+ "id": "cordova-plugin-battery-status-tests",
+ "platforms": []
+ },
+ "keywords": [
+ "ecosystem:cordova"
+ ],
+ "author": "",
+ "license": "Apache 2.0"
+}
diff --git a/tests/plugin.xml b/tests/plugin.xml
index 476794d..22d1524 100644
--- a/tests/plugin.xml
+++ b/tests/plugin.xml
@@ -22,7 +22,7 @@
xmlns:rim="http://www.blackberry.com/ns/widgets"
xmlns:android="http://schemas.android.com/apk/res/android"
id="cordova-plugin-battery-status-tests"
- version="1.2.3">
+ version="1.2.4">
<name>Cordova Battery Plugin Tests</name>
<license>Apache 2.0</license>
diff --git a/tests/tests.js b/tests/tests.js
index 428208f..38571a0 100644
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -54,7 +54,7 @@
window.removeEventListener("batterystatus", onEvent, false);
}
catch (e) {
- console.err('Error removing batterystatus event listener: ' + e);
+ console.error('Error removing batterystatus event listener: ' + e);
}
}
});
@@ -90,7 +90,7 @@
window.removeEventListener("batterylow", onEvent, false);
}
catch (e) {
- console.err('Error removing batterylow event listener: ' + e);
+ console.error('Error removing batterylow event listener: ' + e);
}
}
});
@@ -209,7 +209,7 @@
window.removeEventListener("batterycritical", onEvent, false);
}
catch (e) {
- console.err('Error removing batterycritical event listener: ' + e);
+ console.error('Error removing batterycritical event listener: ' + e);
}
}
});
