Set VERSION to 2.4.1-dev (via coho)
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/926fbf0e Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/926fbf0e Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/926fbf0e Branch: refs/heads/master Commit: 926fbf0e8ccce6f70c34520e507dc9c08dd15f6f Parents: e4ff41c Author: Steve Gill <[email protected]> Authored: Tue Feb 28 17:55:56 2017 -0800 Committer: Steve Gill <[email protected]> Committed: Thu Mar 2 15:44:42 2017 -0800 ---------------------------------------------------------------------- package.json | 2 +- plugin.xml | 477 +++++++++++++++++++++++++++++--------------------- tests/plugin.xml | 38 +++- 3 files changed, 314 insertions(+), 203 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/926fbf0e/package.json ---------------------------------------------------------------------- diff --git a/package.json b/package.json index 4bac73c..c1fdea7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cordova-plugin-camera", - "version": "2.4.0", + "version": "2.4.1-dev", "description": "Cordova Camera Plugin", "types": "./types/index.d.ts", "cordova": { http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/926fbf0e/plugin.xml ---------------------------------------------------------------------- diff --git a/plugin.xml b/plugin.xml index f1684d9..d363e3a 100644 --- a/plugin.xml +++ b/plugin.xml @@ -1,200 +1,285 @@ -<?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"> - <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> - <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/> +<?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:android="http://schemas.android.com/apk/res/android"; + xmlns:rim="http://www.blackberry.com/ns/widgets"; + id="cordova-plugin-camera" + version="2.4.1-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> - </platform> - <platform name="android"> - <config-file target="res/xml/config.xml" parent="/*"> - <feature name="Camera"> - <param name="android-package" value="org.apache.cordova.camera.CameraLauncher"/> - </feature> - </config-file> - <config-file target="AndroidManifest.xml" parent="/*"> - <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> - </config-file> - <config-file target="AndroidManifest.xml" parent="application"> - <provider android:name="android.support.v4.content.FileProvider" 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 src="www/CameraPopoverOptions.js" name="CameraPopoverOptions"> + <clobbers target="CameraPopoverOptions" /> </js-module> - <framework src="com.android.support:support-v4:24.1.1+"/> - </platform> - <platform name="amazon-fireos"> - <config-file target="res/xml/config.xml" parent="/*"> - <feature name="Camera"> - <param name="android-package" value="org.apache.cordova.camera.CameraLauncher"/> - </feature> - </config-file> - <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 src="www/Camera.js" name="camera"> + <clobbers target="navigator.camera" /> </js-module> - </platform> - <platform name="ubuntu"> - <config-file target="config.xml" parent="/*"> - <feature name="Camera"> - <param policy_group="camera" policy_version="1"/> - </feature> - </config-file> - <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle"> - <clobbers target="CameraPopoverHandle"/> - </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"/> - <resource-file src="src/ubuntu/toolbar-left.png"/> - <resource-file src="src/ubuntu/toolbar-middle.png"/> - <resource-file src="src/ubuntu/toolbar-right.png"/> - </platform> - <platform name="ios"> - <config-file target="config.xml" parent="/*"> - <feature name="Camera"> - <param name="ios-package" value="CDVCamera"/> - </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"/> - <header-file src="src/ios/CDVCamera.h"/> - <header-file src="src/ios/CDVJpegHeaderWriter.h"/> - <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"/> - <framework src="AssetsLibrary.framework"/> - <framework src="MobileCoreServices.framework"/> - <framework src="CoreGraphics.framework"/> - <framework src="AVFoundation.framework"/> - <preference name="CAMERA_USAGE_DESCRIPTION" default=" "/> - <preference name="PHOTOLIBRARY_USAGE_DESCRIPTION" default=" "/> - </platform> - <platform name="blackberry10"> - <source-file src="src/blackberry10/index.js" target-dir="Camera"/> - <config-file target="www/config.xml" parent="/widget"> - <feature name="Camera" value="Camera"/> - </config-file> - <config-file target="www/config.xml" parent="/widget/rim:permissions"> - <rim:permit>access_shared</rim:permit> - <rim:permit>use_camera</rim:permit> - </config-file> - <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle"> - <clobbers target="CameraPopoverHandle"/> - </js-module> - <asset src="www/blackberry10/assets" target="chrome"/> - </platform> - <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> - <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> - <platform name="windows8"> - <config-file target="package.appxmanifest" parent="/Package/Capabilities"> - <Capability Name="picturesLibrary"/> - <DeviceCapability Name="webcam"/> - </config-file> - <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle"> - <clobbers target="CameraPopoverHandle"/> - </js-module> - <js-module src="src/windows/CameraProxy.js" name="CameraProxy"> - <runs/> - </js-module> - </platform> - <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> - <platform name="windows"> - <config-file target="package.appxmanifest" parent="/Package/Capabilities"> - <DeviceCapability Name="webcam"/> - </config-file> - <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle"> - <clobbers target="CameraPopoverHandle"/> - </js-module> - <js-module src="src/windows/CameraProxy.js" name="CameraProxy"> - <runs/> - </js-module> - </platform> + + <!-- 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"> + <param name="android-package" value="org.apache.cordova.camera.CameraLauncher"/> + </feature> + </config-file> + <config-file target="AndroidManifest.xml" parent="/*"> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> + </config-file> + <config-file target="AndroidManifest.xml" parent="application"> + <provider + android:name="android.support.v4.content.FileProvider" + 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"> + <param name="android-package" value="org.apache.cordova.camera.CameraLauncher"/> + </feature> + </config-file> + <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"> + <param policy_group="camera" policy_version="1" /> + </feature> + </config-file> + <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle"> + <clobbers target="CameraPopoverHandle" /> + </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" /> + <resource-file src="src/ubuntu/toolbar-left.png" /> + <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"> + <param name="ios-package" value="CDVCamera" /> + </feature> + <preference name="CameraUsesGeolocation" value="false" /> + </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" /> + <framework src="ImageIO.framework" weak="true" /> + <framework src="CoreLocation.framework" /> + <framework src="CoreGraphics.framework" /> + <framework src="AssetsLibrary.framework" /> + <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"> + <feature name="Camera" value="Camera"/> + </config-file> + <config-file target="www/config.xml" parent="/widget/rim:permissions"> + <rim:permit>access_shared</rim:permit> + <rim:permit>use_camera</rim:permit> + </config-file> + <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle"> + <clobbers target="CameraPopoverHandle" /> + </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" /> + </config-file> + <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle"> + <clobbers target="CameraPopoverHandle" /> + </js-module> + <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" /> + </config-file> + <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle"> + <clobbers target="CameraPopoverHandle" /> + </js-module> + <js-module src="src/windows/CameraProxy.js" name="CameraProxy"> + <runs /> + </js-module> + </platform> + + + </plugin> http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/926fbf0e/tests/plugin.xml ---------------------------------------------------------------------- diff --git a/tests/plugin.xml b/tests/plugin.xml index 286f4e6..f7e902a 100644 --- a/tests/plugin.xml +++ b/tests/plugin.xml @@ -1,7 +1,33 @@ -<?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"> - <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"/> +<?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:android="http://schemas.android.com/apk/res/android"; + xmlns:rim="http://www.blackberry.com/ns/widgets"; + id="cordova-plugin-camera-tests" + version="2.4.1-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> </plugin> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
