Merge pull request #66 from mono0926/swift4

Swift4
mono0926 · Aug 9, 2017 · 0e37269 · 0e37269
2 parents 7c7e6ef + d53fac6
commit 0e37269
Show file tree

Hide file tree

Showing 5 changed files with 87 additions and 8 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -0,0 +1,79 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "APIKit",
+        "repositoryURL": "https://github.com/ishkawa/APIKit.git",
+        "state": {
+          "branch": null,
+          "revision": "e756462be5f19101fcbed77465b168f6167be7af",
+          "version": "3.1.2"
+        }
+      },
+      {
+        "package": "Commander",
+        "repositoryURL": "https://github.com/kylef/Commander.git",
+        "state": {
+          "branch": null,
+          "revision": "4c320a3507d621d27f89514eb576664becfee643",
+          "version": "0.6.1"
+        }
+      },
+      {
+        "package": "HeliumLogger",
+        "repositoryURL": "https://github.com/IBM-Swift/HeliumLogger.git",
+        "state": {
+          "branch": null,
+          "revision": "9b310ce5d126580028de665c914578d58e34b8ac",
+          "version": "1.7.0"
+        }
+      },
+      {
+        "package": "Himotoki",
+        "repositoryURL": "https://github.com/ikesyo/Himotoki.git",
+        "state": {
+          "branch": null,
+          "revision": "ed691fd21fe2adc6f0ea4ca53b0609a1ef8fb226",
+          "version": "3.1.0"
+        }
+      },
+      {
+        "package": "LoggerAPI",
+        "repositoryURL": "https://github.com/IBM-Swift/LoggerAPI.git",
+        "state": {
+          "branch": null,
+          "revision": "51bca3a997a299ab7291c62bf91ec9c8e299f42a",
+          "version": "1.7.0"
+        }
+      },
+      {
+        "package": "Result",
+        "repositoryURL": "https://github.com/antitypical/Result.git",
+        "state": {
+          "branch": null,
+          "revision": "c8446185238659a2b27c0261f64ff1254291d07d",
+          "version": "3.2.3"
+        }
+      },
+      {
+        "package": "Spectre",
+        "repositoryURL": "https://github.com/kylef/Spectre.git",
+        "state": {
+          "branch": null,
+          "revision": "e46b75cf03ad5e563b4b0a5068d3d6f04d77d80b",
+          "version": "0.7.2"
+        }
+      },
+      {
+        "package": "Yaml",
+        "repositoryURL": "https://github.com/behrang/YamlSwift.git",
+        "state": {
+          "branch": null,
+          "revision": "901c4943f3206afb3b965bad2d1338e3c4fdbeba",
+          "version": "3.4.0"
+        }
+      }
+    ]
+  },
+  "version": 1
+}
diff --git a/Sources/LicensePlistCore/Entity/CocoaPodsLicense.swift b/Sources/LicensePlistCore/Entity/CocoaPodsLicense.swift
@@ -45,7 +45,7 @@ private struct AcknowledgementsPlist {
     let preferenceSpecifiers: [PreferenceSpecifier]
 }
 
-extension AcknowledgementsPlist: Decodable {
+extension AcknowledgementsPlist: Himotoki.Decodable {
     static func decode(_ e: Extractor) throws -> AcknowledgementsPlist {
         return try AcknowledgementsPlist(preferenceSpecifiers: e.array("PreferenceSpecifiers"))
     }
@@ -59,7 +59,7 @@ private struct PreferenceSpecifier {
     var isLicense: Bool { return license != nil }
 }
 
-extension PreferenceSpecifier: Decodable {
+extension PreferenceSpecifier: Himotoki.Decodable {
     static func decode(_ e: Extractor) throws -> PreferenceSpecifier {
         return try PreferenceSpecifier(footerText: e.value("FooterText"),
                                        title: e.value("Title"),

diff --git a/Sources/LicensePlistCore/GitHubClient/GitHubRequest.swift b/Sources/LicensePlistCore/GitHubClient/GitHubRequest.swift
@@ -21,7 +21,7 @@ extension GitHubRequest {
     }
 }
 
-extension GitHubRequest where Response: Decodable {
+extension GitHubRequest where Response: Himotoki.Decodable {
     func response(from object: Any, urlResponse: HTTPURLResponse) throws -> Response {
         return try decodeValue(object)
     }

diff --git a/Sources/LicensePlistCore/GitHubClient/RepoRequests.swift b/Sources/LicensePlistCore/GitHubClient/RepoRequests.swift
@@ -39,7 +39,7 @@ struct LicenseResponse {
     let kind: LicenseKindResponse
 }
 
-extension LicenseResponse: Decodable {
+extension LicenseResponse: Himotoki.Decodable {
     static func decode(_ e: Extractor) throws -> LicenseResponse {
         let content: String = try e.value("content")
         let encofing: String = try e.value("encoding")
@@ -57,7 +57,7 @@ struct LicenseKindResponse {
     let spdxId: String?
 }
 
-extension LicenseKindResponse: Decodable {
+extension LicenseKindResponse: Himotoki.Decodable {
     static func decode(_ e: Extractor) throws -> LicenseKindResponse {
         return try LicenseKindResponse(name: e.value("name"), spdxId: e.valueOptional("spdx_id"))
     }

diff --git a/Sources/LicensePlistCore/GitHubClient/SearchRequests.swift b/Sources/LicensePlistCore/GitHubClient/SearchRequests.swift
@@ -28,7 +28,7 @@ struct RepositoriesResponse {
     let items: [RepositoryResponse]
 }
 
-extension RepositoriesResponse: Decodable {
+extension RepositoriesResponse: Himotoki.Decodable {
     static func decode(_ e: Extractor) throws -> RepositoriesResponse {
         return try RepositoriesResponse(items: e.array("items"))
     }
@@ -48,7 +48,7 @@ final class RepositoryResponse {
     }
 }
 
-extension RepositoryResponse: Decodable {
+extension RepositoryResponse: Himotoki.Decodable {
     static func decode(_ e: Extractor) throws -> RepositoryResponse {
         return try RepositoryResponse(owner: e.value("owner"),
                                       name: e.value("name"),
@@ -61,7 +61,7 @@ struct RepositoryOwnerResponse {
     let login: String
 }
 
-extension RepositoryOwnerResponse: Decodable {
+extension RepositoryOwnerResponse: Himotoki.Decodable {
     static func decode(_ e: Extractor) throws -> RepositoryOwnerResponse {
         return try RepositoryOwnerResponse(login: e.value("login"))
     }