@@ -31,14 +31,17 @@ allprojects {
31
31
32
32
tasks {
33
33
compileJava {
34
+ dependsOn(clean)
35
+ options.compilerArgs.addAll(listOf (" -source" , " 17" , " -target" , " 17" ))
34
36
options.encoding = Charsets .UTF_8 .name()
35
37
}
36
38
test {
37
39
useJUnitPlatform()
38
40
}
39
- compileJava {
40
- dependsOn(clean)
41
- }
41
+ }
42
+
43
+ java {
44
+ toolchain.languageVersion = JavaLanguageVersion .of(21 )
42
45
}
43
46
}
44
47
@@ -49,31 +52,20 @@ fun Project.dependency(dependency: Any) = also {
49
52
}
50
53
}
51
54
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" )
64
56
fun Project.paperweight () = also {
65
57
it.apply (plugin = " io.papermc.paperweight.userdev" )
66
- }.java21()
58
+ }
67
59
fun Project.shadowJar () = also {
68
60
it.apply (plugin = " io.github.goooler.shadow" )
69
61
}
70
62
fun Project.runPaper () = also {
71
63
it.apply (plugin = " xyz.jpenilla.run-paper" )
72
64
}
73
65
74
- val api = project(" api" ).paper().java17()
66
+ val api = project(" api" ).paper()
75
67
76
- val dist = project(" dist" ).paper().java17(). dependency(api)
68
+ val dist = project(" dist" ).paper().dependency(api)
77
69
78
70
val nms = listOf (
79
71
project(" nms:v1_20_R4" ).paperweight(),
@@ -100,7 +92,6 @@ listOf(
100
92
project(" test-plugin:shade" ).runPaper().shadowJar()
101
93
).forEach {
102
94
it.paper()
103
- .java21()
104
95
.fatJar()
105
96
.tasks {
106
97
runServer {
@@ -111,7 +102,7 @@ listOf(
111
102
}
112
103
}
113
104
114
- rootProject.java21(). fatJar()
105
+ rootProject.fatJar()
115
106
116
107
tasks {
117
108
jar {
0 commit comments