Update Travis-CI: Remove Swift 4.x support, Add Swift 5.4; update git…

…hub org references (#62)
Kitura · Aug 30, 2021 · 38798db · 38798db
1 parent 2b14531
commit 38798db
Show file tree

Hide file tree

Showing 34 changed files with 1,079 additions and 608 deletions.
diff --git 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
@@ -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
@@ -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/[email protected] b/[email protected]
diff --git 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
@@ -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("&+&#4370&#4449;&#4523".htmlUnescape(), "&+한")
 
         // test various parse errors

diff --git a/docs/Enums.html b/docs/Enums.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Enums  Reference</title>
+    <title>Enumerations  Reference</title>
     <link rel="stylesheet" type="text/css" href="css/jazzy.css" />
     <link rel="stylesheet" type="text/css" href="css/highlight.css" />
     <meta charset="utf-8">
@@ -14,13 +14,14 @@
   </head>
   <body>
 
+    <a name="//apple_ref/swift/Section/Enumerations" class="dashAnchor"></a>
 
-    <a title="Enums  Reference"></a>
+    <a title="Enumerations  Reference"></a>
 
     <header class="header">
       <p class="header-col header-col--primary">
         <a class="header-link" href="index.html">
-          HTMLEntities Docs
+          HTMLEntities 4.0.0 Docs
         </a>
          (100% documented)
       </p>
@@ -32,7 +33,7 @@
       </p>
 
         <p class="header-col header-col--secondary">
-          <a class="header-link" href="https://github.com/IBM-Swift/swift-html-entities">
+          <a class="header-link" href="https://github.com/Kitura/swift-html-entities">
             <img class="header-icon" src="img/gh.png"/>
             View on GitHub
           </a>
@@ -43,14 +44,14 @@
     <p class="breadcrumbs">
       <a class="breadcrumb" href="index.html">HTMLEntities Reference</a>
       <img class="carat" src="img/carat.png" />
-      Enums  Reference
+      Enumerations  Reference
     </p>
 
     <div class="content-wrapper">
       <nav class="navigation">
         <ul class="nav-groups">
           <li class="nav-group-name">
-            <a class="nav-group-name-link" href="Enums.html">Enums</a>
+            <a class="nav-group-name-link" href="Enums.html">Enumerations</a>
             <ul class="nav-group-tasks">
               <li class="nav-group-task">
                 <a class="nav-group-task-link" href="Enums/ParseError.html">ParseError</a>
@@ -73,9 +74,9 @@
       <article class="main-content">
 
         <section class="section">
-          <div class="section-content">
-            <h1>Enums</h1>
-            <p>The following enums are available globally.</p>
+          <div class="section-content top-matter">
+            <h1>Enumerations</h1>
+            <p>The following enumerations are available globally.</p>
 
           </div>
         </section>
@@ -108,7 +109,7 @@ <h1>Enums</h1>
                         <h4>Declaration</h4>
                         <div class="language">
                           <p class="aside-title">Swift</p>
-                          <pre class="highlight"><code><span class="kd">public</span> <span class="kd">enum</span> <span class="kt">ParseError</span><span class="p">:</span> <span class="kt">Error</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">enum</span> <span class="kt">ParseError</span> <span class="p">:</span> <span class="kt">Error</span></code></pre>
 
                         </div>
                       </div>
@@ -123,8 +124,8 @@ <h4>Declaration</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2017 <a class="link" href="https://github.com/IBM-Swift/swift-html-entities" target="_blank" rel="external">IBM</a>. All rights reserved. (Last updated: 2017-10-02)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.8.1</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2021 <a class="link" href="https://github.com/Kitura/swift-html-entities" target="_blank" rel="external">IBM and the Kitura project authors</a>. All rights reserved. (Last updated: 2021-08-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.7</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
     </section>
   </body>
 </div>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,5 +10,3 @@ readme: README.md

		skip_undocumented: false
		hide_documentation_coverage: false

		xcodebuild_arguments: [-project, HTMLEntities.xcodeproj, -target, HTMLEntities]