CB-12519 Updated version and RELEASENOTES.md for release 1.2.4
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 4d61ae6..9c29a80 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,6 +20,12 @@
-->
# Release Notes
+### 1.2.4 (Feb 28, 2017)
+* [CB-12353](https://issues.apache.org/jira/browse/CB-12353) Corrected merges usage in `plugin.xml`
+* [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**
+* [CB-12230](https://issues.apache.org/jira/browse/CB-12230) Removed **Windows 8.1** build badges
+
### 1.2.3 (Dec 07, 2016)
* [CB-12224](https://issues.apache.org/jira/browse/CB-12224) Updated version and RELEASENOTES.md for release 1.2.3
* [CB-11917](https://issues.apache.org/jira/browse/CB-11917) - Remove pull request template checklist item: "iCLA has been submitted…"
diff --git a/package.json b/package.json
index 946da3d..2ea04d6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-device-motion",
- "version": "1.2.4-dev",
+ "version": "1.2.4",
"description": "Cordova Device Motion Plugin",
"types": "./types/index.d.ts",
"cordova": {
diff --git a/plugin.xml b/plugin.xml
index ea1ba04..28a2fdd 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,165 +1,103 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
- id="cordova-plugin-device-motion"
- version="1.2.4-dev">
-
- <name>Device Motion</name>
- <description>Cordova Device Motion Plugin</description>
- <license>Apache 2.0</license>
- <keywords>cordova,device,motion</keywords>
- <repo>https://git-wip-us.apache.org/repos/asf/cordova-plugin-device-motion.git</repo>
- <issue>https://issues.apache.org/jira/browse/CB/component/12320636</issue>
-
- <js-module src="www/Acceleration.js" name="Acceleration">
- <clobbers target="Acceleration" />
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" id="cordova-plugin-device-motion" version="1.2.4">
+ <name>Device Motion</name>
+ <description>Cordova Device Motion Plugin</description>
+ <license>Apache 2.0</license>
+ <keywords>cordova,device,motion</keywords>
+ <repo>https://git-wip-us.apache.org/repos/asf/cordova-plugin-device-motion.git</repo>
+ <issue>https://issues.apache.org/jira/browse/CB/component/12320636</issue>
+ <js-module src="www/Acceleration.js" name="Acceleration">
+ <clobbers target="Acceleration"/>
+ </js-module>
+ <js-module src="www/accelerometer.js" name="accelerometer">
+ <clobbers target="navigator.accelerometer"/>
+ </js-module>
+ <platform name="firefoxos">
+ <config-file target="config.xml" parent="/*">
+ <feature name="Accelerometer">
+ <param name="firefoxos-package" value="Accelerometer"/>
+ </feature>
+ </config-file>
+ <js-module src="src/firefoxos/accelerometer.js" name="accelerometer-impl">
+ <runs/>
</js-module>
-
- <js-module src="www/accelerometer.js" name="accelerometer">
- <clobbers target="navigator.accelerometer" />
+ </platform>
+ <platform name="android">
+ <config-file target="res/xml/config.xml" parent="/*">
+ <feature name="Accelerometer">
+ <param name="android-package" value="org.apache.cordova.devicemotion.AccelListener"/>
+ </feature>
+ </config-file>
+ <source-file src="src/android/AccelListener.java" target-dir="src/org/apache/cordova/devicemotion"/>
+ </platform>
+ <platform name="amazon-fireos">
+ <config-file target="res/xml/config.xml" parent="/*">
+ <feature name="Accelerometer">
+ <param name="android-package" value="org.apache.cordova.devicemotion.AccelListener"/>
+ </feature>
+ </config-file>
+ <source-file src="src/android/AccelListener.java" target-dir="src/org/apache/cordova/devicemotion"/>
+ </platform>
+ <platform name="ubuntu">
+ <header-file src="src/ubuntu/accelerometer.h"/>
+ <source-file src="src/ubuntu/accelerometer.cpp"/>
+ </platform>
+ <platform name="ios">
+ <config-file target="config.xml" parent="/*">
+ <feature name="Accelerometer">
+ <param name="ios-package" value="CDVAccelerometer"/>
+ </feature>
+ </config-file>
+ <header-file src="src/ios/CDVAccelerometer.h"/>
+ <source-file src="src/ios/CDVAccelerometer.m"/>
+ <framework src="CoreMotion.framework"/>
+ </platform>
+ <platform name="blackberry10">
+ <config-file target="www/config.xml" parent="/widget">
+ <feature name="Accelerometer" value="Accelerometer"/>
+ </config-file>
+ <source-file src="src/blackberry10/index.js" target-dir="Accelerometer"/>
+ </platform>
+ <platform name="wp7">
+ <config-file target="config.xml" parent="/*">
+ <feature name="Accelerometer">
+ <param name="wp-package" value="Accelerometer"/>
+ </feature>
+ </config-file>
+ <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
+ <Capability Name="ID_CAP_SENSORS"/>
+ </config-file>
+ <source-file src="src/wp/Accelerometer.cs"/>
+ </platform>
+ <platform name="wp8">
+ <config-file target="config.xml" parent="/*">
+ <feature name="Accelerometer">
+ <param name="wp-package" value="Accelerometer"/>
+ </feature>
+ </config-file>
+ <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
+ <Capability Name="ID_CAP_SENSORS"/>
+ </config-file>
+ <source-file src="src/wp/Accelerometer.cs"/>
+ </platform>
+ <platform name="windows8">
+ <js-module src="src/windows/AccelerometerProxy.js" name="AccelerometerProxy">
+ <runs/>
</js-module>
-
- <!-- firefoxos -->
- <platform name="firefoxos">
- <config-file target="config.xml" parent="/*">
- <feature name="Accelerometer">
- <param name="firefoxos-package" value="Accelerometer" />
- </feature>
- </config-file>
-
- <js-module src="src/firefoxos/accelerometer.js" name="accelerometer-impl">
- <runs />
- </js-module>
- </platform>
-
- <!-- android -->
- <platform name="android">
-
- <config-file target="res/xml/config.xml" parent="/*">
- <feature name="Accelerometer">
- <param name="android-package" value="org.apache.cordova.devicemotion.AccelListener"/>
- </feature>
- </config-file>
-
- <source-file src="src/android/AccelListener.java" target-dir="src/org/apache/cordova/devicemotion" />
-
- </platform>
-
- <!-- amazon-fireos -->
- <platform name="amazon-fireos">
-
- <config-file target="res/xml/config.xml" parent="/*">
- <feature name="Accelerometer">
- <param name="android-package" value="org.apache.cordova.devicemotion.AccelListener"/>
- </feature>
- </config-file>
-
- <source-file src="src/android/AccelListener.java" target-dir="src/org/apache/cordova/devicemotion" />
-
- </platform>
-
- <!-- ubuntu -->
- <platform name="ubuntu">
- <header-file src="src/ubuntu/accelerometer.h" />
- <source-file src="src/ubuntu/accelerometer.cpp" />
- </platform>
-
- <!-- ios -->
- <platform name="ios">
-
- <config-file target="config.xml" parent="/*">
- <feature name="Accelerometer">
- <param name="ios-package" value="CDVAccelerometer"/>
- </feature>
- </config-file>
-
- <header-file src="src/ios/CDVAccelerometer.h" />
- <source-file src="src/ios/CDVAccelerometer.m" />
-
- <framework src="CoreMotion.framework" />
- </platform>
-
- <!-- blackberry10 -->
- <platform name="blackberry10">
- <config-file target="www/config.xml" parent="/widget">
- <feature name="Accelerometer" value="Accelerometer"/>
- </config-file>
- <source-file src="src/blackberry10/index.js" target-dir="Accelerometer" />
- </platform>
-
- <!-- wp7 -->
- <platform name="wp7">
- <config-file target="config.xml" parent="/*">
- <feature name="Accelerometer">
- <param name="wp-package" value="Accelerometer"/>
- </feature>
- </config-file>
-
- <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
- <Capability Name="ID_CAP_SENSORS" />
- </config-file>
-
- <source-file src="src/wp/Accelerometer.cs" />
- </platform>
-
- <!-- wp8 -->
- <platform name="wp8">
- <config-file target="config.xml" parent="/*">
- <feature name="Accelerometer">
- <param name="wp-package" value="Accelerometer"/>
- </feature>
- </config-file>
-
- <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
- <Capability Name="ID_CAP_SENSORS" />
- </config-file>
-
- <source-file src="src/wp/Accelerometer.cs" />
- </platform>
-
- <!-- windows8 -->
- <platform name="windows8">
- <js-module src="src/windows/AccelerometerProxy.js" name="AccelerometerProxy">
- <runs />
- </js-module>
- </platform>
-
- <!-- windows -->
- <platform name="windows">
- <js-module src="src/windows/AccelerometerProxy.js" name="AccelerometerProxy">
- <runs />
- </js-module>
- </platform>
-
- <!-- tizen -->
- <platform name="tizen">
- <js-module src="src/tizen/AccelerometerProxy.js" name="AccelerometerProxy">
- <runs/>
- </js-module>
- </platform>
-
- <!-- browser -->
- <platform name="browser">
- <js-module src="src/browser/AccelerometerProxy.js" name="AccelerometerProxy">
- <runs/>
- </js-module>
- </platform>
+ </platform>
+ <platform name="windows">
+ <js-module src="src/windows/AccelerometerProxy.js" name="AccelerometerProxy">
+ <runs/>
+ </js-module>
+ </platform>
+ <platform name="tizen">
+ <js-module src="src/tizen/AccelerometerProxy.js" name="AccelerometerProxy">
+ <runs/>
+ </js-module>
+ </platform>
+ <platform name="browser">
+ <js-module src="src/browser/AccelerometerProxy.js" name="AccelerometerProxy">
+ <runs/>
+ </js-module>
+ </platform>
</plugin>
diff --git a/tests/plugin.xml b/tests/plugin.xml
index cfb238a..49b82b8 100644
--- a/tests/plugin.xml
+++ b/tests/plugin.xml
@@ -1,29 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
- id="cordova-plugin-device-motion-tests"
- version="1.2.4-dev">
- <name>Cordova Device Motion Plugin Tests</name>
- <license>Apache 2.0</license>
-
- <js-module src="tests.js" name="tests">
- </js-module>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" id="cordova-plugin-device-motion-tests" version="1.2.4">
+ <name>Cordova Device Motion Plugin Tests</name>
+ <license>Apache 2.0</license>
+ <js-module src="tests.js" name="tests"/>
</plugin>
