Merge remote-tracking branch 'refs/remotes/origin/gh-pages'

Sources/ScrobbleKit/Public/Models/SBKAlbum.swift

@@ -18,7 +18,7 @@ public struct SBKAlbum: Decodable {
     /// The playcount of the album.
     public var playcount: Int?
     /// The URL of the album on Last.fm.
-    public var url: String?
+    public var url: URL?
     /// The number of listeners for the album.
     public var listeners: Int?
     /// The wiki information associated with the album.
@@ -81,7 +81,7 @@ public struct SBKAlbum: Decodable {
     internal init(topAlbumArtist: SBKArtistTopAlbum) {
         self.artist = topAlbumArtist.artist.name
         self.name = topAlbumArtist.name
-        self.url = topAlbumArtist.url
+        self.url = URL(optionalString: topAlbumArtist.url)
         self.musicBrainzID = UUID(optionalString: topAlbumArtist.mbid)
         self.playcount = topAlbumArtist.playcount
         self.image = topAlbumArtist.image
@@ -103,7 +103,7 @@ public struct SBKAlbum: Decodable {
         self.playcount = try container.decodeIfPresent(IntegerStringDecoder.self, forKey: SBKAlbum.CodingKeys.playcount)?.intValue
         self.image = try container.decodeIfPresent([SBKImageResponse].self, forKey: SBKAlbum.CodingKeys.image)
         self.tracks = try container.decodeIfPresent(SBKAlbumTracksRequestResponseList.self, forKey: SBKAlbum.CodingKeys.tracks)
-        self.url = try container.decodeIfPresent(String.self, forKey: SBKAlbum.CodingKeys.url)
+        self.url = try container.decodeIfPresent(URL.self, forKey: SBKAlbum.CodingKeys.url)
         self.listeners = try container.decodeIfPresent(IntegerStringDecoder.self, forKey: SBKAlbum.CodingKeys.listeners)?.intValue
         self.wiki = try container.decodeIfPresent(SBKWiki.self, forKey: SBKAlbum.CodingKeys.wiki)
 

Sources/ScrobbleKit/Public/Models/SBKTag.swift

@@ -13,7 +13,7 @@ import Foundation
 public struct SBKTag: Decodable {
 
     /// The URL for the tag on the Last.fm website.
-    public let url: String?
+    public let url: URL?
 
     /// The name of the tag.
     public let name: String
@@ -35,14 +35,14 @@ public struct SBKTag: Decodable {
     public init(from decoder: Decoder) throws {
         let container: KeyedDecodingContainer<SBKTag.CodingKeys> = try decoder.container(keyedBy: SBKTag.CodingKeys.self)
 
-        self.url = try container.decodeIfPresent(String.self, forKey: SBKTag.CodingKeys.url)
+        self.url = try container.decodeIfPresent(URL.self, forKey: SBKTag.CodingKeys.url)
         self.name = try container.decode(String.self, forKey: SBKTag.CodingKeys.name)
         self.reach = try container.decodeIfPresent(Int.self, forKey: SBKTag.CodingKeys.reach)
         self.count = try? container.decodeIfPresent(Int.self, forKey: SBKTag.CodingKeys.count)
         self.wiki = try container.decodeIfPresent(SBKWiki.self, forKey: SBKTag.CodingKeys.wiki)
     }
 
-    internal init(url: String? = nil, name: String, reach: Int? = nil, count: Int? = nil, wiki: SBKWiki? = nil) {
+    internal init(url: URL? = nil, name: String, reach: Int? = nil, count: Int? = nil, wiki: SBKWiki? = nil) {
         self.url = url
         self.name = name
         self.reach = reach

docs/metadata.json

@@ -1 +1 @@
-{"schemaVersion":{"minor":1,"patch":0,"major":0},"bundleDisplayName":"ScrobbleKit","bundleIdentifier":"ScrobbleKit"}
+{"bundleDisplayName":"ScrobbleKit","schemaVersion":{"major":0,"patch":0,"minor":1},"bundleIdentifier":"ScrobbleKit"}