From c7379416359a203197517f57bd6f18a4609b735e Mon Sep 17 00:00:00 2001 From: Cruz Date: Wed, 26 Sep 2018 02:01:38 +0900 Subject: [PATCH 1/5] Update .swift-version to 4.2 --- .swift-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.swift-version b/.swift-version index 5186d07..bf77d54 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.0 +4.2 From 19ee23313bd9d7863b6d16ec6d43f468e9c9efef Mon Sep 17 00:00:00 2001 From: Cruz Date: Wed, 26 Sep 2018 02:01:50 +0900 Subject: [PATCH 2/5] Update .travis.yml to support xcode 10 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 266f413..471aa62 100644 --- 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 From 781bf9e91a217f4d90f8febe02b19d0b188be07c Mon Sep 17 00:00:00 2001 From: Cruz Date: Wed, 26 Sep 2018 01:56:22 +0900 Subject: [PATCH 3/5] Support Demo Xcode 10 with Swift 4.2 --- Demo/.swift-version | 2 +- Demo/Demo.xcodeproj/project.pbxproj | 12 ++++++------ Demo/Demo/AppDelegate.swift | 2 +- Demo/Podfile.lock | 16 ++++++++-------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Demo/.swift-version b/Demo/.swift-version index f398a20..bf77d54 100644 --- a/Demo/.swift-version +++ b/Demo/.swift-version @@ -1 +1 @@ -3.0 \ No newline at end of file +4.2 diff --git a/Demo/Demo.xcodeproj/project.pbxproj b/Demo/Demo.xcodeproj/project.pbxproj index 9adbc05..78d4d75 100644 --- 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 index b4c96d0..f4adb7a 100644 --- 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 index 2895ad8..30827b9 100644 --- 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 From 718d66f1f837b887d4cc8d575381989517971d71 Mon Sep 17 00:00:00 2001 From: Cruz Date: Wed, 26 Sep 2018 02:04:39 +0900 Subject: [PATCH 4/5] Update Changelog.md --- Changelog.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Changelog.md b/Changelog.md index f4179cc..55e4041 100644 --- 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. From 25c024862daa9fe51147ff32eef18ba919dfbec5 Mon Sep 17 00:00:00 2001 From: Cruz Date: Wed, 26 Sep 2018 02:04:56 +0900 Subject: [PATCH 5/5] Bumping version to 4.3.0 --- RxNimble.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RxNimble.podspec b/RxNimble.podspec index 31af6f0..340b4fb 100644 --- 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.