mirror of
https://github.com/octoleo/plantuml.git
synced 2024-06-11 12:42:26 +00:00
Merge branch 'master' into PatchBranch
This commit is contained in:
commit
4e5bf030b6
58
.github/labeler.yml
vendored
58
.github/labeler.yml
vendored
|
@ -1,37 +1,55 @@
|
||||||
'm:release':
|
'm:release':
|
||||||
- 'CHANGELOG.md'
|
- changed-files:
|
||||||
- 'gradle.properties'
|
- any-glob-to-any-file:
|
||||||
|
- 'CHANGELOG.md'
|
||||||
|
- 'gradle.properties'
|
||||||
|
|
||||||
'm:docs':
|
'm:docs':
|
||||||
- '*.md'
|
- changed-files:
|
||||||
- 'docs/**/*'
|
- any-glob-to-any-file:
|
||||||
|
- '*.md'
|
||||||
|
- 'docs/**/*'
|
||||||
|
|
||||||
'm:workflow':
|
'm:workflow':
|
||||||
- .github/**
|
- changed-files:
|
||||||
|
- any-glob-to-any-file:
|
||||||
|
- .github/**
|
||||||
|
|
||||||
'm:gradle':
|
'm:gradle':
|
||||||
- 'gradle*'
|
- changed-files:
|
||||||
- 'gradle/**'
|
- any-glob-to-any-file:
|
||||||
- '**/settings.gradle.*'
|
- 'gradle*'
|
||||||
- '**/build.gradle.*'
|
- 'gradle/**'
|
||||||
- 'sjpp.jar'
|
- '**/settings.gradle.*'
|
||||||
|
- '**/build.gradle.*'
|
||||||
|
- 'sjpp.jar'
|
||||||
|
|
||||||
'm:source':
|
'm:source':
|
||||||
- 'skin/**/*'
|
- changed-files:
|
||||||
- 'src/**/*'
|
- any-glob-to-any-file:
|
||||||
- 'stdlib/**/*'
|
- 'skin/**/*'
|
||||||
- 'svg/**/*'
|
- 'src/**/*'
|
||||||
- 'themes/**/*'
|
- 'stdlib/**/*'
|
||||||
- 'manifest.txt'
|
- 'svg/**/*'
|
||||||
|
- 'themes/**/*'
|
||||||
|
- 'manifest.txt'
|
||||||
|
|
||||||
'm:test':
|
'm:test':
|
||||||
- 'test/**/*'
|
- changed-files:
|
||||||
|
- any-glob-to-any-file:
|
||||||
|
- 'test/**/*'
|
||||||
|
|
||||||
'm:license':
|
'm:license':
|
||||||
- '**/*license.txt'
|
- changed-files:
|
||||||
|
- any-glob-to-any-file:
|
||||||
|
- '**/*license.txt'
|
||||||
|
|
||||||
'm:docker':
|
'm:docker':
|
||||||
- Dockerfile
|
- changed-files:
|
||||||
|
- any-glob-to-any-file:
|
||||||
|
- Dockerfile
|
||||||
|
|
||||||
'm:native':
|
'm:native':
|
||||||
- .github/workflows/native-image.yml
|
- changed-files:
|
||||||
|
- any-glob-to-any-file:
|
||||||
|
- .github/workflows/native-image.yml
|
||||||
|
|
8
.github/workflows/ci.yml
vendored
8
.github/workflows/ci.yml
vendored
|
@ -115,7 +115,7 @@ jobs:
|
||||||
run: gradle test --no-daemon -i
|
run: gradle test --no-daemon -i
|
||||||
|
|
||||||
- name: Upload test reports
|
- name: Upload test reports
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v4
|
||||||
if: needs.workflow_config.outputs.do_test_linux == 'true'
|
if: needs.workflow_config.outputs.do_test_linux == 'true'
|
||||||
with:
|
with:
|
||||||
# Using github.run_number here to reduce confusion when downloading & comparing from several builds
|
# Using github.run_number here to reduce confusion when downloading & comparing from several builds
|
||||||
|
@ -172,7 +172,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
echo "release_version=$(gradle properties -q | grep "version:" | awk '{print $2}')" >> $GITHUB_OUTPUT
|
echo "release_version=$(gradle properties -q | grep "version:" | awk '{print $2}')" >> $GITHUB_OUTPUT
|
||||||
- name: Cache libs
|
- name: Cache libs
|
||||||
uses: actions/cache/save@v3
|
uses: actions/cache/save@v4
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
build/libs
|
build/libs
|
||||||
|
@ -228,7 +228,7 @@ jobs:
|
||||||
cache: gradle
|
cache: gradle
|
||||||
|
|
||||||
- name: Restore Libs cache
|
- name: Restore Libs cache
|
||||||
uses: actions/cache/restore@v3
|
uses: actions/cache/restore@v4
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
build/libs
|
build/libs
|
||||||
|
@ -244,7 +244,7 @@ jobs:
|
||||||
enableCrossOsArchive: true
|
enableCrossOsArchive: true
|
||||||
|
|
||||||
- name: Upload artifacts
|
- name: Upload artifacts
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
# Using github.run_number here to reduce confusion when downloading & comparing artifacts from several builds
|
# Using github.run_number here to reduce confusion when downloading & comparing artifacts from several builds
|
||||||
name: ${{ github.run_number }}-artifacts
|
name: ${{ github.run_number }}-artifacts
|
||||||
|
|
2
.github/workflows/labeler.yml
vendored
2
.github/workflows/labeler.yml
vendored
|
@ -9,4 +9,4 @@ jobs:
|
||||||
pull-requests: write
|
pull-requests: write
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/labeler@v4
|
- uses: actions/labeler@v5
|
||||||
|
|
4
.github/workflows/native-image.yml
vendored
4
.github/workflows/native-image.yml
vendored
|
@ -32,7 +32,7 @@ jobs:
|
||||||
components: 'native-image'
|
components: 'native-image'
|
||||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
- uses: actions/cache/restore@v3
|
- uses: actions/cache/restore@v4
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
build/libs
|
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 }}"
|
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
|
- name: Cache native image
|
||||||
uses: actions/cache/save@v3
|
uses: actions/cache/save@v4
|
||||||
with:
|
with:
|
||||||
path: "build/libs/plantuml-${{ matrix.platform }}-*"
|
path: "build/libs/plantuml-${{ matrix.platform }}-*"
|
||||||
key: "native-image-${{ matrix.platform }}-${{ github.run_id }}"
|
key: "native-image-${{ matrix.platform }}-${{ github.run_id }}"
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
Thank you for your interest in contributing to PlantUML! This guide will help you build the PlantUML project.
|
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
|
## ☕ Java Compatibility and Development Notes
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# Warning, "version" should be the same in gradle.properties and Version.java
|
# Warning, "version" should be the same in gradle.properties and Version.java
|
||||||
# Any idea anyone how to magically synchronize those :-) ?
|
# Any idea anyone how to magically synchronize those :-) ?
|
||||||
version = 1.2024.1
|
version = 1.2024.2beta1
|
||||||
org.gradle.workers.max = 3
|
org.gradle.workers.max = 3
|
|
@ -197,7 +197,7 @@ public class GraphvizUtils {
|
||||||
if (s == null)
|
if (s == null)
|
||||||
return -1;
|
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);
|
final Matcher m = p.matcher(s);
|
||||||
if (m.find() == false)
|
if (m.find() == false)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
|
@ -73,7 +73,7 @@ public class GraphvizVersionFinder {
|
||||||
|
|
||||||
public GraphvizVersion getVersion() {
|
public GraphvizVersion getVersion() {
|
||||||
final String dotVersion = dotVersion();
|
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 Matcher m = p.matcher(dotVersion);
|
||||||
final boolean find = m.find();
|
final boolean find = m.find();
|
||||||
if (find == false)
|
if (find == false)
|
||||||
|
|
|
@ -46,7 +46,7 @@ public class Version {
|
||||||
|
|
||||||
// Warning, "version" should be the same in gradle.properties and Version.java
|
// Warning, "version" should be the same in gradle.properties and Version.java
|
||||||
// Any idea anyone how to magically synchronize those :-) ?
|
// 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() {
|
public static String versionString() {
|
||||||
return version;
|
return version;
|
||||||
|
|
Binary file not shown.
|
@ -1,4 +1,9 @@
|
||||||
@startuml
|
@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'
|
!$THEME = 'sunlust'
|
||||||
!if %not(%variable_exists("$BGCOLOR"))
|
!if %not(%variable_exists("$BGCOLOR"))
|
||||||
!$BGCOLOR = '#fdf6e3'
|
!$BGCOLOR = '#fdf6e3'
|
||||||
|
|
Loading…
Reference in New Issue
Block a user