Skip to content

Commit 54b8eb6

Browse files
djones6ianpartridge
authored andcommitted
Rename package for Swift 4.1, add 4.1 to Travis (#40)
* Rename package for Swift 4.1, add 4.1 to Travis * Disable UInt64.max Stringify test on Linux
1 parent 7eb6c83 commit 54b8eb6

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

.travis.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,25 @@ matrix:
1616
- os: linux
1717
dist: trusty
1818
sudo: required
19-
env: SWIFT_SNAPSHOT=4.0
19+
env: SWIFT_SNAPSHOT=4.0.3
20+
- os: linux
21+
dist: trusty
22+
sudo: required
23+
env: SWIFT_SNAPSHOT=4.1-DEVELOPMENT-SNAPSHOT-2018-02-26-a
2024
- os: osx
2125
osx_image: xcode8.3
2226
sudo: required
2327
- os: osx
2428
osx_image: xcode9
2529
sudo: required
26-
env: SWIFT_SNAPSHOT=4.0
30+
env: SWIFT_SNAPSHOT=4.0.3
31+
- os: osx
32+
osx_image: xcode9.3beta
33+
sudo: required
34+
env: SWIFT_SNAPSHOT=4.1-DEVELOPMENT-SNAPSHOT-2018-02-26-a
2735

2836
before_install:
2937
- git clone https://github.com/IBM-Swift/Package-Builder.git
3038

3139
script:
32-
- ./Package-Builder/build-package.sh -projectDir $TRAVIS_BUILD_DIR
40+
- ./Package-Builder/build-package.sh -projectDir $TRAVIS_BUILD_DIR
File renamed without changes.

Tests/SwiftyJSONTests/NumberTests.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,12 @@ class NumberTests: XCTestCase {
467467
XCTAssertTrue(json.uInt64Value == uInt64Max.uint64Value)
468468
XCTAssertTrue(json.number! == uInt64Max)
469469
XCTAssertEqual(json.numberValue, uInt64Max)
470+
#if !os(Linux)
471+
// Fails on Linux from Swift 4.0.3 after SCLF was fixed to correctly Stringify UInt values
472+
// greater than Int64.max - see https://github.com/apple/swift-corelibs-foundation/pull/1196
473+
// We have decided not to fix this in SwiftyJSON for now (see IBM-Swift/SwiftyJSON#40)
470474
XCTAssertEqual(json.stringValue, uInt64Max.stringValue)
475+
#endif
471476

472477
let n32767 = NSNumber(value: 32767)
473478
json.int64 = n32767.int64Value

0 commit comments

Comments
 (0)