Skip to content

Commit c0c2278

Browse files
authored
Merge pull request #325 from CodaFi/upper-crust
Update to Swift 3.1
2 parents 82bf915 + 6f7b829 commit c0c2278

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ matrix:
55
include:
66
- os: osx
77
language: objective-c
8-
osx_image: xcode8.2
8+
osx_image: xcode8.3
99
before_install:
1010
- git submodule update --init --recursive
1111
script:
@@ -14,7 +14,7 @@ matrix:
1414
- carthage build --no-skip-current
1515
- os: osx
1616
language: objective-c
17-
osx_image: xcode8
17+
osx_image: xcode8.3
1818
before_install:
1919
- git submodule update --init --recursive
2020
script:
@@ -37,9 +37,9 @@ matrix:
3737
before_install:
3838
- git submodule update --init --recursive
3939
- wget -q -O - https://swift.org/keys/all-keys.asc | gpg --import -
40-
- wget https://swift.org/builds/swift-3.0-release/ubuntu1404/swift-3.0-RELEASE/swift-3.0-RELEASE-ubuntu14.04.tar.gz
41-
- tar xzf swift-3.0-RELEASE-ubuntu14.04.tar.gz
42-
- export PATH=${PWD}/swift-3.0-RELEASE-ubuntu14.04/usr/bin:"${PATH}"
40+
- wget https://swift.org/builds/swift-3.1-release/ubuntu1404/swift-3.1-RELEASE/swift-3.1-RELEASE-ubuntu14.04.tar.gz
41+
- tar xzf swift-3.1-RELEASE-ubuntu14.04.tar.gz
42+
- export PATH=${PWD}/swift-3.1-RELEASE-ubuntu14.04/usr/bin:"${PATH}"
4343
script:
4444
- swift build
4545
notifications:

Cartfile.private

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
github "typelift/Swiftx" "master"
1+
github "typelift/Swiftx"
22
github "typelift/SwiftCheck"
33
github "typelift/Operadics"
44

Cartfile.resolved

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
github "typelift/Operadics" "0.2.2"
2-
github "typelift/SwiftCheck" "0.7.2"
3-
github "typelift/Swiftx" "7945839e1a173911879a3552a5d2265554d9337b"
2+
github "typelift/SwiftCheck" "0.8.0"
3+
github "typelift/Swiftx" "0.5.2"

Sources/Bounded.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,21 +149,21 @@ extension Int64 : Bounded {
149149
#if os(OSX)
150150
extension Float : Bounded {
151151
public static func minBound() -> Float {
152-
return FLT_MIN
152+
return Float.leastNormalMagnitude
153153
}
154154

155155
public static func maxBound() -> Float {
156-
return FLT_MAX
156+
return Float.greatestFiniteMagnitude
157157
}
158158
}
159159

160160
extension Double : Bounded {
161161
public static func minBound() -> Double {
162-
return DBL_MIN
162+
return Double.leastNormalMagnitude
163163
}
164164

165165
public static func maxBound() -> Double {
166-
return DBL_MAX
166+
return Double.greatestFiniteMagnitude
167167
}
168168
}
169169
#endif

0 commit comments

Comments
 (0)