Skip to content

Commit

Permalink
Merge pull request #26 from CodaFi/focus-on-the-positives
Browse files Browse the repository at this point in the history
Update to Swift 2.2
  • Loading branch information
CodaFi committed Mar 22, 2016
2 parents 579ee7a + 1134976 commit fa10ee1
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
language: objective-c
osx_image: xcode7.2
osx_image: xcode7.3
before_install: true
install: true
script:
- script/cibuild Focus Focus-iOS
- script/cibuild Focus
- xcodebuild test -scheme Focus-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 1080p'
- xcodebuild build -scheme Focus-watchOS -destination 'platform=watchOS Simulator,name=Apple Watch - 42mm'

Expand Down
4 changes: 2 additions & 2 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Operadics
Submodule Operadics updated 3 files
+10 −0 Operators.swift
+4 −0 Package.swift
+38 −0 README.md
2 changes: 1 addition & 1 deletion Carthage/Checkouts/SwiftCheck
Submodule SwiftCheck updated 47 files
+25 −0 .github/CONTRIBUTING.md
+35 −0 .github/ISSUE_TEMPLATE.md
+24 −0 .github/PULL_REQUEST_TEMPLATE.md
+38 −11 .travis.yml
+11 −0 Package.swift
+2 −2 README.md
+90 −44 Sources/Arbitrary.swift
+38 −24 Sources/Check.swift
+34 −11 Sources/CoArbitrary.swift
+177 −166 Sources/Gen.swift
+0 −0 Sources/Info.plist
+20 −7 Sources/Lattice.swift
+101 −31 Sources/Modifiers.swift
+246 −0 Sources/Operators.swift
+154 −129 Sources/Property.swift
+69 −30 Sources/Random.swift
+60 −56 Sources/Rose.swift
+28 −14 Sources/State.swift
+0 −0 Sources/SwiftCheck.h
+354 −294 Sources/Test.swift
+28 −19 Sources/TestOperators.swift
+19 −10 Sources/Testable.swift
+34 −26 Sources/Witness.swift
+20 −40 Sources/WitnessedArbitrary.swift
+2 −2 SwiftCheck.podspec
+274 −249 SwiftCheck.xcodeproj/project.pbxproj
+6 −6 SwiftCheck.xcodeproj/xcshareddata/xcschemes/SwiftCheck-iOS.xcscheme
+0 −43 SwiftCheck/Equatable.swift
+0 −52 SwiftCheckTests/PropertySpec.swift
+1 −0 Tests/BooleanIdentitySpec.swift
+18 −23 Tests/ComplexSpec.swift
+1 −0 Tests/DiscardSpec.swift
+2 −1 Tests/FailureSpec.swift
+13 −6 Tests/GenSpec.swift
+0 −0 Tests/Info.plist
+192 −0 Tests/LambdaSpec.swift
+1 −0 Tests/ModifierSpec.swift
+101 −0 Tests/PathSpec.swift
+153 −0 Tests/PropertySpec.swift
+1 −0 Tests/ReplaySpec.swift
+63 −0 Tests/RoseSpec.swift
+1 −0 Tests/ShrinkSpec.swift
+20 −0 Tests/SimpleSpec.swift
+2 −1 Tests/TestSpec.swift
+81 −76 Tutorial.playground/Contents.swift
+0 −6 Tutorial.playground/timeline.xctimeline
+2 −2 script/cibuild
10 changes: 5 additions & 5 deletions Focus/Protocols.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
/// The shared supertype of all optics.
///
/// N.B.: Right now, this exists solely to standardize the four
/// `typealias`es that the other `protocol`s all use, but, in future
/// `associatedtype`s that the other `protocol`s all use, but, in future
/// releases, `extension`s of it may provide some optic-generic operators.
public protocol OpticFamilyType {
typealias Source
typealias Target
typealias AltSource
typealias AltTarget
associatedtype Source
associatedtype Target
associatedtype AltSource
associatedtype AltTarget
}

0 comments on commit fa10ee1

Please sign in to comment.