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:58:56 UTC

[1/8] cordova-plugin-device git commit: CB-12224 Incremented plugin version.

Repository: cordova-plugin-device
Updated Branches:
  refs/heads/1.1.x d98132583 -> da0356e4a


CB-12224 Incremented plugin version.


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/e1ab9f4c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/tree/e1ab9f4c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/diff/e1ab9f4c

Branch: refs/heads/1.1.x
Commit: e1ab9f4c2eeea06ed59b10b86ac242264c45ac71
Parents: a736ae4
Author: Shazron Abdullah <sh...@apache.org>
Authored: Wed Dec 7 16:55:07 2016 -0800
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Wed Dec 7 16:55:07 2016 -0800

----------------------------------------------------------------------
 package.json     | 2 +-
 plugin.xml       | 2 +-
 tests/plugin.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/e1ab9f4c/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 12c2d1e..9435f38 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-device",
-  "version": "1.1.4",
+  "version": "1.1.5-dev",
   "description": "Cordova Device Plugin",
   "cordova": {
     "id": "cordova-plugin-device",

http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/e1ab9f4c/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index ae956f8..7ad5cbd 100644
--- a/plugin.xml
+++ b/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-device"
-    version="1.1.4">
+    version="1.1.5-dev">
     <name>Device</name>
     <description>Cordova Device Plugin</description>
     <license>Apache 2.0</license>

http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/e1ab9f4c/tests/plugin.xml
----------------------------------------------------------------------
diff --git a/tests/plugin.xml b/tests/plugin.xml
index 4efeaf6..df6a6a9 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-device-tests"
-    version="1.1.4">
+    version="1.1.5-dev">
     <name>Cordova Device Plugin Tests</name>
     <license>Apache 2.0</license>
 


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


[4/8] cordova-plugin-device git commit: CB-12363 Added build badges for iOS 9.3 and 10.0

Posted by st...@apache.org.
CB-12363 Added build badges for iOS 9.3 and 10.0


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/99474e0e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/tree/99474e0e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/diff/99474e0e

Branch: refs/heads/1.1.x
Commit: 99474e0e5860215059952a63e84b726ca4e88278
Parents: 3b93a47
Author: Alexander Sorokin <al...@akvelon.com>
Authored: Wed Jan 18 13:28:33 2017 +0300
Committer: Alexander Sorokin <al...@akvelon.com>
Committed: Wed Jan 18 13:28:33 2017 +0300

----------------------------------------------------------------------
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/99474e0e/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 9dee373..5d263db 100644
--- a/README.md
+++ b/README.md
@@ -21,9 +21,9 @@ description: Get device information.
 #         under the License.
 -->
 
-|Android 4.4|Android 5.1|iOS|Windows 10 Store|Travis CI|
-|:-:|:-:|:-:|:-:|:-:|
-|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=android-4.4,PLUGIN=cordova-plugin-device)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-4.4,PLUGIN=cordova-plugin-device/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=android-5.1,PLUGIN=cordova-plugin-device)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-5.1,PLUGIN=cordova-plugin-device/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=ios,PLUGIN=cordova-plugin-device)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios,PLUGIN=cordova-plugin-device/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=windows-10-store,PLUGIN=cordova-plugin-device)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLA
 TFORM=windows-10-store,PLUGIN=cordova-plugin-device/)|[![Build Status](https://travis-ci.org/apache/cordova-plugin-device.svg?branch=master)](https://travis-ci.org/apache/cordova-plugin-device)|
+|Android 4.4|Android 5.1|iOS 9.3|iOS 10.0|Windows 10 Store|Travis CI|
+|:-:|:-:|:-:|:-:|:-:|:-:|
+|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=android-4.4,PLUGIN=cordova-plugin-device)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-4.4,PLUGIN=cordova-plugin-device/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=android-5.1,PLUGIN=cordova-plugin-device)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-5.1,PLUGIN=cordova-plugin-device/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=ios-9.3,PLUGIN=cordova-plugin-device)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios-9.3,PLUGIN=cordova-plugin-device/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=ios-10.0,PLUGIN=cordova-plugin-device)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLA
 TFORM=ios-10.0,PLUGIN=cordova-plugin-device/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=windows-10-store,PLUGIN=cordova-plugin-device)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=windows-10-store,PLUGIN=cordova-plugin-device/)|[![Build Status](https://travis-ci.org/apache/cordova-plugin-device.svg?branch=master)](https://travis-ci.org/apache/cordova-plugin-device)|
 
 # cordova-plugin-device
 


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


[8/8] cordova-plugin-device git commit: CB-12519: fixed merge conflict

Posted by st...@apache.org.
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 <st...@gmail.com>
Authored: Tue Feb 28 17:49:32 2017 -0800
Committer: Steve Gill <st...@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


[7/8] cordova-plugin-device git commit: CB-12519 Updated version and RELEASENOTES.md for release 1.1.5

Posted by st...@apache.org.
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


[6/8] cordova-plugin-device git commit: CB-12353 Corrected merges usage in plugin.xml

Posted by st...@apache.org.
CB-12353 Corrected merges usage in plugin.xml


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/48e0e7f3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/tree/48e0e7f3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/diff/48e0e7f3

Branch: refs/heads/1.1.x
Commit: 48e0e7f321e88bdfc6b42659ae396e5d4be40992
Parents: cf56c90
Author: daserge <v-...@microsoft.com>
Authored: Wed Jan 18 19:21:10 2017 +0300
Committer: daserge <v-...@microsoft.com>
Committed: Fri Jan 20 15:40:27 2017 +0300

----------------------------------------------------------------------
 plugin.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/48e0e7f3/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index f0a18bb..7ddc14d 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -143,7 +143,7 @@
     <!-- windows -->
     <platform name="windows">
         <js-module src="src/windows/DeviceProxy.js" name="DeviceProxy">
-            <merges target="" />
+            <runs />
         </js-module>
     </platform>
 


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


[2/8] cordova-plugin-device git commit: CB-12230 Removed Windows 8.1 build badges

Posted by st...@apache.org.
CB-12230 Removed Windows 8.1 build badges


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/10b7ab62
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/tree/10b7ab62
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/diff/10b7ab62

Branch: refs/heads/1.1.x
Commit: 10b7ab62fd4071ee6deec1185631e97b7a6bcbd4
Parents: e1ab9f4
Author: Alexander Sorokin <al...@akvelon.com>
Authored: Fri Dec 9 13:07:42 2016 +0300
Committer: Alexander Sorokin <al...@akvelon.com>
Committed: Fri Dec 9 14:21:09 2016 +0300

----------------------------------------------------------------------
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/10b7ab62/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 10b8016..9dee373 100644
--- a/README.md
+++ b/README.md
@@ -21,9 +21,9 @@ description: Get device information.
 #         under the License.
 -->
 
-|Android|iOS| Windows 8.1 Store | Windows 8.1 Phone | Windows 10 Store | Travis CI |
-|:-:|:-:|:-:|:-:|:-:|:-:|
-|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=android,PLUGIN=cordova-plugin-device)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android,PLUGIN=cordova-plugin-device/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=ios,PLUGIN=cordova-plugin-device)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios,PLUGIN=cordova-plugin-device/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=windows-8.1-store,PLUGIN=cordova-plugin-device)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=windows-8.1-store,PLUGIN=cordova-plugin-device/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=windows-8.1-phone,PLUGIN=cordova-plugin-device)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-buil
 d/PLATFORM=windows-8.1-phone,PLUGIN=cordova-plugin-device/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=windows-10-store,PLUGIN=cordova-plugin-device)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=windows-10-store,PLUGIN=cordova-plugin-device/)|[![Build Status](https://travis-ci.org/apache/cordova-plugin-device.svg?branch=master)](https://travis-ci.org/apache/cordova-plugin-device)|
+|Android 4.4|Android 5.1|iOS|Windows 10 Store|Travis CI|
+|:-:|:-:|:-:|:-:|:-:|
+|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=android-4.4,PLUGIN=cordova-plugin-device)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-4.4,PLUGIN=cordova-plugin-device/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=android-5.1,PLUGIN=cordova-plugin-device)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-5.1,PLUGIN=cordova-plugin-device/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=ios,PLUGIN=cordova-plugin-device)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios,PLUGIN=cordova-plugin-device/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=windows-10-store,PLUGIN=cordova-plugin-device)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLA
 TFORM=windows-10-store,PLUGIN=cordova-plugin-device/)|[![Build Status](https://travis-ci.org/apache/cordova-plugin-device.svg?branch=master)](https://travis-ci.org/apache/cordova-plugin-device)|
 
 # cordova-plugin-device
 


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


[3/8] cordova-plugin-device git commit: CB-12236 - Fixed RELEASENOTES for cordova-plugin-device

Posted by st...@apache.org.
CB-12236 - Fixed RELEASENOTES for cordova-plugin-device


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/3b93a47c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/tree/3b93a47c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/diff/3b93a47c

Branch: refs/heads/1.1.x
Commit: 3b93a47c00a75765247b2ab80f43bbf00ae33e25
Parents: 10b7ab6
Author: Shazron Abdullah <sh...@apache.org>
Authored: Sun Dec 11 12:43:39 2016 -0800
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Sun Dec 11 12:43:39 2016 -0800

----------------------------------------------------------------------
 RELEASENOTES.md | 182 +--------------------------------------------------
 plugin.xml      |   2 +
 2 files changed, 3 insertions(+), 181 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/3b93a47c/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index c06a44c..b68c14f 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -21,189 +21,9 @@
 # Release Notes
 
 ### 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"
 * [CB-11832](https://issues.apache.org/jira/browse/CB-11832) Incremented plugin version.
-* [CB-11832](https://issues.apache.org/jira/browse/CB-11832) Updated version and RELEASENOTES.md for release 1.1.3
-* [CB-11795](https://issues.apache.org/jira/browse/CB-11795) Add 'protective' entry to cordovaDependencies
-* Add badges for paramedic builds on Jenkins
-* Add pull request template.
-* Readme: Add fenced code blocks with langauage hints
-* [CB-10996](https://issues.apache.org/jira/browse/CB-10996) Adding front matter to README.md
-* [CB-11091](https://issues.apache.org/jira/browse/CB-11091) Incremented plugin version.
-*  Updated version and RELEASENOTES.md for release 1.1.2
-* Close #49
-* Use passed device, follow create policy forf CFUUIDCreate
-* [CB-10631](https://issues.apache.org/jira/browse/CB-10631) ios: Fix for device.uuid in iOS 5.1.1
-* Updating the comment to exclude URL
-* Minor changes to readme
-* [CB-10636](https://issues.apache.org/jira/browse/CB-10636) Add JSHint for plugins
-* chore: edit package.json license to match SPDX id
-* Refactored deviceInfo on iOS for better readability.
-* [CB-10368](https://issues.apache.org/jira/browse/CB-10368) Incremented plugin version.
-* [CB-10368](https://issues.apache.org/jira/browse/CB-10368) Updated version and RELEASENOTES.md for release 1.1.1
-* Property manufacturer documented
-* fix typo
-* [CB-10238](https://issues.apache.org/jira/browse/CB-10238) Move device-plugin out from cordovalib to the plugin repository
-* [CB-10238](https://issues.apache.org/jira/browse/CB-10238) Move device-plugin out from cordovalib to the plugin repository
-* [CB-9923](https://issues.apache.org/jira/browse/CB-9923) Update `device.platform` documentation for browser platform
-* [CB-10035](https://issues.apache.org/jira/browse/CB-10035) Incremented plugin version.
-* [CB-10035](https://issues.apache.org/jira/browse/CB-10035) linked issues in RELEASENOTES.md
-* [CB-10035](https://issues.apache.org/jira/browse/CB-10035) Updated version and RELEASENOTES.md for release 1.1.0
-* removed r prefix from tags
-* [CB-10035](https://issues.apache.org/jira/browse/CB-10035) Updated RELEASENOTES to be newest to oldest
-* fix whitespace tab to spaces
-* Add `isVirtual` for Windows 8.x (Phone) platforms
-* [CB-9847](https://issues.apache.org/jira/browse/CB-9847) Fixed merge error of 408c3a20be976ca5b814c9f161c31d4edf1c00fc
-* Added basic Android support for hardware serial number
-* Cleanup PRs. This closes #27. This closes #17.
-* [CB-9865](https://issues.apache.org/jira/browse/CB-9865) Better simulator detection for iOS
-* Actually fixing the contribute link.
-* Fixing contribute link.
-* fix merge conflict, for reals
-* add JIRA issue tracker link
-* updated docs
-* Cleanup wp8 code
-* WP8 implementation
-* update to use TARGET_OS_SIMULATOR as TARGET_IPHONE_SIMULATOR is deprecated.
-* update code to use 'isVirtual'
-* create test to verify existence and type of new property 'isVirtual'
-* add isSimulator for iOS & Android device
-* Fixed typo
-* Updated documentation to mention backwards compatibility
-* Updated README to reflect new behaviour and quirks on iOS
-* Check user defaults first to maintain backwards compatibility
-* Revert "Check user defaults first to maintain backwards compatibility"
-* Check user defaults first to maintain backwards compatibility
-* Remove line incorrectly committed
-* Changed UUID to use [UIDevice identifierForVendor]
-* remove travis-ci
-* [CB-9192](https://issues.apache.org/jira/browse/CB-9192) Incremented plugin version.
-* [CB-9202](https://issues.apache.org/jira/browse/CB-9202) updated repo url to github mirror in package.json
-* [CB-9192](https://issues.apache.org/jira/browse/CB-9192) Updated version and RELEASENOTES.md for release 1.0.1
-* [CB-9128](https://issues.apache.org/jira/browse/CB-9128) cordova-plugin-device documentation translation: cordova-plugin-device
-* Attempts to corrent npm markdown issue
-* [CB-8858](https://issues.apache.org/jira/browse/CB-8858) Incremented plugin version.
-* [CB-8858](https://issues.apache.org/jira/browse/CB-8858) Updated version in package.json for release 1.0.0
-* Revert "CB-8858 Incremented plugin version."
-* [CB-8858](https://issues.apache.org/jira/browse/CB-8858) Incremented plugin version.
-* [CB-8858](https://issues.apache.org/jira/browse/CB-8858) Updated version and RELEASENOTES.md for release 1.0.0
-* [CB-8746](https://issues.apache.org/jira/browse/CB-8746) gave plugin major version bump
-* [CB-8683](https://issues.apache.org/jira/browse/CB-8683) changed plugin-id to pacakge-name
-* [CB-8653](https://issues.apache.org/jira/browse/CB-8653) properly updated translated docs to use new id
-* [CB-8653](https://issues.apache.org/jira/browse/CB-8653) updated translated docs to use new id
-* Use TRAVIS_BUILD_DIR, install paramedic by npm
-* [CB-8653](https://issues.apache.org/jira/browse/CB-8653) Updated Readme
-* remove defunct windows8 version
-* add travis badge
-* update plugin path
-* Add cross-plugin ios paramedic test running for TravisCI
-* [CB-8538](https://issues.apache.org/jira/browse/CB-8538) Added package.json file
-* [CB-8429](https://issues.apache.org/jira/browse/CB-8429) Incremented plugin version.
-* [CB-8429](https://issues.apache.org/jira/browse/CB-8429) Updated version and RELEASENOTES.md for release 0.3.0
-* Fixes a syntax error introduced in 1a13ee0
-* [CB7285][Windows] add manufacturer property for windows, and cleanup
-* [CB-7285](https://issues.apache.org/jira/browse/CB-7285) Add test for manufacturer property
-* [CB-7285][WP8] add manufacturer info
-* update of manufacturer name
-* added device.manufacturer property for Android, iOS (Apple duh), Blackberry (RIM duh)
-* Support for Windows Phone 8 ANID2 ANID is only supported up to Windows Phone 7.5
-* [CB-8351](https://issues.apache.org/jira/browse/CB-8351) Use a local copy of uniqueAppInstanceIdentifier rather than CordovaLib's version
-* - Fixed a bug that caused an "cannot call method of undefined" error if the browser's user agent wasn't recognized - Added support for Internet Explorer user agent strings - NOTE: IE 11's user agent string does not include "MSIE", so "Trident" is searched for instead
-* [CB-8110](https://issues.apache.org/jira/browse/CB-8110) Incremented plugin version.
-* [CB-8110](https://issues.apache.org/jira/browse/CB-8110) Updated version and RELEASENOTES.md for release 0.2.13
-* Changing device.platform to always report the platform as "browser".
-* [CB-5892](https://issues.apache.org/jira/browse/CB-5892) - Remove deprecated window.Settings
-* [CB-7700](https://issues.apache.org/jira/browse/CB-7700) cordova-plugin-device documentation translation: cordova-plugin-device
-* [CB-7571](https://issues.apache.org/jira/browse/CB-7571) Bump version of nested plugin to match parent plugin
-* [CB-7571](https://issues.apache.org/jira/browse/CB-7571) Incremented plugin version.
-* [CB-7571](https://issues.apache.org/jira/browse/CB-7571) Updated version and RELEASENOTES.md for release 0.2.12
-* [CB-7471](https://issues.apache.org/jira/browse/CB-7471) cordova-plugin-device documentation translation: cordova-plugin-device
-* [CB-7552](https://issues.apache.org/jira/browse/CB-7552) - device.name docs have not been removed
-* [fxos] Fix cordova version
-* added status box and documentation to manual tests
-* [fxos] Fix cordova version
-* added status box and documentation to manual tests
-* Added plugin support for the browser
-* [CB-7262](https://issues.apache.org/jira/browse/CB-7262) Adds support for universal windows apps.
-* [CB-7244](https://issues.apache.org/jira/browse/CB-7244) Incremented plugin version.
-* [CB-7244](https://issues.apache.org/jira/browse/CB-7244) Updated version and RELEASENOTES.md for release 0.2.11
-* update DeviceProxy.js
-* [CB-7168](https://issues.apache.org/jira/browse/CB-7168) Moving Device autotests to plugin (aka new-style tests)
-* CB-6127lisa7cordova-plugin-consolecordova-plugin-device documentation translation: cordova-plugin-device
-* Use Windows system calls to get better info
-* [CB-6877](https://issues.apache.org/jira/browse/CB-6877) Incremented plugin version.
-* [CB-6877](https://issues.apache.org/jira/browse/CB-6877) Updated version and RELEASENOTES.md for release 0.2.10
-* [CB-6127](https://issues.apache.org/jira/browse/CB-6127) Spanish and French Translations added. Github close #12
-* Changing 1.5 to 2.0
-* added firefoxos version - conversion
-* added firefoxos version
-* [CB-6800](https://issues.apache.org/jira/browse/CB-6800) Add license
-* documentation translation: cordova-plugin-device
-* Lisa testing pulling in plugins for plugin: cordova-plugin-device
-* Lisa testing pulling in plugins for plugin: cordova-plugin-device
-* [CB-6491](https://issues.apache.org/jira/browse/CB-6491) add CONTRIBUTING.md
-* [CB-6452](https://issues.apache.org/jira/browse/CB-6452) Incremented plugin version on dev branch.
-* [CB-6452](https://issues.apache.org/jira/browse/CB-6452) Updated version and RELEASENOTES.md for release 0.2.9
-* [CB-6460](https://issues.apache.org/jira/browse/CB-6460) Update license headers
-* [CB-6422](https://issues.apache.org/jira/browse/CB-6422) [windows8] use cordova/exec/proxy
-* [CB-5105](https://issues.apache.org/jira/browse/CB-5105) Removed dead code for device.version
-* Add NOTICE file
-* [CB-5980](https://issues.apache.org/jira/browse/CB-5980) Incremented plugin version on dev branch.
-* Lisa testing pulling in plugins for plugin: cordova-plugin-device
-* Lisa testing pulling in plugins for plugin: cordova-plugin-device
-* [CB-5980](https://issues.apache.org/jira/browse/CB-5980) Updated version and RELEASENOTES.md for release 0.2.8
-* src/tizen: Adding DeviceProxy.
-* plugin.xml: Adding platform tizen.
-* supported platforms updated
-* Delete stale test/ directory
-*  Incremented plugin version on dev branch.
-*  Updated version and RELEASENOTES.md for release 0.2.7
-* [CB-5737](https://issues.apache.org/jira/browse/CB-5737) Fix exception on close caused by left over telephony code from [CB-5504](https://issues.apache.org/jira/browse/CB-5504)
-* [CB-5719](https://issues.apache.org/jira/browse/CB-5719) Incremented plugin version on dev branch.
-* [CB-5719](https://issues.apache.org/jira/browse/CB-5719) Updated version and RELEASENOTES.md for release 0.2.6
-* [CB-5658](https://issues.apache.org/jira/browse/CB-5658) Update license comment formatting of doc/index.md
-* [CB-5658](https://issues.apache.org/jira/browse/CB-5658) Add doc.index.md for Device plugin
-* [CB-5658](https://issues.apache.org/jira/browse/CB-5658) Delete stale snapshot of plugin docs
-* [CB-5504](https://issues.apache.org/jira/browse/CB-5504) Moving Telephony Logic out of Device
-* [CB-5565](https://issues.apache.org/jira/browse/CB-5565) Incremented plugin version on dev branch.
-* [CB-5565](https://issues.apache.org/jira/browse/CB-5565) Updated version and RELEASENOTES.md for release 0.2.5
-* [CB-5316](https://issues.apache.org/jira/browse/CB-5316) Spell Cordova as a brand unless it's a command or script
-* [ubuntu] use cordova/exec/proxy
-* add ubuntu platform
-* Modify Device.platform logic to use amazon-fireos as the platform for Amazon Devices
-* 1. Added amazon-fireos platform. 2. Change to use cordova-amazon-fireos as the platform if user agent contains 'cordova-amazon-fireos'
-* [CB-5188](https://issues.apache.org/jira/browse/CB-5188)
-* [CB-5188](https://issues.apache.org/jira/browse/CB-5188) Updated version and RELEASENOTES.md for release 0.2.4
-* [CB-5128](https://issues.apache.org/jira/browse/CB-5128) added repo + issue tag in plugin.xml for device plugin
-* [CB-5085](https://issues.apache.org/jira/browse/CB-5085) device.cordova returning wrong value
-* [CB-4915](https://issues.apache.org/jira/browse/CB-4915) Incremented plugin version on dev branch.
-* [CB-4915](https://issues.apache.org/jira/browse/CB-4915) Updated version and RELEASENOTES.md for release 0.2.3
-* [CB-4889](https://issues.apache.org/jira/browse/CB-4889) bumping&resetting version
-* [windows8] commandProxy has moved
-* [BlackBerry10] removed uneeded permission tags in plugin.xml
-* [CB-4889](https://issues.apache.org/jira/browse/CB-4889) renaming org.apache.cordova.core.device to org.apache.cordova.device
-* Rename CHANGELOG.md -> RELEASENOTES.md
-* updated to use commandProxy for ffos
-* add firefoxos support
-* [CB-4752](https://issues.apache.org/jira/browse/CB-4752) Incremented plugin version on dev branch.
-* [BlackBerry10] removed uneeded permission tags in plugin.xml
-* [CB-4752](https://issues.apache.org/jira/browse/CB-4752) Updated version and changelog
-* removed extraneous print statement
-* [CB-4432](https://issues.apache.org/jira/browse/CB-4432) copyright notice change
-* removed extraneous print statement
-* [CB-4432](https://issues.apache.org/jira/browse/CB-4432) copyright notice change
-* [CB-4595](https://issues.apache.org/jira/browse/CB-4595) updated version
-* reverted name element to be user readable
-* [CB-4417](https://issues.apache.org/jira/browse/CB-4417) Move cordova-plugin-device to its own Java package.
-* updated namespace
-* updated readme, namespace and name tag
-* [plugin.xml] adding rim namespace
-* [plugin.xml] adding android namespace
-* [plugin.xml] standardizing license + meta
-* [license] adding apache license file
-* updating plugin.xml with registry data
-* [Windows8] Windows8 is now supported
-* added basic Device support for Windows8
 
 ### 1.1.3 (Sep 08, 2016)
 * [CB-11795](https://issues.apache.org/jira/browse/CB-11795) Add 'protective' entry to cordovaDependencies

http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/3b93a47c/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 7ad5cbd..f0a18bb 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -95,6 +95,8 @@
 
         <header-file src="src/ios/CDVDevice.h" />
         <source-file src="src/ios/CDVDevice.m" />
+		
+		<framework src="libz.tbd" />
     </platform>
 
     <!-- blackberry10 -->


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


[5/8] cordova-plugin-device git commit: CB-12369: Add plugin typings from DefinitelyTyped

Posted by st...@apache.org.
CB-12369: Add plugin typings from DefinitelyTyped

 This closes #60


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/cf56c90f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/tree/cf56c90f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/diff/cf56c90f

Branch: refs/heads/1.1.x
Commit: cf56c90f4f0b3488ce66519edfc055bd93ee967d
Parents: 99474e0
Author: Nikita Matrosov <v-...@microsoft.com>
Authored: Thu Jan 19 15:52:51 2017 +0300
Committer: Vladimir Kotikov <ko...@gmail.com>
Committed: Fri Jan 20 11:06:02 2017 +0300

----------------------------------------------------------------------
 package.json     |  1 +
 types/index.d.ts | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/cf56c90f/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 9435f38..46166be 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,7 @@
   "name": "cordova-plugin-device",
   "version": "1.1.5-dev",
   "description": "Cordova Device Plugin",
+  "types": "./types/index.d.ts",
   "cordova": {
     "id": "cordova-plugin-device",
     "platforms": [

http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/cf56c90f/types/index.d.ts
----------------------------------------------------------------------
diff --git a/types/index.d.ts b/types/index.d.ts
new file mode 100644
index 0000000..d4450b4
--- /dev/null
+++ b/types/index.d.ts
@@ -0,0 +1,36 @@
+// Type definitions for Apache Cordova Device plugin
+// Project: https://github.com/apache/cordova-plugin-device
+// Definitions by: Microsoft Open Technologies Inc <http://msopentech.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// 
+// Copyright (c) Microsoft Open Technologies Inc
+// Licensed under the MIT license 
+
+/**
+ * This plugin defines a global device object, which describes the device's hardware and software.
+ * Although the object is in the global scope, it is not available until after the deviceready event.
+ */
+interface Device {
+    /** Get the version of Cordova running on the device. */
+    cordova: string;
+    /** Indicates that Cordova initialize successfully. */
+    available: boolean;
+    /**
+     * The device.model returns the name of the device's model or product. The value is set
+     * by the device manufacturer and may be different across versions of the same product.
+     */
+    model: string;
+    /** Get the device's operating system name. */
+    platform: string;
+    /** Get the device's Universally Unique Identifier (UUID). */
+    uuid: string;
+    /** Get the operating system version. */
+    version: string;
+	/** Get the device's manufacturer. */
+	manufacturer: string;
+	/** Whether the device is running on a simulator. */
+	isVirtual: boolean;
+	/** Get the device hardware serial number. */
+	serial: string;}
+
+declare var device: Device;
\ No newline at end of file


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