Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to 1.20.5 #4186

Merged
merged 22 commits into from
Sep 13, 2024
Merged

Update to 1.20.5 #4186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
3b8b94e
Update to 1.20.5
WalshyDev May 5, 2024
f0e4fed
Keep old isMinecraftVersion func
WalshyDev May 5, 2024
bd6c7e4
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/compati…
WalshyDev May 10, 2024
62b3969
Update mockbukkit
J3fftw1 Jun 5, 2024
11564f4
Update Junit and maven plugin versions, update mockbukkit to latest f…
md5sha256 Aug 11, 2024
e6b6af5
Refactor AbstractLocateRegexCheck to detect and return null if the lo…
md5sha256 Aug 11, 2024
e18156b
Refactor to use a permission check in the TestGuideCommand
md5sha256 Aug 11, 2024
3a0612b
Fix TestBiomeMapCompatibility failing due to JsonUtils neeeding Slime…
md5sha256 Aug 11, 2024
ccda59a
Refactor versioned classes to use the Registry api
md5sha256 Aug 11, 2024
9a30d31
Mark the paper-api dependency in the provided scope
md5sha256 Aug 11, 2024
279db22
Check if getBasePotionType can be used before using it
md5sha256 Aug 11, 2024
6ac44b3
Revert "Refactor versioned classes to use the Registry api"
md5sha256 Aug 11, 2024
72beb28
Refactor VersionedEntityType and VersionedEnchantment to use the regi…
md5sha256 Aug 11, 2024
118ed68
Mark the paper-api dependency in the test scope, update comment
md5sha256 Aug 11, 2024
23fc4f9
Refactor MinecraftVersion to include a range of minor patches which a…
md5sha256 Aug 11, 2024
87e4fc4
Make tests pass and update to dough pr
WalshyDev Sep 9, 2024
166e6fa
Update CI
WalshyDev Sep 9, 2024
1330a87
Update dough and move fireworkutils to registry
WalshyDev Sep 9, 2024
cf98cd8
Update dough to HEAD
WalshyDev Sep 9, 2024
283a896
chore: various changes to 1.20.5 branch (#4240)
ybw0014 Sep 11, 2024
2082304
Update src/test/java/io/github/thebusybiscuit/slimefun4/core/services…
WalshyDev Sep 11, 2024
0b23a1e
Update src/main/java/io/github/thebusybiscuit/slimefun4/api/Minecraft…
WalshyDev Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/discord-webhook.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ jobs:
- name: Checkout repository
uses: actions/[email protected]

- name: Set up Java JDK 17
- name: Set up Java JDK 21
uses: actions/[email protected]
with:
distribution: 'adopt'
java-version: '17'
java-version: '21'
java-package: jdk
architecture: x64

Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/e2e-testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,12 @@ jobs:
javaVersion: '18'
- mcVersion: '1.19.4'
javaVersion: '19'
- mcVersion: 'latest'
- mcVersion: '1.20.4'
javaVersion: '20'
- mcVersion: '1.20.6'
javaVersion: '21'
#- mcVersion: 'latest'
# javaVersion: '21'

steps:
- name: Checkout repository
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/javadocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/[email protected]
with:
distribution: 'adopt'
java-version: '17'
java-version: '21'
java-package: jdk
architecture: x64

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/maven-compiler.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/[email protected]
with:
distribution: 'adopt'
java-version: '17'
java-version: '21'
java-package: jdk
architecture: x64

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/[email protected]
with:
distribution: 'adopt'
java-version: '17'
java-version: '21'
java-package: jdk
architecture: x64

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/[email protected]
with:
distribution: 'adopt'
java-version: '17'
java-version: '21'
java-package: jdk
architecture: x64

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sonarcloud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ jobs:
with:
fetch-depth: 0

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/[email protected]
with:
distribution: 'adopt'
java-version: '17'
java-version: '21'
java-package: jdk
architecture: x64

Expand Down
46 changes: 26 additions & 20 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,12 @@
<!-- Target Java 16 -->
<maven.compiler.source>16</maven.compiler.source>
<maven.compiler.target>16</maven.compiler.target>
<!-- Run tests using java 21 -->
<maven.compiler.testSource>21</maven.compiler.testSource>
<maven.compiler.testTarget>21</maven.compiler.testTarget>

<!-- Spigot properties -->
<spigot.version>1.20.4</spigot.version>
<spigot.version>1.20.6</spigot.version>
<spigot.javadocs>https://hub.spigotmc.org/javadocs/spigot/</spigot.javadocs>

<!-- Default settings for sonarcloud.io -->
Expand Down Expand Up @@ -115,7 +118,7 @@
<!-- Compiler plugin -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version>
<version>3.13.0</version>

<configuration>
<excludes>
Expand All @@ -130,7 +133,7 @@
<!-- Attach sources -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.0</version>
<version>3.3.1</version>

<executions>
<execution>
Expand All @@ -146,7 +149,7 @@
<!-- Plugin for Unit Tests -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.5</version>
<version>3.3.1</version>

<configuration>
<junitArtifactName>org.junit.jupiter:junit-jupiter</junitArtifactName>
Expand Down Expand Up @@ -235,7 +238,7 @@
<!-- Javadocs -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.3</version>
<version>3.7.0</version>

<configuration>
<reportOutputDirectory>${project.basedir}</reportOutputDirectory>
Expand Down Expand Up @@ -329,9 +332,19 @@
</resources>
</build>

<dependencies>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.10.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<!-- Development dependencies -->
<dependency>
<groupId>com.google.code.findbugs</groupId>
Expand All @@ -344,7 +357,7 @@
<dependency>
<groupId>com.github.baked-libs.dough</groupId>
<artifactId>dough-api</artifactId>
<version>baf2d79f62</version>
<version>f8ff25187d</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -358,7 +371,6 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.10.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -375,9 +387,9 @@
</dependency>
<!-- This needs to be before Spigot because MockBukkit will fail otherwise. -->
<dependency>
<groupId>com.github.seeseemelk</groupId>
<artifactId>MockBukkit-v1.20</artifactId>
<version>3.65.0</version>
<groupId>com.github.MockBukkit</groupId>
<artifactId>MockBukkit</artifactId>
<version>c7cc678834</version>
<scope>test</scope>

<exclusions>
Expand All @@ -387,19 +399,13 @@
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
</exclusion>
<exclusion>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Override MockBukkit's Paper to a pinned slightly older version -->
<!-- This is because MockBukkit currently fails after this PR: -->
<!-- https://github.com/PaperMC/Paper/pull/9629 -->
<!-- Override Spigot with Paper tests as a CommandMap ctor which MockBukkit uses only exists on Paper but not in Spigot -->
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.20.4-R0.1-20240205.114523-90</version>
<version>1.20.6-R0.1-SNAPSHOT</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-SNAPSHOT is still latest version?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep that's latest -- probably worth pinning again once we're in .21

<scope>test</scope>
</dependency>

Expand Down
Loading
Loading