Skip to content

Commit 6da1216

Browse files
APickledWalrussovdeeth
APickledWalrus
and
sovdeeth
authored
Raise the minimum Java version to 17 (#6905)
Require Java 17 Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
1 parent c8aa674 commit 6da1216

13 files changed

Lines changed: 13 additions & 184 deletions

‎.github/workflows/java-11-builds.yml‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎.github/workflows/java-17-builds.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Java 17 CI (MC 1.17-1.20.4)
1+
name: Java 17 CI (MC 1.19.4-1.20.4)
22

33
on:
44
push:

‎.github/workflows/junit-11-builds.yml‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎.github/workflows/junit-17-builds.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: JUnit (MC 1.17-1.20.4)
1+
name: JUnit (MC 1.19.4-1.20.4)
22

33
on:
44
push:

‎README.md‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ Skript requires **Spigot** to work. You heard it right, **CraftBukkit** does *no
1616
**Paper**, which is a fork of Spigot, is recommended; it is required for some
1717
parts of Skript to be available.
1818

19-
Skript supports only the **latest** patch versions of Minecraft 1.13+.
20-
For example, this means that 1.16.5 is supported, but 1.16.4 is *not*.
19+
Skript supports only the **latest** patch versions of Minecraft 1.19 and newer.
20+
For example, this means that 1.19.4 is supported, but 1.19.3 is *not*.
2121
Testing with all old patch versions is not feasible for us.
2222

2323
Minecraft 1.12 and earlier are not, and will not be supported. New Minecraft
@@ -77,15 +77,14 @@ Skript has some tests written in Skript. Running them requires a Minecraft
7777
server, but our build script will create one for you. Running the tests is easy:
7878

7979
```
80-
./gradlew (quickTest|skriptTest|skriptTestJava11|skriptTestJava17|skriptTestJava21)
80+
./gradlew (quickTest|skriptTest|skriptTestJava17|skriptTestJava21)
8181
```
8282

8383
<code>quickTest</code> runs the test suite on newest supported server version.
8484
<code>skriptTestJava21</code> (1.20.6+) runs the tests on Java 21 supported versions.
85-
<code>skriptTestJava17</code> (1.17-1.20.4) runs the tests on Java 17 supported versions.
86-
<code>skriptTestJava11</code> (1.13-1.16) runs the tests on Java 11 supported versions.
85+
<code>skriptTestJava17</code> (1.19.4-1.20.4) runs the tests on Java 17 supported versions.
8786
<code>skriptTest</code> runs the tests on all versions.
88-
That is, it runs skriptTestJava11, skriptTestJava17, and skriptTestJava21.
87+
That is, it runs skriptTestJava17, and skriptTestJava21.
8988

9089
By running the tests, you agree to Mojang's End User License Agreement.
9190

‎build.gradle‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ task build(overwrite: true, type: ShadowJar) {
7070
from sourceSets.main.output
7171
}
7272

73-
// Excludes the tests for the build task. Should be using junit, junitJava17, junitJava11, skriptTest, quickTest.
73+
// Excludes the tests for the build task. Should be using junit, junitJava17, skriptTest, quickTest.
7474
// We do not want tests to run for building. That's time consuming and annoying. Especially in development.
7575
test {
7676
exclude '**/*'
@@ -233,11 +233,10 @@ void createTestTask(String name, String desc, String environments, int javaVersi
233233

234234
def java21 = 21
235235
def java17 = 17
236-
def java11 = 11
237236

238237
def latestEnv = 'java21/paper-1.21.0.json'
239238
def latestJava = java21
240-
def oldestJava = java11
239+
def oldestJava = java17
241240

242241
def latestJUnitEnv = 'java17/paper-1.20.4.json'
243242
def latestJUnitJava = java17
@@ -260,25 +259,23 @@ int envJava = project.property('testEnvJavaVersion') == null ? latestJava : Inte
260259
createTestTask('quickTest', 'Runs tests on one environment being the latest supported Java and Minecraft.', environments + latestEnv, latestJava, 0)
261260
createTestTask('skriptTestJava21', 'Runs tests on all Java 21 environments.', environments + 'java21', java21, 0)
262261
createTestTask('skriptTestJava17', 'Runs tests on all Java 17 environments.', environments + 'java17', java17, 0)
263-
createTestTask('skriptTestJava11', 'Runs tests on all Java 11 environments.', environments + 'java11', java11, 0)
264262
createTestTask('skriptTestDev', 'Runs testing server and uses \'system.in\' for command input, stop server to finish.', environments + env, envJava, 0, Modifiers.DEV_MODE, Modifiers.DEBUG)
265263
createTestTask('skriptProfile', 'Starts the testing server with JProfiler support.', environments + latestEnv, latestJava, -1, Modifiers.PROFILE)
266264
createTestTask('genNightlyDocs', 'Generates the Skript documentation website html files.', environments + env, envJava, 0, Modifiers.GEN_NIGHTLY_DOCS)
267265
createTestTask('genReleaseDocs', 'Generates the Skript documentation website html files for a release.', environments + env, envJava, 0, Modifiers.GEN_RELEASE_DOCS)
268266
tasks.register('skriptTest') {
269267
description = 'Runs tests on all environments.'
270-
dependsOn skriptTestJava11, skriptTestJava17, skriptTestJava21
268+
dependsOn skriptTestJava17, skriptTestJava21
271269
}
272270

273271
createTestTask('JUnitQuick', 'Runs JUnit tests on one environment being the latest supported Java and Minecraft.', environments + latestJUnitEnv, latestJUnitJava, 0, Modifiers.JUNIT)
274272
// Disabled as EasyMock 5.2.0 is required for Java 21 support
275273
// However, we are currently using 5.0.1 (see https://github.com/SkriptLang/Skript/pull/6204#discussion_r1405302009)
276274
//createTestTask('JUnitJava21', 'Runs JUnit tests on all Java 21 environments.', environments + 'java21', java21, 0, Modifiers.JUNIT)
277275
createTestTask('JUnitJava17', 'Runs JUnit tests on all Java 17 environments.', environments + 'java17', java17, 0, Modifiers.JUNIT)
278-
createTestTask('JUnitJava11', 'Runs JUnit tests on all Java 11 environments.', environments + 'java11', java11, 0, Modifiers.JUNIT)
279276
tasks.register('JUnit') {
280277
description = 'Runs JUnit tests on all environments.'
281-
dependsOn JUnitJava11, JUnitJava17//, JUnitJava21
278+
dependsOn JUnitJava17//, JUnitJava21
282279
}
283280

284281
// Build flavor configurations

‎code-conventions.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,8 @@ Your comments should look something like these:
194194
## Language Features
195195

196196
### Compatibility
197-
[//]: # (To be updated for 2.10 for Java 17)
198-
* Contributions should maintain Java 11 source/binary compatibility, even though compiling Skript requires Java 21
199-
- Users must not need JRE newer than version 11
197+
* Contributions should maintain Java 17 source/binary compatibility, even though compiling Skript requires Java 21
198+
- Users must not need JRE newer than version 17
200199
* Versions up to and including Java 21 should work too
201200
- Please avoid using unsafe reflection
202201
* It is recommended to make fields final, if they are effectively final

‎src/test/skript/environments/java11/paper-1.13.2.json‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎src/test/skript/environments/java11/paper-1.14.4.json‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎src/test/skript/environments/java11/paper-1.15.2.json‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)