Repository: cordova-plugin-file-transfer Updated Branches: refs/heads/master 70961b36f -> e95238e1f
CB-12519 Updated version and RELEASENOTES.md for release 1.6.2 Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/37c43b2e Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/37c43b2e Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/37c43b2e Branch: refs/heads/master Commit: 37c43b2e7fcd26b018312f7769987b1685479438 Parents: 70961b3 Author: Steve Gill <[email protected]> Authored: Tue Feb 28 17:41:26 2017 -0800 Committer: Steve Gill <[email protected]> Committed: Tue Feb 28 17:41:26 2017 -0800 ---------------------------------------------------------------------- RELEASENOTES.md | 6 ++ package.json | 2 +- plugin.xml | 271 +++++++++++++++++++------------------------------- tests/plugin.xml | 40 ++------ 4 files changed, 118 insertions(+), 201 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/37c43b2e/RELEASENOTES.md ---------------------------------------------------------------------- diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 47d46d6..989206b 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -20,6 +20,12 @@ --> # Release Notes +### 1.6.2 (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.6.1 (Dec 07, 2016) * [CB-12224](https://issues.apache.org/jira/browse/CB-12224) Updated version and RELEASENOTES.md for release 1.6.1 * [CB-12154](https://issues.apache.org/jira/browse/CB-12154) file-transfer progressEvent.total = -1 on iOS http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/37c43b2e/package.json ---------------------------------------------------------------------- diff --git a/package.json b/package.json index c18d540..39a04b5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cordova-plugin-file-transfer", - "version": "1.6.2-dev", + "version": "1.6.2", "description": "Cordova File Transfer Plugin", "types": "./types/index.d.ts", "cordova": { http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/37c43b2e/plugin.xml ---------------------------------------------------------------------- diff --git a/plugin.xml b/plugin.xml index 9275888..e424458 100644 --- a/plugin.xml +++ b/plugin.xml @@ -1,170 +1,107 @@ -<?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"; - id="cordova-plugin-file-transfer" - version="1.6.2-dev"> - <name>File Transfer</name> - <description>Cordova File Transfer Plugin</description> - <license>Apache 2.0</license> - <keywords>cordova,file,transfer</keywords> - <repo>https://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer.git</repo> - <issue>https://issues.apache.org/jira/browse/CB/component/12320650</issue> - - <dependency id="cordova-plugin-file" version="^4.0.0" /> - - <js-module src="www/FileTransferError.js" name="FileTransferError"> - <clobbers target="window.FileTransferError" /> +<?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"; id="cordova-plugin-file-transfer" version="1.6.2"> + <name>File Transfer</name> + <description>Cordova File Transfer Plugin</description> + <license>Apache 2.0</license> + <keywords>cordova,file,transfer</keywords> + <repo>https://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer.git</repo> + <issue>https://issues.apache.org/jira/browse/CB/component/12320650</issue> + <dependency id="cordova-plugin-file" version="^4.0.0"/> + <js-module src="www/FileTransferError.js" name="FileTransferError"> + <clobbers target="window.FileTransferError"/> + </js-module> + <js-module src="www/FileTransfer.js" name="FileTransfer"> + <clobbers target="window.FileTransfer"/> + </js-module> + <platform name="android"> + <config-file target="res/xml/config.xml" parent="/*"> + <feature name="FileTransfer"> + <param name="android-package" value="org.apache.cordova.filetransfer.FileTransfer"/> + </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/FileTransfer.java" target-dir="src/org/apache/cordova/filetransfer"/> + <source-file src="src/android/FileProgressResult.java" target-dir="src/org/apache/cordova/filetransfer"/> + <source-file src="src/android/FileUploadResult.java" target-dir="src/org/apache/cordova/filetransfer"/> + </platform> + <platform name="amazon-fireos"> + <config-file target="res/xml/config.xml" parent="/*"> + <feature name="FileTransfer"> + <param name="android-package" value="org.apache.cordova.filetransfer.FileTransfer"/> + </feature> + </config-file> + <config-file target="AndroidManifest.xml" parent="/*"> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> + </config-file> + <source-file src="src/amazon/FileTransfer.java" target-dir="src/org/apache/cordova/filetransfer"/> + <source-file src="src/android/FileProgressResult.java" target-dir="src/org/apache/cordova/filetransfer"/> + <source-file src="src/android/FileUploadResult.java" target-dir="src/org/apache/cordova/filetransfer"/> + </platform> + <platform name="ubuntu"> + <header-file src="src/ubuntu/file-transfer.h"/> + <source-file src="src/ubuntu/file-transfer.cpp"/> + </platform> + <platform name="blackberry10"> + <config-file target="www/config.xml" parent="/widget"> + <feature name="FileTransfer" value="FileTransfer"/> + </config-file> + <js-module src="www/blackberry10/FileTransferProxy.js" name="FileTransferProxy"> + <runs/> </js-module> - - <js-module src="www/FileTransfer.js" name="FileTransfer"> - <clobbers target="window.FileTransfer" /> + <js-module src="www/blackberry10/xhrFileTransfer.js" name="xhrFileTransfer"/> + </platform> + <platform name="ios"> + <config-file target="config.xml" parent="/*"> + <feature name="FileTransfer"> + <param name="ios-package" value="CDVFileTransfer"/> + </feature> + </config-file> + <header-file src="src/ios/CDVFileTransfer.h"/> + <source-file src="src/ios/CDVFileTransfer.m"/> + <framework src="AssetsLibrary.framework"/> + </platform> + <platform name="wp7"> + <config-file target="config.xml" parent="/*"> + <feature name="FileTransfer"> + <param name="wp-package" value="FileTransfer"/> + </feature> + </config-file> + <source-file src="src/wp/FileTransfer.cs"/> + <js-module src="www/wp7/base64.js" name="base64"> + <clobbers target="window.FileTransferBase64"/> </js-module> - - <!-- android --> - <platform name="android"> - <config-file target="res/xml/config.xml" parent="/*"> - <feature name="FileTransfer" > - <param name="android-package" value="org.apache.cordova.filetransfer.FileTransfer"/> - </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/FileTransfer.java" target-dir="src/org/apache/cordova/filetransfer" /> - <source-file src="src/android/FileProgressResult.java" target-dir="src/org/apache/cordova/filetransfer" /> - <source-file src="src/android/FileUploadResult.java" target-dir="src/org/apache/cordova/filetransfer" /> - </platform> - - <!-- amamzon-fireos --> - <platform name="amazon-fireos"> - <config-file target="res/xml/config.xml" parent="/*"> - <feature name="FileTransfer" > - <param name="android-package" value="org.apache.cordova.filetransfer.FileTransfer"/> - </feature> - </config-file> - - <config-file target="AndroidManifest.xml" parent="/*"> - <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> - </config-file> - - <source-file src="src/amazon/FileTransfer.java" target-dir="src/org/apache/cordova/filetransfer" /> - <source-file src="src/android/FileProgressResult.java" target-dir="src/org/apache/cordova/filetransfer" /> - <source-file src="src/android/FileUploadResult.java" target-dir="src/org/apache/cordova/filetransfer" /> - </platform> - - <!-- ubuntu --> - <platform name="ubuntu"> - <header-file src="src/ubuntu/file-transfer.h" /> - <source-file src="src/ubuntu/file-transfer.cpp" /> - </platform> - - <!-- blackberry10 --> - <platform name="blackberry10"> - <config-file target="www/config.xml" parent="/widget"> - <feature name="FileTransfer" value="FileTransfer"></feature> - </config-file> - <js-module src="www/blackberry10/FileTransferProxy.js" name="FileTransferProxy" > - <runs /> - </js-module> - <js-module src="www/blackberry10/xhrFileTransfer.js" name="xhrFileTransfer" /> - <!-- - <js-module src="www/blackberry10/abort.js" name="abortProxy" /> - <js-module src="www/blackberry10/download.js" name="downloadProxy" /> - <js-module src="www/blackberry10/upload.js" name="uploadProxy" /> - --> - </platform> - - <!-- ios --> - <platform name="ios"> - <config-file target="config.xml" parent="/*"> - <feature name="FileTransfer"> - <param name="ios-package" value="CDVFileTransfer" /> - </feature> - </config-file> - <header-file src="src/ios/CDVFileTransfer.h" /> - <source-file src="src/ios/CDVFileTransfer.m" /> - - <framework src="AssetsLibrary.framework" /> - </platform> - - <!-- wp7 --> - <platform name="wp7"> - <config-file target="config.xml" parent="/*"> - <feature name="FileTransfer"> - <param name="wp-package" value="FileTransfer"/> - </feature> - </config-file> - - <source-file src="src/wp/FileTransfer.cs" /> - - <js-module src="www/wp7/base64.js" name="base64"> - <clobbers target="window.FileTransferBase64" /> - </js-module> - - </platform> - - <!-- wp8 --> - <platform name="wp8"> - <config-file target="config.xml" parent="/*"> - <feature name="FileTransfer"> - <param name="wp-package" value="FileTransfer"/> - </feature> - </config-file> - - <source-file src="src/wp/FileTransfer.cs" /> - - </platform> - - <!-- windows8 --> - <platform name="windows8"> - <js-module src="src/windows/FileTransferProxy.js" name="FileTransferProxy"> - <runs /> - </js-module> - </platform> - - <!-- windows --> - <platform name="windows"> - <js-module src="src/windows/FileTransferProxy.js" name="FileTransferProxy"> - <runs /> - </js-module> - </platform> - - <!-- firefoxOS --> - <platform name="firefoxos"> - <config-file target="config.xml" parent="/*"> - <permission name="systemXHR" privileged="true"/> - </config-file> - - <js-module src="www/firefoxos/FileTransferProxy.js" name="FileTransferProxy"> - <runs/> - </js-module> - </platform> - - <!-- browser --> - <platform name="browser"> - <js-module src="www/browser/FileTransfer.js" name="BrowserFileTransfer"> - <clobbers target="window.FileTransfer" /> - </js-module> - </platform> + </platform> + <platform name="wp8"> + <config-file target="config.xml" parent="/*"> + <feature name="FileTransfer"> + <param name="wp-package" value="FileTransfer"/> + </feature> + </config-file> + <source-file src="src/wp/FileTransfer.cs"/> + </platform> + <platform name="windows8"> + <js-module src="src/windows/FileTransferProxy.js" name="FileTransferProxy"> + <runs/> + </js-module> + </platform> + <platform name="windows"> + <js-module src="src/windows/FileTransferProxy.js" name="FileTransferProxy"> + <runs/> + </js-module> + </platform> + <platform name="firefoxos"> + <config-file target="config.xml" parent="/*"> + <permission name="systemXHR" privileged="true"/> + </config-file> + <js-module src="www/firefoxos/FileTransferProxy.js" name="FileTransferProxy"> + <runs/> + </js-module> + </platform> + <platform name="browser"> + <js-module src="www/browser/FileTransfer.js" name="BrowserFileTransfer"> + <clobbers target="window.FileTransfer"/> + </js-module> + </platform> </plugin> http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/37c43b2e/tests/plugin.xml ---------------------------------------------------------------------- diff --git a/tests/plugin.xml b/tests/plugin.xml index fd6b546..cdc9abe 100644 --- a/tests/plugin.xml +++ b/tests/plugin.xml @@ -1,34 +1,8 @@ -<?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"; - id="cordova-plugin-file-transfer-tests" - version="1.6.2-dev"> - <name>Cordova File Transfer Plugin Tests</name> - <license>Apache 2.0</license> - - <js-module src="tests.js" name="tests"> - </js-module> - - <hook type="after_prepare" src="hooks/after_prepare.js" /> - - <preference name="FILETRANSFER_SERVER_ADDRESS" default="http://rwswbpiopr.localtunnel.me"/> +<?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"; id="cordova-plugin-file-transfer-tests" version="1.6.2"> + <name>Cordova File Transfer Plugin Tests</name> + <license>Apache 2.0</license> + <js-module src="tests.js" name="tests"/> + <hook type="after_prepare" src="hooks/after_prepare.js"/> + <preference name="FILETRANSFER_SERVER_ADDRESS" default="http://rwswbpiopr.localtunnel.me"/> </plugin> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
