Merge pull request #93 from mattpolzin/swift-5_4

Swift 5 4 CI
mattpolzin · Mar 7, 2021 · 717f3d6 · 717f3d6
2 parents 5a80661 + a8c4bf6
commit 717f3d6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -23,6 +23,7 @@ jobs:
           - swift:5.3-focal
           - swift:5.3-centos8
           - swift:5.3-amazonlinux2
+          - swiftlang/swift:nightly-5.4-focal
     container: ${{ matrix.image }}
     steps:
     - name: Checkout code

diff --git a/Sources/JSONAPI/Resource/Resource Object/ResourceObject.swift b/Sources/JSONAPI/Resource/Resource Object/ResourceObject.swift
@@ -128,7 +128,7 @@ public struct ResourceObject<Description: JSONAPI.ResourceObjectDescription, Met
     /// the entity is being created clientside and the
     /// server is being asked to create a unique Id. Otherwise,
     /// this should be of a type conforming to `IdType`.
-    public let id: ResourceObject.Id
+    public let id: JSONAPI.Id<EntityRawIdType, Self>
 
     /// The JSON API compliant attributes of this `ResourceObject`.
     public let attributes: Description.Attributes

diff --git a/Sources/JSONAPI/Resource/Resource Object/ResourceObjectDecodingError.swift b/Sources/JSONAPI/Resource/Resource Object/ResourceObjectDecodingError.swift
@@ -77,7 +77,7 @@ public struct ResourceObjectDecodingError: Swift.Error, Equatable {
     init?(_ jsonAPIError: JSONAPICodingError, jsonAPIType: String) {
         self.resourceObjectJsonAPIType = jsonAPIType
         switch jsonAPIError {
-        case .typeMismatch(expected: let expected, found: let found, path: let path):
+        case .typeMismatch(expected: _, found: let found, path: let path):
             (location, subjectName) = Self.context(path: path)
             cause = .jsonTypeMismatch(foundType: found)
         case .quantityMismatch(expected: let expected, path: let path):