From 38798dbb6c202d01d0cee4a7aa490d40bbac8d6a Mon Sep 17 00:00:00 2001 From: Danny Sung Date: Sun, 29 Aug 2021 18:00:44 -0700 Subject: [PATCH] Update Travis-CI: Remove Swift 4.x support, Add Swift 5.4; update github org references (#62) --- .jazzy.yaml | 2 - .travis.yml | 45 +-- HTMLEntities.podspec | 6 +- Package@swift-4.swift | 42 --- README.md | 4 +- .../HTMLEntitiesTests/HTMLEntitiesTests.swift | 2 +- docs/Enums.html | 25 +- docs/Enums/ParseError.html | 125 ++++----- docs/Extensions.html | 19 +- docs/Extensions/String.html | 121 ++++++-- docs/Extensions/String/HTMLEscapeOptions.html | 45 +-- docs/css/jazzy.css | 50 +++- .../Contents/Resources/Documents/Enums.html | 25 +- .../Resources/Documents/Enums/ParseError.html | 125 ++++----- .../Resources/Documents/Extensions.html | 19 +- .../Documents/Extensions/String.html | 121 ++++++-- .../Extensions/String/HTMLEscapeOptions.html | 45 +-- .../Resources/Documents/css/jazzy.css | 50 +++- .../Contents/Resources/Documents/index.html | 45 ++- .../Contents/Resources/Documents/js/jazzy.js | 61 ++-- .../Resources/Documents/js/jazzy.search.js | 26 +- .../Resources/Documents/js/jquery.min.js | 6 +- .../Resources/Documents/js/lunr.min.js | 6 +- .../Documents/js/typeahead.jquery.js | 262 ++++++++++++++---- .../Contents/Resources/Documents/search.json | 2 +- .../Contents/Resources/docSet.dsidx | Bin 12288 -> 12288 bytes docs/docsets/HTMLEntities.tgz | Bin 68960 -> 73257 bytes docs/index.html | 45 ++- docs/js/jazzy.js | 61 ++-- docs/js/jazzy.search.js | 26 +- docs/js/jquery.min.js | 6 +- docs/js/lunr.min.js | 6 +- docs/js/typeahead.jquery.js | 262 ++++++++++++++---- docs/search.json | 2 +- 34 files changed, 1079 insertions(+), 608 deletions(-) delete mode 100644 Package@swift-4.swift mode change 100755 => 100644 docs/docsets/HTMLEntities.docset/Contents/Resources/Documents/js/jquery.min.js mode change 100755 => 100644 docs/docsets/HTMLEntities.docset/Contents/Resources/Documents/js/lunr.min.js mode change 100755 => 100644 docs/js/jquery.min.js mode change 100755 => 100644 docs/js/lunr.min.js diff --git a/.jazzy.yaml b/.jazzy.yaml index 79c3439..332aac5 100644 --- a/.jazzy.yaml +++ b/.jazzy.yaml @@ -10,5 +10,3 @@ readme: README.md skip_undocumented: false hide_documentation_coverage: false - -xcodebuild_arguments: [-project, HTMLEntities.xcodeproj, -target, HTMLEntities] diff --git a/.travis.yml b/.travis.yml index 4395f27..007d1b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,55 +15,28 @@ matrix: dist: xenial sudo: required services: docker - env: DOCKER_IMAGE=swift:4.0.3 SWIFT_SNAPSHOT=4.0.3 + env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci-ubuntu16.04:5.1.5 - os: linux - dist: xenial - sudo: required - services: docker - env: DOCKER_IMAGE=swift:4.1.3 SWIFT_SNAPSHOT=4.1.3 - - os: linux - dist: xenial - sudo: required - services: docker - env: DOCKER_IMAGE=swift:4.2.4 SWIFT_SNAPSHOT=4.2.4 - - os: linux - dist: xenial - sudo: required - services: docker - env: DOCKER_IMAGE=swift:5.0.3-xenial SWIFT_SNAPSHOT=5.0.3 - - os: linux - dist: xenial + dist: bionic sudo: required services: docker - env: DOCKER_IMAGE=swift:5.1 + env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci-ubuntu18.04:5.4 - os: linux dist: xenial sudo: required services: docker - env: DOCKER_IMAGE=swift:5.1 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT - - os: osx - osx_image: xcode9.2 - sudo: required - env: SWIFT_SNAPSHOT=4.0.3 - - os: osx - osx_image: xcode9.4 - sudo: required - env: SWIFT_SNAPSHOT=4.1.2 + env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci-ubuntu18.04:latest USE_SWIFT_DEVELOPMENT_SNAPSHOT=1 - os: osx - osx_image: xcode10.1 + osx_image: xcode11 sudo: required - env: SWIFT_SNAPSHOT=4.2.1 + env: SWIFT_SNAPSHOT=5.1.5 JAZZY_ELIGIBLE=true - os: osx - osx_image: xcode10.2 + osx_image: xcode12.2 sudo: required - env: SWIFT_SNAPSHOT=5.0.1 JAZZY_ELIGIBLE=true - os: osx - osx_image: xcode11 - sudo: required - - os: osx - osx_image: xcode11 + osx_image: xcode12.5 sudo: required - env: SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT + env: USE_SWIFT_DEVELOPMENT_SNAPSHOT=1 before_install: - git clone https://github.com/Kitura/Package-Builder.git diff --git a/HTMLEntities.podspec b/HTMLEntities.podspec index 6bdf98a..f082974 100644 --- a/HTMLEntities.podspec +++ b/HTMLEntities.podspec @@ -16,7 +16,7 @@ Pod::Spec.new do |s| # s.name = "HTMLEntities" - s.version = "3.0.13" + s.version = "4.0.0" s.summary = "HTML5 spec-compliant character encoder/decoder for Swift" # This description is used to generate tags and improve search results. @@ -34,7 +34,7 @@ Includes support for HTML5 named character references. You can find the list of In addition, `HTMLEntities` can unescape encoded HTML text that contains decimal, hexadecimal, or HTML5 named character references. DESC - s.homepage = "https://github.com/IBM-Swift/swift-html-entities" + s.homepage = "https://github.com/Kitura/swift-html-entities" # s.screenshots = "www.example.com/screenshots_1.gif", "www.example.com/screenshots_2.gif" @@ -83,7 +83,7 @@ In addition, `HTMLEntities` can unescape encoded HTML text that contains decimal # Supports git, hg, bzr, svn and HTTP. # - s.source = { :git => "https://github.com/IBM-Swift/swift-html-entities.git", :tag => "#{s.version}" } + s.source = { :git => "https://github.com/Kitura/swift-html-entities.git", :tag => "#{s.version}" } # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # diff --git a/Package@swift-4.swift b/Package@swift-4.swift deleted file mode 100644 index 54b93b3..0000000 --- a/Package@swift-4.swift +++ /dev/null @@ -1,42 +0,0 @@ -// swift-tools-version:4.0 -// The swift-tools-version declares the minimum version of Swift required to build this package. - -/** - * Copyright IBM Corporation and the Kitura project authors 2016-2020 - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - **/ - -import PackageDescription - -let package = Package( - name: "HTMLEntities", - products: [ - // Products define the executables and libraries produced by a package, and make them visible to other packages. - .library( - name: "HTMLEntities", - targets: ["HTMLEntities"] - ) - ], - targets: [ - // Targets are the basic building blocks of a package. A target can define a module or a test suite. - // Targets can depend on other targets in this package, and on products in packages which this package depends on. - .target( - name: "HTMLEntities" - ), - .testTarget( - name: "HTMLEntitiesTests", - dependencies: ["HTMLEntities"] - ) - ] -) diff --git a/README.md b/README.md index 00f1758..bc887ec 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # HTMLEntities -[![Build Status - Master](https://api.travis-ci.org/IBM-Swift/swift-html-entities.svg?branch=master)](https://travis-ci.org/IBM-Swift/swift-html-entities) +[![Build Status - Master](https://api.travis-ci.org/Kitura/swift-html-entities.svg?branch=master)](https://travis-ci.org/Kitura/swift-html-entities) ![macOS](https://img.shields.io/badge/os-macOS-green.svg?style=flat) ![Linux](https://img.shields.io/badge/os-linux-green.svg?style=flat) ![Apache 2](https://img.shields.io/badge/license-Apache2-blue.svg?style=flat) -[![codecov](https://codecov.io/gh/IBM-Swift/swift-html-entities/branch/master/graph/badge.svg)](https://codecov.io/gh/IBM-Swift/swift-html-entities) +[![codecov](https://codecov.io/gh/Kitura/swift-html-entities/branch/master/graph/badge.svg)](https://codecov.io/gh/Kitura/swift-html-entities) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) ## Summary diff --git a/Tests/HTMLEntitiesTests/HTMLEntitiesTests.swift b/Tests/HTMLEntitiesTests/HTMLEntitiesTests.swift index a4cc2e7..c1c7b3d 100644 --- a/Tests/HTMLEntitiesTests/HTMLEntitiesTests.swift +++ b/Tests/HTMLEntitiesTests/HTMLEntitiesTests.swift @@ -278,7 +278,7 @@ class HTMLEntitiesTests: XCTestCase { XCTFail("Wrong error thrown") } - // unit test for fix to https://github.com/IBM-Swift/swift-html-entities/issues/29 + // unit test for fix to https://github.com/Kitura/swift-html-entities/issues/29 XCTAssertEqual("&+한".htmlUnescape(), "&+한") // test various parse errors diff --git a/docs/Enums.html b/docs/Enums.html index 05fe5a2..2953cc4 100644 --- a/docs/Enums.html +++ b/docs/Enums.html @@ -1,7 +1,7 @@ - Enums Reference + Enumerations Reference @@ -14,13 +14,14 @@ + - +

- HTMLEntities Docs + HTMLEntities 4.0.0 Docs (100% documented)

@@ -32,7 +33,7 @@

- + View on GitHub @@ -43,14 +44,14 @@

HTMLEntities Reference - Enums Reference + Enumerations Reference

@@ -123,8 +124,8 @@

Declaration

-

© 2017 IBM. All rights reserved. (Last updated: 2017-10-02)

-

Generated by jazzy ♪♫ v0.8.1, a Realm project.

+

© 2021 IBM and the Kitura project authors. All rights reserved. (Last updated: 2021-08-28)

+

Generated by jazzy ♪♫ v0.13.7, a Realm project.

diff --git a/docs/Enums/ParseError.html b/docs/Enums/ParseError.html index 7362d0c..800f483 100644 --- a/docs/Enums/ParseError.html +++ b/docs/Enums/ParseError.html @@ -1,7 +1,7 @@ - ParseError Enum Reference + ParseError Enumeration Reference @@ -16,12 +16,12 @@ - +

- HTMLEntities Docs + HTMLEntities 4.0.0 Docs (100% documented)

@@ -33,7 +33,7 @@

- + View on GitHub @@ -44,14 +44,14 @@

HTMLEntities Reference - ParseError Enum Reference + ParseError Enumeration Reference

-
-
  • @@ -139,36 +136,32 @@

    Declaration

    -

    [I]f the number is in the range 0x0001 to 0x0008, 0x000D to 0x001F, 0x007F +

    “[I]f the number is in the range 0x0001 to 0x0008, 0x000D to 0x001F, 0x007F to 0x009F, 0xFDD0 to 0xFDEF, or is one of 0x000B, 0xFFFE, 0xFFFF, 0x1FFFE, 0x1FFFF, 0x2FFFE, 0x2FFFF, 0x3FFFE, 0x3FFFF, 0x4FFFE, 0x4FFFF, 0x5FFFE, 0x5FFFF, 0x6FFFE, 0x6FFFF, 0x7FFFE, 0x7FFFF, 0x8FFFE, 0x8FFFF, 0x9FFFE, 0x9FFFF, 0xAFFFE, 0xAFFFF, 0xBFFFE, 0xBFFFF, 0xCFFFE, 0xCFFFF, 0xDFFFE, 0xDFFFF, 0xEFFFE, 0xEFFFF, 0xFFFFE, 0xFFFFF, 0x10FFFE, or 0x10FFFF, then -this is a parse error.

    +this is a parse error.”

    Declaration

    Swift

    - 
    case DisallowedNumericReference(String)
    + 
    case DisallowedNumericReference(String)
    • -
-
-
-
- - -
-
  • @@ -208,32 +197,28 @@

    Declaration

    -

    [I]f the characters after the U+0026 AMPERSAND character (&) consist of +

    “[I]f the characters after the U+0026 AMPERSAND character (&) consist of a sequence of one or more alphanumeric ASCII characters followed by a -U+003B SEMICOLON character (;), then this is a parse error.

    +U+003B SEMICOLON character (;), then this is a parse error.”

    Declaration

    Swift

    - 
    case InvalidNamedReference(String)
    + 
    case InvalidNamedReference(String)
    • -
-
-
-
  • @@ -241,32 +226,28 @@

    Declaration

    -

    If no characters match the range, then don’t consume any characters +

    “If no characters match the range, then don’t consume any characters (and unconsume the U+0023 NUMBER SIGN character and, if appropriate, -the X character). This is a parse error; nothing is returned.

    +the X character). This is a parse error; nothing is returned.”

    Declaration

    Swift

    - 
    case MalformedNumericReference(String)
    + 
    case MalformedNumericReference(String)
    • -
-
-
-
  • @@ -274,31 +255,27 @@

    Declaration

    -

    [I]f the next character is a U+003B SEMICOLON, consume that too. -If it isn’t, there is a parse error.

    +

    “[I]f the next character is a U+003B SEMICOLON, consume that too. +If it isn’t, there is a parse error.”

    Declaration

    Swift

    - 
    case MissingSemicolon(String)
    + 
    case MissingSemicolon(String)
    • -
-
-
-
  • @@ -306,15 +283,15 @@

    Declaration

    -

    [I]f the number is in the range 0xD800 to 0xDFFF or is greater -than 0x10FFFF, then this is a parse error.

    +

    “[I]f the number is in the range 0xD800 to 0xDFFF or is greater +than 0x10FFFF, then this is a parse error.”

    Declaration

    Swift

    - 
    case OutsideValidUnicodeRange(String)
    + 
    case OutsideValidUnicodeRange(String)
    @@ -329,8 +306,8 @@

    Declaration

    -

    © 2017 IBM. All rights reserved. (Last updated: 2017-10-02)

    -

    Generated by jazzy ♪♫ v0.8.1, a Realm project.

    +

    © 2021 IBM and the Kitura project authors. All rights reserved. (Last updated: 2021-08-28)

    +

    Generated by jazzy ♪♫ v0.13.7, a Realm project.

diff --git a/docs/Extensions.html b/docs/Extensions.html index 25fd1fe..d7b9d63 100644 --- a/docs/Extensions.html +++ b/docs/Extensions.html @@ -14,13 +14,14 @@ +

- HTMLEntities Docs + HTMLEntities 4.0.0 Docs (100% documented)

@@ -32,7 +33,7 @@

- + View on GitHub @@ -50,7 +51,7 @@