diff --git a/Detect/RxVNDetectBarcodesRequest.swift b/Detect/RxVNDetectBarcodesRequest.swift index 2ade640..fd68630 100644 --- a/Detect/RxVNDetectBarcodesRequest.swift +++ b/Detect/RxVNDetectBarcodesRequest.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) public final class RxVNDetectBarcodesRequest: RxVNRequest { public init(symbologies: [VNBarcodeSymbology]) { diff --git a/Detect/RxVNDetectFaceLandmarksRequest.swift b/Detect/RxVNDetectFaceLandmarksRequest.swift index f3ef63c..efcc6ce 100644 --- a/Detect/RxVNDetectFaceLandmarksRequest.swift +++ b/Detect/RxVNDetectFaceLandmarksRequest.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) public final class RxVNDetectFaceLandmarksRequest: RxVNRequest { public init() { diff --git a/Detect/RxVNDetectRectanglesRequest.swift b/Detect/RxVNDetectRectanglesRequest.swift index 289a98b..a4fc523 100644 --- a/Detect/RxVNDetectRectanglesRequest.swift +++ b/Detect/RxVNDetectRectanglesRequest.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) public final class RxVNDetectRectanglesRequest: RxVNRequest { public init() { diff --git a/Detect/RxVNDetectTextRectanglesRequest.swift b/Detect/RxVNDetectTextRectanglesRequest.swift index 987e7b8..eb06d5c 100644 --- a/Detect/RxVNDetectTextRectanglesRequest.swift +++ b/Detect/RxVNDetectTextRectanglesRequest.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) public final class RxVNDetectTextRectanglesRequest: RxVNRequest { public init(reportCharacterBoxes: Bool) { diff --git a/Detect/VNDetectBarcodesRequest+Rx.swift b/Detect/VNDetectBarcodesRequest+Rx.swift index d0f1024..fb64e51 100644 --- a/Detect/VNDetectBarcodesRequest+Rx.swift +++ b/Detect/VNDetectBarcodesRequest+Rx.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) extension Reactive where Base: VNDetectBarcodesRequest { public static func request(symbologies: [VNBarcodeSymbology]) -> RxVNDetectBarcodesRequest { diff --git a/Detect/VNDetectFaceLandmarksRequest+Rx.swift b/Detect/VNDetectFaceLandmarksRequest+Rx.swift index 3930acf..29e194d 100644 --- a/Detect/VNDetectFaceLandmarksRequest+Rx.swift +++ b/Detect/VNDetectFaceLandmarksRequest+Rx.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) extension Reactive where Base: VNDetectFaceLandmarksRequest { public static func request() -> RxVNDetectFaceLandmarksRequest { diff --git a/Detect/VNDetectRectanglesRequest+Rx.swift b/Detect/VNDetectRectanglesRequest+Rx.swift index bc8a98c..e0045de 100644 --- a/Detect/VNDetectRectanglesRequest+Rx.swift +++ b/Detect/VNDetectRectanglesRequest+Rx.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) extension Reactive where Base: VNDetectRectanglesRequest { public static func request() -> RxVNDetectRectanglesRequest { diff --git a/Detect/VNDetectTextRectanglesRequest+Rx.swift b/Detect/VNDetectTextRectanglesRequest+Rx.swift index cd6941a..50f609e 100644 --- a/Detect/VNDetectTextRectanglesRequest+Rx.swift +++ b/Detect/VNDetectTextRectanglesRequest+Rx.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) extension Reactive where Base: VNDetectTextRectanglesRequest { public static func request(reportCharacterBoxes: Bool) -> RxVNDetectTextRectanglesRequest { diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..30df20d --- /dev/null +++ b/Package.swift @@ -0,0 +1,30 @@ +// swift-tools-version:5.1 + +import PackageDescription + +let package = Package( + name: "RxVision", + platforms: [ + .macOS(.v10_10), .iOS(.v8), // .tvOS(.v9), .watchOS(.v3) + ], + products: [ + .library( + name: "RxVision", + targets: ["RxVision"]), + ], + dependencies: [ + .package(url: "https://github.com/ReactiveX/RxSwift.git", from: "5.0.0") + ], + targets: [ + .target( + name: "RxVision", + dependencies: ["RxSwift"], // "RxRelay"], + path: "." // Sources + ), +// .testTarget( +// name: "RxVisionTests", +// dependencies: ["RxVision"], +// path: "Tests" +// ) + ] +) diff --git a/Track/RxVNTrackObjectRequest.swift b/Track/RxVNTrackObjectRequest.swift index 746e3bb..5800a48 100644 --- a/Track/RxVNTrackObjectRequest.swift +++ b/Track/RxVNTrackObjectRequest.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) public final class RxVNTrackObjectRequest: RxVNRequest { public init(detectedObjectObservation observation: VNDetectedObjectObservation) { diff --git a/Track/RxVNTrackRectangleRequest.swift b/Track/RxVNTrackRectangleRequest.swift index d875c2d..77b6bec 100644 --- a/Track/RxVNTrackRectangleRequest.swift +++ b/Track/RxVNTrackRectangleRequest.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) public final class RxVNTrackRectangleRequest: RxVNRequest { public init(rectangleObservation observation: VNRectangleObservation) { diff --git a/Track/VNTrackObjectRequest+Rx.swift b/Track/VNTrackObjectRequest+Rx.swift index e908874..5700947 100644 --- a/Track/VNTrackObjectRequest+Rx.swift +++ b/Track/VNTrackObjectRequest+Rx.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) extension Reactive where Base: VNTrackObjectRequest { public static func request(detectedObjectObservation observation: VNDetectedObjectObservation) -> RxVNTrackObjectRequest { diff --git a/Track/VNTrackRectangleRequest+Rx.swift b/Track/VNTrackRectangleRequest+Rx.swift index bce127a..5624abd 100644 --- a/Track/VNTrackRectangleRequest+Rx.swift +++ b/Track/VNTrackRectangleRequest+Rx.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) extension Reactive where Base: VNTrackRectangleRequest { public static func request(rectangleObservation observation: VNRectangleObservation) -> RxVNTrackRectangleRequest { diff --git a/Vision/RequestCompletion.swift b/Vision/RequestCompletion.swift index 0da01bc..39ff2c2 100644 --- a/Vision/RequestCompletion.swift +++ b/Vision/RequestCompletion.swift @@ -8,7 +8,9 @@ import Vision +@available(iOS 11.0, *) typealias _RequestCompletion = (request: VNRequest, error: Error?) +@available(iOS 11.0, *) public typealias RequestCompletion = (value: T?, request: VNRequest, error: Error?) diff --git a/Vision/RxVNCoreMLRequest.swift b/Vision/RxVNCoreMLRequest.swift index 4517dd4..3fa35cc 100644 --- a/Vision/RxVNCoreMLRequest.swift +++ b/Vision/RxVNCoreMLRequest.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) public final class RxVNCoreMLRequest: RxVNRequest { public init(model: VNCoreMLModel, imageCropAndScaleOption: VNImageCropAndScaleOption) { diff --git a/Vision/RxVNRequest.swift b/Vision/RxVNRequest.swift index 5e85c0d..f2480d0 100644 --- a/Vision/RxVNRequest.swift +++ b/Vision/RxVNRequest.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) public class RxVNRequest { private let valueSubject: PublishSubject = PublishSubject() diff --git a/Vision/RxVNRequestCompletionHandler.swift b/Vision/RxVNRequestCompletionHandler.swift index 762e0de..562dd61 100644 --- a/Vision/RxVNRequestCompletionHandler.swift +++ b/Vision/RxVNRequestCompletionHandler.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) final class RxVNRequestCompletionHandler { typealias Observer = AnyObserver<_RequestCompletion> diff --git a/Vision/VNCoreMLRequest+Rx.swift b/Vision/VNCoreMLRequest+Rx.swift index 8ad6517..e2b54e4 100644 --- a/Vision/VNCoreMLRequest+Rx.swift +++ b/Vision/VNCoreMLRequest+Rx.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) extension Reactive where Base: VNCoreMLRequest { public static func request(model: VNCoreMLModel, imageCropAndScaleOption: VNImageCropAndScaleOption) -> RxVNCoreMLRequest { diff --git a/Vision/VNImageRequestHandler+Rx.swift b/Vision/VNImageRequestHandler+Rx.swift index 3fd909a..2d2f472 100644 --- a/Vision/VNImageRequestHandler+Rx.swift +++ b/Vision/VNImageRequestHandler+Rx.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) extension Reactive where Base: VNImageRequestHandler { public func perform(_ requests: [RxVNRequest], on value: T) throws { diff --git a/Vision/VNSequenceRequestHandler+Rx.swift b/Vision/VNSequenceRequestHandler+Rx.swift index 5dfcde0..1afc9cb 100644 --- a/Vision/VNSequenceRequestHandler+Rx.swift +++ b/Vision/VNSequenceRequestHandler+Rx.swift @@ -8,7 +8,9 @@ import Vision import RxSwift +import CoreImage +@available(iOS 11.0, *) extension Reactive where Base: VNSequenceRequestHandler { // MARK: - CGImage