Merge pull request #25 from vadymmarkov/swift4

Update project and source code to Swift 4
vadymmarkov · Sep 19, 2017 · 79c6f58 · 79c6f58
2 parents 20b7f7f + 7270936
commit 79c6f58
Show file tree

Hide file tree

Showing 18 changed files with 148 additions and 100 deletions.
diff --git a/.slather.yml b/.slather.yml
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-3.1
+4.0
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-osx_image: xcode8.3
+osx_image: xcode9
 language: swift
 
 before_install:
@@ -11,3 +11,8 @@ script:
 - xcodebuild test -project When.xcodeproj -scheme "When-Mac" -sdk macosx | xcpretty
 - xcodebuild clean build -project When.xcodeproj -scheme "When-iOS" -sdk iphonesimulator | xcpretty
 - xcodebuild test -project When.xcodeproj -scheme "When-iOS" -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.0' | xcpretty
+- xcodebuild clean build -project When.xcodeproj -scheme "When-tvOS" -destination 'platform=tvOS Simulator,name=Apple TV 1080p,OS=10.0' | xcpretty
+- xcodebuild test -project When.xcodeproj -scheme "When-tvOS" -destination 'platform=tvOS Simulator,name=Apple TV 1080p,OS=10.0' | xcpretty && exit ${PIPESTATUS[0]}
+
+notifications:
+  email: false
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,3 +1,3 @@
-github "Quick/Nimble" "v6.1.0"
+github "Quick/Nimble" "v7.0.1"
 github "Quick/Quick" "v1.1.0"
-github "ReactiveX/RxSwift" "3.4.0"
+github "ReactiveX/RxSwift" "3.6.1"
diff --git a/Sources/RxWhen/Promise+Rx.swift b/Sources/RxWhen/Promise+Rx.swift
@@ -6,7 +6,6 @@ import RxSwift
 // MARK: - Observable
 
 extension Promise: ObservableConvertibleType {
-
   public func asObservable() -> Observable<T> {
     return Observable.create({ observer in
       self

diff --git a/When.xcodeproj/project.pbxproj b/When.xcodeproj/project.pbxproj
diff --git a/When.xcodeproj/xcshareddata/xcschemes/RxWhen-iOS.xcscheme b/When.xcodeproj/xcshareddata/xcschemes/RxWhen-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -36,6 +37,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/...cshareddata/xcschemes/RxWhen-Mac.xcscheme → ...hareddata/xcschemes/RxWhen-macOS.xcscheme b/...cshareddata/xcschemes/RxWhen-Mac.xcscheme → ...hareddata/xcschemes/RxWhen-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -16,7 +16,7 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "D58B2C4F1E4130710099F6D7"
                BuildableName = "RxWhen.framework"
-               BlueprintName = "RxWhen-Mac"
+               BlueprintName = "RxWhen-macOS"
                ReferencedContainer = "container:When.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -36,6 +37,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
@@ -47,7 +49,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "D58B2C4F1E4130710099F6D7"
             BuildableName = "RxWhen.framework"
-            BlueprintName = "RxWhen-Mac"
+            BlueprintName = "RxWhen-macOS"
             ReferencedContainer = "container:When.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -65,7 +67,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "D58B2C4F1E4130710099F6D7"
             BuildableName = "RxWhen.framework"
-            BlueprintName = "RxWhen-Mac"
+            BlueprintName = "RxWhen-macOS"
             ReferencedContainer = "container:When.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/When.xcodeproj/xcshareddata/xcschemes/RxWhen-tvOS.xcscheme b/When.xcodeproj/xcshareddata/xcschemes/RxWhen-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -36,6 +37,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/When.xcodeproj/xcshareddata/xcschemes/When-iOS.xcscheme b/When.xcodeproj/xcshareddata/xcschemes/When-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -55,6 +56,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/.../xcshareddata/xcschemes/When-Mac.xcscheme → ...cshareddata/xcschemes/When-macOS.xcscheme b/.../xcshareddata/xcschemes/When-Mac.xcscheme → ...cshareddata/xcschemes/When-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -16,7 +16,21 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "D5C6293F1C3A7FAA007F7B7C"
                BuildableName = "When.framework"
-               BlueprintName = "When-Mac"
+               BlueprintName = "When-macOS"
+               ReferencedContainer = "container:When.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D5C629481C3A7FAA007F7B7C"
+               BuildableName = "When-macOS-Tests.xctest"
+               BlueprintName = "When-macOS-Tests"
                ReferencedContainer = "container:When.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -26,15 +40,16 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "D5C629481C3A7FAA007F7B7C"
-               BuildableName = "When-Mac-Tests.xctest"
-               BlueprintName = "When-Mac-Tests"
+               BuildableName = "When-macOS-Tests.xctest"
+               BlueprintName = "When-macOS-Tests"
                ReferencedContainer = "container:When.xcodeproj">
             </BuildableReference>
          </TestableReference>
@@ -44,7 +59,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "D5C6293F1C3A7FAA007F7B7C"
             BuildableName = "When.framework"
-            BlueprintName = "When-Mac"
+            BlueprintName = "When-macOS"
             ReferencedContainer = "container:When.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -55,6 +70,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
@@ -66,7 +82,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "D5C6293F1C3A7FAA007F7B7C"
             BuildableName = "When.framework"
-            BlueprintName = "When-Mac"
+            BlueprintName = "When-macOS"
             ReferencedContainer = "container:When.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -84,7 +100,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "D5C6293F1C3A7FAA007F7B7C"
             BuildableName = "When.framework"
-            BlueprintName = "When-Mac"
+            BlueprintName = "When-macOS"
             ReferencedContainer = "container:When.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/When.xcodeproj/xcshareddata/xcschemes/When-tvOS.xcscheme b/When.xcodeproj/xcshareddata/xcschemes/When-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -55,6 +56,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/WhenTests/Shared/FunctionsSpec.swift b/WhenTests/Shared/FunctionsSpec.swift
@@ -3,7 +3,6 @@ import Nimble
 @testable import When
 
 class FunctionsSpec: QuickSpec {
-
   override func spec() {
     describe("Functions") {
       describe("#then") {

diff --git a/WhenTests/Shared/PromiseSpec.swift b/WhenTests/Shared/PromiseSpec.swift
@@ -3,7 +3,6 @@ import Nimble
 @testable import When
 
 class PromiseSpec: QuickSpec {
-
   override func spec() {
     describe("Promise") {
       var promise: Promise<String>!

diff --git a/WhenTests/Shared/ResultSpec.swift b/WhenTests/Shared/ResultSpec.swift
@@ -3,7 +3,6 @@ import Nimble
 @testable import When
 
 class ResultSpec: QuickSpec {
-
   override func spec() {
     describe("Result") {
       var result: Result<String>!

diff --git a/WhenTests/Shared/StateSpec.swift b/WhenTests/Shared/StateSpec.swift
@@ -3,7 +3,6 @@ import Nimble
 @testable import When
 
 class StateSpec: QuickSpec {
-
   override func spec() {
     describe("State") {
       var state: State<String>!

diff --git a/bin/bootstrap b/bin/bootstrap
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+carthage bootstrap
+cp Cartfile.resolved Carthage
diff --git a/bin/bootstrap-if-needed b/bin/bootstrap-if-needed
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if ! cmp -s Cartfile.resolved Carthage/Cartfile.resolved; then
+  bin/bootstrap
+fi