From 2db6fb923c5a1646670bb8f3468c63b133af573f Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Mon, 20 Jun 2022 09:44:14 -0500 Subject: [PATCH 1/5] ordered headers above compilation in BuildPhase for Xcode 13 fix Signed-off-by: Matt Bruce --- MVMCore/MVMCore.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCore/MVMCore.xcodeproj/project.pbxproj b/MVMCore/MVMCore.xcodeproj/project.pbxproj index 09c65e5..394e10b 100644 --- a/MVMCore/MVMCore.xcodeproj/project.pbxproj +++ b/MVMCore/MVMCore.xcodeproj/project.pbxproj @@ -765,9 +765,9 @@ isa = PBXNativeTarget; buildConfigurationList = 8876D5D11FB50A9E00EB2E3D /* Build configuration list for PBXNativeTarget "MVMCore" */; buildPhases = ( + 8876D5C61FB50A9E00EB2E3D /* Headers */, 8876D5C41FB50A9E00EB2E3D /* Sources */, 8876D5C51FB50A9E00EB2E3D /* Frameworks */, - 8876D5C61FB50A9E00EB2E3D /* Headers */, 8876D5C71FB50A9E00EB2E3D /* Resources */, ); buildRules = ( From f2bde996a83fe2678aca9cd6a89a22334e086327 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Mon, 20 Jun 2022 09:48:37 -0500 Subject: [PATCH 2/5] created init for Model Signed-off-by: Matt Bruce --- .../ActionType/Client Parameters/ClientParameterModel.swift | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterModel.swift b/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterModel.swift index 37940d7..f570df6 100644 --- a/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterModel.swift +++ b/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterModel.swift @@ -16,6 +16,11 @@ public class ClientParameterModel: Codable { case timeout case list } + + public init(timeout: Double?, list: [ClientParameterModelProtocol]) { + self.timeout = timeout + self.list = list + } required public init(from decoder: Decoder) throws { let typeContainer = try decoder.container(keyedBy: CodingKeys.self) From 71fb70c6ebd6cd4e8bd825ea6849fc582d8c60e5 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Tue, 21 Jun 2022 14:56:52 -0500 Subject: [PATCH 3/5] added initializer Signed-off-by: Matt Bruce --- MVMCore/MVMCore/ActionHandling/OpenURLOptionsModel.swift | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MVMCore/MVMCore/ActionHandling/OpenURLOptionsModel.swift b/MVMCore/MVMCore/ActionHandling/OpenURLOptionsModel.swift index 045aa52..96557c7 100644 --- a/MVMCore/MVMCore/ActionHandling/OpenURLOptionsModel.swift +++ b/MVMCore/MVMCore/ActionHandling/OpenURLOptionsModel.swift @@ -12,6 +12,13 @@ import Foundation open class OpenUrlOptionsModel: Codable { public var options: [UIApplication.OpenExternalURLOptionsKey: Any] + //-------------------------------------------------- + // MARK: - Initializer + //-------------------------------------------------- + public init(options: [UIApplication.OpenExternalURLOptionsKey: Any]) { + self.options = options + } + //-------------------------------------------------- // MARK: - Codable //-------------------------------------------------- From 464df10708f633ba3b502efa9f39570781132cfc Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Tue, 21 Jun 2022 15:31:51 -0500 Subject: [PATCH 4/5] resolved for comments Signed-off-by: Matt Bruce --- MVMCore/MVMCore/ActionHandling/OpenURLOptionsModel.swift | 2 +- .../ActionType/Client Parameters/ClientParameterModel.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MVMCore/MVMCore/ActionHandling/OpenURLOptionsModel.swift b/MVMCore/MVMCore/ActionHandling/OpenURLOptionsModel.swift index 96557c7..09911c8 100644 --- a/MVMCore/MVMCore/ActionHandling/OpenURLOptionsModel.swift +++ b/MVMCore/MVMCore/ActionHandling/OpenURLOptionsModel.swift @@ -15,7 +15,7 @@ open class OpenUrlOptionsModel: Codable { //-------------------------------------------------- // MARK: - Initializer //-------------------------------------------------- - public init(options: [UIApplication.OpenExternalURLOptionsKey: Any]) { + public init(options: [UIApplication.OpenExternalURLOptionsKey: Any] = [:]) { self.options = options } diff --git a/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterModel.swift b/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterModel.swift index f570df6..e1381a6 100644 --- a/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterModel.swift +++ b/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterModel.swift @@ -17,7 +17,7 @@ public class ClientParameterModel: Codable { case list } - public init(timeout: Double?, list: [ClientParameterModelProtocol]) { + public init(list: [ClientParameterModelProtocol], timeout: Double?) { self.timeout = timeout self.list = list } From 5ca22837bf7784dd195c1c1c8671a34e56ee6381 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Tue, 21 Jun 2022 15:39:41 -0500 Subject: [PATCH 5/5] added default value Signed-off-by: Matt Bruce --- .../ActionType/Client Parameters/ClientParameterModel.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterModel.swift b/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterModel.swift index e1381a6..9e63c27 100644 --- a/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterModel.swift +++ b/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterModel.swift @@ -17,7 +17,7 @@ public class ClientParameterModel: Codable { case list } - public init(list: [ClientParameterModelProtocol], timeout: Double?) { + public init(list: [ClientParameterModelProtocol], timeout: Double? = nil) { self.timeout = timeout self.list = list }