CB-12519 Updated version and RELEASENOTES.md for release 2.4.0

RELEASENOTES.md

@@ -20,6 +20,18 @@
 -->
 # Release Notes
 
+### 2.3.2 (Feb 28, 2017)
+* [CB-12501](https://issues.apache.org/jira/browse/CB-12501) **Android**: Appium tests don't use `XPath` selectors anymore
+* [CB-12469](https://issues.apache.org/jira/browse/CB-12469) Appium tests can now run on **iOS 10**
+* [CB-12005](https://issues.apache.org/jira/browse/CB-12005) Changing the `getOrientation` method to return the defined enumerated `EXIF` instead of orientation in degrees for Consistency
+* [CB-12368](https://issues.apache.org/jira/browse/CB-12368) Fix permission check on **Android**
+* [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-12312](https://issues.apache.org/jira/browse/CB-12312) [Appium] [Android] A few changes to the tests:  - updated comments on how to run the tests. extra comments around functionality at certain points in the automation.  - stub of a resolution checker on test startup - still need to figure out acceptable values.  - moved session shutdown to an afterAll clause.  - changed resolution determiner from using webview-based values to using the native windows dimensions - this helps as the webview values may be scaled down intentionally by manufacturers (via changing devicePixelRatio). furthermore, since the screen dimension automation is used purely for native UI automation, better to use the dimensions reported by the native context rather than the web context.  - when finding elements by XPath, use multiple calls to avoid a Windows emulator + Android bug. Made this pattern consistent in the entire test.
+* [CB-12236](https://issues.apache.org/jira/browse/CB-12236) - Fixed RELEASENOTES for cordova-plugin-camera
+* [CB-12230](https://issues.apache.org/jira/browse/CB-12230) Removed Windows 8.1 build badges
+
 ### 2.3.1 (Dec 07, 2016)
 * [CB-12224](https://issues.apache.org/jira/browse/CB-12224) Updated version and RELEASENOTES.md for release 2.3.1
 * Fix missing license headers.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-camera",
-  "version": "2.3.2-dev",
+  "version": "2.4.0",
   "description": "Cordova Camera Plugin",
   "types": "./types/index.d.ts",
   "cordova": {

plugin.xml

@@ -1,65 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:rim="http://www.blackberry.com/ns/widgets" id="cordova-plugin-camera" version="2.4.0">
-  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:android="http://schemas.android.com/apk/res/android"
-    xmlns:rim="http://www.blackberry.com/ns/widgets"
-    id="cordova-plugin-camera"
-    version="2.3.2-dev">
   <name>Camera</name>
   <description>Cordova Camera Plugin</description>
   <license>Apache 2.0</license>
   <keywords>cordova,camera</keywords>
   <repo>https://git-wip-us.apache.org/repos/asf/cordova-plugin-camera.git</repo>
   <issue>https://issues.apache.org/jira/browse/CB/component/12320645</issue>
-
   <dependency id="cordova-plugin-compat" version="^1.1.0"/>
-
   <js-module src="www/CameraConstants.js" name="Camera">
     <clobbers target="Camera"/>
   </js-module>
-
   <js-module src="www/CameraPopoverOptions.js" name="CameraPopoverOptions">
     <clobbers target="CameraPopoverOptions"/>
   </js-module>
-
-
-
   <js-module src="www/Camera.js" name="camera">
     <clobbers target="navigator.camera"/>
   </js-module>
-
-    <!-- firefoxos -->
   <platform name="firefoxos">
     <config-file target="config.xml" parent="/*">
       <feature name="Camera">
         <param name="firefoxos-package" value="Camera"/>
       </feature>
     </config-file>
-
     <js-module src="src/firefoxos/CameraProxy.js" name="CameraProxy">
       <runs/>
     </js-module>
   </platform>
-
-    <!-- android -->
   <platform name="android">
     <config-file target="res/xml/config.xml" parent="/*">
       <feature name="Camera">
@@ -70,32 +36,20 @@
       <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     </config-file>
     <config-file target="AndroidManifest.xml" parent="application">
-          <provider
+      <provider android:name="android.support.v4.content.FileProvider" android:authorities="${applicationId}.provider" android:exported="false" android:grantUriPermissions="true">
-              android:name="android.support.v4.content.FileProvider"
+        <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/provider_paths"/>
-              android:authorities="${applicationId}.provider"
-              android:exported="false"
-              android:grantUriPermissions="true" >
-              <meta-data
-                  android:name="android.support.FILE_PROVIDER_PATHS"
-                  android:resource="@xml/provider_paths"/>
       </provider>
     </config-file>
-
     <source-file src="src/android/CameraLauncher.java" target-dir="src/org/apache/cordova/camera"/>
     <source-file src="src/android/CordovaUri.java" target-dir="src/org/apache/cordova/camera"/>
     <source-file src="src/android/FileHelper.java" target-dir="src/org/apache/cordova/camera"/>
     <source-file src="src/android/ExifHelper.java" target-dir="src/org/apache/cordova/camera"/>
     <source-file src="src/android/xml/provider_paths.xml" target-dir="res/xml"/>
-
     <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
       <clobbers target="CameraPopoverHandle"/>
     </js-module>
-
     <framework src="com.android.support:support-v4:24.1.1+"/>
-
   </platform>
-
-    <!-- amazon-fireos -->
   <platform name="amazon-fireos">
     <config-file target="res/xml/config.xml" parent="/*">
       <feature name="Camera">
@@ -105,18 +59,13 @@
     <config-file target="AndroidManifest.xml" parent="/*">
       <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     </config-file>
-
     <source-file src="src/android/CameraLauncher.java" target-dir="src/org/apache/cordova/camera"/>
     <source-file src="src/android/FileHelper.java" target-dir="src/org/apache/cordova/camera"/>
     <source-file src="src/android/ExifHelper.java" target-dir="src/org/apache/cordova/camera"/>
-
     <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
       <clobbers target="CameraPopoverHandle"/>
     </js-module>
-
   </platform>
-
-     <!-- ubuntu -->
   <platform name="ubuntu">
     <config-file target="config.xml" parent="/*">
       <feature name="Camera">
@@ -128,7 +77,6 @@
     </js-module>
     <header-file src="src/ubuntu/camera.h"/>
     <source-file src="src/ubuntu/camera.cpp"/>
-
     <resource-file src="src/ubuntu/back.png"/>
     <resource-file src="src/ubuntu/CaptureWidget.qml"/>
     <resource-file src="src/ubuntu/shoot.png"/>
@@ -136,8 +84,6 @@
     <resource-file src="src/ubuntu/toolbar-middle.png"/>
     <resource-file src="src/ubuntu/toolbar-right.png"/>
   </platform>
-
-     <!-- ios -->
   <platform name="ios">
     <config-file target="config.xml" parent="/*">
       <feature name="Camera">
@@ -145,18 +91,25 @@
       </feature>
       <preference name="CameraUsesGeolocation" value="false"/>
     </config-file>
-
+    <config-file target="*-Info.plist" parent="NSCameraUsageDescription">
+      <string>$CAMERA_USAGE_DESCRIPTION</string>
+    </config-file>
+    <config-file target="*-Info.plist" parent="NSPhotoLibraryUsageDescription">
+      <string>$PHOTOLIBRARY_USAGE_DESCRIPTION</string>
+    </config-file>
+    <config-file target="*-Info.plist" parent="NSLocationWhenInUseUsageDescription">
+      <string/>
+    </config-file>
     <js-module src="www/ios/CameraPopoverHandle.js" name="CameraPopoverHandle">
       <clobbers target="CameraPopoverHandle"/>
     </js-module>
-
     <header-file src="src/ios/UIImage+CropScaleOrientation.h"/>
-         <source-file src="src/ios/UIImage+CropScaleOrientation.m" />
     <header-file src="src/ios/CDVCamera.h"/>
-         <source-file src="src/ios/CDVCamera.m" />
     <header-file src="src/ios/CDVJpegHeaderWriter.h"/>
-         <source-file src="src/ios/CDVJpegHeaderWriter.m" />
     <header-file src="src/ios/CDVExif.h"/>
+    <source-file src="src/ios/UIImage+CropScaleOrientation.m"/>
+    <source-file src="src/ios/CDVCamera.m"/>
+    <source-file src="src/ios/CDVJpegHeaderWriter.m"/>
     <framework src="ImageIO.framework" weak="true"/>
     <framework src="CoreLocation.framework"/>
     <framework src="CoreGraphics.framework"/>
@@ -164,24 +117,9 @@
     <framework src="MobileCoreServices.framework"/>
     <framework src="CoreGraphics.framework"/>
     <framework src="AVFoundation.framework"/>
-
     <preference name="CAMERA_USAGE_DESCRIPTION" default=" "/>
-         <config-file target="*-Info.plist" parent="NSCameraUsageDescription">
-             <string>$CAMERA_USAGE_DESCRIPTION</string>
-         </config-file>
-
     <preference name="PHOTOLIBRARY_USAGE_DESCRIPTION" default=" "/>
-         <config-file target="*-Info.plist" parent="NSPhotoLibraryUsageDescription">
-             <string>$PHOTOLIBRARY_USAGE_DESCRIPTION</string>
-         </config-file>
-
-         <config-file target="*-Info.plist" parent="NSLocationWhenInUseUsageDescription">
-             <string></string>
-         </config-file>
-
   </platform>
-
-    <!-- blackberry10 -->
   <platform name="blackberry10">
     <source-file src="src/blackberry10/index.js" target-dir="Camera"/>
     <config-file target="www/config.xml" parent="/widget">
@@ -196,51 +134,37 @@
     </js-module>
     <asset src="www/blackberry10/assets" target="chrome"/>
   </platform>
-
-     <!-- wp7 -->
   <platform name="wp7">
     <config-file target="config.xml" parent="/*">
       <feature name="Camera">
         <param name="wp-package" value="Camera"/>
       </feature>
     </config-file>
-
     <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
       <Capability Name="ID_CAP_ISV_CAMERA"/>
       <Capability Name="ID_CAP_MEDIALIB"/>
     </config-file>
-
     <source-file src="src/wp/Camera.cs"/>
-
-
     <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
       <clobbers target="CameraPopoverHandle"/>
     </js-module>
   </platform>
-
-    <!-- wp8 -->
   <platform name="wp8">
     <config-file target="config.xml" parent="/*">
       <feature name="Camera">
         <param name="wp-package" value="Camera"/>
       </feature>
     </config-file>
-
     <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
       <Capability Name="ID_CAP_ISV_CAMERA"/>
       <Capability Name="ID_CAP_MEDIALIB_PHOTO"/>
     </config-file>
-
     <source-file src="src/wp/Camera.cs"/>
-
     <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
       <clobbers target="CameraPopoverHandle"/>
     </js-module>
   </platform>
-
-    <!-- windows8 -->
   <platform name="windows8">
-
     <config-file target="package.appxmanifest" parent="/Package/Capabilities">
       <Capability Name="picturesLibrary"/>
       <DeviceCapability Name="webcam"/>
@@ -251,23 +175,17 @@
     <js-module src="src/windows/CameraProxy.js" name="CameraProxy">
       <runs/>
     </js-module>
-
   </platform>
-
-    <!-- browser -->
   <platform name="browser">
     <config-file target="config.xml" parent="/*">
       <feature name="Camera">
         <param name="browser-package" value="Camera"/>
       </feature>
     </config-file>
-
     <js-module src="src/browser/CameraProxy.js" name="CameraProxy">
       <runs/>
     </js-module>
   </platform>
-
-    <!-- windows -->
   <platform name="windows">
     <config-file target="package.appxmanifest" parent="/Package/Capabilities">
       <DeviceCapability Name="webcam"/>
@@ -279,7 +197,4 @@
       <runs/>
     </js-module>
   </platform>
-
-
-
 </plugin>

tests/plugin.xml

@@ -1,33 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:rim="http://www.blackberry.com/ns/widgets" id="cordova-plugin-camera-tests" version="2.4.0">
-  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:android="http://schemas.android.com/apk/res/android"
-    xmlns:rim="http://www.blackberry.com/ns/widgets"
-    id="cordova-plugin-camera-tests"
-    version="2.3.2-dev">
   <name>Cordova Camera Plugin Tests</name>
   <license>Apache 2.0</license>
-    
   <dependency id="cordova-plugin-file" version=">=2.0.0"/>
-
+  <js-module src="tests.js" name="tests"/>
-    <js-module src="tests.js" name="tests">
-    </js-module>
 </plugin>