Updated PlantUML to support %dirpath()

Fruchtzwerg94 · Nov 16, 2024 · 54431f9 · 54431f9
1 parent 4e67ca2
commit 54431f9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/CI_build.yml b/.github/workflows/CI_build.yml
@@ -40,8 +40,8 @@ jobs:
     - name: Download libraries
       if: matrix.build_configuration == 'Release'
       run: |
-        curl -L --url https://github.com/plantuml/plantuml/releases/download/v1.2024.3/plantuml-1.2024.3.jar --output deploy/plantuml-1.2024.3.jar
-        if ((Get-FileHash -Algorithm MD5 -Path "deploy/plantuml-1.2024.3.jar").Hash -ne "6a918f7a0710b7d6e5373e9151ffa481") { throw "MD5 sum is invalid" }
+        curl -L --url https://github.com/plantuml/plantuml/releases/download/v1.2024.8/plantuml-1.2024.8.jar --output deploy/plantuml-1.2024.8.jar
+        if ((Get-FileHash -Algorithm MD5 -Path "deploy/plantuml-1.2024.8.jar").Hash -ne "ea448bf2868d4c82bb3abad32ee32c0d") { throw "MD5 sum is invalid" }
         curl -L --url http://beta.plantuml.net/plantuml-jlatexmath.zip --output deploy/plantuml-jlatexmath.zip
         if ((Get-FileHash -Algorithm MD5 -Path "deploy/plantuml-jlatexmath.zip").Hash -ne "32a81facc3b8ed331f0d19f2c23d709a") { throw "MD5 sum is invalid" }
         tar -xf deploy/plantuml-jlatexmath.zip -C deploy

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,8 @@
-# X.X.X.X (XX.XX.XXXX)
+# 1.8.0.12 (16.11.2024)
+- PlantUML version updated to 1.2024.8
 - Removed dependency to PlantUml.Net library
 - Removed dependency to Fizzler library
-- Added generated filename to support built in %filename() preprocessor function
+- Added generated file information to support built in %filename() and %dirpath() preprocessor functions
 - Fixed diagram background not set e.g. if white
 
 # 1.7.0.11 (22.02.2024)

diff --git a/PlantUmlViewer/PlantUmlViewer/DiagramGeneration/PlantUml/PlantUmlRunner.cs b/PlantUmlViewer/PlantUmlViewer/DiagramGeneration/PlantUml/PlantUmlRunner.cs
@@ -33,6 +33,7 @@ public static async Task<byte[]> Generate(string javaExecutable, string plantUml
                     "-charset UTF-8",
                     GetOutputFormatArgument(plantUmlArguments.OutputFormat),
                     GetErrorFormatArgument(plantUmlArguments.ErrorFormat),
+                    $"-filedir \"{workingDirectory}\"",
                     string.IsNullOrEmpty(plantUmlArguments.FileName) ? string.Empty : $"-filename \"{plantUmlArguments.FileName}\"",
                     string.IsNullOrEmpty(plantUmlArguments.Include) ? string.Empty : $"\"-I{plantUmlArguments.Include}\"",
                     string.IsNullOrEmpty(plantUmlArguments.Delimitor) ? string.Empty : $"-pipedelimitor \"{plantUmlArguments.Delimitor}\"",

diff --git a/PlantUmlViewer/PlantUmlViewer/PlantUmlViewer.cs b/PlantUmlViewer/PlantUmlViewer/PlantUmlViewer.cs
@@ -14,7 +14,7 @@ namespace PlantUmlViewer
     internal class PlantUmlViewer
     {
         public const string PLUGIN_NAME = "PlantUML Viewer";
-        public const string PLANT_UML_VERSION = "1.2024.3";
+        public const string PLANT_UML_VERSION = "1.2024.8";
         private const string PLANT_UML_JAR = "plantuml-" + PLANT_UML_VERSION + ".jar";
 
         private enum CommandId