Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 6 additions & 5 deletions .github/workflows/windspigot-build-and-upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,18 @@ jobs:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[skip]')"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up JDK 18.0.1
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 18.0.1
server-id: github
cache: 'maven'

- name: Cache local Maven repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand All @@ -29,13 +30,13 @@ jobs:
run: mvn package --file pom.xml

- name: Upload Server Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: WindSpigot-server
path: WindSpigot-Server/target/WindSpigot.jar

- name: Upload API Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: WindSpigot-API
path: WindSpigot-API/target/WindSpigot-API.jar
32 changes: 20 additions & 12 deletions WindSpigot-API/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,21 @@
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<repositories>
<repository>
<id>hpfxd-releases</id>
<name>hpfxd repo</name>
<url>https://repo.hpfxd.com/releases</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>net.sf.trove4j</groupId>
<artifactId>trove4j</artifactId>
<version>3.0.3</version>
<!-- Trove Provided by CraftBukkit -->
<!-- Trove Provided by CraftBukkit -->
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -44,21 +52,21 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
<!-- bundled with Minecraft, should be kept in sync -->
<!-- bundled with Minecraft, should be kept in sync -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>17.0</version>
<scope>compile</scope>
</dependency>
<!-- &lt;!&ndash; https://mvnrepository.com/artifact/com.github.ben-manes.caffeine/caffeine &ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>com.github.ben-manes.caffeine</groupId>-->
<!-- <artifactId>caffeine</artifactId>-->
<!-- <version>2.8.5</version>-->
<!-- </dependency>-->
<!-- &lt;!&ndash; https://mvnrepository.com/artifact/com.github.ben-manes.caffeine/caffeine &ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>com.github.ben-manes.caffeine</groupId>-->
<!-- <artifactId>caffeine</artifactId>-->
<!-- <version>2.8.5</version>-->
<!-- </dependency>-->

<!-- bundled with Minecraft, should be kept in sync -->
<!-- bundled with Minecraft, should be kept in sync -->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
Expand All @@ -84,7 +92,7 @@
<scope>compile</scope>
</dependency>

<!-- testing -->
<!-- testing -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down Expand Up @@ -120,9 +128,9 @@
</execution>
</executions>
<configuration>
<!-- utterly useless artifact from shade 2.x -->
<!-- utterly useless artifact from shade 2.x -->
<createDependencyReducedPom>false</createDependencyReducedPom>
<!-- when downloading via Maven we can pull depends individually -->
<!-- when downloading via Maven we can pull depends individually -->
<shadedArtifactAttached>true</shadedArtifactAttached>
</configuration>
</plugin>
Expand Down
22 changes: 13 additions & 9 deletions WindSpigot-Server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>4.1.68.Final</version>
<version>4.1.132.Final</version>
</dependency>

<dependency>
Expand All @@ -56,7 +56,7 @@
<artifactId>fastutil</artifactId>
<version>8.5.6</version>
</dependency>

<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>minecraft-server</artifactId>
Expand Down Expand Up @@ -140,7 +140,7 @@
<dependency>
<groupId>com.velocitypowered</groupId>
<artifactId>velocity-native</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>3.1.1</version>
</dependency>

<dependency>
Expand All @@ -160,9 +160,9 @@
<artifactId>checker-qual</artifactId>
<version>3.21.0</version>
</dependency>
<!-- Kyori api -->
<!-- https://mvnrepository.com/artifact/net.kyori/adventure-api -->

<!-- Kyori api -->
<!-- https://mvnrepository.com/artifact/net.kyori/adventure-api -->
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-key</artifactId>
Expand All @@ -176,11 +176,15 @@
<url>https://maven.elmakers.com/repository/</url>
</repository>
<repository>
<id>velocity-repo</id>
<url>https://repo.velocitypowered.com/snapshots/</url>
<id>papermc</id>
<url>https://repo.papermc.io/repository/maven-public/</url>
</repository>
<repository>
<id>hpfxd-releases</id>
<name>hpfxd repo</name>
<url>https://repo.hpfxd.com/releases</url>
</repository>
</repositories>

<!-- This builds a completely 'ready to start' jar with all dependencies
inside -->
<build>
Expand Down
Loading