Merge pull request #96 from Carthage/update-deps

mdiep · web-flow · commit 69f88d466099 · 2017-06-13T09:05:42.000-04:00
Update dependencies
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,6 @@ matrix:
     - os: osx
       osx_image: xcode8.3
       script:
-        - swift package update
         - swift build
         - SWIFTPM_TEST_ReactiveTask=YES swift test
       env: JOB=SWIFTPM_DARWIN
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,3 +1,3 @@
 github "jspahrsummers/xcconfigs" "3d9d996"
 github "Quick/Quick" ~> 1.1
-github "Quick/Nimble" ~> 6.1
+github "Quick/Nimble" ~> 7.0.1
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,5 +1,5 @@
-github "Quick/Nimble" "v6.1.0"
+github "Quick/Nimble" "v7.0.1"
 github "Quick/Quick" "v1.1.0"
-github "ReactiveCocoa/ReactiveSwift" "1.1.0"
-github "antitypical/Result" "3.2.1"
+github "ReactiveCocoa/ReactiveSwift" "1.1.3"
+github "antitypical/Result" "3.2.3"
 github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
@@ -1 +1 @@
-Subproject commit e3c1a78af33b3fa778207fcc6ba33221838c0788
+Subproject commit 39b67002306fda9de4c9fd1290a6295f97edd09e
diff --git a/Carthage/Checkouts/ReactiveSwift b/Carthage/Checkouts/ReactiveSwift
@@ -1 +1 @@
-Subproject commit c83de32f1adbcef89618cde4222f69a8bcecd7c2
+Subproject commit 92d73573a1b097e70fa56084e41b1af7272ad1ab
diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result
@@ -1 +1 @@
-Subproject commit 2af7c146071c8d8fb3953f19924ecebf15c88ea7
+Subproject commit c8446185238659a2b27c0261f64ff1254291d07d
diff --git a/Package.pins b/Package.pins
@@ -5,7 +5,7 @@
       "package": "Nimble",
       "reason": null,
       "repositoryURL": "https://github.com/Quick/Nimble.git",
-      "version": "6.1.0"
+      "version": "7.0.1"
     },
     {
       "package": "Quick",
@@ -17,13 +17,13 @@
       "package": "ReactiveSwift",
       "reason": null,
       "repositoryURL": "https://github.com/ReactiveCocoa/ReactiveSwift.git",
-      "version": "1.1.1"
+      "version": "1.1.3"
     },
     {
       "package": "Result",
       "reason": null,
       "repositoryURL": "https://github.com/antitypical/Result.git",
-      "version": "3.2.1"
+      "version": "3.2.3"
     }
   ],
   "version": 1
diff --git a/Package.swift b/Package.swift
@@ -15,7 +15,7 @@ let package = Package(
         if isSwiftPackagerManagerTest {
             deps += [
                 .Package(url: "https://github.com/Quick/Quick.git", majorVersion: 1, minor: 1),
-                .Package(url: "https://github.com/Quick/Nimble.git", majorVersion: 6, minor: 1),
+                .Package(url: "https://github.com/Quick/Nimble.git", majorVersion: 7),
             ]
         }
         return deps

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ let package = Package(`
`15`	`15`	`if isSwiftPackagerManagerTest {`
`16`	`16`	`deps += [`
`17`	`17`	`.Package(url: "https://github.com/Quick/Quick.git", majorVersion: 1, minor: 1),`
`18`		`- .Package(url: "https://github.com/Quick/Nimble.git", majorVersion: 6, minor: 1),`
	`18`	`+ .Package(url: "https://github.com/Quick/Nimble.git", majorVersion: 7),`
`19`	`19`	`]`
`20`	`20`	`}`
`21`	`21`	`return deps`