github/cordova-plugin-camera
github/cordova-plugin-camera
3
0
Fork 0
mirror of https://github.com/apache/cordova-plugin-camera.git synced 2025-01-19 03:42:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Set VERSION to 2.4.1-dev (via coho)

Browse Source
This commit is contained in:
Steve Gill 2017-02-28 17:55:56 -08:00
parent e4ff41c07c
commit 926fbf0e8c
3 changed files with 314 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

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

233
plugin.xml
View File

@ -1,31 +1,65 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8"?>
<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.4.1-dev">
<name>Camera</name> <name>Camera</name>
<description>Cordova Camera Plugin</description> <description>Cordova Camera Plugin</description>
<license>Apache 2.0</license> <license>Apache 2.0</license>
<keywords>cordova,camera</keywords> <keywords>cordova,camera</keywords>
<repo>https://git-wip-us.apache.org/repos/asf/cordova-plugin-camera.git</repo> <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> <issue>https://issues.apache.org/jira/browse/CB/component/12320645</issue>
<dependency id="cordova-plugin-compat" version="^1.1.0"/>
<dependency id="cordova-plugin-compat" version="^1.1.0" />
<js-module src="www/CameraConstants.js" name="Camera"> <js-module src="www/CameraConstants.js" name="Camera">
<clobbers target="Camera"/> <clobbers target="Camera" />
</js-module> </js-module>
<js-module src="www/CameraPopoverOptions.js" name="CameraPopoverOptions"> <js-module src="www/CameraPopoverOptions.js" name="CameraPopoverOptions">
<clobbers target="CameraPopoverOptions"/> <clobbers target="CameraPopoverOptions" />
</js-module> </js-module>
<js-module src="www/Camera.js" name="camera"> <js-module src="www/Camera.js" name="camera">
<clobbers target="navigator.camera"/> <clobbers target="navigator.camera" />
</js-module> </js-module>
<!-- firefoxos -->
<platform name="firefoxos"> <platform name="firefoxos">
<config-file target="config.xml" parent="/*"> <config-file target="config.xml" parent="/*">
<feature name="Camera"> <feature name="Camera">
<param name="firefoxos-package" value="Camera"/> <param name="firefoxos-package" value="Camera" />
</feature> </feature>
</config-file> </config-file>
<js-module src="src/firefoxos/CameraProxy.js" name="CameraProxy"> <js-module src="src/firefoxos/CameraProxy.js" name="CameraProxy">
<runs/> <runs />
</js-module> </js-module>
</platform> </platform>
<!-- android -->
<platform name="android"> <platform name="android">
<config-file target="res/xml/config.xml" parent="/*"> <config-file target="res/xml/config.xml" parent="/*">
<feature name="Camera"> <feature name="Camera">
@ -33,23 +67,35 @@
</feature> </feature>
</config-file> </config-file>
<config-file target="AndroidManifest.xml" parent="/*"> <config-file target="AndroidManifest.xml" parent="/*">
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
</config-file> </config-file>
<config-file target="AndroidManifest.xml" parent="application"> <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"> <provider
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/provider_paths"/> 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> </provider>
</config-file> </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/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/CordovaUri.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/FileHelper.java" target-dir="src/org/apache/cordova/camera" />
<source-file src="src/android/xml/provider_paths.xml" target-dir="res/xml"/> <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"> <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
<clobbers target="CameraPopoverHandle"/> <clobbers target="CameraPopoverHandle" />
</js-module> </js-module>
<framework src="com.android.support:support-v4:24.1.1+"/>
<framework src="com.android.support:support-v4:24.1.1+" />
</platform> </platform>
<!-- amazon-fireos -->
<platform name="amazon-fireos"> <platform name="amazon-fireos">
<config-file target="res/xml/config.xml" parent="/*"> <config-file target="res/xml/config.xml" parent="/*">
<feature name="Camera"> <feature name="Camera">
@ -57,71 +103,87 @@
</feature> </feature>
</config-file> </config-file>
<config-file target="AndroidManifest.xml" parent="/*"> <config-file target="AndroidManifest.xml" parent="/*">
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
</config-file> </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/CameraLauncher.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/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"> <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
<clobbers target="CameraPopoverHandle"/> <clobbers target="CameraPopoverHandle" />
</js-module> </js-module>
</platform> </platform>
<!-- ubuntu -->
<platform name="ubuntu"> <platform name="ubuntu">
<config-file target="config.xml" parent="/*"> <config-file target="config.xml" parent="/*">
<feature name="Camera"> <feature name="Camera">
<param policy_group="camera" policy_version="1"/> <param policy_group="camera" policy_version="1" />
</feature> </feature>
</config-file> </config-file>
<js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle"> <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
<clobbers target="CameraPopoverHandle"/> <clobbers target="CameraPopoverHandle" />
</js-module> </js-module>
<header-file src="src/ubuntu/camera.h"/> <header-file src="src/ubuntu/camera.h" />
<source-file src="src/ubuntu/camera.cpp"/> <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/back.png" />
<resource-file src="src/ubuntu/shoot.png"/> <resource-file src="src/ubuntu/CaptureWidget.qml" />
<resource-file src="src/ubuntu/toolbar-left.png"/> <resource-file src="src/ubuntu/shoot.png" />
<resource-file src="src/ubuntu/toolbar-middle.png"/> <resource-file src="src/ubuntu/toolbar-left.png" />
<resource-file src="src/ubuntu/toolbar-right.png"/> <resource-file src="src/ubuntu/toolbar-middle.png" />
<resource-file src="src/ubuntu/toolbar-right.png" />
</platform> </platform>
<!-- ios -->
<platform name="ios"> <platform name="ios">
<config-file target="config.xml" parent="/*"> <config-file target="config.xml" parent="/*">
<feature name="Camera"> <feature name="Camera">
<param name="ios-package" value="CDVCamera"/> <param name="ios-package" value="CDVCamera" />
</feature> </feature>
<preference name="CameraUsesGeolocation" value="false"/> <preference name="CameraUsesGeolocation" value="false" />
</config-file> </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"> <config-file target="*-Info.plist" parent="NSCameraUsageDescription">
<string>$CAMERA_USAGE_DESCRIPTION</string> <string>$CAMERA_USAGE_DESCRIPTION</string>
</config-file> </config-file>
<preference name="PHOTOLIBRARY_USAGE_DESCRIPTION" default=" " />
<config-file target="*-Info.plist" parent="NSPhotoLibraryUsageDescription"> <config-file target="*-Info.plist" parent="NSPhotoLibraryUsageDescription">
<string>$PHOTOLIBRARY_USAGE_DESCRIPTION</string> <string>$PHOTOLIBRARY_USAGE_DESCRIPTION</string>
</config-file> </config-file>
<config-file target="*-Info.plist" parent="NSLocationWhenInUseUsageDescription"> <config-file target="*-Info.plist" parent="NSLocationWhenInUseUsageDescription">
<string/> <string></string>
</config-file> </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>
<!-- blackberry10 -->
<platform name="blackberry10"> <platform name="blackberry10">
<source-file src="src/blackberry10/index.js" target-dir="Camera"/> <source-file src="src/blackberry10/index.js" target-dir="Camera" />
<config-file target="www/config.xml" parent="/widget"> <config-file target="www/config.xml" parent="/widget">
<feature name="Camera" value="Camera"/> <feature name="Camera" value="Camera"/>
</config-file> </config-file>
@ -130,71 +192,94 @@
<rim:permit>use_camera</rim:permit> <rim:permit>use_camera</rim:permit>
</config-file> </config-file>
<js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle"> <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
<clobbers target="CameraPopoverHandle"/> <clobbers target="CameraPopoverHandle" />
</js-module> </js-module>
<asset src="www/blackberry10/assets" target="chrome"/> <asset src="www/blackberry10/assets" target="chrome" />
</platform> </platform>
<!-- wp7 -->
<platform name="wp7"> <platform name="wp7">
<config-file target="config.xml" parent="/*"> <config-file target="config.xml" parent="/*">
<feature name="Camera"> <feature name="Camera">
<param name="wp-package" value="Camera"/> <param name="wp-package" value="Camera"/>
</feature> </feature>
</config-file> </config-file>
<config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities"> <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
<Capability Name="ID_CAP_ISV_CAMERA"/> <Capability Name="ID_CAP_ISV_CAMERA" />
<Capability Name="ID_CAP_MEDIALIB"/> <Capability Name="ID_CAP_MEDIALIB" />
</config-file> </config-file>
<source-file src="src/wp/Camera.cs"/>
<source-file src="src/wp/Camera.cs" />
<js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle"> <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
<clobbers target="CameraPopoverHandle"/> <clobbers target="CameraPopoverHandle" />
</js-module> </js-module>
</platform> </platform>
<!-- wp8 -->
<platform name="wp8"> <platform name="wp8">
<config-file target="config.xml" parent="/*"> <config-file target="config.xml" parent="/*">
<feature name="Camera"> <feature name="Camera">
<param name="wp-package" value="Camera"/> <param name="wp-package" value="Camera"/>
</feature> </feature>
</config-file> </config-file>
<config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities"> <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
<Capability Name="ID_CAP_ISV_CAMERA"/> <Capability Name="ID_CAP_ISV_CAMERA" />
<Capability Name="ID_CAP_MEDIALIB_PHOTO"/> <Capability Name="ID_CAP_MEDIALIB_PHOTO"/>
</config-file> </config-file>
<source-file src="src/wp/Camera.cs"/>
<source-file src="src/wp/Camera.cs" />
<js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle"> <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
<clobbers target="CameraPopoverHandle"/> <clobbers target="CameraPopoverHandle" />
</js-module> </js-module>
</platform> </platform>
<!-- windows8 -->
<platform name="windows8"> <platform name="windows8">
<config-file target="package.appxmanifest" parent="/Package/Capabilities"> <config-file target="package.appxmanifest" parent="/Package/Capabilities">
<Capability Name="picturesLibrary"/> <Capability Name="picturesLibrary" />
<DeviceCapability Name="webcam"/> <DeviceCapability Name="webcam" />
</config-file> </config-file>
<js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle"> <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
<clobbers target="CameraPopoverHandle"/> <clobbers target="CameraPopoverHandle" />
</js-module> </js-module>
<js-module src="src/windows/CameraProxy.js" name="CameraProxy"> <js-module src="src/windows/CameraProxy.js" name="CameraProxy">
<runs/> <runs />
</js-module> </js-module>
</platform> </platform>
<!-- browser -->
<platform name="browser"> <platform name="browser">
<config-file target="config.xml" parent="/*"> <config-file target="config.xml" parent="/*">
<feature name="Camera"> <feature name="Camera">
<param name="browser-package" value="Camera"/> <param name="browser-package" value="Camera" />
</feature> </feature>
</config-file> </config-file>
<js-module src="src/browser/CameraProxy.js" name="CameraProxy"> <js-module src="src/browser/CameraProxy.js" name="CameraProxy">
<runs/> <runs />
</js-module> </js-module>
</platform> </platform>
<!-- windows -->
<platform name="windows"> <platform name="windows">
<config-file target="package.appxmanifest" parent="/Package/Capabilities"> <config-file target="package.appxmanifest" parent="/Package/Capabilities">
<DeviceCapability Name="webcam"/> <DeviceCapability Name="webcam" />
</config-file> </config-file>
<js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle"> <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
<clobbers target="CameraPopoverHandle"/> <clobbers target="CameraPopoverHandle" />
</js-module> </js-module>
<js-module src="src/windows/CameraProxy.js" name="CameraProxy"> <js-module src="src/windows/CameraProxy.js" name="CameraProxy">
<runs/> <runs />
</js-module> </js-module>
</platform> </platform>
</plugin> </plugin>

34
tests/plugin.xml
View File

@ -1,7 +1,33 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8"?>
<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.4.1-dev">
<name>Cordova Camera Plugin Tests</name> <name>Cordova Camera Plugin Tests</name>
<license>Apache 2.0</license> <license>Apache 2.0</license>
<dependency id="cordova-plugin-file" version=">=2.0.0"/>
<js-module src="tests.js" name="tests"/> <dependency id="cordova-plugin-file" version=">=2.0.0" />
<js-module src="tests.js" name="tests">
</js-module>
</plugin> </plugin>