Skip to content

Commit bae11ef

Browse files
committed
Update gradle and dependencies
1 parent 59bfd77 commit bae11ef

8 files changed

Lines changed: 66 additions & 69 deletions

File tree

.github/workflows/build.yml

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,33 +15,17 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- name: Checkout repository
19-
# See https://github.com/actions/checkout/commits
20-
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
21-
22-
- name: Validate Gradle Wrapper
23-
# See https://github.com/gradle/wrapper-validation-action/commits
24-
uses: gradle/actions/wrapper-validation@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
25-
26-
- name: Setup Java
27-
# See https://github.com/actions/setup-java/commits
28-
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
29-
with:
30-
java-version: 17
31-
distribution: temurin
32-
3318
- name: Setup Gradle
34-
# See https://github.com/gradle/actions/commits
35-
uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
19+
uses: GeyserMC/actions/setup-gradle-composite@master
3620
with:
37-
gradle-home-cache-cleanup: true
21+
setup-java_java-version: 21
3822

3923
- name: Build GeyserConnect
4024
run: ./gradlew build
4125

4226
- name: Archive artifacts
4327
# See https://github.com/actions/upload-artifact/commits
44-
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
28+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
4529
if: success()
4630
with:
4731
name: GeyserConnect

.github/workflows/pullrequest.yml

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,33 +15,17 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- name: Checkout repository
19-
# See https://github.com/actions/checkout/commits
20-
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
21-
22-
- name: Validate Gradle Wrapper
23-
# See https://github.com/gradle/wrapper-validation-action/commits
24-
uses: gradle/actions/wrapper-validation@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
25-
26-
- name: Setup Java
27-
# See https://github.com/actions/setup-java/commits
28-
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
29-
with:
30-
java-version: 17
31-
distribution: temurin
32-
3318
- name: Setup Gradle
34-
# See https://github.com/gradle/actions/commits
35-
uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
19+
uses: GeyserMC/actions/setup-gradle-composite@master
3620
with:
37-
cache-read-only: true
21+
setup-java_java-version: 21
3822

3923
- name: Build GeyserConnect
4024
run: ./gradlew build
4125

4226
- name: Archive artifacts
4327
# See https://github.com/actions/upload-artifact/commits
44-
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
28+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
4529
if: success()
4630
with:
4731
name: GeyserConnect

build.gradle

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,13 @@ repositories {
2727
}
2828

2929
dependencies {
30-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0'
31-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.0'
32-
33-
compileOnly 'org.geysermc.geyser:api:2.4.1-SNAPSHOT'
34-
compileOnly('org.geysermc.geyser:core:2.4.1-SNAPSHOT') {
30+
compileOnly(libs.bundles.geyser) {
3531
exclude group: 'io.netty'
3632
exclude group: 'io.netty.incubator'
3733
}
3834

39-
implementation 'org.xerial:sqlite-jdbc:3.46.0.0'
40-
implementation 'com.mysql:mysql-connector-j:9.0.0'
35+
implementation libs.sqlite
36+
implementation libs.mysql
4137
}
4238

4339
jar {

gradle/libs.versions.toml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
[versions]
2+
geyser = "2.7.0-SNAPSHOT"
3+
sqlite = "3.46.0.0"
4+
mysql = "9.0.0"
5+
6+
[libraries]
7+
geyser-core = { group = "org.geysermc.geyser", name = "core", version.ref = "geyser" }
8+
geyser-api = { group = "org.geysermc.geyser", name = "api", version.ref = "geyser" }
9+
sqlite = { group = "org.xerial", name = "sqlite-jdbc", version.ref = "sqlite" }
10+
mysql = { group = "com.mysql", name = "mysql-connector-j", version.ref = "mysql" }
11+
12+
[bundles]
13+
geyser = [
14+
"geyser-core",
15+
"geyser-api"
16+
]

gradle/wrapper/gradle-wrapper.jar

-16.8 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

gradlew

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

gradlew.bat

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

0 commit comments

Comments
 (0)