From e6e4e53b692e9c1cf7b556089cbb51aa1904c5bf Mon Sep 17 00:00:00 2001 From: Krunoslav Zaher Date: Tue, 21 Jul 2015 20:35:19 +0200 Subject: [PATCH] Updated to 1.8 --- .../RxBlocking.xcodeproj/project.pbxproj | 3 + RxCocoa/RxCocoa.xcodeproj/project.pbxproj | 6 +- RxExample/RxExample.xcodeproj/project.pbxproj | 5 +- .../APIWrappersViewController.swift | 32 +++++------ RxExample/RxExample/iOS/Main.storyboard | 57 ++++++++++++------- RxSwift/RxSwift.xcodeproj/project.pbxproj | 3 + 6 files changed, 63 insertions(+), 43 deletions(-) diff --git a/RxBlocking/RxBlocking.xcodeproj/project.pbxproj b/RxBlocking/RxBlocking.xcodeproj/project.pbxproj index 7ed17d49..a6eed984 100644 --- a/RxBlocking/RxBlocking.xcodeproj/project.pbxproj +++ b/RxBlocking/RxBlocking.xcodeproj/project.pbxproj @@ -244,6 +244,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = RxBlocking; @@ -287,6 +288,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = RxBlocking; SDKROOT = iphoneos; @@ -366,6 +368,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = RxBlocking; SDKROOT = iphoneos; diff --git a/RxCocoa/RxCocoa.xcodeproj/project.pbxproj b/RxCocoa/RxCocoa.xcodeproj/project.pbxproj index d0e4b3fe..79240695 100644 --- a/RxCocoa/RxCocoa.xcodeproj/project.pbxproj +++ b/RxCocoa/RxCocoa.xcodeproj/project.pbxproj @@ -18,7 +18,6 @@ 653C8BF41B114EB600983087 /* UIControl+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 653C8BF31B114EB600983087 /* UIControl+Rx.swift */; }; C8003BA81B51AB760002F09F /* _RXSwizzling.h in Headers */ = {isa = PBXBuildFile; fileRef = C8003BA61B51AB760002F09F /* _RXSwizzling.h */; settings = {ATTRIBUTES = (Public, ); }; }; C8003BA91B51AB760002F09F /* _RXSwizzling.m in Sources */ = {isa = PBXBuildFile; fileRef = C8003BA71B51AB760002F09F /* _RXSwizzling.m */; }; - C8092BBB1AF50436008D9A2C /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C8092BBA1AF50436008D9A2C /* CoreData.framework */; }; C80A4E301B517F4E00C24BD5 /* _RXKVOObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = C80A4E2E1B517F4E00C24BD5 /* _RXKVOObserver.h */; settings = {ATTRIBUTES = (Public, ); }; }; C80A4E311B517F4E00C24BD5 /* _RXKVOObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = C80A4E2F1B517F4E00C24BD5 /* _RXKVOObserver.m */; }; C80A4E321B51814100C24BD5 /* _RXKVOObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = C80A4E2E1B517F4E00C24BD5 /* _RXKVOObserver.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -67,7 +66,6 @@ C87360B41B51E0A100FDA532 /* KVOObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C87360B31B51E0A100FDA532 /* KVOObserver.swift */; }; C87360B51B51E0A100FDA532 /* KVOObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C87360B31B51E0A100FDA532 /* KVOObserver.swift */; }; C87360B61B51E57500FDA532 /* _RXSwizzling.m in Sources */ = {isa = PBXBuildFile; fileRef = C8003BA71B51AB760002F09F /* _RXSwizzling.m */; }; - C88BB8851B07E6130064D411 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C8092BBA1AF50436008D9A2C /* CoreData.framework */; }; C88BB8861B07E6130064D411 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C8A56BCD1AD744FD00B4673B /* RxSwift.framework */; }; C88BB8881B07E6130064D411 /* RxCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = C81553E31A98AB4A00C63152 /* RxCocoa.h */; settings = {ATTRIBUTES = (Public, ); }; }; C88BB8E81B07F2BE0064D411 /* UIButton+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88BB8E01B07F2BE0064D411 /* UIButton+Rx.swift */; }; @@ -112,7 +110,6 @@ 653C8BF31B114EB600983087 /* UIControl+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIControl+Rx.swift"; sourceTree = ""; }; C8003BA61B51AB760002F09F /* _RXSwizzling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _RXSwizzling.h; sourceTree = ""; }; C8003BA71B51AB760002F09F /* _RXSwizzling.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = _RXSwizzling.m; sourceTree = ""; }; - C8092BBA1AF50436008D9A2C /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; C80A4E2E1B517F4E00C24BD5 /* _RXKVOObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _RXKVOObserver.h; sourceTree = ""; }; C80A4E2F1B517F4E00C24BD5 /* _RXKVOObserver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = _RXKVOObserver.m; sourceTree = ""; }; C80B56211B2DFCA0008F915D /* NSManagedObjectContext+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectContext+Rx.swift"; sourceTree = ""; }; @@ -625,6 +622,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = RxCocoa/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.1; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_SWIFT_FLAGS = "-D DEBUG -D TRACE_RESOURCES"; @@ -670,6 +668,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = RxCocoa/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.1; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = ""; @@ -747,6 +746,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = RxCocoa/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.1; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; OTHER_SWIFT_FLAGS = "-D TRACE_RESOURCES"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/RxExample/RxExample.xcodeproj/project.pbxproj b/RxExample/RxExample.xcodeproj/project.pbxproj index 79f70638..171c5557 100644 --- a/RxExample/RxExample.xcodeproj/project.pbxproj +++ b/RxExample/RxExample.xcodeproj/project.pbxproj @@ -558,8 +558,6 @@ C890A6581AEBD26B00AFF7E6 /* GitHubSignupViewController.swift in Sources */, C8A57F741B40AF7C00D5570A /* Random.xcdatamodeld in Sources */, 075F13101B4E9D5A000D7861 /* APIWrappersViewController.swift in Sources */, - C88C786F1B3EB0A00061C5AB /* RxTableViewSectionedReloadDataSource.swift in Sources */, - C859B9AA1B45CB0900D012D7 /* RxCollectionViewSectionedAnimatedDataSource.swift in Sources */, C83367311AD029AE00C668A7 /* Wireframe.swift in Sources */, 07E300071B14995F00F00100 /* TableViewController.swift in Sources */, C859B9A41B45C5D900D012D7 /* PartialUpdatesViewController.swift in Sources */, @@ -633,6 +631,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = RxExample/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.2; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_SWIFT_FLAGS = "-D DEBUG -D TRACE_RESOURCES"; @@ -675,6 +674,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = RxExample/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.2; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; OTHER_SWIFT_FLAGS = "-D RELEASE"; PRODUCT_NAME = RxExample; @@ -761,6 +761,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = RxExample/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.2; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; OTHER_SWIFT_FLAGS = "-D TRACE_RESOURCES"; PRODUCT_NAME = RxExample; diff --git a/RxExample/RxExample/Examples/APIWrappers/APIWrappersViewController.swift b/RxExample/RxExample/Examples/APIWrappers/APIWrappersViewController.swift index 6eceeddb..c7d4618e 100644 --- a/RxExample/RxExample/Examples/APIWrappers/APIWrappersViewController.swift +++ b/RxExample/RxExample/Examples/APIWrappers/APIWrappersViewController.swift @@ -43,19 +43,19 @@ class APIWrappersViewController: ViewController { ash.rx_clickedButtonAtIndex >- subscribeNext { x in - println("UIActionSheet clickedButtonAtIndex \(x)") + print("UIActionSheet clickedButtonAtIndex \(x)") } >- disposeBag.addDisposable ash.rx_willDismissWithButtonIndex >- subscribeNext { x in - println("UIActionSheet willDismissWithButtonIndex \(x)") + print("UIActionSheet willDismissWithButtonIndex \(x)") } >- disposeBag.addDisposable ash.rx_didDismissWithButtonIndex >- subscribeNext { x in - println("UIActionSheet didDismissWithButtonIndex \(x)") + print("UIActionSheet didDismissWithButtonIndex \(x)") av.show() } @@ -66,19 +66,19 @@ class APIWrappersViewController: ViewController { av.rx_clickedButtonAtIndex >- subscribeNext { x in - println("UIAlertView clickedButtonAtIndex \(x)") + print("UIAlertView clickedButtonAtIndex \(x)") } >- disposeBag.addDisposable av.rx_willDismissWithButtonIndex >- subscribeNext { x in - println("UIAlertView willDismissWithButtonIndex \(x)") + print("UIAlertView willDismissWithButtonIndex \(x)") } >- disposeBag.addDisposable av.rx_didDismissWithButtonIndex >- subscribeNext { x in - println("UIAlertView didDismissWithButtonIndex \(x)") + print("UIAlertView didDismissWithButtonIndex \(x)") } >- disposeBag.addDisposable @@ -92,7 +92,7 @@ class APIWrappersViewController: ViewController { bbitem.rx_tap >- subscribeNext { x in - println("UIBarButtonItem Tapped") + print("UIBarButtonItem Tapped") } >- disposeBag.addDisposable @@ -100,7 +100,7 @@ class APIWrappersViewController: ViewController { segmentedControl.rx_value >- subscribeNext { x in - println("UISegmentedControl value \(x)") + print("UISegmentedControl value \(x)") } >- disposeBag.addDisposable @@ -109,7 +109,7 @@ class APIWrappersViewController: ViewController { switcher.rx_value >- subscribeNext { x in - println("UISwitch value \(x)") + print("UISwitch value \(x)") } >- disposeBag.addDisposable @@ -118,7 +118,7 @@ class APIWrappersViewController: ViewController { button.rx_tap >- subscribeNext { x in - println("UIButton Tapped") + print("UIButton Tapped") } >- disposeBag.addDisposable @@ -127,7 +127,7 @@ class APIWrappersViewController: ViewController { slider.rx_value >- subscribeNext { x in - println("UISlider value \(x)") + print("UISlider value \(x)") } >- disposeBag.addDisposable @@ -136,7 +136,7 @@ class APIWrappersViewController: ViewController { datePicker.rx_date >- subscribeNext { x in - println("UIDatePicker date \(x)") + print("UIDatePicker date \(x)") } >- disposeBag.addDisposable @@ -145,7 +145,7 @@ class APIWrappersViewController: ViewController { textField.rx_text >- subscribeNext { [unowned self] x in - println("UITextField text \(x)") + print("UITextField text \(x)") self.textField.resignFirstResponder() } >- disposeBag.addDisposable @@ -155,7 +155,7 @@ class APIWrappersViewController: ViewController { mypan.rx_event >- subscribeNext { x in - println("UIGestureRecognizer event \(x)") + print("UIGestureRecognizer event \(x)") } >- disposeBag.addDisposable @@ -167,13 +167,13 @@ class APIWrappersViewController: ViewController { manager.rx_didUpdateLocations >- subscribeNext { x in - println("rx_didUpdateLocations \(x)") + print("rx_didUpdateLocations \(x)") } >- disposeBag.addDisposable manager.rx_didFailWithError >- subscribeNext { x in - println("rx_didFailWithError \(x)") + print("rx_didFailWithError \(x)") } >- disposeBag.addDisposable diff --git a/RxExample/RxExample/iOS/Main.storyboard b/RxExample/RxExample/iOS/Main.storyboard index 61877024..414b5ba4 100644 --- a/RxExample/RxExample/iOS/Main.storyboard +++ b/RxExample/RxExample/iOS/Main.storyboard @@ -1,7 +1,8 @@ - + - + + @@ -39,9 +40,10 @@ - + + @@ -256,13 +258,13 @@ - + - - + - diff --git a/RxSwift/RxSwift.xcodeproj/project.pbxproj b/RxSwift/RxSwift.xcodeproj/project.pbxproj index 14d327bc..033adba4 100644 --- a/RxSwift/RxSwift.xcodeproj/project.pbxproj +++ b/RxSwift/RxSwift.xcodeproj/project.pbxproj @@ -945,6 +945,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = RxSwift/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.3; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; OTHER_SWIFT_FLAGS = "-D TRACE_RESOURCES"; SDKROOT = ""; @@ -1062,6 +1063,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = RxSwift/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.3; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_SWIFT_FLAGS = "-D TRACE_RESOURCES -D DEBUG"; @@ -1107,6 +1109,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = RxSwift/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.3; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = ""; TARGETED_DEVICE_FAMILY = "1,2";