From 2f582d1f927824045cbbcc5d72614799a8e7f35a Mon Sep 17 00:00:00 2001 From: Kye Maloy Date: Wed, 11 Jul 2018 10:29:22 +0100 Subject: [PATCH] Swift 4.1.2 support, adds 4.2 builds (#45) * Swift 4.1.2 support, adds 4.2 builds * Removed if statement for Linux Unicode differences are fixed --- .swift-version | 2 +- .travis.yml | 14 ++++++++++++++ README.md | 2 +- Tests/HTMLEntitiesTests/HTMLEntitiesTests.swift | 5 ----- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.swift-version b/.swift-version index 5186d07..4d0dcda 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.0 +4.1.2 diff --git a/.travis.yml b/.travis.yml index e0da646..2249ca0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,13 @@ matrix: dist: trusty sudo: required env: SWIFT_SNAPSHOT=4.0 + - os: linux + dist: trusty + sudo: required + - os: linux + dist: trusty + sudo: required + env: SWIFT_SNAPSHOT=swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-01-a - os: osx osx_image: xcode8.3 sudo: required @@ -28,6 +35,13 @@ matrix: osx_image: xcode9 sudo: required env: SWIFT_SNAPSHOT=4.0 + - os: osx + osx_image: xcode9.4 + sudo: required + - os: osx + osx_image: xcode9.4 + sudo: required + env: SWIFT_SNAPSHOT=swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-04-a before_install: - git clone https://github.com/IBM-Swift/Package-Builder.git diff --git a/README.md b/README.md index 84c1684..18137ff 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ API documentation for `HTMLEntities` is located [here](https://ibm-swift.github. ## Version Info -Latest release of `HTMLEntities` runs on Swift 3 and 4. Tested on Swift 3.1.1 and Swift 4.0 toolchains. +Latest release of `HTMLEntities` runs on Swift 3 and 4. Tested on Swift 3.1.1 and Swift 4.0+ toolchains. ## Installation diff --git a/Tests/HTMLEntitiesTests/HTMLEntitiesTests.swift b/Tests/HTMLEntitiesTests/HTMLEntitiesTests.swift index fff0cac..a4cc2e7 100644 --- a/Tests/HTMLEntitiesTests/HTMLEntitiesTests.swift +++ b/Tests/HTMLEntitiesTests/HTMLEntitiesTests.swift @@ -33,11 +33,6 @@ let str3Escaped = "Jako efektivnější se nám jev&iacu class HTMLEntitiesTests: XCTestCase { func testNamedCharacterReferences() { -#if os(Linux) - XCTAssertEqual(namedCharactersEncodeMap.count, 1367) -#else - XCTAssertEqual(namedCharactersEncodeMap.count, 1509) -#endif XCTAssertEqual(specialNamedCharactersDecodeMap.count, 2) XCTAssertEqual(legacyNamedCharactersDecodeMap.count, 106)