diff --git a/iOS Example/Cartfile b/iOS Example/Cartfile index 4056d09..6c7e3a8 100644 --- a/iOS Example/Cartfile +++ b/iOS Example/Cartfile @@ -1 +1 @@ -github "ReactiveX/RxSwift" ~> 4.3 +github "ReactiveX/RxSwift" ~> 4.3.1 diff --git a/iOS Example/Cartfile.resolved b/iOS Example/Cartfile.resolved index b8f6784..b34f3f7 100644 --- a/iOS Example/Cartfile.resolved +++ b/iOS Example/Cartfile.resolved @@ -1 +1 @@ -github "ReactiveX/RxSwift" "4.3.0" +github "ReactiveX/RxSwift" "4.3.1" diff --git a/iOS Example/iOS Example.xcodeproj/project.pbxproj b/iOS Example/iOS Example.xcodeproj/project.pbxproj index 63a9f65..b74e171 100644 --- a/iOS Example/iOS Example.xcodeproj/project.pbxproj +++ b/iOS Example/iOS Example.xcodeproj/project.pbxproj @@ -66,6 +66,7 @@ B388AB0C1C6567FA00726BCA /* RxMediaPicker.framework */, B388AAF71C65648700726BCA /* iOS Example */, B388AAF61C65648700726BCA /* Products */, + FC379B442167D6DA00D47524 /* Recovered References */, ); sourceTree = ""; }; @@ -89,6 +90,14 @@ path = "iOS Example"; sourceTree = ""; }; + FC379B442167D6DA00D47524 /* Recovered References */ = { + isa = PBXGroup; + children = ( + B388AAE91C65640700726BCA /* RxSwift.framework */, + ); + name = "Recovered References"; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -286,7 +295,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "pt.ruicosta.iOS-Example"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -307,7 +316,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "pt.ruicosta.iOS-Example"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; }; name = Release; }; diff --git a/iOS Example/iOS Example/ViewController.swift b/iOS Example/iOS Example/ViewController.swift index d37578e..1f7f08c 100644 --- a/iOS Example/iOS Example/ViewController.swift +++ b/iOS Example/iOS Example/ViewController.swift @@ -22,9 +22,9 @@ class ViewController: UIViewController, RxMediaPickerDelegate { let views = ["buttonPhoto": buttonPhoto, "buttonVideo": buttonVideo, "container": container] - var constraints = NSLayoutConstraint.constraints(withVisualFormat: "V:|-50-[buttonPhoto]-20-[buttonVideo]-20-[container(==200)]", options: NSLayoutFormatOptions(rawValue: 0), metrics: .none, views: views) + var constraints = NSLayoutConstraint.constraints(withVisualFormat: "V:|-50-[buttonPhoto]-20-[buttonVideo]-20-[container(==200)]", options: NSLayoutConstraint.FormatOptions(rawValue: 0), metrics: .none, views: views) - constraints += NSLayoutConstraint.constraints(withVisualFormat: "H:[container(==200)]", options: NSLayoutFormatOptions(rawValue: 0), metrics: .none, views: views) + constraints += NSLayoutConstraint.constraints(withVisualFormat: "H:[container(==200)]", options: NSLayoutConstraint.FormatOptions(rawValue: 0), metrics: .none, views: views) constraints.append(NSLayoutConstraint(item: buttonPhoto, attribute: .centerX, relatedBy: .equal, toItem: view, attribute: .centerX, multiplier: 1, constant: 0)) constraints.append(NSLayoutConstraint(item: buttonVideo, attribute: .centerX, relatedBy: .equal, toItem: view, attribute: .centerX, multiplier: 1, constant: 0)) @@ -62,7 +62,7 @@ class ViewController: UIViewController, RxMediaPickerDelegate { } } - func pickPhoto() { + @objc func pickPhoto() { picker.selectImage(editable: true) .observeOn(MainScheduler.instance) .subscribe(onNext: { (image, editedImage) in @@ -81,7 +81,7 @@ class ViewController: UIViewController, RxMediaPickerDelegate { .disposed(by: disposeBag) } - func recordVideo() { + @objc func recordVideo() { #if (arch(i386) || arch(x86_64)) let alert = UIAlertController(title: "Error - Simulator", message: "Video recording not available on the simulator", preferredStyle: .alert) alert.addAction(UIAlertAction(title: "OK", style: .default, handler: .none))