Skip to content

Commit f4d2e14

Browse files
Merge remote-tracking branch 'other-repo/main'
2 parents f6e52e3 + dc73369 commit f4d2e14

23 files changed

Lines changed: 865 additions & 434 deletions

.github/dependabot.yml

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,18 @@
11
version: 2
22
updates:
33

4-
- package-ecosystem: "maven"
4+
- package-ecosystem: "gradle"
55
directory: "/"
66
schedule:
77
interval: "daily"
8-
time: "12:00"
9-
timezone: "Europe/Berlin"
108
assignees:
119
- "bierdosenhalter"
12-
reviewers:
13-
- "bierdosenhalter"
14-
commit-message:
15-
prefix: "maven"
16-
include: "scope"
10+
- "A4P5"
1711

1812
- package-ecosystem: "github-actions"
1913
directory: "/"
2014
schedule:
2115
interval: "daily"
22-
time: "12:00"
23-
timezone: "Europe/Berlin"
2416
assignees:
2517
- "bierdosenhalter"
26-
reviewers:
27-
- "bierdosenhalter"
28-
commit-message:
29-
prefix: "github-actions"
30-
include: "scope"
18+
- "A4P5"

.github/workflows/release.yml

Lines changed: 24 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,34 @@
1-
name: onTagTagTag
2-
3-
on:
4-
push:
5-
tags:
6-
- '*'
7-
1+
name: 'release'
2+
on: [ push, pull_request ]
3+
permissions:
4+
contents: write
85
jobs:
9-
release:
10-
runs-on: ubuntu-latest
6+
ci:
7+
runs-on: ubuntu-22.04
118
steps:
129

13-
- name: Git
14-
uses: actions/checkout@v3
15-
16-
- name: Java
17-
uses: actions/setup-java@v3.5.0
10+
- name: 'Checkout repository'
11+
uses: actions/checkout@v4
1812
with:
19-
distribution: 'adopt'
20-
java-version: '8'
13+
fetch-depth: 0
2114

22-
- name: Cache
23-
uses: actions/cache@v3.0.8
15+
- name: 'Validate gradlew'
16+
uses: gradle/actions/wrapper-validation@v4
17+
18+
- name: 'Setup Java'
19+
uses: actions/setup-java@v4
2420
with:
25-
path: ~/.m2
26-
key: '${{ runner.os }}-m2-${{ hashFiles(''**/pom.xml'') }}'
27-
restore-keys: '${{ runner.os }}-m2'
21+
java-version: '21'
22+
distribution: 'temurin'
23+
check-latest: true
24+
cache: 'gradle'
2825

29-
- name: Package
30-
run: mvn --batch-mode --show-version --errors package --file pom.xml
26+
- name: 'Build plugin'
27+
run: ./gradlew --console plain --no-daemon --full-stacktrace check build
3128

32-
- name: Draft
33-
id: create_release
34-
uses: actions/create-release@v1
35-
env:
36-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
29+
- name: 'Release plugin'
30+
uses: softprops/action-gh-release@v2
31+
if: startsWith(github.ref, 'refs/tags/v')
3732
with:
38-
tag_name: ${{ github.ref }}
39-
release_name: ${{ github.ref }}
4033
body: 'automated release at commit ${{ github.sha }}'
41-
draft: false
42-
prerelease: false
43-
44-
- name: Release
45-
uses: csexton/release-asset-action@v2
46-
with:
47-
pattern: "target/ServerPingPlayerList-*.jar"
48-
github-token: ${{ secrets.GITHUB_TOKEN }}
49-
release-url: ${{ steps.create_release.outputs.upload_url }}
34+
files: 'build/dist/*.jar'

.gitignore

Lines changed: 39 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,42 @@
1-
# test
2-
test/
3-
4-
# User-specific stuff
5-
.idea/
6-
1+
.gradle
2+
build/
3+
!gradle/wrapper/gradle-wrapper.jar
4+
!**/src/main/**/build/
5+
!**/src/test/**/build/
6+
7+
### IntelliJ IDEA ###
8+
.idea/modules.xml
9+
.idea/jarRepositories.xml
10+
.idea/compiler.xml
11+
.idea/libraries/
12+
*.iws
713
*.iml
814
*.ipr
9-
*.iws
10-
11-
# IntelliJ
1215
out/
13-
14-
# Compiled class file
15-
*.class
16-
17-
# Log file
18-
*.log
19-
20-
# BlueJ files
21-
*.ctxt
22-
23-
# Package Files #
24-
*.jar
25-
*.war
26-
*.nar
27-
*.ear
28-
*.zip
29-
*.tar.gz
30-
*.rar
31-
32-
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
33-
hs_err_pid*
34-
35-
*~
36-
37-
# temporary files which can be created if a process still has a handle open of a deleted file
38-
.fuse_hidden*
39-
40-
# KDE directory preferences
41-
.directory
42-
43-
# Linux trash folder which might appear on any partition or disk
44-
.Trash-*
45-
46-
# .nfs files are created when an open file is removed but is still being accessed
47-
.nfs*
48-
49-
# General
50-
.DS_Store
51-
.AppleDouble
52-
.LSOverride
53-
54-
# Icon must end with two \r
55-
Icon
56-
57-
# Thumbnails
58-
._*
59-
60-
# Files that might appear in the root of a volume
61-
.DocumentRevisions-V100
62-
.fseventsd
63-
.Spotlight-V100
64-
.TemporaryItems
65-
.Trashes
66-
.VolumeIcon.icns
67-
.com.apple.timemachine.donotpresent
68-
69-
# Directories potentially created on remote AFP share
70-
.AppleDB
71-
.AppleDesktop
72-
Network Trash Folder
73-
Temporary Items
74-
.apdisk
75-
76-
# Windows thumbnail cache files
77-
Thumbs.db
78-
Thumbs.db:encryptable
79-
ehthumbs.db
80-
ehthumbs_vista.db
81-
82-
# Dump file
83-
*.stackdump
84-
85-
# Folder config file
86-
[Dd]esktop.ini
87-
88-
# Recycle Bin used on file shares
89-
$RECYCLE.BIN/
90-
91-
# Windows Installer files
92-
*.cab
93-
*.msi
94-
*.msix
95-
*.msm
96-
*.msp
97-
98-
# Windows shortcuts
99-
*.lnk
100-
101-
target/
102-
103-
pom.xml.tag
104-
pom.xml.releaseBackup
105-
pom.xml.versionsBackup
106-
pom.xml.next
107-
108-
release.properties
109-
dependency-reduced-pom.xml
110-
buildNumber.properties
111-
.mvn/timing.properties
112-
.mvn/wrapper/maven-wrapper.jar
113-
.flattened-pom.xml
114-
115-
# Common working directory
116-
run/
16+
!**/src/main/**/out/
17+
!**/src/test/**/out/
18+
19+
### Eclipse ###
20+
.apt_generated
21+
.classpath
22+
.factorypath
23+
.project
24+
.settings
25+
.springBeans
26+
.sts4-cache
27+
bin/
28+
!**/src/main/**/bin/
29+
!**/src/test/**/bin/
30+
31+
### NetBeans ###
32+
/nbproject/private/
33+
/nbbuild/
34+
/dist/
35+
/nbdist/
36+
/.nb-gradle/
37+
38+
### VS Code ###
39+
.vscode/
40+
41+
### Mac OS ###
42+
.DS_Store

.idea/.name

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)