Skip to content

Commit 4d9181c

Browse files
committed
Update for 1.20.6 and Java 21. This release now requires 1.20.6
1 parent ece86cf commit 4d9181c

14 files changed

Lines changed: 238 additions & 155 deletions

File tree

build.gradle

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
1+
buildscript {
2+
ext {
3+
asmAsmVersion = "9.6" // https://gitlab.ow2.org/asm/asm/-/tags
4+
}
5+
configurations {
6+
classpath {
7+
resolutionStrategy {
8+
//in order to handle jackson's higher release version in shadow, this needs to be upgraded to latest.
9+
force(group: "org.ow2.asm", name: "asm", version: asmAsmVersion)
10+
force(group: "org.ow2.asm", name: "asm-commons", version: asmAsmVersion)
11+
}
12+
}
13+
}
14+
}
115
plugins {
2-
id 'com.github.johnrengelman.shadow' version '7.1.0'
16+
id 'com.github.johnrengelman.shadow' version '8.1.1'
317
id "com.jfrog.artifactory" version "4.21.0"
418
}
519

@@ -38,7 +52,7 @@ allprojects {
3852

3953
java {
4054
toolchain {
41-
languageVersion = JavaLanguageVersion.of(17)
55+
languageVersion = JavaLanguageVersion.of(21)
4256
}
4357
}
4458

@@ -85,11 +99,11 @@ allprojects {
8599
}
86100

87101
dependencies {
88-
compileOnly 'org.spigotmc:spigot-api:1.20.4-R0.1-SNAPSHOT'
89-
compileOnly 'com.sk89q.worldedit:worldedit-core:7.2.18-SNAPSHOT'
90-
compileOnly 'com.sk89q.worldedit:worldedit-bukkit:7.2.18-SNAPSHOT'
91-
compileOnly 'com.sk89q.worldguard:worldguard-core:7.0.8'
92-
compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.8'
102+
compileOnly 'org.spigotmc:spigot-api:1.20.6-R0.1-SNAPSHOT'
103+
compileOnly 'com.sk89q.worldedit:worldedit-core:7.3.1-SNAPSHOT'
104+
compileOnly 'com.sk89q.worldedit:worldedit-bukkit:7.3.1-SNAPSHOT'
105+
compileOnly 'com.sk89q.worldguard:worldguard-core:7.0.9'
106+
compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.9'
93107
compileOnly 'com.github.MilkBowl:VaultAPI:1.7'
94108
compileOnly 'com.comphenix.protocol:ProtocolLib:5.0.0-SNAPSHOT'
95109
compileOnly 'fr.neatmonster:nocheatplus:3.15.1-RC'
@@ -98,7 +112,7 @@ allprojects {
98112
implementation "io.papermc:paperlib:1.0.7"
99113
implementation 'org.bstats:bstats-bukkit:2.2.1'
100114

101-
testImplementation 'org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT'
115+
testImplementation 'org.spigotmc:spigot-api:1.20.6-R0.1-SNAPSHOT'
102116
testImplementation 'com.sk89q.worldedit:worldedit-core:7.2.14'
103117
testImplementation group: 'junit', name: 'junit', version: '4.12'
104118
testImplementation group: 'org.powermock', name: 'powermock-api-mockito', version: '1.7.4'
@@ -113,12 +127,12 @@ allprojects {
113127
}
114128

115129
task sourcesJar(type: Jar, dependsOn: classes) {
116-
classifier = 'sources'
130+
archiveClassifier.set('sources')
117131
from sourceSets.main.allSource
118132
}
119133

120134
task javadocJar(type: Jar, dependsOn: javadoc) {
121-
classifier = 'javadoc'
135+
archiveClassifier.set('javadoc')
122136
from javadoc.destinationDir
123137
}
124138

@@ -139,7 +153,7 @@ allprojects {
139153
}
140154

141155
shadowJar {
142-
classifier 'dist'
156+
archiveClassifier.set('dist')
143157
dependencies {
144158
include(dependency('io.papermc:paperlib'))
145159
include(dependency('com.sk89q:squirrelid'))

gradle/wrapper/gradle-wrapper.jar

-15.7 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.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)