Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Sources/Mailgun/Extensions/MailgunClient+encode.swift
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
#if canImport(FoundationEssentials)
import FoundationEssentials
#else
import Foundation
#endif

extension MailgunClient {
func encode(apiKey: String) throws -> String {
guard let apiKeyData = "api:\(apiKey)".data(using: .utf8) else {
Expand Down
1 change: 1 addition & 0 deletions Sources/Mailgun/Extensions/MailgunClient+parse.swift
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import NIOFoundationCompat
import Vapor

extension MailgunClient {
Expand Down
6 changes: 3 additions & 3 deletions Sources/Mailgun/Models/MailgunIncomingMessage.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Vapor
public import Vapor

public struct MailgunIncomingMessage: Content {
public static var defaultContentType: HTTPMediaType { .formData }
Expand Down Expand Up @@ -49,7 +49,7 @@ public struct MailgunIncomingMessage: Content {
}
}

public init(from decoder: Decoder) throws {
public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: CodingKeys.self)
recipient = try container.decode(String.self, forKey: .recipient)
sender = try container.decode(String.self, forKey: .sender)
Expand All @@ -65,7 +65,7 @@ public struct MailgunIncomingMessage: Content {

var _attachments: [File] = []
let attachmentsContainer = try decoder.container(keyedBy: DynamicAttachmentKey.self)
try attachmentsContainer.allKeys.forEach { attachmentKey in
for attachmentKey in attachmentsContainer.allKeys {
_attachments.append(try attachmentsContainer.decode(File.self, forKey: attachmentKey))
}
attachments = _attachments
Expand Down
7 changes: 6 additions & 1 deletion Sources/Mailgun/Models/MailgunRouteSetup.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import Foundation
public import Vapor

#if canImport(FoundationEssentials)
import FoundationEssentials
#else
import Foundation
#endif

public struct MailgunRouteSetup: Content {
public static var defaultContentType: HTTPMediaType { .urlEncodedForm }

Expand Down
4 changes: 2 additions & 2 deletions Sources/Mailgun/Models/MailgunTemplate.swift
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import Vapor
public import Vapor

/// Template, see https://documentation.mailgun.com/en/latest/api-templates.html#templates
public struct MailgunTemplate: Content {
public static let defaultContentType: HTTPMediaType { .formData }
public static var defaultContentType: HTTPMediaType { .formData }

public let name: String
public let description: String
Expand Down
2 changes: 1 addition & 1 deletion Tests/MailgunTests/MailgunTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import SystemPackage
import Testing
import VaporTesting

@Suite("Mailgun Tests")
@Suite("Mailgun Tests", .serialized)
struct MailgunTests {
private func configure(_ app: Application) async throws {
let config = ConfigReader(providers: [
Expand Down
Loading