Merge pull request #34 from cruisediary/master

Compatibility with Swift 4.2
RxSwiftCommunity · Sep 25, 2018 · dfc2868 · dfc2868
2 parents a9e2d27 + 25c0248
commit dfc2868
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 20 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.0
+4.2
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,8 @@
-osx_image: xcode9
+osx_image: xcode10
 language: objective-c
 podfile: Demo/Podfile
 cache: cocoapods
 before_install:
   - gem install cocoapods -v '1.3.1'
   - pod repo update
-script: cd Demo ; set -o pipefail && xcodebuild -workspace 'Demo.xcworkspace' -scheme 'Demo' -configuration 'Debug' -sdk iphonesimulator -destination platform='iOS Simulator',OS='11.0',name='iPhone 8' build test  | xcpretty -c --test
+script: cd Demo ; set -o pipefail && xcodebuild -workspace 'Demo.xcworkspace' -scheme 'Demo' -configuration 'Debug' -sdk iphonesimulator -destination platform='iOS Simulator',OS='12.0',name='iPhone 8' build test  | xcpretty -c --test
diff --git a/Changelog.md b/Changelog.md
@@ -4,6 +4,11 @@
 
 - Nothing yet.
 
+## 4.3.0
+- Swift 4.2 support
+- Xcode 10 support
+- Update Demo supporting Xcode 10 with Swift 4.2
+
 ## 4.2.0
 
 - Updated RxSwift requirement. 

diff --git a/Demo/.swift-version b/Demo/.swift-version
@@ -1 +1 @@
-3.0
+4.2
diff --git a/Demo/Demo.xcodeproj/project.pbxproj b/Demo/Demo.xcodeproj/project.pbxproj
@@ -390,7 +390,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -436,7 +436,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -450,7 +450,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ashfurrow.Demo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -463,7 +463,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ashfurrow.Demo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -475,7 +475,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ashfurrow.DemoTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -487,7 +487,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ashfurrow.DemoTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

diff --git a/Demo/Demo/AppDelegate.swift b/Demo/Demo/AppDelegate.swift
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }

diff --git a/Demo/Podfile.lock b/Demo/Podfile.lock
@@ -1,13 +1,13 @@
 PODS:
-  - Nimble (7.3.0)
-  - Quick (1.3.1)
-  - RxBlocking (4.2.0):
+  - Nimble (7.3.1)
+  - Quick (1.3.2)
+  - RxBlocking (4.3.1):
     - RxSwift (~> 4.0)
   - RxNimble (4.2.0):
     - Nimble (~> 7.0)
     - RxBlocking (~> 4.0)
     - RxSwift (~> 4.2)
-  - RxSwift (4.2.0)
+  - RxSwift (4.3.1)
 
 DEPENDENCIES:
   - Nimble
@@ -26,11 +26,11 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Nimble: c8d6a1f463701921c46de965c673e13cafa09196
-  Quick: d17304d58d0d169dd0bd1c6e5c28e3318de32a1a
-  RxBlocking: e339d8a6e752e25ade95ff858466c55436668f59
+  Nimble: 04f732da099ea4d153122aec8c2a88fd0c7219ae
+  Quick: 2623cb30d7a7f41ca62f684f679586558f483d46
+  RxBlocking: 64c051285261ca2339481e91b5f70eb06b03660a
   RxNimble: cb8c3dd1ca79b83c60744f1c327130c1aef202a1
-  RxSwift: 99e10317ddfcc7fbe01356aafd118fde4a0be104
+  RxSwift: fe0fd770a43acdb7d0a53da411c9b892e69bb6e4
 
 PODFILE CHECKSUM: 7405369509db0cbd242146add66181ab5ab0efb0
 

diff --git a/RxNimble.podspec b/RxNimble.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "RxNimble"
-  s.version      = "4.2.0"
+  s.version      = "4.3.0"
   s.summary      = "Nimble extensions that making unit testing with RxSwift easier 🎉"
   s.description  = <<-DESC
     This library includes functions that make testing RxSwift projects easier with Nimble.