Merge pull request #112 from mattprowse/reactiveswift-5.0

ikesyo · web-flow · commit 699e6ac560d2 · 2019-04-03T10:10:23.000+09:00
Update ReactiveSwift to 5.0
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.1.2
+4.2
diff --git a/.travis.yml b/.travis.yml
@@ -6,13 +6,13 @@ branches:
 matrix:
   include:
     - os: osx
-      osx_image: xcode9.4
+      osx_image: xcode10.1
       xcode_scheme: ReactiveTask
       script:
         - set -o pipefail && xcodebuild -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "$TRAVIS_XCODE_SCHEME" test | xcpretty
-      env: JOB=Xcode9.4
+      env: JOB=Xcode10.1
     - os: osx
-      osx_image: xcode9.4
+      osx_image: xcode10.1
       script:
         - swift --version
         - swift build
@@ -21,8 +21,9 @@ matrix:
         submodules: false
       env: JOB=SWIFTPM_DARWIN
     - os: osx
-      osx_image: xcode9.4
+      osx_image: xcode10.1
       script:
+        - gem update cocoapods
         - pod repo update
         - pod lib lint
 notifications:
@@ -44,4 +45,4 @@ deploy:
   on:
     repo: Carthage/ReactiveTask
     tags: true
-    condition: $JOB = Xcode9.4
+    condition: $JOB = Xcode10.1
diff --git a/Cartfile b/Cartfile
@@ -1,2 +1,2 @@
-github "antitypical/Result" ~> 4.0
-github "ReactiveCocoa/ReactiveSwift" ~> 4.0
+github "antitypical/Result" ~> 4.1
+github "ReactiveCocoa/ReactiveSwift" ~> 5.0
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,3 +1,3 @@
 github "jspahrsummers/xcconfigs" "3d9d996"
-github "Quick/Quick" ~> 1.3.1
-github "Quick/Nimble" ~> 7.1.3
+github "Quick/Quick" ~> 2.0
+github "Quick/Nimble" ~> 8.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,5 +1,5 @@
-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 "Quick/Nimble" "v8.0.1"
+github "Quick/Quick" "v2.0.0"
+github "ReactiveCocoa/ReactiveSwift" "5.0.0"
+github "antitypical/Result" "4.1.0"
 github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
@@ -1 +1 @@
-Subproject commit 9c1379fdcd58c4f2278aea5e029394ba9a2b8f07
+Subproject commit 43304bf2b1579fd555f2fdd51742771c1e4f2b98
diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick
@@ -1 +1 @@
-Subproject commit b060679e70d13c3c7dcd124201b5b1b34ce6f340
+Subproject commit 0b4ed6c706dd0cce923b5019a605a9bcc6b1b600
diff --git a/Carthage/Checkouts/ReactiveSwift b/Carthage/Checkouts/ReactiveSwift
@@ -1 +1 @@
-Subproject commit 4f6a12ae6762e825b0e19a4f7076eafa43847e6e
+Subproject commit e285cea17cca8e23928d1e85a235638184e39ac9
diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result
@@ -1 +1 @@
-Subproject commit 8fc088dcf72802801efeecba76ea8fb041fb773d
+Subproject commit 2ca499ba456795616fbc471561ff1d963e6ae160
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: "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"),
+        .package(url: "https://github.com/antitypical/Result.git", from: "4.1.0"),
+        .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", from: "5.0.0"),
+        .package(url: "https://github.com/Quick/Quick.git", from: "2.0.0"),
+        .package(url: "https://github.com/Quick/Nimble.git", from: "8.0.1")
     ],
     targets: [
         .target(name: "ReactiveTask", dependencies: ["Result", "ReactiveSwift"], path: "Sources"),
diff --git a/ReactiveTask.podspec b/ReactiveTask.podspec
@@ -16,11 +16,11 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/Carthage/ReactiveTask.git", :tag => "#{s.version}" }
   # Directory glob for all Swift files
   s.source_files  = "Sources/*.{swift}"
-  s.dependency 'Result', '~> 4.0'
-  s.dependency 'ReactiveSwift', '~> 4.0'
+  s.dependency 'Result', '~> 4.1'
+  s.dependency 'ReactiveSwift', '~> 5.0'
 
   s.pod_target_xcconfig = {"OTHER_SWIFT_FLAGS[config=Release]" => "$(inherited) -suppress-warnings" }
 
   s.cocoapods_version = ">= 1.4.0"
-  s.swift_version = "4.1.2"
-end
+  s.swift_version = "4.2"
+end
diff --git a/ReactiveTask.xcodeproj/project.pbxproj b/ReactiveTask.xcodeproj/project.pbxproj
@@ -280,11 +280,11 @@
 				TargetAttributes = {
 					D0BFEA571A2D1E5E00E23194 = {
 						CreatedOnToolsVersion = 6.1.1;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 1010;
 					};
 					D0BFEA621A2D1E5E00E23194 = {
 						CreatedOnToolsVersion = 6.1.1;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 1010;
 					};
 				};
 			};
@@ -371,7 +371,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -393,7 +393,7 @@
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -434,6 +434,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = Tests/ReactiveTaskTests/Info.plist;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -448,6 +449,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = Tests/ReactiveTaskTests/Info.plist;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -468,7 +470,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				SDKROOT = macosx;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -496,6 +498,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = Tests/ReactiveTaskTests/Info.plist;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -516,7 +519,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				SDKROOT = macosx;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -544,6 +547,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = Tests/ReactiveTaskTests/Info.plist;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
