Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Swift 3.1 #325

Merged
merged 1 commit into from
Mar 29, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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-release/ubuntu1404/swift-3.0-RELEASE/swift-3.0-RELEASE-ubuntu14.04.tar.gz
- tar xzf swift-3.0-RELEASE-ubuntu14.04.tar.gz
- export PATH=${PWD}/swift-3.0-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
2 changes: 1 addition & 1 deletion Cartfile.private
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "typelift/Swiftx" "master"
github "typelift/Swiftx"
github "typelift/SwiftCheck"
github "typelift/Operadics"

4 changes: 2 additions & 2 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "typelift/Operadics" "0.2.2"
github "typelift/SwiftCheck" "0.7.2"
github "typelift/Swiftx" "7945839e1a173911879a3552a5d2265554d9337b"
github "typelift/SwiftCheck" "0.8.0"
github "typelift/Swiftx" "0.5.2"
8 changes: 4 additions & 4 deletions Sources/Bounded.swift
Original file line number Diff line number Diff line change
Expand Up @@ -149,21 +149,21 @@ extension Int64 : Bounded {
#if os(OSX)
extension Float : Bounded {
public static func minBound() -> Float {
return FLT_MIN
return Float.leastNormalMagnitude
}

public static func maxBound() -> Float {
return FLT_MAX
return Float.greatestFiniteMagnitude
}
}

extension Double : Bounded {
public static func minBound() -> Double {
return DBL_MIN
return Double.leastNormalMagnitude
}

public static func maxBound() -> Double {
return DBL_MAX
return Double.greatestFiniteMagnitude
}
}
#endif
Expand Down