Commit Graph

364 Commits

Author SHA1 Message Date
Jérôme Alves
cbb0ed5d29 Merge branch 'swift-3.0' into swift-3.0-removing-rx_-prefix 2016-08-15 19:19:22 +02:00
Jérôme Alves
7f65914f93 Fix ActivityToken dispose type. 2016-08-15 17:53:13 +02:00
Jérôme Alves
e4e422c4f1 Merge branch 'swift-3.0' into swift-3.0-removing-rx_-prefix
Conflicts:
	RxCocoa/Common/Observables/NSNotificationCenter+Rx.swift
	RxCocoa/OSX/NSImageView+Rx.swift
	RxCocoa/iOS/UICollectionView+Rx.swift
	RxCocoa/iOS/UIControl+Rx.swift
	RxCocoa/iOS/UIImageView+Rx.swift
	RxCocoa/iOS/UILabel+Rx.swift
	RxCocoa/iOS/UITableView+Rx.swift
	RxExample/RxDataSources/DataSources+Rx/UISectionedViewType+RxAnimatedDataSource.swift
	RxExample/RxExample/Examples/APIWrappers/APIWrappersViewController.swift
	RxExample/RxExample/Examples/GitHubSearchRepositories/GitHubSearchRepositoriesViewController.swift
	RxExample/RxExample/Examples/GitHubSignup/UsingDriver/GitHubSignupViewController2.swift
	RxExample/RxExample/Examples/GitHubSignup/UsingVanillaObservables/GitHubSignupViewController1.swift
	RxExample/RxExample/Examples/ImagePicker/UIImagePickerController+RxCreate.swift
	RxExample/RxExample/Examples/OSX simple example/IntroductionExampleViewController.swift
	RxExample/RxExample/Examples/SimpleTableViewExample/SimpleTableViewExampleViewController.swift
	RxExample/RxExample/Examples/SimpleTableViewExampleSectioned/SimpleTableViewExampleSectionedViewController.swift
	RxExample/RxExample/Examples/SimpleValidation/SimpleValidationViewController.swift
	RxExample/RxExample/Examples/TableViewPartialUpdates/PartialUpdatesViewController.swift
	RxExample/RxExample/Examples/TableViewWithEditingCommands/TableViewWithEditingCommandsViewController.swift
	RxExample/RxExample/Examples/WikipediaImageSearch/Views/WikipediaSearchCell.swift
	RxExample/RxExample/Examples/WikipediaImageSearch/Views/WikipediaSearchViewController.swift
	Tests/RxCocoaTests/DelegateProxyTest.swift
	Tests/RxCocoaTests/KVOObservableTests.swift
	Tests/RxCocoaTests/RxTest+Controls.swift
	Tests/RxCocoaTests/UICollectionView+RxTests.swift
	Tests/RxCocoaTests/UIScrollView+RxTests.swift
	Tests/RxCocoaTests/UITableView+RxTests.swift
2016-08-15 12:17:26 +02:00
Mo Ramezanpoor
75971c61c6 Replaces all calls to AnonymousDisposable.init() with Disposables.create(). 2016-08-10 15:00:29 +01:00
Mo Ramezanpoor
64526c8dcd Replaces all calls to StableCompositeDisposable.create() with Disposables.create(). 2016-08-10 14:49:21 +01:00
Mo Ramezanpoor
1fe15bb9da Replaces all calls to NopDisposable.instance with Disposables.create(). 2016-08-10 14:47:53 +01:00
Mo Ramezanpoor
2812da1f5e Replace immutable initialisations of CompositeDisposable with Disposables.create().
The factory methods will select specialised implementations based on the case.
2016-08-10 14:27:45 +01:00
Jérôme Alves
10ff55cfba Moves RxCocoa extensions from rx_ syntax to rx. syntax.
The main work is done in this commit but the feature it's still "work in progress"
2016-08-09 00:17:38 +02:00
Krunoslav Zaher
aef4e69339 Modernizes APIs. 2016-08-07 20:14:19 +02:00
Krunoslav Zaher
3637153169 Fixes warnings. 2016-08-07 18:59:36 +02:00
Krunoslav Zaher
d1cde77b18 Modernizes image view extensions. 2016-08-07 18:08:13 +02:00
Krunoslav Zaher
afd40f5d8b Modernizes UICollectionView extensions. 2016-08-07 16:48:25 +02:00
Krunoslav Zaher
1b0e0a3c88 Updates RxDataSources. 2016-08-07 16:12:16 +02:00
Krunoslav Zaher
38c45c066d Example compilation fixes. 2016-08-04 10:56:09 +02:00
Krunoslav Zaher
01d86ff684 Fixes OSX compilation issues. 2016-08-04 10:48:36 +02:00
Krunoslav Zaher
2ead37809e Fixes example app compiling. 2016-08-04 10:44:46 +02:00
Yuki Nagai
7f84ec604e WIP. Update for Xcode 8 beta 4. 2016-08-02 15:46:11 +09:00
Krunoslav Zaher
490b6cbbc5 Merge pull request #790 from sunshinejr/swift-3.0
[Swift 3.0] Remove first parameter names for Observables.
2016-07-29 12:11:35 +02:00
Łukasz Mróz
181a94bbc9 [Swift3] doOn syntax. 2016-07-25 20:39:01 +02:00
Krunoslav Zaher
f3f2b0e083 Updates to Swift 3.0 2016-07-22 22:34:34 +02:00
Cameron Pulsford
5c908f18b8 Adds further Xcode 8 beta 3 fixes. 2016-07-19 18:42:18 -04:00
Krunoslav Zaher
9cac0cc234 Adaptations for Swift 3.0. 2016-07-10 14:55:18 +02:00
Krunoslav Zaher
1124f40ef1 Fixes Swift version. 2016-07-10 12:45:41 +02:00
Krunoslav Zaher
03fae9de6f Changes deployment target for example app. 2016-07-10 12:39:02 +02:00
Krunoslav Zaher
e222e52223 Deletes RxExample-iOS-no-module scheme. 2016-07-09 23:11:54 +02:00
Krunoslav Zaher
bce8e9cd2d Fixes example app. 2016-07-07 23:50:38 +02:00
sergdort
cfb8b1558a Merge branch 'master' into swift-3.0
Conflicts:
	RxExample/RxDataSources/DataSources/CollectionViewSectionedDataSource.swift
	RxExample/RxDataSources/DataSources/Differentiator.swift
	RxExample/RxDataSources/DataSources/TableViewSectionedDataSource.swift
	RxExample/RxExample.xcodeproj/project.pbxproj
	RxExample/RxExample.xcodeproj/xcshareddata/xcschemes/RxExample-iOS-no-module.xcscheme
	RxExample/RxExample/Examples/TableViewPartialUpdates/PartialUpdatesViewController.swift
	RxExample/RxExample/Examples/TableViewWithEditingCommands/TableViewWithEditingCommandsViewController.swift
	RxExample/RxExample/Services/HtmlParsing.swift
	Tests/RxCocoaTests/CLLocationManager+RxTests.swift
	Tests/RxCocoaTests/UICollectionView+RxTests.swift
2016-07-05 18:00:36 +03:00
Krunoslav Zaher
95ee9d0de8 Fixes problem with editing UITableView example. #768 2016-07-04 20:55:54 +02:00
Krunoslav Zaher
56e09abb11 Fixes problem with Swift 2.3 2016-07-04 07:02:49 +02:00
Krunoslav Zaher
f51151c3d2 Fixes RandomAPI response Parsing. 2016-07-04 04:25:21 +02:00
Krunoslav Zaher
2787393621 Fixes for Xcode 7.3.1 2016-07-04 04:06:01 +02:00
Krunoslav Zaher
bce72a2617 Fixes headers. 2016-07-04 02:54:32 +02:00
Krunoslav Zaher
88f718ffc3 Updates latest version of data sources. 2016-07-04 02:06:08 +02:00
Krunoslav Zaher
e20ac5fbb7 Adds simple data source usage examples in inline docs. 2016-07-04 01:42:26 +02:00
Krunoslav Zaher
c0939e1b4e Removes RxExample-no-module scheme. 2016-07-03 16:05:46 +02:00
Krunoslav Zaher
5a9771e818 Removes no-module version. 2016-06-30 10:51:05 +02:00
Douglas Heriot
5a566ae183 Fix RxExample for Xcode 8, Swift 2.3 2016-06-29 22:54:12 +10:00
Jamie Pinkham
c719c8cf86 fix compiler warnings about unused variables 2016-06-22 10:16:49 -04:00
Jamie Pinkham
5a9f47262a Merge branch 'upstream-develop' into swift-3.0
# Conflicts:
#	RxCocoa/Common/CocoaUnits/Driver/Driver+Subscription.swift
#	RxCocoa/Common/CocoaUnits/UIBindingObserver.swift
#	RxSwift/Schedulers/MainScheduler.swift
2016-06-22 09:54:44 -04:00
Jamie Pinkham
db4c04dcea use Foundation.Timer
and fix result of call unused warning
2016-06-22 09:51:01 -04:00
Jamie Pinkham
a5f19de922 fix reachability 2016-06-21 08:45:00 -04:00
Jamie Pinkham
8bad8e547f fix wireframe for mac tests 2016-06-20 14:06:36 -04:00
Jamie Pinkham
ced6ce3a7e fixes the unit tests for the rx ios example 2016-06-20 14:04:42 -04:00
Jamie Pinkham
c35136fe0b get example projects working.. woo! 2016-06-18 15:21:44 -07:00
Jamie Pinkham
39a20441e1 begin fixing up the examples 2016-06-18 01:24:07 -07:00
Jamie Pinkham
c4cf2e0d12 builds ios, ios rx cocoa and ios rx blocking 2016-06-17 23:19:16 -07:00
Jamie Pinkham
0e38ecbc87 Merge branch 'develop' into swift-3.0
# Conflicts:
#	Documentation/DesignRationale.md
#	Rx.playground/Pages/Introduction.xcplaygroundpage/Contents.swift
#	RxCocoa/Common/DelegateProxyType.swift
#	RxCocoa/iOS/UICollectionView+Rx.swift
#	RxCocoa/iOS/UIControl+Rx.swift
#	RxCocoa/iOS/UIScrollView+Rx.swift
#	RxCocoa/iOS/UITableView+Rx.swift
#	RxExample/RxDataSources/DataSources+Rx/ObservableConvertibleType+Differentiator.swift
#	RxSwift/Concurrency/Lock.swift
#	RxSwift/Disposables/CompositeDisposable.swift
#	RxSwift/Event.swift
#	RxSwift/Extensions/String+Rx.swift
#	RxSwift/Schedulers/OperationQueueScheduler.swift
2016-06-17 21:14:06 -07:00
Krunoslav Zaher
96b269dc5f Documents <-> internals better. 2016-06-14 23:44:44 +02:00
Krunoslav Zaher
c52090aee2 Patches the problem with <-> clearing the value on return. Correct solution is still unknown. 2016-06-10 11:26:10 +02:00
Scott Gardner
ab4c845d46 Minor update to Rx.playground 2016-06-08 06:44:00 -05:00