Merge branch 'master' into PatchBranch

.github/labeler.yml

@@ -1,37 +1,55 @@
 'm:release':
-- 'CHANGELOG.md'
-- 'gradle.properties'
+- changed-files:
+  - any-glob-to-any-file:
+    - 'CHANGELOG.md'
+    - 'gradle.properties'
 
 'm:docs':
-- '*.md'
-- 'docs/**/*'
+- changed-files:
+  - any-glob-to-any-file:
+    - '*.md'
+    - 'docs/**/*'
 
 'm:workflow':
-- .github/**
+- changed-files:
+  - any-glob-to-any-file:
+    - .github/**
 
 'm:gradle':
-- 'gradle*'
-- 'gradle/**'
-- '**/settings.gradle.*'
-- '**/build.gradle.*'
-- 'sjpp.jar'
+- changed-files:
+  - any-glob-to-any-file:
+    - 'gradle*'
+    - 'gradle/**'
+    - '**/settings.gradle.*'
+    - '**/build.gradle.*'
+    - 'sjpp.jar'
 
 'm:source':
-- 'skin/**/*'
-- 'src/**/*'
-- 'stdlib/**/*'
-- 'svg/**/*'
-- 'themes/**/*'
-- 'manifest.txt'
+- changed-files:
+  - any-glob-to-any-file:
+    - 'skin/**/*'
+    - 'src/**/*'
+    - 'stdlib/**/*'
+    - 'svg/**/*'
+    - 'themes/**/*'
+    - 'manifest.txt'
 
 'm:test':
-- 'test/**/*'
+- changed-files:
+  - any-glob-to-any-file:
+    - 'test/**/*'
 
 'm:license':
-- '**/*license.txt'
+- changed-files:
+  - any-glob-to-any-file:
+    - '**/*license.txt'
 
 'm:docker':
-- Dockerfile
+- changed-files:
+  - any-glob-to-any-file:
+    - Dockerfile
 
 'm:native':
-- .github/workflows/native-image.yml
+- changed-files:
+  - any-glob-to-any-file:
+    - .github/workflows/native-image.yml

.github/workflows/ci.yml

@@ -115,7 +115,7 @@ jobs:
         run: gradle test --no-daemon -i
 
       - name: Upload test reports
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: needs.workflow_config.outputs.do_test_linux == 'true'
         with:
           # Using github.run_number here to reduce confusion when downloading & comparing from several builds
@@ -172,7 +172,7 @@ jobs:
         run: |
           echo "release_version=$(gradle properties -q | grep "version:" | awk '{print $2}')" >> $GITHUB_OUTPUT
       - name: Cache libs
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
         with:
           path: |
             build/libs
@@ -228,7 +228,7 @@ jobs:
           cache: gradle
 
       - name: Restore Libs cache
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
         with:
           path: |
             build/libs
@@ -244,7 +244,7 @@ jobs:
           enableCrossOsArchive: true
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           # Using github.run_number here to reduce confusion when downloading & comparing artifacts from several builds
           name: ${{ github.run_number }}-artifacts

.github/workflows/labeler.yml

@@ -9,4 +9,4 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v4
+    - uses: actions/labeler@v5

.github/workflows/native-image.yml

@@ -32,7 +32,7 @@ jobs:
           components: 'native-image'
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: actions/cache/restore@v3
+      - uses: actions/cache/restore@v4
         with:
           path: |
             build/libs
@@ -57,7 +57,7 @@ jobs:
           native-image -H:ConfigurationFileDirectories=native-image-config-dir --no-fallback --report-unsupported-elements-at-runtime -jar "build/libs/plantuml-${{ inputs.release-version }}.jar" -H:Path="build/libs" -H:Name="plantuml-${{ matrix.platform }}-${{ inputs.release-version }}"
 
       - name: Cache native image
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
         with:
           path: "build/libs/plantuml-${{ matrix.platform }}-*"
           key: "native-image-${{ matrix.platform }}-${{ github.run_id }}"

BUILDING.md

@@ -2,7 +2,7 @@
 
 Thank you for your interest in contributing to PlantUML! This guide will help you build the PlantUML project.
 
-PlantUML can be built using either [Gradle](#building-plantuml-with-gradle) or [Ant](#building-plantuml-with-ant-alternative-method). It's recommended to use Gradle as the primary build tool for this project. You will find instructions for both methods, starting with Gradle.
+PlantUML can be built using either [Gradle](#-building-plantuml-with-gradle) or [Ant](#-building-plantuml-with-ant-alternative-method). It's recommended to use Gradle as the primary build tool for this project. You will find instructions for both methods, starting with Gradle.
 
 ## ☕ Java Compatibility and Development Notes
 

gradle.properties

@@ -1,4 +1,4 @@
 # Warning, "version" should be the same in gradle.properties and Version.java
 # Any idea anyone how to magically synchronize those :-) ?
-version = 1.2024.1
+version = 1.2024.2beta1
 org.gradle.workers.max = 3

src/net/sourceforge/plantuml/dot/GraphvizUtils.java

@@ -197,7 +197,7 @@ public class GraphvizUtils {
 		if (s == null)
 			return -1;
 
-		final Pattern p = Pattern.compile("\\s(\\d)\\.(\\d\\d?)\\D");
+		final Pattern p = Pattern.compile("\\s(\\d+)\\.(\\d\\d?)\\D");
 		final Matcher m = p.matcher(s);
 		if (m.find() == false)
 			return -1;

src/net/sourceforge/plantuml/dot/GraphvizVersionFinder.java

@@ -73,7 +73,7 @@ public class GraphvizVersionFinder {
 
 	public GraphvizVersion getVersion() {
 		final String dotVersion = dotVersion();
-		final Pattern p = Pattern.compile("(\\d)\\.(\\d\\d?)");
+		final Pattern p = Pattern.compile("(\\d+)\\.(\\d\\d?)");
 		final Matcher m = p.matcher(dotVersion);
 		final boolean find = m.find();
 		if (find == false)

src/net/sourceforge/plantuml/version/Version.java

@@ -46,7 +46,7 @@ public class Version {
 
 	// Warning, "version" should be the same in gradle.properties and Version.java
 	// Any idea anyone how to magically synchronize those :-) ?
-	private static final String version = "1.2024.1";
+	private static final String version = "1.2024.2beta1";
 
 	public static String versionString() {
 		return version;

themes/puml-theme-sunlust.puml

@@ -1,4 +1,9 @@
 @startuml
+'' NAME = Sunlust
+'' DESCRIPTION = sunlust theme based off of the [solarized theme](https://ethanschoonover.com/solarized)
+'' AUTHOR = Artem V. Ageev
+'' LICENCE = GPL 3+
+
 !$THEME = 'sunlust'
 !if %not(%variable_exists("$BGCOLOR"))
 !$BGCOLOR = '#fdf6e3'