Skip to content

Commit

Permalink
More cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@TBG1000
TBG1000 committed Jul 21, 2024
1 parent 3d9254c commit f0a1ad4
Show file tree
Hide file tree
Showing 7 changed files with 492 additions and 441 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: '8'
- name: Build jar
run: mvn package
- name: artifact
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: MatchBot-1.0.0-SNAPSHOT.jar
path: target/MatchBot-1.0.0-SNAPSHOT.jar
Expand All @@ -33,7 +33,7 @@ jobs:
- name: Upload Release Asset
id: upload-release-asset
if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main')
uses: actions/upload-release-asset@v1
uses: actions/upload-release-asset@v4
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
288 changes: 148 additions & 140 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,148 +1,156 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>me.tbg.match</groupId>
<artifactId>MatchBot</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>MatchBot</name>
<description>A minecraft to discord java plugin</description>
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>me.tbg.match</groupId>
<artifactId>MatchBot</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>MatchBot</name>
<description>A minecraft to discord java plugin</description>

<!-- Repository Locations -->
<repositories>
<repository>
<id>pgm-repo</id>
<url>https://repo.pgm.fyi/snapshots</url>
</repository>
<repository>
<id>snapshots-repo</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</repository>
</repositories>
<!-- Repository Locations -->
<repositories>
<repository>
<id>pgm-repo</id>
<url>https://repo.pgm.fyi/snapshots</url>
</repository>
<repository>
<id>snapshots-repo</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</repository>
</repositories>

<!-- Dependencies -->
<dependencies>
<dependency>
<groupId>app.ashcon</groupId>
<artifactId>sportpaper</artifactId>
<version>1.8.8-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>tc.oc.pgm</groupId>
<artifactId>core</artifactId>
<version>0.16-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>tc.oc.pgm</groupId>
<artifactId>util</artifactId>
<version>0.16-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.javacord</groupId>
<artifactId>javacord</artifactId>
<version>3.8.0</version>
<type>pom</type>
</dependency>
</dependencies>
<build>
<resources>
<!-- Include the required plugin.yml and config.yml for Bukkit -->
<resource>
<directory>${basedir}/src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
<!-- Dependencies -->
<dependencies>
<dependency>
<groupId>app.ashcon</groupId>
<artifactId>sportpaper</artifactId>
<version>1.8.8-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>tc.oc.pgm</groupId>
<artifactId>core</artifactId>
<version>0.16-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>tc.oc.pgm</groupId>
<artifactId>util</artifactId>
<version>0.16-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.javacord</groupId>
<artifactId>javacord</artifactId>
<version>3.8.0</version>
<type>pom</type>
</dependency>
</dependencies>
<build>
<resources>
<!-- Include the required plugin.yml and config.yml for Bukkit -->
<resource>
<directory>${basedir}/src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<compilerArgs>
<arg>-parameters</arg> <!-- Required for aikar/commands to auto generate syntax -->
</compilerArgs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.3</version>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<minimizeJar>true</minimizeJar>
<artifactSet>
<includes>
<include>*:*</include>
</includes>
</artifactSet>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
<relocations>
<relocation>
<pattern>org.apache.logging.log4j</pattern>
<shadedPattern>tc.oc.occ.bolt.lib.logger</shadedPattern>
</relocation>
<relocation>
<pattern>okhttp3</pattern>
<shadedPattern>tc.oc.occ.bolt.lib.okhttp3</shadedPattern>
</relocation>
<relocation>
<pattern>okio</pattern>
<shadedPattern>tc.oc.occ.bolt.lib.okio</shadedPattern>
</relocation>
<relocation>
<pattern>com.fasterxml</pattern>
<shadedPattern>tc.oc.occ.bolt.lib.jackson</shadedPattern>
</relocation>
</relocations>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<compilerArgs>
<arg>-parameters</arg> <!-- Required for aikar/commands to auto generate syntax -->
</compilerArgs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.3</version>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<minimizeJar>true</minimizeJar>
<artifactSet>
<includes>
<include>*:*</include>
</includes>
</artifactSet>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
<relocations>
<relocation>
<pattern>org.apache.logging.log4j</pattern>
<shadedPattern>tc.oc.occ.bolt.lib.logger</shadedPattern>
</relocation>
<relocation>
<pattern>okhttp3</pattern>
<shadedPattern>tc.oc.occ.bolt.lib.okhttp3</shadedPattern>
</relocation>
<relocation>
<pattern>okio</pattern>
<shadedPattern>tc.oc.occ.bolt.lib.okio</shadedPattern>
</relocation>
<relocation>
<pattern>com.fasterxml</pattern>
<shadedPattern>tc.oc.occ.bolt.lib.jackson</shadedPattern>
</relocation>
</relocations>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>

<!-- Validates that code is properly formatted with Google's code style -->
<plugin>
<groupId>com.coveo</groupId>
<artifactId>fmt-maven-plugin</artifactId>
<version>2.9</version>
<configuration>
<style>google</style>
</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<!-- Validates that code is properly formatted with Google's code style -->
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>2.43.0</version>
<configuration>
<ratchetFrom>origin/dev</ratchetFrom>
<java>
<removeUnusedImports/>
<palantirJavaFormat>
<version>2.47.0</version>
<style>GOOGLE</style>
<formatJavadoc>true</formatJavadoc>
</palantirJavaFormat>
</java>
</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<!-- Special Properties -->
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<skipTests>true</skipTests>
</properties>
<!-- Special Properties -->
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<skipTests>true</skipTests>
</properties>

</project>
Loading

0 comments on commit f0a1ad4

Please sign in to comment.