Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,16 @@ jobs:
steps:
- uses: actions/checkout@v6

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v5
with:
java-version: 17
java-version: 21
distribution: 'temurin'


- name: Set up JDK 21
- name: Set up JDK 25
uses: actions/setup-java@v5
with:
java-version: 21
java-version: 25
distribution: 'temurin'

- name: Gradle build
Expand All @@ -38,7 +37,8 @@ jobs:

- name: Upload JAR
if: ${{ github.event_name != 'pull_request'}}
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: vane-${{ matrix.project }}-${{ env.git_hash }}.jar
path: target/vane-${{ matrix.project }}-*.jar
archive: false
4 changes: 2 additions & 2 deletions .github/workflows/lint-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ jobs:
if: always() && github.repository == 'oddlama/vane'

steps:
- uses: actions/checkout@v6.0.1
- uses: actions/checkout@v6
with:
fetch-depth: 0
persist-credentials: false
ref: ${{ github.event.pull_request.head.sha }}

- uses: actions/setup-node@v6.1.0
- uses: actions/setup-node@v6
with:
node-version: 24
- run: |
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies {
}

java {
toolchain.languageVersion.set(JavaLanguageVersion.of(21))
toolchain.languageVersion.set(JavaLanguageVersion.of(25))
}

// We don't need to generate an empty `vane.jar`
Expand Down
22 changes: 11 additions & 11 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
[versions]
paper = "1.21.11-R0.1-SNAPSHOT"
bstats = "3.1.0"
paper = "26.1.2.build.+"
bstats = "3.2.1"

[libraries]
annotations = {group = "org.jetbrains", name = "annotations", version = "26.0.2-1"}
annotations = {group = "org.jetbrains", name = "annotations", version = "26.1.0"}
reflections = {group = "org.reflections", name = "reflections", version = "0.10.2"}
commonsLang = {group = "org.apache.commons", name = "commons-lang3", version = "3.20.0"}
commonsText = {group = "org.apache.commons", name = "commons-text", version = "1.15.0"}
json = {group = "org.json", name = "json", version = "20250517"}
slf4j = {group = "org.slf4j", name = "slf4j-api", version = "2.0.17"}
nightConfig = {group = "com.electronwill.night-config", name = "toml", version = "3.8.3"}
json = {group = "org.json", name = "json", version = "20251224"}
slf4j = {group = "org.slf4j", name = "slf4j-api", version = "2.0.18"}
nightConfig = {group = "com.electronwill.night-config", name = "toml", version = "3.8.4"}

# Minecraft
bstatsBase = {group = "org.bstats", name = "bstats-base", version.ref = "bstats"}
bstatsBukkit = {group = "org.bstats", name = "bstats-bukkit", version.ref = "bstats"}
bstatsVelocity = {group = "org.bstats", name = "bstats-velocity", version.ref = "bstats"}
vault = {group = "com.github.MilkBowl", name = "VaultAPI", version = "1.7.1"}
velocity = {group = "com.velocitypowered", name = "velocity-api", version = "3.4.0-SNAPSHOT"}
packetEvents = {group = "com.github.retrooper", name = "packetevents-spigot", version = "2.11.1"}
velocity = {group = "com.velocitypowered", name = "velocity-api", version = "3.5.0-SNAPSHOT"}
packetEvents = {group = "com.github.retrooper", name = "packetevents-spigot", version = "2.12.1"}

# maps
dynmap = {group = "us.dynmap", name = "DynmapCoreAPI", version = "3.7-beta-6"}
bluemap = {group = "de.bluecolored", name = "bluemap-api", version = "2.7.7"}
dynmap = {group = "us.dynmap", name = "DynmapCoreAPI", version = "3.8"}
bluemap = {group = "de.bluecolored", name = "bluemap-api", version = "2.7.8"}

[plugins]
paperweightUserdev = {id = "io.papermc.paperweight.userdev", version = "2.0.0-beta.19"}
paperweightUserdev = {id = "io.papermc.paperweight.userdev", version = "2.0.0-beta.+"}
runPaper = {id = "xyz.jpenilla.run-paper", version = "3.0.2"}
shadow = {id = "com.gradleup.shadow", version = "9.3.0"}
blossom = {id = "net.kyori.blossom", version = "2.2.0"}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 10 additions & 21 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vane-core/src/main/resources/resource_pack/pack.mcmeta
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"pack": {
"description": "Vane plugin resource pack",
"min_format": 69,
"max_format": 75
"max_format": 84
}
}
2 changes: 1 addition & 1 deletion vane-proxy-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies {

java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
languageVersion = JavaLanguageVersion.of(21)
}
}

Expand Down
2 changes: 1 addition & 1 deletion vane-velocity/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies {

java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
languageVersion = JavaLanguageVersion.of(21)
}
}

Expand Down
Loading