Misc org update (#87)

* Update github org references

* Update jazzy

* Update github org reference in .travis.yml

* updated dependency versions for kitura org

* Add xcode12 to travis build

* try async-http-client.git 1.1.0

* Fix async-http-client.git to 1.1.0, and undo shutdownSync fix.

* travis: update xcode version for development snapshot

.jazzy.yaml

@@ -1,6 +1,6 @@
 module: SwiftyRequest
-author: IBM
-github_url: https://github.com/IBM-Swift/SwiftyRequest
+author: IBM & Kitura Project Contributors
+github_url: https://github.com/Kitura/SwiftyRequest
 
 theme: fullwidth
 clean: true
@@ -11,4 +11,3 @@ readme: README.md
 skip_undocumented: false
 hide_documentation_coverage: false
 
-xcodebuild_arguments: [-project, SwiftyRequest.xcodeproj, -target, SwiftyRequest, LIBRARY_SEARCH_PATHS=.build/debug]

.travis.yml

@@ -34,12 +34,15 @@ matrix:
       osx_image: xcode11
       sudo: required
     - os: osx
-      osx_image: xcode11
+      osx_image: xcode12
+      sudo: required
+    - os: osx
+      osx_image: xcode12.2
       sudo: required
       env: SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
 
 before_install:
-  - git clone https://github.com/IBM-Swift/Package-Builder.git
+  - git clone https://github.com/Kitura/Package-Builder.git
 
 script:
   - ./Package-Builder/build-package.sh -projectDir $TRAVIS_BUILD_DIR

Package.swift

@@ -27,9 +27,10 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/IBM-Swift/CircuitBreaker.git", from: "5.0.0"),
-        .package(url: "https://github.com/IBM-Swift/LoggerAPI.git", from: "1.8.0"),
-        .package(url: "https://github.com/swift-server/async-http-client.git", from: "1.2.0"),
+        .package(url: "https://github.com/Kitura/CircuitBreaker.git", from: "5.0.200"),
+        .package(url: "https://github.com/Kitura/LoggerAPI.git", from: "1.9.200"),
+        //.package(url: "https://github.com/swift-server/async-http-client.git", from: "1.2.0"),
+        .package(url: "https://github.com/swift-server/async-http-client.git", .upToNextMinor(from: "1.1.0")),
     ],
     targets: [
         .target(

README.md

@@ -1,15 +1,15 @@
 <p align="center">
     <a href="http://kitura.io/">
-        <img src="https://raw.githubusercontent.com/IBM-Swift/Kitura/master/Sources/Kitura/resources/kitura-bird.svg?sanitize=true" height="100" alt="Kitura">
+        <img src="https://raw.githubusercontent.com/Kitura/Kitura/master/Sources/Kitura/resources/kitura-bird.svg?sanitize=true" height="100" alt="Kitura">
     </a>
 </p>
 
 <p align="center">
-    <a href="https://ibm-swift.github.io/SwiftyRequest/index.html">
+    <a href="https://kitura.github.io/SwiftyRequest/index.html">
     <img src="https://img.shields.io/badge/apidoc-SwiftyRequest-1FBCE4.svg?style=flat" alt="APIDoc">
     </a>
-    <a href="https://travis-ci.org/IBM-Swift/SwiftyRequest">
-    <img src="https://travis-ci.org/IBM-Swift/SwiftyRequest.svg?branch=master" alt="Build Status - Master">
+    <a href="https://travis-ci.org/Kitura/SwiftyRequest">
+    <img src="https://travis-ci.org/Kitura/SwiftyRequest.svg?branch=master" alt="Build Status - Master">
     </a>
     <img src="https://img.shields.io/badge/os-macOS-green.svg?style=flat" alt="macOS">
     <img src="https://img.shields.io/badge/os-linux-green.svg?style=flat" alt="Linux">
@@ -37,7 +37,7 @@ The latest release of SwiftyRequest is built upon the Swift-NIO based [`async-ht
 - Several response methods (e.g. Data, Object, Array, String, etc.) to eliminate boilerplate code in your application.
 - Direct retrieval of `Codable` types.
 - JSON encoding and decoding.
-- Integration with the [CircuitBreaker](https://github.com/IBM-Swift/CircuitBreaker) library.
+- Integration with the [CircuitBreaker](https://github.com/Kitura/CircuitBreaker) library.
 - Authentication tokens.
 - Client Certificate support (2-way SSL).
 - Multipart form data.
@@ -53,10 +53,10 @@ To leverage the `SwiftyRequest` package in your Swift application, you should sp
 
 ### Add dependencies
 
-Add `SwiftyRequest` to the dependencies within your application's `Package.swift` file. Substitute `"x.x.x"` with the latest `SwiftyRequest` [release](https://github.com/IBM-Swift/SwiftyRequest/releases).
+Add `SwiftyRequest` to the dependencies within your application's `Package.swift` file. Substitute `"x.x.x"` with the latest `SwiftyRequest` [release](https://github.com/Kitura/SwiftyRequest/releases).
 
 ```swift
-.package(url: "https://github.com/IBM-Swift/SwiftyRequest.git", from: "x.x.x")
+.package(url: "https://github.com/Kitura/SwiftyRequest.git", from: "x.x.x")
 ```
 Add `SwiftyRequest` to your target's dependencies:
 
@@ -132,7 +132,7 @@ request.responseData(queryItems: [URLQueryItem(name: "hour", value: "9")]) { res
 
 ## CircuitBreaker Integration
 
-`SwiftyRequest` has built-in functionality for leveraging the [CircuitBreaker](https://github.com/IBM-Swift/CircuitBreaker) library to increase your application's stability. To make use of this functionality, assign a `CircuitParameters` object to the `circuitParameters` property. This object will include a reference to a fallback function that will be invoked when the circuit is failing fast.
+`SwiftyRequest` has built-in functionality for leveraging the [CircuitBreaker](https://github.com/Kitura/CircuitBreaker) library to increase your application's stability. To make use of this functionality, assign a `CircuitParameters` object to the `circuitParameters` property. This object will include a reference to a fallback function that will be invoked when the circuit is failing fast.
 
 ### Fallback
 Here is an example of a fallback closure:
@@ -213,12 +213,12 @@ If you need to handle certificates in other formats, you may create a ClientCert
 
 ## API documentation
 
-For more information visit our [API reference](http://ibm-swift.github.io/SwiftyRequest/).
+For more information visit our [API reference](http://kitura.github.io/SwiftyRequest/).
 
 ## Community
 
 We love to talk server-side Swift, and Kitura. Join our [Slack](http://swift-at-ibm-slack.mybluemix.net/) to meet the team!
 
 ## License
 
-This library is licensed under Apache 2.0. Full license text is available in [LICENSE](https://github.com/IBM-Swift/SwiftyRequest/blob/master/LICENSE).
+This library is licensed under Apache 2.0. Full license text is available in [LICENSE](https://github.com/Kitura/SwiftyRequest/blob/master/LICENSE).

Sources/SwiftyRequest/RestRequest.swift

@@ -103,11 +103,14 @@ fileprivate class MutableRequest {
 public class RestRequest {
 
     deinit {
+        /*
         if MultiThreadedEventLoopGroup.currentEventLoop != nil {
             session.shutdown(){ _ in }
         } else {
             try? session.syncShutdown()
         }
+        */
+        try? session.syncShutdown()
     }
 
     /// A default `HTTPClient` instance.

SwiftyRequest.podspec

@@ -3,13 +3,13 @@ Pod::Spec.new do |s|
   s.name        = "SwiftyRequest"
   s.version     = "2.2.1"
   s.summary     = "SwiftyRequest is an HTTP networking library built for Swift."
-  s.homepage    = "https://github.com/IBM-Swift/SwiftyRequest"
+  s.homepage    = "https://github.com/Kitura/SwiftyRequest"
   s.license     = { :type => "Apache License, Version 2.0" }
   s.author     = "IBM"
   s.module_name  = 'SwiftyRequest'
   s.ios.deployment_target = "10.0"
   s.osx.deployment_target = "10.11"
-  s.source   = { :git => "https://github.com/IBM-Swift/SwiftyRequest.git", :tag => s.version }
+  s.source   = { :git => "https://github.com/Kitura/SwiftyRequest.git", :tag => s.version }
   s.source_files = "Sources/**/*.swift"
   s.dependency 'LoggerAPI', '~> 1.7'
   s.dependency 'IBMSwiftCircuitBreaker', '~> 5.0'

TestServer/Package.swift

@@ -7,10 +7,10 @@ let package = Package(
     name: "TestServer",
     dependencies: [
         // Dependencies declare other packages that this package depends on.
-        .package(url: "https://github.com/IBM-Swift/Kitura.git", from: "2.6.0"),
-        .package(url: "https://github.com/IBM-Swift/FileKit.git", .upToNextMinor(from: "0.0.0")),
-        .package(url: "https://github.com/IBM-Swift/HeliumLogger.git", from: "1.8.0"),
-        .package(url: "https://github.com/IBM-Swift/Swift-JWT.git", from: "3.1.0"),
+        .package(url: "https://github.com/Kitura/Kitura.git", from: "2.6.0"),
+        .package(url: "https://github.com/Kitura/FileKit.git", .upToNextMinor(from: "0.0.0")),
+        .package(url: "https://github.com/Kitura/HeliumLogger.git", from: "1.8.0"),
+        .package(url: "https://github.com/Kitura/Swift-JWT.git", from: "3.1.0"),
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.

Tests/SwiftyRequestTests/SwiftyRequestTests.swift

@@ -531,7 +531,7 @@ class SwiftyRequestTests: XCTestCase {
     func testFileDownload() {
         let expectation = self.expectation(description: "download file SwiftyRequest test")
 
-        let url = "https://raw.githubusercontent.com/IBM-Swift/SwiftyRequest/c7cfc669a5872831e816d9f9c6fec06bc638222b/Tests/SwiftyRequestTests/test_file.json"
+        let url = "https://raw.githubusercontent.com/Kitura/SwiftyRequest/c7cfc669a5872831e816d9f9c6fec06bc638222b/Tests/SwiftyRequestTests/test_file.json"
 
         let request = RestRequest(url: url)
 

docs/Classes.html

@@ -21,7 +21,7 @@
     <header class="header">
       <p class="header-col header-col--primary">
         <a class="header-link" href="index.html">
-          SwiftyRequest Docs
+          SwiftyRequest 2.2.1 Docs
         </a>
          (91% documented)
       </p>
@@ -33,7 +33,7 @@
       </p>
 
         <p class="header-col header-col--secondary">
-          <a class="header-link" href="https://github.com/IBM-Swift/SwiftyRequest">
+          <a class="header-link" href="https://github.com/Kitura/SwiftyRequest">
             <img class="header-icon" src="img/gh.png"/>
             View on GitHub
           </a>
@@ -111,7 +111,7 @@
       <article class="main-content">
 
         <section class="section">
-          <div class="section-content">
+          <div class="section-content top-matter">
             <h1>Classes</h1>
             <p>The following classes are available globally.</p>
 
@@ -150,10 +150,6 @@ <h4>Declaration</h4>
                     </section>
                   </div>
                 </li>
-              </ul>
-            </div>
-            <div class="task-group">
-              <ul class="item-container">
                 <li class="item">
                   <div>
                     <code>
@@ -182,10 +178,6 @@ <h4>Declaration</h4>
                     </section>
                   </div>
                 </li>
-              </ul>
-            </div>
-            <div class="task-group">
-              <ul class="item-container">
                 <li class="item">
                   <div>
                     <code>
@@ -223,8 +215,8 @@ <h4>Declaration</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2019 <a class="link" href="https://github.com/IBM-Swift/SwiftyRequest" target="_blank" rel="external">IBM</a>. All rights reserved. (Last updated: 2019-09-27)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2020 <a class="link" href="https://github.com/Kitura/SwiftyRequest" target="_blank" rel="external">IBM &amp; Kitura Project Contributors</a>. All rights reserved. (Last updated: 2020-11-25)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
     </section>
   </body>
 </div>

docs/Classes/MultipartFormData.html

@@ -21,7 +21,7 @@
     <header class="header">
       <p class="header-col header-col--primary">
         <a class="header-link" href="../index.html">
-          SwiftyRequest Docs
+          SwiftyRequest 2.2.1 Docs
         </a>
          (91% documented)
       </p>
@@ -33,7 +33,7 @@
       </p>
 
         <p class="header-col header-col--secondary">
-          <a class="header-link" href="https://github.com/IBM-Swift/SwiftyRequest">
+          <a class="header-link" href="https://github.com/Kitura/SwiftyRequest">
             <img class="header-icon" src="../img/gh.png"/>
             View on GitHub
           </a>
@@ -111,10 +111,11 @@
       <article class="main-content">
 
         <section class="section">
-          <div class="section-content">
+          <div class="section-content top-matter">
             <h1>MultipartFormData</h1>
               <div class="declaration">
                 <div class="language">
+
                   <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">class</span> <span class="kt">MultipartFormData</span></code></pre>
 
                 </div>
@@ -187,7 +188,7 @@ <h4>Declaration</h4>
                     <code>
                     <a name="/s:13SwiftyRequest17MultipartFormDataC6append_8withName8mimeType04fileH0y10Foundation0E0V_S2SSgAKtF"></a>
                     <a name="//apple_ref/swift/Method/append(_:withName:mimeType:fileName:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:13SwiftyRequest17MultipartFormDataC6append_8withName8mimeType04fileH0y10Foundation0E0V_S2SSgAKtF">append(_:withName:mimeType:fileName:)</a>
+                    <a class="token" href="#/s:13SwiftyRequest17MultipartFormDataC6append_8withName8mimeType04fileH0y10Foundation0E0V_S2SSgAKtF">append(_:<wbr>withName:<wbr>mimeType:<wbr>fileName:<wbr>)</a>
                     </code>
                   </div>
                   <div class="height-container">
@@ -273,7 +274,7 @@ <h4>Return Value</h4>
                     <code>
                     <a name="/s:13SwiftyRequest17MultipartFormDataC6append_8withName8mimeTypey10Foundation3URLV_S2SSgtF"></a>
                     <a name="//apple_ref/swift/Method/append(_:withName:mimeType:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:13SwiftyRequest17MultipartFormDataC6append_8withName8mimeTypey10Foundation3URLV_S2SSgtF">append(_:withName:mimeType:)</a>
+                    <a class="token" href="#/s:13SwiftyRequest17MultipartFormDataC6append_8withName8mimeTypey10Foundation3URLV_S2SSgtF">append(_:<wbr>withName:<wbr>mimeType:<wbr>)</a>
                     </code>
                   </div>
                   <div class="height-container">
@@ -381,8 +382,8 @@ <h4>Return Value</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2019 <a class="link" href="https://github.com/IBM-Swift/SwiftyRequest" target="_blank" rel="external">IBM</a>. All rights reserved. (Last updated: 2019-09-27)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2020 <a class="link" href="https://github.com/Kitura/SwiftyRequest" target="_blank" rel="external">IBM &amp; Kitura Project Contributors</a>. All rights reserved. (Last updated: 2020-11-25)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
     </section>
   </body>
 </div>