From 15a8124dfb953ff83b81a032da10e0945574c57a Mon Sep 17 00:00:00 2001 From: Yannick Loriot Date: Wed, 12 Oct 2016 22:05:51 +0200 Subject: [PATCH] Bump to v7.1.1 --- Example/QRCodeReader.swift/Info.plist | 2 +- .../QRCodeReader.swift/ViewController.swift | 2 +- Example/QRCodeReader/Info.plist | 2 +- QRCodeReader.swift.podspec | 2 +- README.md | 6 ++--- Sources/QRCodeReader.swift | 24 ++++++++++++++++--- 6 files changed, 28 insertions(+), 10 deletions(-) diff --git a/Example/QRCodeReader.swift/Info.plist b/Example/QRCodeReader.swift/Info.plist index 81215ba..47e9a53 100644 --- a/Example/QRCodeReader.swift/Info.plist +++ b/Example/QRCodeReader.swift/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 7.1.0 + 7.1.1 CFBundleSignature ???? CFBundleVersion diff --git a/Example/QRCodeReader.swift/ViewController.swift b/Example/QRCodeReader.swift/ViewController.swift index b0d218c..d080544 100644 --- a/Example/QRCodeReader.swift/ViewController.swift +++ b/Example/QRCodeReader.swift/ViewController.swift @@ -29,7 +29,7 @@ import AVFoundation class ViewController: UIViewController, QRCodeReaderViewControllerDelegate { lazy var reader = QRCodeReaderViewController(builder: QRCodeReaderViewControllerBuilder { - $0.reader = QRCodeReader() + $0.reader = QRCodeReader(metadataObjectTypes: [AVMetadataObjectTypeQRCode]) $0.showTorchButton = true }) diff --git a/Example/QRCodeReader/Info.plist b/Example/QRCodeReader/Info.plist index 74b7a12..96e313b 100644 --- a/Example/QRCodeReader/Info.plist +++ b/Example/QRCodeReader/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 7.1.0 + 7.1.1 CFBundleSignature ???? CFBundleVersion diff --git a/QRCodeReader.swift.podspec b/QRCodeReader.swift.podspec index 57a9364..7418002 100644 --- a/QRCodeReader.swift.podspec +++ b/QRCodeReader.swift.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'QRCodeReader.swift' s.module_name = 'QRCodeReader' - s.version = '7.1.0' + s.version = '7.1.1' s.license = 'MIT' s.summary = 'Simple QRCode and 1D bar code reader in Swift' s.homepage = 'https://github.com/yannickl/QRCodeReader.swift.git' diff --git a/README.md b/README.md index 144fee9..0a6d643 100644 --- a/README.md +++ b/README.md @@ -105,7 +105,7 @@ platform :ios, '8.0' use_frameworks! target 'TargetName' do - pod 'QRCodeReader.swift', '~> 7.1.0' + pod 'QRCodeReader.swift', '~> 7.1.1' end ``` @@ -137,7 +137,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.0 +github "yannickl/QRCodeReader.swift" >= 7.1.1 ``` #### Swift Package Manager @@ -151,7 +151,7 @@ let package = Package( name: "YOUR_PROJECT_NAME", targets: [], dependencies: [ - .Package(url: "https://github.com/yannickl/QRCodeReader.swift.git", versions: "7.1.0" ..< Version.max) + .Package(url: "https://github.com/yannickl/QRCodeReader.swift.git", versions: "7.1.1" ..< Version.max) ] ) ``` diff --git a/Sources/QRCodeReader.swift b/Sources/QRCodeReader.swift index c18ef7b..8cc7c9d 100644 --- a/Sources/QRCodeReader.swift +++ b/Sources/QRCodeReader.swift @@ -88,11 +88,29 @@ public final class QRCodeReader: NSObject, AVCaptureMetadataOutputObjectsDelegat } /** - Initializes the code reader with an array of metadata object types. - - - parameter startingCaptureDevicePosition: The Camera to use on start of scanning + Initializes the code reader with an array of metadata object types, and the default initial capture position + - parameter metadataObjectTypes: An array of strings identifying the types of metadata objects to process. */ + public convenience init(metadataObjectTypes types: [String]) { + self.init(metadataObjectTypes: types, captureDevicePosition: .back) + } + + /** + Initializes the code reader with the starting capture device position, and the default array of metadata object types + + - parameter captureDevicePosition: The capture position to use on start of scanning + */ + public convenience init(captureDevicePosition position: AVCaptureDevicePosition) { + self.init(metadataObjectTypes: [AVMetadataObjectTypeQRCode], captureDevicePosition: position) + } + + /** + Initializes the code reader with an array of metadata object types. + + - parameter metadataObjectTypes: An array of strings identifying the types of metadata objects to process. + - parameter captureDevicePosition: The Camera to use on start of scanning. + */ public init(metadataObjectTypes types: [String], captureDevicePosition: AVCaptureDevicePosition) { metadataObjectTypes = types