@@ -31,14 +31,17 @@ allprojects {
3131
3232 tasks {
3333 compileJava {
34+ dependsOn(clean)
35+ options.compilerArgs.addAll(listOf (" -source" , " 17" , " -target" , " 17" ))
3436 options.encoding = Charsets .UTF_8 .name()
3537 }
3638 test {
3739 useJUnitPlatform()
3840 }
39- compileJava {
40- dependsOn(clean)
41- }
41+ }
42+
43+ java {
44+ toolchain.languageVersion = JavaLanguageVersion .of(21 )
4245 }
4346}
4447
@@ -49,31 +52,20 @@ fun Project.dependency(dependency: Any) = also {
4952 }
5053}
5154
52- fun Project.java17 () = also {
53- it.java {
54- toolchain.languageVersion = JavaLanguageVersion .of(17 )
55- }
56- }
57- fun Project.java21 () = also {
58- it.java {
59- toolchain.languageVersion = JavaLanguageVersion .of(21 )
60- }
61- }
62-
63- fun Project.paper () = dependency(" io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT" )
55+ fun Project.paper () = dependency(" io.papermc.paper:paper-api:1.20.6-R0.1-SNAPSHOT" )
6456fun Project.paperweight () = also {
6557 it.apply (plugin = " io.papermc.paperweight.userdev" )
66- }.java21()
58+ }
6759fun Project.shadowJar () = also {
6860 it.apply (plugin = " io.github.goooler.shadow" )
6961}
7062fun Project.runPaper () = also {
7163 it.apply (plugin = " xyz.jpenilla.run-paper" )
7264}
7365
74- val api = project(" api" ).paper().java17()
66+ val api = project(" api" ).paper()
7567
76- val dist = project(" dist" ).paper().java17(). dependency(api)
68+ val dist = project(" dist" ).paper().dependency(api)
7769
7870val nms = listOf (
7971 project(" nms:v1_20_R4" ).paperweight(),
@@ -100,7 +92,6 @@ listOf(
10092 project(" test-plugin:shade" ).runPaper().shadowJar()
10193).forEach {
10294 it.paper()
103- .java21()
10495 .fatJar()
10596 .tasks {
10697 runServer {
@@ -111,7 +102,7 @@ listOf(
111102 }
112103}
113104
114- rootProject.java21(). fatJar()
105+ rootProject.fatJar()
115106
116107tasks {
117108 jar {
0 commit comments