Merge pull request #323 from CodaFi/call-of-the-postal-horn

CodaFi · web-flow · commit 82bf915555ef · 2017-01-21T16:39:43.000-07:00
Call of the postal horn
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ matrix:
   include:
     - os: osx
       language: objective-c
-      osx_image: xcode8
+      osx_image: xcode8.2
       before_install:
         - git submodule update --init --recursive
       script:
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,4 +1,4 @@
-github "typelift/Swiftx" 
+github "typelift/Swiftx" "master"
 github "typelift/SwiftCheck"
 github "typelift/Operadics"
 
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,3 +1,3 @@
 github "typelift/Operadics" "0.2.2"
 github "typelift/SwiftCheck" "0.7.2"
-github "typelift/Swiftx" "0.5.1"
+github "typelift/Swiftx" "7945839e1a173911879a3552a5d2265554d9337b"
diff --git a/Carthage/Checkouts/Swiftx b/Carthage/Checkouts/Swiftx
@@ -1 +1 @@
-Subproject commit ab348687a4de14628ddc9f4a84b1d48928921e8f
+Subproject commit 7945839e1a173911879a3552a5d2265554d9337b
diff --git a/Package.swift b/Package.swift
@@ -11,6 +11,3 @@ let package = Package(
 	]
 )
 
-let libSwiftz = Product(name: "Swiftz", type: .Library(.Dynamic), modules: "Swiftz")
-products.append(libSwiftz)
-

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,3 @@ let package = Package(`
`11`	`11`	`]`
`12`	`12`	`)`
`13`	`13`
`14`		`-let libSwiftz = Product(name: "Swiftz", type: .Library(.Dynamic), modules: "Swiftz")`
`15`		`-products.append(libSwiftz)`
`16`		`-`