cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [8/8] cordova-plugin-device git commit: CB-12519: fixed merge conflict
Date Thu, 02 Mar 2017 23:59:03 GMT
CB-12519: fixed merge conflict


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/commit/da0356e4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/tree/da0356e4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/diff/da0356e4

Branch: refs/heads/1.1.x
Commit: da0356e4ab549d575256b18acd02d87a724f48f8
Parents: d981325 64d9e95
Author: Steve Gill <stevengill97@gmail.com>
Authored: Tue Feb 28 17:49:32 2017 -0800
Committer: Steve Gill <stevengill97@gmail.com>
Committed: Thu Mar 2 14:09:39 2017 -0800

----------------------------------------------------------------------
 README.md        |  4 ++--
 RELEASENOTES.md  |  6 ++++++
 package.json     |  3 ++-
 plugin.xml       |  9 ++++-----
 tests/plugin.xml |  2 +-
 types/index.d.ts | 36 ++++++++++++++++++++++++++++++++++++
 6 files changed, 51 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/da0356e4/plugin.xml
----------------------------------------------------------------------
diff --cc plugin.xml
index 1c73a03,95a5d9c..01c20a1
--- a/plugin.xml
+++ b/plugin.xml
@@@ -1,176 -1,115 +1,175 @@@
 -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 -<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:rim="http://www.blackberry.com/ns/widgets"
xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-device" version="1.1.5">
 -  <name>Device</name>
 -  <description>Cordova Device Plugin</description>
 -  <license>Apache 2.0</license>
 -  <keywords>cordova,device</keywords>
 -  <repo>https://git-wip-us.apache.org/repos/asf/cordova-plugin-device.git</repo>
 -  <issue>https://issues.apache.org/jira/browse/CB/component/12320648</issue>
 -  <js-module src="www/device.js" name="device">
 -    <clobbers target="device"/>
 -  </js-module>
 -  <platform name="firefoxos">
 -    <config-file target="config.xml" parent="/*">
 -      <feature name="Device">
 -        <param name="firefoxos-package" value="Device"/>
 -      </feature>
 -    </config-file>
 -    <js-module src="src/firefoxos/DeviceProxy.js" name="DeviceProxy">
 -      <runs/>
 +<?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"
 +    xmlns:rim="http://www.blackberry.com/ns/widgets"
 +    xmlns:android="http://schemas.android.com/apk/res/android"
 +    id="cordova-plugin-device"
-     version="1.1.4">
++    version="1.1.5">
 +    <name>Device</name>
 +    <description>Cordova Device Plugin</description>
 +    <license>Apache 2.0</license>
 +    <keywords>cordova,device</keywords>
 +    <repo>https://git-wip-us.apache.org/repos/asf/cordova-plugin-device.git</repo>
 +    <issue>https://issues.apache.org/jira/browse/CB/component/12320648</issue>
 +
 +    <js-module src="www/device.js" name="device">
 +        <clobbers target="device" />
      </js-module>
 -  </platform>
 -  <platform name="tizen">
 -    <js-module src="src/tizen/DeviceProxy.js" name="DeviceProxy">
 -      <runs/>
 -    </js-module>
 -  </platform>
 -  <platform name="android">
 -    <config-file target="res/xml/config.xml" parent="/*">
 -      <feature name="Device">
 -        <param name="android-package" value="org.apache.cordova.device.Device"/>
 -      </feature>
 -    </config-file>
 -    <source-file src="src/android/Device.java" target-dir="src/org/apache/cordova/device"/>
 -  </platform>
 -  <platform name="amazon-fireos">
 -    <config-file target="res/xml/config.xml" parent="/*">
 -      <feature name="Device">
 -        <param name="android-package" value="org.apache.cordova.device.Device"/>
 -      </feature>
 -    </config-file>
 -    <source-file src="src/android/Device.java" target-dir="src/org/apache/cordova/device"/>
 -  </platform>
 -  <platform name="ubuntu">
 -    <header-file src="src/ubuntu/device.h"/>
 -    <source-file src="src/ubuntu/device.cpp"/>
 -    <js-module src="src/ubuntu/device.js" name="DeviceProxy">
 -      <merges target="device"/>
 -    </js-module>
 -  </platform>
 -  <platform name="ios">
 -    <config-file target="config.xml" parent="/*">
 -      <feature name="Device">
 -        <param name="ios-package" value="CDVDevice"/>
 -      </feature>
 -    </config-file>
 -    <header-file src="src/ios/CDVDevice.h"/>
 -    <source-file src="src/ios/CDVDevice.m"/>
 -    <framework src="libz.tbd"/>
 -  </platform>
 -  <platform name="blackberry10">
 -    <source-file src="src/blackberry10/index.js" target-dir="Device"/>
 -    <config-file target="www/config.xml" parent="/widget">
 -      <feature name="Device" value="Device"/>
 -    </config-file>
 -    <config-file target="www/config.xml" parent="/widget/rim:permissions">
 -      <rim:permit>read_device_identifying_information</rim:permit>
 -    </config-file>
 -  </platform>
 -  <platform name="wp7">
 -    <config-file target="config.xml" parent="/*">
 -      <feature name="Device">
 -        <param name="wp-package" value="Device"/>
 -      </feature>
 -    </config-file>
 -    <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
 -      <Capability Name="ID_CAP_IDENTITY_DEVICE"/>
 -    </config-file>
 -    <source-file src="src/wp/Device.cs"/>
 -  </platform>
 -  <platform name="wp8">
 -    <config-file target="config.xml" parent="/*">
 -      <feature name="Device">
 -        <param name="wp-package" value="Device"/>
 -      </feature>
 -    </config-file>
 -    <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
 -      <Capability Name="ID_CAP_IDENTITY_DEVICE"/>
 -    </config-file>
 -    <source-file src="src/wp/Device.cs"/>
 -  </platform>
 -  <platform name="windows">
 -    <js-module src="src/windows/DeviceProxy.js" name="DeviceProxy">
 -      <runs/>
 -    </js-module>
 -  </platform>
 -  <platform name="browser">
 -    <config-file target="config.xml" parent="/*">
 -      <feature name="Device">
 -        <param name="browser-package" value="Device"/>
 -      </feature>
 -    </config-file>
 -    <js-module src="src/browser/DeviceProxy.js" name="DeviceProxy">
 -      <runs/>
 -    </js-module>
 -  </platform>
 -  <platform name="osx">
 -    <config-file target="config.xml" parent="/*">
 -      <feature name="Device">
 -        <param name="ios-package" value="CDVDevice"/>
 -      </feature>
 -    </config-file>
 -    <header-file src="src/osx/CDVDevice.h"/>
 -    <source-file src="src/osx/CDVDevice.m"/>
 -  </platform>
 +
 +    <!-- firefoxos -->
 +    <platform name="firefoxos">
 +        <config-file target="config.xml" parent="/*">
 +            <feature name="Device">
 +                <param name="firefoxos-package" value="Device" />
 +            </feature>
 +        </config-file>
 +
 +        <js-module src="src/firefoxos/DeviceProxy.js" name="DeviceProxy">
 +            <runs />
 +        </js-module>
 +    </platform>
 +
 +    <!-- tizen -->
 +    <platform name="tizen">
 +        <js-module src="src/tizen/DeviceProxy.js" name="DeviceProxy">
 +            <runs />
 +        </js-module>
 +    </platform>
 +
 +    <!-- android -->
 +    <platform name="android">
 +        <config-file target="res/xml/config.xml" parent="/*">
 +            <feature name="Device" >
 +                <param name="android-package" value="org.apache.cordova.device.Device"/>
 +            </feature>
 +        </config-file>
 +
 +        <source-file src="src/android/Device.java" target-dir="src/org/apache/cordova/device"
/>
 +    </platform>
 +
 +    <!-- amazon-fireos -->
 +    <platform name="amazon-fireos">
 +        <config-file target="res/xml/config.xml" parent="/*">
 +            <feature name="Device" >
 +                <param name="android-package" value="org.apache.cordova.device.Device"/>
 +            </feature>
 +        </config-file>
 +
 +        <source-file src="src/android/Device.java" target-dir="src/org/apache/cordova/device"
/>
 +    </platform>
-     
++
 +    <!-- ubuntu -->
 +    <platform name="ubuntu">
 +        <header-file src="src/ubuntu/device.h" />
 +        <source-file src="src/ubuntu/device.cpp" />
 +        <js-module src="src/ubuntu/device.js" name="DeviceProxy">
 +            <merges target="device" />
 +        </js-module>
 +    </platform>
 +
 +    <!-- ios -->
 +    <platform name="ios">
 +        <config-file target="config.xml" parent="/*">
 +            <feature name="Device">
 +                <param name="ios-package" value="CDVDevice"/>
 +            </feature>
 +        </config-file>
 +
 +        <header-file src="src/ios/CDVDevice.h" />
 +        <source-file src="src/ios/CDVDevice.m" />
- 		
++
 +		<framework src="libz.tbd" />
 +    </platform>
 +
 +    <!-- blackberry10 -->
 +    <platform name="blackberry10">
 +        <source-file src="src/blackberry10/index.js" target-dir="Device" />
 +        <config-file target="www/config.xml" parent="/widget">
 +            <feature name="Device" value="Device"/>
 +        </config-file>
 +        <config-file target="www/config.xml" parent="/widget/rim:permissions">
 +            <rim:permit>read_device_identifying_information</rim:permit>
 +        </config-file>
 +    </platform>
 +
 +    <!-- wp7 -->
 +    <platform name="wp7">
 +        <config-file target="config.xml" parent="/*">
 +            <feature name="Device">
 +                <param name="wp-package" value="Device"/>
 +            </feature>
 +        </config-file>
 +
 +        <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
 +            <Capability Name="ID_CAP_IDENTITY_DEVICE" />
 +        </config-file>
 +
 +        <source-file src="src/wp/Device.cs" />
 +    </platform>
 +
 +    <!-- wp8 -->
 +    <platform name="wp8">
 +        <config-file target="config.xml" parent="/*">
 +            <feature name="Device">
 +                <param name="wp-package" value="Device"/>
 +            </feature>
 +        </config-file>
 +
 +        <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
 +            <Capability Name="ID_CAP_IDENTITY_DEVICE" />
 +        </config-file>
 +
 +        <source-file src="src/wp/Device.cs" />
 +    </platform>
 +
 +    <!-- windows -->
 +    <platform name="windows">
 +        <js-module src="src/windows/DeviceProxy.js" name="DeviceProxy">
-             <merges target="" />
++            <runs />
 +        </js-module>
 +    </platform>
 +
 +    <!-- browser -->
 +    <platform name="browser">
 +        <config-file target="config.xml" parent="/*">
 +            <feature name="Device">
 +                <param name="browser-package" value="Device" />
 +            </feature>
 +        </config-file>
 +
 +        <js-module src="src/browser/DeviceProxy.js" name="DeviceProxy">
 +            <runs />
 +        </js-module>
 +    </platform>
 +
 +    <!-- osx -->
 +    <platform name="osx">
 +        <config-file target="config.xml" parent="/*">
 +            <feature name="Device">
 +                <param name="ios-package" value="CDVDevice"/>
 +            </feature>
 +        </config-file>
 +
 +        <header-file src="src/osx/CDVDevice.h" />
 +        <source-file src="src/osx/CDVDevice.m" />
 +    </platform>
 +
- 
  </plugin>

http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/da0356e4/tests/plugin.xml
----------------------------------------------------------------------
diff --cc tests/plugin.xml
index 4efeaf6,846b201..f877aba
--- a/tests/plugin.xml
+++ b/tests/plugin.xml
@@@ -1,31 -1,6 +1,31 @@@
 -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 -<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:rim="http://www.blackberry.com/ns/widgets"
xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-device-tests"
version="1.1.5">
 -  <name>Cordova Device Plugin Tests</name>
 -  <license>Apache 2.0</license>
 -  <js-module src="tests.js" name="tests"/>
 +<?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"
 +    xmlns:rim="http://www.blackberry.com/ns/widgets"
 +    xmlns:android="http://schemas.android.com/apk/res/android"
 +    id="cordova-plugin-device-tests"
-     version="1.1.4">
++    version="1.1.5">
 +    <name>Cordova Device Plugin Tests</name>
 +    <license>Apache 2.0</license>
 +
 +    <js-module src="tests.js" name="tests">
 +    </js-module>
  </plugin>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message