Merge pull request #107 from Carthage/reactiveswift-4.0

tmspzz · web-flow · commit eae241506b05 · 2018-07-20T17:50:28.000+02:00
Update ReactiveSwift to 4.0
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.0
+4.1.2
diff --git a/.travis.yml b/.travis.yml
@@ -6,13 +6,13 @@ branches:
 matrix:
   include:
     - os: osx
-      osx_image: xcode9.1
+      osx_image: xcode9.4
       xcode_scheme: ReactiveTask
       script:
         - set -o pipefail && xcodebuild -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "$TRAVIS_XCODE_SCHEME" test | xcpretty
-      env: JOB=Xcode9
+      env: JOB=Xcode9.4
     - os: osx
-      osx_image: xcode9.1
+      osx_image: xcode9.4
       script:
         - swift --version
         - swift build
@@ -39,4 +39,4 @@ deploy:
   on:
     repo: Carthage/ReactiveTask
     tags: true
-    condition: $JOB = Xcode9
+    condition: $JOB = Xcode9.4
diff --git a/Cartfile b/Cartfile
@@ -1,2 +1,2 @@
-github "antitypical/Result" ~> 3.2.1
-github "ReactiveCocoa/ReactiveSwift" ~> 3.0
+github "antitypical/Result" ~> 4.0
+github "ReactiveCocoa/ReactiveSwift" ~> 4.0
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,3 +1,3 @@
 github "jspahrsummers/xcconfigs" "3d9d996"
-github "Quick/Quick" ~> 1.2
-github "Quick/Nimble" ~> 7.0.2
+github "Quick/Quick" ~> 1.3.1
+github "Quick/Nimble" ~> 7.1.3
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,5 +1,5 @@
-github "Quick/Nimble" "v7.0.2"
-github "Quick/Quick" "v1.2.0"
-github "ReactiveCocoa/ReactiveSwift" "3.0.0"
-github "antitypical/Result" "3.2.4"
+github "Quick/Nimble" "v7.1.3"
+github "Quick/Quick" "v1.3.1"
+github "ReactiveCocoa/ReactiveSwift" "4.0.0"
+github "antitypical/Result" "4.0.0"
 github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
@@ -1 +1 @@
-Subproject commit 38c9ab0846a3fbec308eb2aa9ef68b10a7434eb4
+Subproject commit 9c1379fdcd58c4f2278aea5e029394ba9a2b8f07
diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick
@@ -1 +1 @@
-Subproject commit 0ff81f2c665b4381f526bd656f8708dd52a9ea2f
+Subproject commit b060679e70d13c3c7dcd124201b5b1b34ce6f340
diff --git a/Carthage/Checkouts/ReactiveSwift b/Carthage/Checkouts/ReactiveSwift
@@ -1 +1 @@
-Subproject commit 2ec944c43ef9cf6b1380629e3ea483f62a7afaef
+Subproject commit 4f6a12ae6762e825b0e19a4f7076eafa43847e6e
diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result
@@ -1 +1 @@
-Subproject commit 7477584259bfce2560a19e06ad9f71db441fff11
+Subproject commit 8fc088dcf72802801efeecba76ea8fb041fb773d
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -7,10 +7,10 @@ let package = Package(
         .library(name: "ReactiveTask", targets: ["ReactiveTask"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/antitypical/Result.git", from: "3.2.1"),
-        .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", from: "3.0.0"),
-        .package(url: "https://github.com/Quick/Quick.git", from: "1.2.0"),
-        .package(url: "https://github.com/Quick/Nimble.git", from: "7.0.2"),
+        .package(url: "https://github.com/antitypical/Result.git", from: "4.0.0"),
+        .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", from: "4.0.0"),
+        .package(url: "https://github.com/Quick/Quick.git", from: "1.3.1"),
+        .package(url: "https://github.com/Quick/Nimble.git", from: "7.1.3"),
     ],
     targets: [
         .target(name: "ReactiveTask", dependencies: ["Result", "ReactiveSwift"], path: "Sources"),
diff --git a/ReactiveTask.xcodeproj/project.pbxproj b/ReactiveTask.xcodeproj/project.pbxproj
@@ -275,7 +275,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0940;
 				ORGANIZATIONNAME = Carthage;
 				TargetAttributes = {
 					D0BFEA571A2D1E5E00E23194 = {
@@ -391,6 +391,7 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				SDKROOT = macosx;
+				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 4.0;
 				VERSIONING_SYSTEM = "apple-generic";
diff --git a/ReactiveTask.xcodeproj/xcshareddata/xcschemes/ReactiveTask.xcscheme b/ReactiveTask.xcodeproj/xcshareddata/xcschemes/ReactiveTask.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -40,7 +40,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -70,7 +69,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/ReactiveTask.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ReactiveTask.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/ReactiveTask.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ReactiveTask.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildSystemType</key>
+	<string>Latest</string>
+</dict>
+</plist>
