Updates Carthage and CocoaPods

Author: kzaher

.gitignore

@@ -26,6 +26,7 @@ timeline.xctimeline
 # you should judge for yourself, the pros and cons are mentioned at:
 # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
 #
+Pods
 
 # Carthage
 #

.travis.yml

@@ -15,7 +15,6 @@ env:
   - BUILD="pod repo update && pod lib lint RxDataSources.podspec --verbose && pod lib lint Differentiator.podspec --verbose "
   - BUILD="carthage update --platform iOS  && carthage build --no-skip-current --platform iOS"
   - BUILD="carthage update --platform tvOS && carthage build --no-skip-current --platform tvOS"
-  - BUILD="swift test"
 
 script: eval "${BUILD}"
 

Cartfile.resolved

@@ -1 +1 @@
-github "ReactiveX/RxSwift" "4.0.0-beta.0"
+github "ReactiveX/RxSwift" "4.0.0"

Podfile

@@ -2,8 +2,8 @@ platform :ios, '8.0'
 use_frameworks!
 
 def common
-    pod 'RxSwift', :git => '[email protected]:ReactiveX/RxSwift.git', :branch => 'rxswift4.0-swift4.0'
-    pod 'RxCocoa', :git => '[email protected]:ReactiveX/RxSwift.git', :branch => 'rxswift4.0-swift4.0'
+    pod 'RxSwift', :git => '[email protected]:ReactiveX/RxSwift.git', :branch => 'master'
+    pod 'RxCocoa', :git => '[email protected]:ReactiveX/RxSwift.git', :branch => 'master'
 end
 
 target 'RxDataSources' do

RxDataSources.xcodeproj/project.pbxproj

@@ -1262,7 +1262,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = io.rx.Tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -1280,7 +1279,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = io.rx.Tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};