From 029ae13bdeecf55ad61ac7f6e82b59dd58bc29e0 Mon Sep 17 00:00:00 2001 From: Robert Widmann Date: Mon, 21 Mar 2016 22:37:43 -0400 Subject: [PATCH 1/3] Update to swift 2.2 --- .travis.yml | 2 +- Cartfile.resolved | 4 +-- Carthage/Checkouts/Operadics | 2 +- Carthage/Checkouts/SwiftCheck | 2 +- Swiftx.podspec | 2 +- Swiftx.xcodeproj/project.pbxproj | 12 ++----- .../xcschemes/Swiftx-iOS.xcscheme | 2 +- Swiftx/Combinators.swift | 7 +--- Swiftx/Sections.swift | 32 ------------------- 9 files changed, 11 insertions(+), 54 deletions(-) diff --git a/.travis.yml b/.travis.yml index a64c0ff..dbadb9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode7.2 +osx_image: xcode7.3 env: - TEST_CONFIG="RELEASE" - TEST_CONFIG="PODS" diff --git a/Cartfile.resolved b/Cartfile.resolved index fecdb6b..7e29a4f 100644 --- a/Cartfile.resolved +++ b/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" diff --git a/Carthage/Checkouts/Operadics b/Carthage/Checkouts/Operadics index c65e635..8117a84 160000 --- a/Carthage/Checkouts/Operadics +++ b/Carthage/Checkouts/Operadics @@ -1 +1 @@ -Subproject commit c65e6355e22282a89d68a8a2d594a32c36c1e7b0 +Subproject commit 8117a84bb4111814c35af80285f3f9baff290d7e diff --git a/Carthage/Checkouts/SwiftCheck b/Carthage/Checkouts/SwiftCheck index 118d474..f214146 160000 --- a/Carthage/Checkouts/SwiftCheck +++ b/Carthage/Checkouts/SwiftCheck @@ -1 +1 @@ -Subproject commit 118d47429bef32296e2f663ae72d8aa24d4c9a66 +Subproject commit f2141461f015315cc583222f0bb30ae07da8aad8 diff --git a/Swiftx.podspec b/Swiftx.podspec index defa81d..a87d564 100644 --- a/Swiftx.podspec +++ b/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 diff --git a/Swiftx.xcodeproj/project.pbxproj b/Swiftx.xcodeproj/project.pbxproj index 2d7d776..3511cc5 100644 --- a/Swiftx.xcodeproj/project.pbxproj +++ b/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; diff --git a/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx-iOS.xcscheme b/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx-iOS.xcscheme index 844f746..2b6f569 100644 --- a/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx-iOS.xcscheme +++ b/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx-iOS.xcscheme @@ -22,7 +22,7 @@ diff --git a/Swiftx/Combinators.swift b/Swiftx/Combinators.swift index f33212f..0ca47cc 100644 --- a/Swiftx/Combinators.swift +++ b/Swiftx/Combinators.swift @@ -17,12 +17,7 @@ public func const(x : A) -> B -> A { } /// Flip a function's arguments -public func flip(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(f : (A, B) -> C)(b : B, a : A) -> C { +public func flip(f : ((A, B) -> C), _ b : B, _ a : A) -> C { return f(a, b) } diff --git a/Swiftx/Sections.swift b/Swiftx/Sections.swift index b42eef8..df79d89 100644 --- a/Swiftx/Sections.swift +++ b/Swiftx/Sections.swift @@ -1095,14 +1095,6 @@ public prefix func == (rhs : UnsafePointer) -> UnsafePointer -> 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 == (lhs : ReverseRandomAccessIndex) -> ReverseRandomAc return { rhs in lhs == rhs } } -public prefix func == (y : T) -> T -> Bool { - return { x in x == y } -} - -public postfix func == (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 != (rhs : UnsafePointer) -> UnsafePointer -> 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 > (rhs : UnsafePointer) -> UnsafePointer -> 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 <(lhs : SetIndex) -> SetIndex -> Bool { return { rhs in lhs < rhs } } From da83e466f4ec37264772c0b529f1c7e6f6babffb Mon Sep 17 00:00:00 2001 From: Robert Widmann Date: Mon, 21 Mar 2016 23:14:54 -0400 Subject: [PATCH 2/3] Uh. --- Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx-iOS.xcscheme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx-iOS.xcscheme b/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx-iOS.xcscheme index 2b6f569..b7abc94 100644 --- a/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx-iOS.xcscheme +++ b/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx-iOS.xcscheme @@ -25,7 +25,7 @@ buildForRunning = "NO" buildForProfiling = "NO" buildForArchiving = "NO" - buildForAnalyzing = "YES"> + buildForAnalyzing = "NO"> Date: Tue, 22 Mar 2016 18:49:54 -0400 Subject: [PATCH 3/3] Try a thing --- .travis.yml | 2 +- Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx.xcscheme | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index dbadb9e..17123b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ env: 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 diff --git a/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx.xcscheme b/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx.xcscheme index fcc0963..f17c8eb 100644 --- a/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx.xcscheme +++ b/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx.xcscheme @@ -23,10 +23,10 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -52,11 +52,11 @@