Merge pull request #51 from CodaFi/x-gon-give-it-to-you

Update to Swift 2.2

.travis.yml

@@ -1,13 +1,13 @@
 language: objective-c
-osx_image: xcode7.2
+osx_image: xcode7.3
 env:
     - TEST_CONFIG="RELEASE"
     - TEST_CONFIG="PODS"
 
 before_install: true
 install: true
 script: 
-    - if [[ "$TEST_CONFIG" == "RELEASE" ]]; then script/cibuild Swiftx Swiftx-iOS ; fi
+    - if [[ "$TEST_CONFIG" == "RELEASE" ]]; then script/cibuild Swiftx ; fi
     - if [[ "$TEST_CONFIG" == "RELEASE" ]]; then xcodebuild test -scheme Swiftx-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 1080p' ; fi
     - if [[ "$TEST_CONFIG" == "RELEASE" ]]; then xcodebuild build -scheme Swiftx-watchOS -destination 'platform=watchOS Simulator,name=Apple Watch - 42mm' ; fi
     - if [[ "$TEST_CONFIG" == "PODS" ]]; then pod lib lint; fi

Cartfile.resolved

@@ -1,2 +1,2 @@
-github "typelift/Operadics" "0.1.4"
-github "typelift/SwiftCheck" "v0.4.4"
+github "typelift/Operadics" "0.2.0"
+github "typelift/SwiftCheck" "v0.6.0"

Swiftx.podspec

@@ -36,6 +36,6 @@ Pod::Spec.new do |s|
     s.tvos.deployment_target = "9.1"
     s.watchos.deployment_target = "2.1"
     s.source   = { :git => "https://github.com/typelift/Swiftx.git", :tag => "v#{s.version}", :submodules => true }
-    s.source_files = "Swiftx/*.swift", "Carthage/Checkouts/Operadics/*.swift"
+    s.source_files = "Swiftx/*.swift", "Carthage/Checkouts/Operadics/Operators.swift"
 end
 

Swiftx.xcodeproj/project.pbxproj

@@ -1087,7 +1087,7 @@
 		84DF767C1B0BDE0A00C912B0 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1138,10 +1138,7 @@
 				APPLICATION_EXTENSION_API_ONLY = NO;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -1161,10 +1158,7 @@
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = NO;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = SwiftxTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.3;

Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx-iOS.xcscheme

@@ -22,10 +22,10 @@
          </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
-            buildForRunning = "YES"
+            buildForRunning = "NO"
             buildForProfiling = "NO"
             buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
+            buildForAnalyzing = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "84DF76711B0BDE0A00C912B0"

Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx.xcscheme

@@ -23,10 +23,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -52,11 +52,11 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
@@ -74,10 +74,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference

Swiftx/Combinators.swift

@@ -17,12 +17,7 @@ public func const<A, B>(x : A) -> B -> A {
 }
 
 /// Flip a function's arguments
-public func flip<A, B, C>(f : ((A, B) -> C), b : B, a : A) -> C {
-	return f(a, b)
-}
-
-/// Flip a function's arguments and return a function that takes the arguments in flipped order.
-public func flip<A, B, C>(f : (A, B) -> C)(b : B, a : A) -> C {
+public func flip<A, B, C>(f : ((A, B) -> C), _ b : B, _ a : A) -> C {
 	return f(a, b)
 }
 

Swiftx/Sections.swift

@@ -1095,14 +1095,6 @@ public prefix func == <T>(rhs : UnsafePointer<T>) -> UnsafePointer<T> -> Bool {
 	return { lhs in lhs == rhs }
 }
 
-public postfix func ==(lhs : Bit) -> Bit -> Bool {
-	return { rhs in lhs == rhs }
-}
-
-public prefix func ==(rhs : Bit) -> Bit -> Bool {
-	return { lhs in lhs == rhs }
-}
-
 public postfix func ==(lhs : UInt) -> UInt -> Bool {
 	return { rhs in lhs == rhs }
 }
@@ -1400,14 +1392,6 @@ public postfix func == <I>(lhs : ReverseRandomAccessIndex<I>) -> ReverseRandomAc
 	return { rhs in lhs == rhs }
 }
 
-public prefix func == <T : _Strideable>(y : T) -> T -> Bool {
-	return { x in x == y }
-}
-
-public postfix func == <T : _Strideable>(x : T) -> T -> Bool {
-	return { y in x == y }
-}
-
 public postfix func ==(lhs : String) -> String -> Bool {
 	return { rhs in lhs == rhs }
 }
@@ -1491,14 +1475,6 @@ public prefix func != <T>(rhs : UnsafePointer<T>) -> UnsafePointer<T> -> Bool {
 	return { lhs in lhs != rhs }
 }
 
-public postfix func !=(lhs : Bit) -> Bit -> Bool {
-	return { rhs in lhs != rhs }
-}
-
-public prefix func !=(rhs : Bit) -> Bit -> Bool {
-	return { lhs in lhs != rhs }
-}
-
 public postfix func !=(lhs : UInt) -> UInt -> Bool {
 	return { rhs in lhs != rhs }
 }
@@ -2057,10 +2033,6 @@ public prefix func >(rhs : UInt64) -> UInt64 -> Bool {
 	return { lhs in lhs > rhs }
 }
 
-public prefix func >(rhs : Bit) -> Bit -> Bool {
-	return { lhs in lhs > rhs }
-}
-
 public prefix func > <T>(rhs : UnsafePointer<T>) -> UnsafePointer<T> -> Bool {
 	return { lhs in lhs > rhs }
 }
@@ -2162,10 +2134,6 @@ public postfix func <(lhs : UInt64) -> UInt64 -> Bool {
 	return { rhs in lhs < rhs }
 }
 
-public postfix func <(lhs : Bit) -> Bit -> Bool {
-	return { rhs in lhs < rhs }
-}
-
 public postfix func <<T : Hashable>(lhs : SetIndex<T>) -> SetIndex<T> -> Bool {
 	return { rhs in lhs < rhs }
 }