Skip to content

Commit

Permalink
chore(release): 2.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
bitjson committed May 17, 2018
1 parent 3acb339 commit d54dc34
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 14 deletions.
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
<a name="2.6.0"></a>
# [2.6.0](https://github.com/bitpay/cordova-plugin-qrscanner/compare/2.5.0...2.6.0) (2018-05-17)


### Bug Fixes

* **android:** Remove cordova-plugin-compat android dependency ([85e2396](https://github.com/bitpay/cordova-plugin-qrscanner/commit/85e2396))
* **ios:** prevents iOS plugin from crashing when destroy is called without a callback ([610a004](https://github.com/bitpay/cordova-plugin-qrscanner/commit/610a004)), closes [#142](https://github.com/bitpay/cordova-plugin-qrscanner/issues/142)
* **ios,android:** set background to transparent rather than white ([c9531b8](https://github.com/bitpay/cordova-plugin-qrscanner/commit/c9531b8)), closes [#135](https://github.com/bitpay/cordova-plugin-qrscanner/issues/135)
* **package:** add `main` property to package ([955e375](https://github.com/bitpay/cordova-plugin-qrscanner/commit/955e375)), closes [#83](https://github.com/bitpay/cordova-plugin-qrscanner/issues/83)
* **package:** Use upstream swift support plugin ([211597c](https://github.com/bitpay/cordova-plugin-qrscanner/commit/211597c))
* **windows:** prevent memory leaks when destroying, add rd file ([1a4843a](https://github.com/bitpay/cordova-plugin-qrscanner/commit/1a4843a))


### Features

* **browser:** upgrade qrcode-reader to ^1.0.4 ([08cf523](https://github.com/bitpay/cordova-plugin-qrscanner/commit/08cf523)), closes [#92](https://github.com/bitpay/cordova-plugin-qrscanner/issues/92)
* **ios:** Upgrade, convert syntax to Swift 3.1 ([27fdd92](https://github.com/bitpay/cordova-plugin-qrscanner/commit/27fdd92))
* **windows:** target windows 10 universal ([691cdda](https://github.com/bitpay/cordova-plugin-qrscanner/commit/691cdda))



<a name="2.5.0"></a>
# [2.5.0](https://github.com/bitpay/cordova-plugin-qrscanner/compare/2.4.1...v2.5.0) (2017-02-15)

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-qrscanner",
"version": "2.5.0",
"version": "2.6.0",
"description": "Fast, energy-efficient, highly-configurable QR code scanner.",
"cordova": {
"id": "cordova-plugin-qrscanner",
Expand Down
15 changes: 3 additions & 12 deletions plugin.xml
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
id="cordova-plugin-qrscanner"
version="2.5.0">

<plugin
xmlns="http://www.phonegap.com/ns/plugins/1.0" id="cordova-plugin-qrscanner" version="2.6.0">
<name>QRScanner</name>

<engines>
<engine name="cordova" version=">=3.4.0"/>
</engines>

<js-module src="www/www.min.js" name="QRScanner">
<clobbers target="QRScanner" />
</js-module>

<platform name="android">
<config-file target="res/xml/config.xml" parent="/*">
<feature name="QRScanner">
Expand All @@ -27,7 +22,6 @@
<source-file src="src/android/QRScanner.java" target-dir="src/com/bitpay/cordova/qrscanner"/>
<framework src="src/android/qrscanner.gradle" custom="true" type="gradleReference"/>
</platform>

<platform name="ios">
<config-file target="config.xml" parent="/*">
<feature name="QRScanner">
Expand All @@ -40,7 +34,6 @@
<string>The camera is used to scan QR codes.</string>
</config-file>
</platform>

<platform name="browser">
<config-file target="config.xml" parent="/*">
<feature name="QRScanner">
Expand All @@ -51,7 +44,6 @@
<runs />
</js-module>
</platform>

<platform name="windows">
<config-file target="config.xml" parent="/*">
<feature name="QRScanner">
Expand All @@ -72,5 +64,4 @@
<hook src="hooks/windows/check-arch.js" type="before_compile" />
<hook src="hooks/windows/check-arch.js" type="before_run" />
</platform>

</plugin>
</plugin>

0 comments on commit d54dc34

Please sign in to comment.