Bump to v7.1.2

This commit is contained in:
Yannick Loriot 2016-10-13 13:47:49 +02:00
parent 15a8124dfb
commit 753348ac08
6 changed files with 15 additions and 6 deletions

View File

@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>7.1.1</string>
<string>7.1.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>

View File

@ -57,6 +57,8 @@ class ViewController: UIViewController, QRCodeReaderViewControllerDelegate {
// MARK: - QRCodeReader Delegate Methods
func reader(_ reader: QRCodeReaderViewController, didScanResult result: QRCodeReaderResult) {
reader.stopScanning()
dismiss(animated: true) { [weak self] in
let alert = UIAlertController(
title: "QRCodeReader",
@ -76,6 +78,8 @@ class ViewController: UIViewController, QRCodeReaderViewControllerDelegate {
}
func readerDidCancel(_ reader: QRCodeReaderViewController) {
reader.stopScanning()
dismiss(animated: true, completion: nil)
}
}

View File

@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>7.1.1</string>
<string>7.1.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>

View File

@ -1,7 +1,7 @@
Pod::Spec.new do |s|
s.name = 'QRCodeReader.swift'
s.module_name = 'QRCodeReader'
s.version = '7.1.1'
s.version = '7.1.2'
s.license = 'MIT'
s.summary = 'Simple QRCode and 1D bar code reader in Swift'
s.homepage = 'https://github.com/yannickl/QRCodeReader.swift.git'

View File

@ -64,6 +64,8 @@ lazy var readerVC = QRCodeReaderViewController(builder: QRCodeReaderViewControll
// MARK: - QRCodeReaderViewController Delegate Methods
func reader(_ reader: QRCodeReader, didScanResult result: QRCodeReaderResult) {
reader.stopScanning()
dismiss(animated: true, completion: nil)
}
@ -76,6 +78,8 @@ func reader(_ reader: QRCodeReaderViewController, didSwitchCamera newCaptureDevi
}
func readerDidCancel(_ reader: QRCodeReader) {
reader.stopScanning()
dismiss(animated: true, completion: nil)
}
```
@ -105,7 +109,7 @@ platform :ios, '8.0'
use_frameworks!
target 'TargetName' do
pod 'QRCodeReader.swift', '~> 7.1.1'
pod 'QRCodeReader.swift', '~> 7.1.2'
end
```
@ -137,7 +141,7 @@ $ brew install carthage
To integrate `QRCodeReader` into your Xcode project using Carthage, specify it in your `Cartfile` file:
```ogdl
github "yannickl/QRCodeReader.swift" >= 7.1.1
github "yannickl/QRCodeReader.swift" >= 7.1.2
```
#### Swift Package Manager
@ -151,7 +155,7 @@ let package = Package(
name: "YOUR_PROJECT_NAME",
targets: [],
dependencies: [
.Package(url: "https://github.com/yannickl/QRCodeReader.swift.git", versions: "7.1.1" ..< Version.max)
.Package(url: "https://github.com/yannickl/QRCodeReader.swift.git", versions: "7.1.2" ..< Version.max)
]
)
```

View File

@ -142,6 +142,7 @@ public final class QRCodeReader: NSObject, AVCaptureMetadataOutputObjectsDelegat
}
/// Switch between the back and the front camera.
@discardableResult
public func switchDeviceInput() -> AVCaptureDeviceInput? {
if let _frontDeviceInput = frontDeviceInput {
session.beginConfiguration()