From e386df6ce9d08f6886af39bfda914a8af1b3cde1 Mon Sep 17 00:00:00 2001 From: odinn1984 Date: Mon, 13 Nov 2023 11:10:20 +0200 Subject: [PATCH 1/2] feat: make this compile on ue5.1.1 --- .../BlockadeLabsSkyboxAi/Private/CustomMessageDialog.cpp | 2 +- .../Source/BlockadeLabsSkyboxAi/Public/CustomMessageDialog.h | 4 ++-- .../Source/SkyboxAiApi/Public/SKyboxAiHttpClient.h | 2 +- BlockadeLabsSkyboxAi/Source/SkyboxAiApi/SkyboxAiApi.Build.cs | 2 +- README.md | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/BlockadeLabsSkyboxAi/Source/BlockadeLabsSkyboxAi/Private/CustomMessageDialog.cpp b/BlockadeLabsSkyboxAi/Source/BlockadeLabsSkyboxAi/Private/CustomMessageDialog.cpp index 4e42ce0..042e309 100644 --- a/BlockadeLabsSkyboxAi/Source/BlockadeLabsSkyboxAi/Private/CustomMessageDialog.cpp +++ b/BlockadeLabsSkyboxAi/Source/BlockadeLabsSkyboxAi/Private/CustomMessageDialog.cpp @@ -1,6 +1,6 @@ #include "CustomMessageDialog.h" -#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION == 0 +#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION <= 1 EAppReturnType::Type FCustomMessageDialog::Open( EAppMsgCategory MessageCategory, diff --git a/BlockadeLabsSkyboxAi/Source/BlockadeLabsSkyboxAi/Public/CustomMessageDialog.h b/BlockadeLabsSkyboxAi/Source/BlockadeLabsSkyboxAi/Public/CustomMessageDialog.h index 6c225d2..69199f5 100644 --- a/BlockadeLabsSkyboxAi/Source/BlockadeLabsSkyboxAi/Public/CustomMessageDialog.h +++ b/BlockadeLabsSkyboxAi/Source/BlockadeLabsSkyboxAi/Public/CustomMessageDialog.h @@ -1,6 +1,6 @@ #pragma once -#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION == 0 +#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION <= 1 enum class EAppMsgCategory : uint8 { @@ -14,7 +14,7 @@ enum class EAppMsgCategory : uint8 struct FCustomMessageDialog : FMessageDialog { -#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION == 0 +#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION <= 1 static EAppReturnType::Type Open( EAppMsgCategory MessageCategory, diff --git a/BlockadeLabsSkyboxAi/Source/SkyboxAiApi/Public/SKyboxAiHttpClient.h b/BlockadeLabsSkyboxAi/Source/SkyboxAiApi/Public/SKyboxAiHttpClient.h index 901d18e..bc229f0 100644 --- a/BlockadeLabsSkyboxAi/Source/SkyboxAiApi/Public/SKyboxAiHttpClient.h +++ b/BlockadeLabsSkyboxAi/Source/SkyboxAiApi/Public/SKyboxAiHttpClient.h @@ -4,7 +4,7 @@ #if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION == 3 #include "HttpFwd.h" -#elif ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION == 0 +#elif ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION <= 1 #include "Interfaces/IHttpRequest.h" #endif diff --git a/BlockadeLabsSkyboxAi/Source/SkyboxAiApi/SkyboxAiApi.Build.cs b/BlockadeLabsSkyboxAi/Source/SkyboxAiApi/SkyboxAiApi.Build.cs index db907b8..446956c 100644 --- a/BlockadeLabsSkyboxAi/Source/SkyboxAiApi/SkyboxAiApi.Build.cs +++ b/BlockadeLabsSkyboxAi/Source/SkyboxAiApi/SkyboxAiApi.Build.cs @@ -55,7 +55,7 @@ public SkyboxAiApi(ReadOnlyTargetRules Target) : base(Target) if (BuildVersion.TryRead(BuildVersion.GetDefaultFileName(), out Version)) { - if (Version.MajorVersion == 5 && Version.MinorVersion == 0) + if (Version.MajorVersion == 5 && Version.MinorVersion <= 1) { PrivateDependencyModuleNames.AddRange( new string[] diff --git a/README.md b/README.md index 569c1e9..5686808 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ There are many solutions for secret management, please use one of them if you wa | Engine Version | Windows | Linux | OSX | | -------------- | ------- | ----- | --- | | **5.0** | YES | NO | NO | -| **5.1** | NO | NO | NO | +| **5.1** | YES | NO | NO | | **5.2** | NO | NO | NO | | **5.3** | YES | NO | NO | From cd839a44da0faa4f06cbd6befd1b81348ce37176 Mon Sep 17 00:00:00 2001 From: odinn1984 Date: Mon, 13 Nov 2023 11:56:34 +0200 Subject: [PATCH 2/2] feat: make this compile on ue5.2.1 --- .../BlockadeLabsSkyboxAi/Private/CustomMessageDialog.cpp | 2 +- .../Source/BlockadeLabsSkyboxAi/Public/CustomMessageDialog.h | 4 ++-- .../Source/SkyboxAiApi/Public/SKyboxAiHttpClient.h | 3 ++- README.md | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/BlockadeLabsSkyboxAi/Source/BlockadeLabsSkyboxAi/Private/CustomMessageDialog.cpp b/BlockadeLabsSkyboxAi/Source/BlockadeLabsSkyboxAi/Private/CustomMessageDialog.cpp index 042e309..92c6377 100644 --- a/BlockadeLabsSkyboxAi/Source/BlockadeLabsSkyboxAi/Private/CustomMessageDialog.cpp +++ b/BlockadeLabsSkyboxAi/Source/BlockadeLabsSkyboxAi/Private/CustomMessageDialog.cpp @@ -1,6 +1,6 @@ #include "CustomMessageDialog.h" -#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION <= 1 +#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION <= 2 EAppReturnType::Type FCustomMessageDialog::Open( EAppMsgCategory MessageCategory, diff --git a/BlockadeLabsSkyboxAi/Source/BlockadeLabsSkyboxAi/Public/CustomMessageDialog.h b/BlockadeLabsSkyboxAi/Source/BlockadeLabsSkyboxAi/Public/CustomMessageDialog.h index 69199f5..8d15954 100644 --- a/BlockadeLabsSkyboxAi/Source/BlockadeLabsSkyboxAi/Public/CustomMessageDialog.h +++ b/BlockadeLabsSkyboxAi/Source/BlockadeLabsSkyboxAi/Public/CustomMessageDialog.h @@ -1,6 +1,6 @@ #pragma once -#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION <= 1 +#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION <= 2 enum class EAppMsgCategory : uint8 { @@ -14,7 +14,7 @@ enum class EAppMsgCategory : uint8 struct FCustomMessageDialog : FMessageDialog { -#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION <= 1 +#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION <= 2 static EAppReturnType::Type Open( EAppMsgCategory MessageCategory, diff --git a/BlockadeLabsSkyboxAi/Source/SkyboxAiApi/Public/SKyboxAiHttpClient.h b/BlockadeLabsSkyboxAi/Source/SkyboxAiApi/Public/SKyboxAiHttpClient.h index bc229f0..17c675d 100644 --- a/BlockadeLabsSkyboxAi/Source/SkyboxAiApi/Public/SKyboxAiHttpClient.h +++ b/BlockadeLabsSkyboxAi/Source/SkyboxAiApi/Public/SKyboxAiHttpClient.h @@ -2,13 +2,14 @@ #include "CoreMinimal.h" -#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION == 3 +#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 2 #include "HttpFwd.h" #elif ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION <= 1 #include "Interfaces/IHttpRequest.h" #endif #include "JsonObjectConverter.h" +#include "Logging/MessageLog.h" #include "SkyboxAiHttpClient.generated.h" typedef TFunction FSkyboxAiHttpCallback; diff --git a/README.md b/README.md index 5686808..4f834bf 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ There are many solutions for secret management, please use one of them if you wa | -------------- | ------- | ----- | --- | | **5.0** | YES | NO | NO | | **5.1** | YES | NO | NO | -| **5.2** | NO | NO | NO | +| **5.2** | YES | NO | NO | | **5.3** | YES | NO | NO | ## Setting Up The Plugin