Support Unreal Engine 5.5

nutti · Dec 29, 2024 · c2b1292 · c2b1292
1 parent d4ac8cb
commit c2b1292
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 13 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,9 +9,8 @@ workflows:
             - unreal-engine-ci
           matrix:
             parameters:
-              # TODO: The container image is not supported for 5.4.0.
               unreal-engine-version: [
-                "4.27.0", "5.0.0", "5.1.0", "5.2.0", "5.3.0"
+                "4.27.0", "5.0.0", "5.1.0", "5.2.0", "5.3.0", "5.4.3", "5.5.1"
               ]
               version: ["free", "full"]
       - build-sample:

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -19,7 +19,10 @@ jobs:
       fail-fast: false
       matrix:
         unreal_engine_version:
-          ["4.27.0", "5.0.0", "5.1.0", "5.2.0", "5.3.0", "5.4.0"]
+          [
+            "4.27.0",
+            "5.0.0", "5.1.0", "5.2.0", "5.3.0", "5.4.0", "5.5.0"
+          ]
         version:
           ["free", "full"]
     steps:
@@ -45,7 +48,7 @@ jobs:
           mv BlueprintToRSTDoc_UE${{ matrix.unreal_engine_version }}_${{ matrix.version }}.zip release-plugin-${{ matrix.version }}
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: BlueprintToRSTDoc_${{ matrix.version }}
           path: "release-plugin-${{ matrix.version }}"
@@ -64,7 +67,7 @@ jobs:
           mv samples/SampleProject.zip release-sample
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: SampleProject
           path: "release-sample"
@@ -78,7 +81,7 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v2
       - name: Fetch Artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           path: dist
       - name: Install hub command

diff --git a/BlueprintToRSTDoc/BlueprintToRSTDoc.uplugin b/BlueprintToRSTDoc/BlueprintToRSTDoc.uplugin
@@ -4,7 +4,7 @@
   "VersionName": "1.2",
   "FriendlyName": "Blueprint to reStructuredText Document",
   "Description": "Generate reStructuredText (RST) Format Documents from Blueprints",
-  "EngineVersion": "5.4.0",
+  "EngineVersion": "5.5.0",
   "Category": "Other",
   "CreatedBy": "nutti (Colorful Pico)",
   "CreatedByURL": "https://github.com/nutti/UEPlugin-BlueprintToRSTDoc",

diff --git a/BlueprintToRSTDoc/Source/BlueprintToRSTDoc/Private/BPLibrary.cpp b/BlueprintToRSTDoc/Source/BlueprintToRSTDoc/Private/BPLibrary.cpp
@@ -14,12 +14,17 @@
 #include "Common.h"
 #include "EdGraphSchema_K2.h"
 #include "Engine/UserDefinedEnum.h"
-#include "Engine/UserDefinedStruct.h"
 #include "GenericPlatform/GenericPlatformFile.h"
 #include "HAL/FileManagerGeneric.h"
 #include "Misc/EngineVersionComparison.h"
 #include "Settings.h"
 
+#if !UE_VERSION_OLDER_THAN(5, 5, 0)
+#include "StructUtils/UserDefinedStruct.h"
+#else
+#include "Engine/UserDefinedStruct.h"
+#endif
+
 void ConvertBPNameToCPPName(FString& Out, const FString& Type)
 {
 	Out = Type;

diff --git a/tests/functional_test/FunctionalTest/Content/FunctionalTest/TestEnumeration.uasset b/tests/functional_test/FunctionalTest/Content/FunctionalTest/TestEnumeration.uasset
diff --git a/tools/remove_code.sh b/tools/remove_code.sh
@@ -6,7 +6,7 @@ set -eEu
 
 SUPPORTED_VERSIONS=(
     "4.26.0" "4.27.0"
-    "5.0.0" "5.1.0" "5.2.0" "5.3.0" "5.4.0"
+    "5.0.0" "5.1.0" "5.2.0" "5.3.0" "5.4.0" "5.5.0"
 )
 
 function usage() {
@@ -19,7 +19,7 @@ if [ $# -ne 4 ]; then
 fi
 
 SOURCE_DIR=${1}
-ENGINE_VERSION=${2}
+ENGINE_VERSION="${2%.*}.0"
 FULL=0
 if [ "${3}" = "full" ]; then
     FULL=1

diff --git a/tools/replace_engine_version.sh b/tools/replace_engine_version.sh
@@ -6,7 +6,7 @@ set -eEu
 
 SUPPORTED_VERSIONS=(
     "4.26.0" "4.27.0"
-    "5.0.0" "5.1.0" "5.2.0" "5.3.0" "5.4.0"
+    "5.0.0" "5.1.0" "5.2.0" "5.3.0" "5.4.0" "5.5.0"
 )
 
 function usage() {
@@ -19,7 +19,7 @@ if [ $# -ne 2 ]; then
 fi
 
 source_dir=${1}
-engine_version=${2}
+engine_version="${2%.*}.0"
 
 supported=0
 for v in "${SUPPORTED_VERSIONS[@]}"; do
@@ -35,6 +35,6 @@ fi
 
 # shellcheck disable=SC2044
 for file in $(find "${source_dir}" -name "*.uplugin"); do
-    sed -i -e "s/\"EngineVersion\": \"5.4.0\",/\"EngineVersion\": \"${engine_version}\",/g" "${file}"
+    sed -i -e "s/\"EngineVersion\": \"5.5.0\",/\"EngineVersion\": \"${engine_version}\",/g" "${file}"
     echo "Replaced engine version in ${file}"
 done