Skip to content

Commit 4e46546

Browse files
WalshyDevJ3fftw1md5sha256ybw0014JustAHuman-xD
authored
Update to 1.20.5 (#4186)
**This build should be considered experimental for now** * Update to 1.20.5 * Keep old isMinecraftVersion func * Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/compatibility/VersionedEnchantment.java Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com> * Update mockbukkit * Update Junit and maven plugin versions, update mockbukkit to latest for 1.20.6 * Refactor AbstractLocateRegexCheck to detect and return null if the locale file only contains the null delimiter * Refactor to use a permission check in the TestGuideCommand * Fix TestBiomeMapCompatibility failing due to JsonUtils neeeding Slimefun to be loaded, add biome json for 1.20.5+ * Refactor versioned classes to use the Registry api * Mark the paper-api dependency in the provided scope * Check if getBasePotionType can be used before using it * Revert "Refactor versioned classes to use the Registry api" This reverts commit b529c34. * Refactor VersionedEntityType and VersionedEnchantment to use the registry api * Mark the paper-api dependency in the test scope, update comment * Refactor MinecraftVersion to include a range of minor patches which a MinecraftVersion targets * Make tests pass and update to dough pr * Update CI * Update dough and move fireworkutils to registry * Update dough to HEAD * chore: various changes to 1.20.5 branch (#4240) * fix: fix isBefore, also added unit tests * chore: comments * chore: simplify * chore: use == for enum comparison * chore: retrigger ci * chore(ci): e2e on more versions * Update src/test/java/io/github/thebusybiscuit/slimefun4/core/services/localization/TestColorCodes.java Co-authored-by: JustAHuman-xD <65748158+JustAHuman-xD@users.noreply.github.com> * Update src/main/java/io/github/thebusybiscuit/slimefun4/api/MinecraftVersion.java Co-authored-by: ybw0014 <i@guizhanss.com> --------- Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com> Co-authored-by: Andrew Wong <42793301+md5sha256@users.noreply.github.com> Co-authored-by: ybw0014 <i@guizhanss.com> Co-authored-by: JustAHuman-xD <65748158+JustAHuman-xD@users.noreply.github.com>
1 parent 17d01d7 commit 4e46546

60 files changed

Lines changed: 952 additions & 333 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/discord-webhook.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323
- name: Checkout repository
2424
uses: actions/checkout@v4.1.1
2525

26-
- name: Set up Java JDK 17
26+
- name: Set up Java JDK 21
2727
uses: actions/setup-java@v4.0.0
2828
with:
2929
distribution: 'adopt'
30-
java-version: '17'
30+
java-version: '21'
3131
java-package: jdk
3232
architecture: x64
3333

‎.github/workflows/e2e-testing.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,12 @@ jobs:
2525
javaVersion: '18'
2626
- mcVersion: '1.19.4'
2727
javaVersion: '19'
28-
- mcVersion: 'latest'
28+
- mcVersion: '1.20.4'
2929
javaVersion: '20'
30+
- mcVersion: '1.20.6'
31+
javaVersion: '21'
32+
#- mcVersion: 'latest'
33+
# javaVersion: '21'
3034

3135
steps:
3236
- name: Checkout repository

‎.github/workflows/javadocs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
- name: Checkout repository
1919
uses: actions/checkout@v4
2020

21-
- name: Set up JDK 17
21+
- name: Set up JDK 21
2222
uses: actions/setup-java@v4.0.0
2323
with:
2424
distribution: 'adopt'
25-
java-version: '17'
25+
java-version: '21'
2626
java-package: jdk
2727
architecture: x64
2828

‎.github/workflows/maven-compiler.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ jobs:
2727
- name: Checkout repository
2828
uses: actions/checkout@v4
2929

30-
- name: Set up JDK 17
30+
- name: Set up JDK 21
3131
uses: actions/setup-java@v4.0.0
3232
with:
3333
distribution: 'adopt'
34-
java-version: '17'
34+
java-version: '21'
3535
java-package: jdk
3636
architecture: x64
3737

‎.github/workflows/publish-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@v4
1717

18-
- name: Set up JDK 17
18+
- name: Set up JDK 21
1919
uses: actions/setup-java@v3.13.0
2020
with:
2121
distribution: 'adopt'
22-
java-version: '17'
22+
java-version: '21'
2323
java-package: jdk
2424
architecture: x64
2525

‎.github/workflows/pull-request.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ jobs:
2121
- name: Checkout repository
2222
uses: actions/checkout@v4
2323

24-
- name: Set up JDK 17
24+
- name: Set up JDK 21
2525
uses: actions/setup-java@v4.0.0
2626
with:
2727
distribution: 'adopt'
28-
java-version: '17'
28+
java-version: '21'
2929
java-package: jdk
3030
architecture: x64
3131

‎.github/workflows/sonarcloud.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323
with:
2424
fetch-depth: 0
2525

26-
- name: Set up JDK 17
26+
- name: Set up JDK 21
2727
uses: actions/setup-java@v4.0.0
2828
with:
2929
distribution: 'adopt'
30-
java-version: '17'
30+
java-version: '21'
3131
java-package: jdk
3232
architecture: x64
3333

‎pom.xml‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,12 @@
2424
<!-- Target Java 16 -->
2525
<maven.compiler.source>16</maven.compiler.source>
2626
<maven.compiler.target>16</maven.compiler.target>
27+
<!-- Run tests using java 21 -->
28+
<maven.compiler.testSource>21</maven.compiler.testSource>
29+
<maven.compiler.testTarget>21</maven.compiler.testTarget>
2730

2831
<!-- Spigot properties -->
29-
<spigot.version>1.20.4</spigot.version>
32+
<spigot.version>1.20.6</spigot.version>
3033
<spigot.javadocs>https://hub.spigotmc.org/javadocs/spigot/</spigot.javadocs>
3134

3235
<!-- Default settings for sonarcloud.io -->
@@ -115,7 +118,7 @@
115118
<!-- Compiler plugin -->
116119
<groupId>org.apache.maven.plugins</groupId>
117120
<artifactId>maven-compiler-plugin</artifactId>
118-
<version>3.12.1</version>
121+
<version>3.13.0</version>
119122

120123
<configuration>
121124
<excludes>
@@ -130,7 +133,7 @@
130133
<!-- Attach sources -->
131134
<groupId>org.apache.maven.plugins</groupId>
132135
<artifactId>maven-source-plugin</artifactId>
133-
<version>3.3.0</version>
136+
<version>3.3.1</version>
134137

135138
<executions>
136139
<execution>
@@ -146,7 +149,7 @@
146149
<!-- Plugin for Unit Tests -->
147150
<groupId>org.apache.maven.plugins</groupId>
148151
<artifactId>maven-surefire-plugin</artifactId>
149-
<version>3.2.5</version>
152+
<version>3.3.1</version>
150153

151154
<configuration>
152155
<junitArtifactName>org.junit.jupiter:junit-jupiter</junitArtifactName>
@@ -235,7 +238,7 @@
235238
<!-- Javadocs -->
236239
<groupId>org.apache.maven.plugins</groupId>
237240
<artifactId>maven-javadoc-plugin</artifactId>
238-
<version>3.6.3</version>
241+
<version>3.7.0</version>
239242

240243
<configuration>
241244
<reportOutputDirectory>${project.basedir}</reportOutputDirectory>
@@ -329,9 +332,19 @@
329332
</resources>
330333
</build>
331334

332-
<dependencies>
333-
335+
<dependencyManagement>
336+
<dependencies>
337+
<dependency>
338+
<groupId>org.junit</groupId>
339+
<artifactId>junit-bom</artifactId>
340+
<version>5.10.3</version>
341+
<type>pom</type>
342+
<scope>import</scope>
343+
</dependency>
344+
</dependencies>
345+
</dependencyManagement>
334346

347+
<dependencies>
335348
<!-- Development dependencies -->
336349
<dependency>
337350
<groupId>com.google.code.findbugs</groupId>
@@ -344,7 +357,7 @@
344357
<dependency>
345358
<groupId>com.github.baked-libs.dough</groupId>
346359
<artifactId>dough-api</artifactId>
347-
<version>baf2d79f62</version>
360+
<version>f8ff25187d</version>
348361
<scope>compile</scope>
349362
</dependency>
350363
<dependency>
@@ -358,7 +371,6 @@
358371
<dependency>
359372
<groupId>org.junit.jupiter</groupId>
360373
<artifactId>junit-jupiter</artifactId>
361-
<version>5.10.2</version>
362374
<scope>test</scope>
363375
</dependency>
364376
<dependency>
@@ -375,9 +387,9 @@
375387
</dependency>
376388
<!-- This needs to be before Spigot because MockBukkit will fail otherwise. -->
377389
<dependency>
378-
<groupId>com.github.seeseemelk</groupId>
379-
<artifactId>MockBukkit-v1.20</artifactId>
380-
<version>3.65.0</version>
390+
<groupId>com.github.MockBukkit</groupId>
391+
<artifactId>MockBukkit</artifactId>
392+
<version>c7cc678834</version>
381393
<scope>test</scope>
382394

383395
<exclusions>
@@ -387,19 +399,13 @@
387399
<groupId>org.jetbrains</groupId>
388400
<artifactId>annotations</artifactId>
389401
</exclusion>
390-
<exclusion>
391-
<groupId>io.papermc.paper</groupId>
392-
<artifactId>paper-api</artifactId>
393-
</exclusion>
394402
</exclusions>
395403
</dependency>
396-
<!-- Override MockBukkit's Paper to a pinned slightly older version -->
397-
<!-- This is because MockBukkit currently fails after this PR: -->
398-
<!-- https://github.com/PaperMC/Paper/pull/9629 -->
404+
<!-- Override Spigot with Paper tests as a CommandMap ctor which MockBukkit uses only exists on Paper but not in Spigot -->
399405
<dependency>
400406
<groupId>io.papermc.paper</groupId>
401407
<artifactId>paper-api</artifactId>
402-
<version>1.20.4-R0.1-20240205.114523-90</version>
408+
<version>1.20.6-R0.1-SNAPSHOT</version>
403409
<scope>test</scope>
404410
</dependency>
405411

0 commit comments

Comments
 (0)