fixed merge issues
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device-motion/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device-motion/commit/8ae57679 Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device-motion/tree/8ae57679 Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device-motion/diff/8ae57679 Branch: refs/heads/master Commit: 8ae57679c8d8ae1114e726a2b72cbd8342000139 Parents: 9054be4 2e8eff8 Author: Steven Gill <[email protected]> Authored: Wed Apr 24 13:31:25 2013 -0700 Committer: Steven Gill <[email protected]> Committed: Wed Apr 24 13:31:25 2013 -0700 ---------------------------------------------------------------------- plugin.xml | 15 +++++ src/ios/CDVAccelerometer.h | 39 ++++++++++++ src/ios/CDVAccelerometer.m | 128 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 182 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-plugin-device-motion/blob/8ae57679/plugin.xml ---------------------------------------------------------------------- diff --cc plugin.xml index 2a6d0e0,6b83900..c3d0722 --- a/plugin.xml +++ b/plugin.xml @@@ -1,9 -1,10 +1,10 @@@ <?xml version="1.0" encoding="UTF-8"?> <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"; - xmlns:android="http://schemas.android.com/apk/res/android"; - id="org.apache.cordova.core" +xmlns:android="http://schemas.android.com/apk/res/android"; +id="org.apache.cordova.core.AccelListener"> version="0.1.0"> + <name>Device Motion</name> <!-- android --> @@@ -12,6 -14,20 +14,19 @@@ <plugin name="Accelerometer" value="org.apache.cordova.core.AccelListener"/> </config-file> - <source-file src="AccelListener.java" target-dir="org/apache/cordova/core" /> - - </platform> + <source-file src="AccelListener.java" target-dir="src/org/apache/cordova/core" /> + </platform> + + <!-- ios --> + <platform name="ios"> + + <config-file target="config.xml" parent="/cordova/plugins"> + <plugin name="Accelerometer" value="CDVAccelerometer"/> + </config-file> + + <header-file src="CDVAccelerometer.h" target-dir="org/apache/cordova/core" /> + <source-file src="CDVAccelerometer.m" target-dir="org/apache/cordova/core" /> + + </platform> + </plugin>
