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/03/02 23:59:02 UTC
[7/8] cordova-plugin-device git commit: CB-12519 Updated version and
RELEASENOTES.md for release 1.1.5
CB-12519 Updated version and RELEASENOTES.md for release 1.1.5
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/64d9e956
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/tree/64d9e956
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/diff/64d9e956
Branch: refs/heads/1.1.x
Commit: 64d9e956139dbbabcc0420ee18d0e12df6bc3210
Parents: 48e0e7f
Author: Steve Gill <st...@gmail.com>
Authored: Tue Feb 28 17:41:26 2017 -0800
Committer: Steve Gill <st...@gmail.com>
Committed: Tue Feb 28 17:41:26 2017 -0800
----------------------------------------------------------------------
RELEASENOTES.md | 6 ++
package.json | 2 +-
plugin.xml | 287 ++++++++++++++++++++------------------------------
tests/plugin.xml | 35 +-----
4 files changed, 125 insertions(+), 205 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/64d9e956/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index b68c14f..18700a8 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,6 +20,12 @@
-->
# Release Notes
+### 1.1.5 (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.1.4 (Dec 07, 2016)
* [CB-12224](https://issues.apache.org/jira/browse/CB-12224) Updated version and RELEASENOTES.md for release 1.1.4
* [CB-11917](https://issues.apache.org/jira/browse/CB-11917) - Remove pull request template checklist item: "iCLA has been submitted\u2026"
http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/64d9e956/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 46166be..75228fe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-device",
- "version": "1.1.5-dev",
+ "version": "1.1.5",
"description": "Cordova Device Plugin",
"types": "./types/index.d.ts",
"cordova": {
http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/64d9e956/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 7ddc14d..95a5d9c 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,176 +1,115 @@
-<?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.5-dev">
- <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" />
+<?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/>
</js-module>
-
- <!-- 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">
- <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>
-
-
+ </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>
</plugin>
http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/64d9e956/tests/plugin.xml
----------------------------------------------------------------------
diff --git a/tests/plugin.xml b/tests/plugin.xml
index df6a6a9..846b201 100644
--- a/tests/plugin.xml
+++ b/tests/plugin.xml
@@ -1,31 +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"
- 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-dev">
- <name>Cordova Device 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" 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"/>
</plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org