From 54431f90e9c6ced38d961545ef1a5ad1eee34232 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sat, 16 Nov 2024 21:10:12 +0100 Subject: [PATCH] Updated PlantUML to support %dirpath() --- .github/workflows/CI_build.yml | 4 ++-- CHANGELOG.md | 5 +++-- .../DiagramGeneration/PlantUml/PlantUmlRunner.cs | 1 + PlantUmlViewer/PlantUmlViewer/PlantUmlViewer.cs | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/CI_build.yml b/.github/workflows/CI_build.yml index 4885978..5819176 100644 --- 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 index d069323..3941a10 100644 --- 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 index 56b5d9b..08f73a4 100644 --- a/PlantUmlViewer/PlantUmlViewer/DiagramGeneration/PlantUml/PlantUmlRunner.cs +++ b/PlantUmlViewer/PlantUmlViewer/DiagramGeneration/PlantUml/PlantUmlRunner.cs @@ -33,6 +33,7 @@ public static async Task 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 index c014e02..1d15366 100644 --- 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