Skip to content

Commit 44e48fb

Browse files
committed
Build against Paper 26.1.1 to ensure compatibility
- Switch to VaultAPI 1.7 as there's really no difference and the previous repo is down - Compile with Java 25 - Downgrade to Java 21 Probably we will be discontinuing 11 and 16 downgrades as, according to bstats, amount of servers using it is really low.
1 parent 98ed90e commit 44e48fb

2 files changed

Lines changed: 9 additions & 5 deletions

File tree

build.gradle.kts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import xyz.wagyourtail.jvmdg.gradle.task.DowngradeJar
22
import xyz.wagyourtail.jvmdg.gradle.task.ShadeJar
3+
import org.gradle.jvm.toolchain.JavaLanguageVersion
34

45
plugins {
56
java
@@ -15,7 +16,7 @@ allprojects {
1516

1617
java {
1718
toolchain {
18-
languageVersion = JavaLanguageVersion.of(21)
19+
languageVersion = JavaLanguageVersion.of(25)
1920
}
2021
}
2122
}
@@ -24,7 +25,7 @@ subprojects {
2425
tasks.withType<JavaCompile> {
2526
options.compilerArgs = listOf("-Xlint:deprecation", "-Xlint:unchecked")
2627
options.encoding = Charsets.UTF_8.name()
27-
options.release = 21
28+
options.release = 25
2829
}
2930

3031
tasks.withType<Javadoc> {
@@ -89,7 +90,10 @@ val javaVersions = listOf(
8990
JavaVersion.VERSION_16,
9091

9192
// from 1.18 to 1.20.4
92-
JavaVersion.VERSION_17
93+
JavaVersion.VERSION_17,
94+
95+
// from 1.20.5 to 1.21.11
96+
JavaVersion.VERSION_21
9397
)
9498

9599
for (javaVersion in javaVersions) {

bukkit/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ dependencies {
7171
compileOnlyProject(":common")
7272

7373
// Paper
74-
compileOnlyServer("io.papermc.paper:paper-api:1.21.11-pre3-R0.1-SNAPSHOT")
74+
compileOnlyServer("io.papermc.paper:paper-api:26.1.1.build.29-alpha")
7575

7676
// ASkyBlock
7777
compileOnlyPlugin("com.wasteofplastic:askyblock:3.0.9.4")
@@ -134,7 +134,7 @@ dependencies {
134134
// uSkyBlock TODO fix whenever repo is up
135135
//compileOnlyPlugin("ovh.uskyblock:uSkyBlock-API:2.8.9")
136136
// Vault
137-
compileOnlyPlugin("com.github.MilkBowl:VaultAPI:1.7.1")
137+
compileOnlyPlugin("com.github.MilkBowl:VaultAPI:1.7")
138138
// VotingPlugin
139139
compileOnlyPlugin("com.bencodez:votingplugin:6.18.4")
140140
// WildStacker

0 commit comments

Comments
 (0)