Merge pull request #13 from carlosypunto/master

 update to RxSwift 4.0

.gitignore

@@ -29,5 +29,4 @@ Carthage
 # 
 # Note: if you ignore the Pods directory, make sure to uncomment
 # `pod install` in .travis.yml
-#
-#Example/Pods/
+Example/Pods/

.travis.yml

@@ -2,8 +2,24 @@
 # * http://www.objc.io/issue-6/travis-ci.html
 # * https://github.com/supermarin/xcpretty#usage
 
-osx_image: xcode8
+os: osx
+osx_image: xcode9.1
 language: objective-c
+sudo: required
+env:
+  global:
+    - WORKSPACE="Example/RxSegue.xcworkspace"
+    - SCHEME="RxSegue-Example"
+    - IOS_SDK="iphonesimulator11.1"
+    - DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=11.1"
+before_install:
+- gem install cocoapods # Since Travis is not always on latest version
+- cd Example && pod update && cd ..
 script:
-- set -o pipefail && xcodebuild -workspace 'Example/RxSegue.xcworkspace' -scheme 'RxSegue-Example' -configuration 'Debug' -sdk iphonesimulator -destination platform='iOS Simulator',OS='10.0',name='iPhone 7' build test  | xcpretty -c --test
-#- pod lib lint
+- set -o pipefail
+- xcodebuild clean build test
+    -workspace "$WORKSPACE"
+    -scheme "$SCHEME"
+    -configuration Release
+    -sdk "$IOS_SDK"
+    -destination "$DESTINATION"

Cartfile

@@ -1 +1 @@
-github "ReactiveX/RxSwift" ~> 3.0
+github "ReactiveX/RxSwift" ~> 4.0

Cartfile.resolved

@@ -1 +1 @@
-github "ReactiveX/RxSwift" "3.0.0"
+github "ReactiveX/RxSwift" "4.0.0"

Example/Podfile

@@ -1,29 +1,28 @@
-platform :"ios", "8.0"
+platform :ios, '8.0'
 source 'https://github.com/CocoaPods/Specs.git'
 use_frameworks!
 
 target 'RxSegue_Example' do
-  pod "RxSegue", :path => "../"
-  pod 'RxCocoa', '~> 3.0'
+  pod 'RxSegue', :path => '../'
+  pod 'RxCocoa', '~> 4.0'
 end
 
 target 'RxSegue_Tests' do
-  pod "RxSegue", :path => "../"
-
-  pod 'Nimble'
+  pod 'RxSegue', :path => '../'
+  pod 'Nimble', '~> 7.0'
 end
 
 post_install do |installer|
     installer.pods_project.targets.each do |target|
         target.build_configurations.each do |config|
-            config.build_settings['SWIFT_VERSION'] = '3.0'
-        end
-        if target.name == 'RxSwift' || target.name == 'RxCocoa'
-            target.build_configurations.each do |config|
-                if config.name == 'Debug'
-                    config.build_settings['OTHER_SWIFT_FLAGS'] = ['$(inherited)', '-D', 'TRACE_RESOURCES']
-                end
-            end
+            config.build_settings['SWIFT_VERSION'] = '4.0'
         end
+#        if target.name == 'RxSwift' || target.name == 'RxCocoa'
+#            target.build_configurations.each do |config|
+#                if config.name == 'Debug'
+#                    config.build_settings['OTHER_SWIFT_FLAGS'] = ['$(inherited)', '-D', 'TRACE_RESOURCES']
+#                end
+#            end
+#        end
     end
 end

Example/Podfile.lock

@@ -1,26 +1,26 @@
 PODS:
-  - Nimble (5.1.1)
-  - RxCocoa (3.0.1):
-    - RxSwift (~> 3.0)
-  - RxSegue (1.0.1):
-    - RxSwift (~> 3.0)
-  - RxSwift (3.0.1)
+  - Nimble (7.0.3)
+  - RxCocoa (4.0.0):
+    - RxSwift (~> 4.0)
+  - RxSegue (2.0.0):
+    - RxSwift (~> 4.0)
+  - RxSwift (4.0.0)
 
 DEPENDENCIES:
-  - Nimble
-  - RxCocoa (~> 3.0)
+  - Nimble (~> 7.0)
+  - RxCocoa (~> 4.0)
   - RxSegue (from `../`)
 
 EXTERNAL SOURCES:
   RxSegue:
-    :path: "../"
+    :path: ../
 
 SPEC CHECKSUMS:
-  Nimble: 415e3aa3267e7bc2c96b05fa814ddea7bb686a29
-  RxCocoa: 15a52fc590dcc700cb4a690a633b5c5184ce3a78
-  RxSegue: 3c71cc77860e2deb500eadf8af99a96e4a3d858e
-  RxSwift: af5680055c4ad04480189c52d28385b1029493a6
+  Nimble: 7f5a9c447a33002645a071bddafbfb24ea70e0ac
+  RxCocoa: d62846ca96495d862fa4c59ea7d87e5031d7340e
+  RxSegue: 5a6d41926f293a635bd9d11149b01ee131d0c601
+  RxSwift: fd680d75283beb5e2559486f3c0ff852f0d35334
 
-PODFILE CHECKSUM: 8344bcee7f331568f9f73fd121c822191b790a5a
+PODFILE CHECKSUM: 680337950b11ffdc8bffd61e0f44610cbaa38511
 
-COCOAPODS: 1.2.0.beta.1
+COCOAPODS: 1.3.1