Skip to content

Commit

Permalink
Merge pull request #37 from CodaFi/upper-crust
Browse files Browse the repository at this point in the history
Update to Swift 3.1
  • Loading branch information
CodaFi authored Mar 30, 2017
2 parents 0eff159 + 775b593 commit 185e191
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ matrix:
include:
- os: osx
language: objective-c
osx_image: xcode8.2
osx_image: xcode8.3
before_install:
- git submodule update --init --recursive
script:
Expand All @@ -14,7 +14,7 @@ matrix:
- carthage build --no-skip-current
- os: osx
language: objective-c
osx_image: xcode8.2
osx_image: xcode8.3
before_install:
- git submodule update --init --recursive
script:
Expand All @@ -37,9 +37,9 @@ matrix:
before_install:
- git submodule update --init --recursive
- wget -q -O - https://swift.org/keys/all-keys.asc | gpg --import -
- wget https://swift.org/builds/swift-3.0.2-release/ubuntu1404/swift-3.0.2-RELEASE/swift-3.0.2-RELEASE-ubuntu14.04.tar.gz
- tar xzf swift-3.0.2-RELEASE-ubuntu14.04.tar.gz
- export PATH=${PWD}/swift-3.0.2-RELEASE-ubuntu14.04/usr/bin:\"${PATH}\"
- wget https://swift.org/builds/swift-3.1-release/ubuntu1404/swift-3.1-RELEASE/swift-3.1-RELEASE-ubuntu14.04.tar.gz
- tar xzf swift-3.1-RELEASE-ubuntu14.04.tar.gz
- export PATH=${PWD}/swift-3.1-RELEASE-ubuntu14.04/usr/bin:\"${PATH}\"
script:
- swift build
notifications:
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.2.1"
github "typelift/SwiftCheck" "v0.7.0"
github "typelift/Operadics" "0.2.2"
github "typelift/SwiftCheck" "0.8.0"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Operadics
Submodule Operadics updated 1 files
+2 −0 Package.swift
2 changes: 1 addition & 1 deletion Carthage/Checkouts/SwiftCheck
Submodule SwiftCheck updated 54 files
+2 −0 .gitignore
+1 −0 .swift-version
+18 −11 .travis.yml
+14 −13 README.md
+19 −32 Sources/Arbitrary.swift
+896 −0 Sources/Cartesian.swift
+1 −1 Sources/CoArbitrary.swift
+2 −2 Sources/Compose.swift
+108 −216 Sources/Gen.swift
+10 −5 Sources/Lattice.swift
+55 −26 Sources/Modifiers.swift
+3 −3 Sources/Property.swift
+17 −8 Sources/Random.swift
+13 −13 Sources/Rose.swift
+1 −1 Sources/Test.swift
+8 −6 Sources/Testable.swift
+2 −2 SwiftCheck.podspec
+187 −123 SwiftCheck.xcodeproj/project.pbxproj
+1 −1 SwiftCheck.xcodeproj/xcshareddata/xcschemes/SwiftCheck-iOS.xcscheme
+1 −1 SwiftCheck.xcodeproj/xcshareddata/xcschemes/SwiftCheck-tvOS.xcscheme
+1 −1 SwiftCheck.xcodeproj/xcshareddata/xcschemes/SwiftCheck.xcscheme
+62 −0 Templates/Cartesian.swift.gyb
+54 −0 Templates/CartesianSpec.swift.gyb
+0 −60 Tests/BooleanIdentitySpec.swift
+0 −79 Tests/ComplexSpec.swift
+0 −28 Tests/DiscardSpec.swift
+0 −348 Tests/GenSpec.swift
+30 −0 Tests/LinuxMain.swift
+0 −63 Tests/ModifierSpec.swift
+0 −171 Tests/PropertySpec.swift
+0 −36 Tests/RawRepresentableSpec.swift
+0 −41 Tests/ShrinkSpec.swift
+88 −0 Tests/SwiftCheckTests/BooleanIdentitySpec.swift
+264 −0 Tests/SwiftCheckTests/CartesianSpec.swift
+93 −0 Tests/SwiftCheckTests/ComplexSpec.swift
+40 −0 Tests/SwiftCheckTests/DiscardSpec.swift
+13 −0 Tests/SwiftCheckTests/FailureSpec.swift
+1,212 −0 Tests/SwiftCheckTests/FileCheck.swift
+88 −0 Tests/SwiftCheckTests/FormatterSpec.swift
+462 −0 Tests/SwiftCheckTests/GenSpec.swift
+9 −2 Tests/SwiftCheckTests/LambdaSpec.swift
+93 −0 Tests/SwiftCheckTests/ModifierSpec.swift
+14 −8 Tests/SwiftCheckTests/PathSpec.swift
+227 −0 Tests/SwiftCheckTests/PropertySpec.swift
+7 −1 Tests/SwiftCheckTests/ReplaySpec.swift
+8 −1 Tests/SwiftCheckTests/RoseSpec.swift
+73 −0 Tests/SwiftCheckTests/ShrinkSpec.swift
+91 −71 Tests/SwiftCheckTests/SimpleSpec.swift
+79 −0 Tests/SwiftCheckTests/TestSpec.swift
+0 −54 Tests/TestSpec.swift
+14 −14 Tutorial.playground/Contents.swift
+4 −0 Utilities/compile.sh
+3 −0 Utilities/gyb
+1,146 −0 Utilities/gyb.py

0 comments on commit 185e191

Please sign in to comment.