Skip to content

Commit bfbe562

Browse files
authored
Merge pull request #382 from HSLdevcom/develop
Develop > Master
2 parents 75b128d + 3e84c49 commit bfbe562

37 files changed

+74560
-76701
lines changed

.github/workflows/test-and-build.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,16 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- uses: actions/checkout@v3
10-
- name: Set up JDK 11
10+
- name: Set up JDK 25
1111
uses: actions/setup-java@v3
1212
with:
1313
distribution: 'temurin'
14-
java-version: '11'
14+
java-version: '25'
1515
cache: 'maven'
16+
- name: Run Spotless Apply
17+
run: mvn spotless:apply
18+
env:
19+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1620
- name: Build with Maven
1721
run: mvn clean package -Dmaven.javadoc.skip=true -B -V
1822
- name: Run integration tests
@@ -24,11 +28,11 @@ jobs:
2428
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
2529
steps:
2630
- uses: actions/checkout@v3
27-
- name: Set up JDK 11
31+
- name: Set up JDK 25
2832
uses: actions/setup-java@v3
2933
with:
3034
distribution: 'temurin'
31-
java-version: '11'
35+
java-version: '25'
3236
cache: 'maven'
3337
- name: Publish package
3438
run: mvn --batch-mode deploy

eclipse-java-formatter.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<profiles version="13">
3+
<profile kind="CodeFormatterProfile" name="Custom-4spaces-NoCommentSplit" version="13">
4+
5+
<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
6+
<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
7+
<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
8+
<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
9+
10+
<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
11+
12+
<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="9999"/>
13+
<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="false"/>
14+
<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/>
15+
<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="false"/>
16+
17+
</profile>
18+
</profiles>

0 commit comments

Comments
 (0)