Merge pull request #619 from BigBotNetwork/greg-dev

New version
This commit is contained in:
Skidder 2021-03-05 09:04:12 +01:00 committed by GitHub
commit 6f785661e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 17 deletions

View file

@ -6,11 +6,11 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.13
uses: actions/setup-java@v1
- uses: actions/checkout@v2.3.4
- name: Set up JDK 15
uses: actions/setup-java@v1.3.4
with:
java-version: 1.13
java-version: '15'
- name: Build with Maven
run: mvn -B package --file pom.xml
@ -19,11 +19,11 @@ jobs:
needs: build
if: github.ref == 'refs/heads/master'
steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.13
uses: actions/setup-java@v1
- uses: actions/checkout@v2.3.4
- name: Set up JDK 15
uses: actions/setup-java@v1.3.4
with:
java-version: 1.13
java-version: 15''
- name: Build Final Jar
run: mvn clean compile assembly:single
- name: Copy folder content recursively to remote

18
pom.xml
View file

@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>Hadder</groupId>
<artifactId>Hadder</artifactId>
<version>1.3.25</version>
<version>1.3.26</version>
<name>Hadder</name>
<inceptionYear>2019</inceptionYear>
<description>Hadder is a multi-purpose Discord bot.</description>
@ -22,8 +22,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.13</maven.compiler.source>
<maven.compiler.target>1.13</maven.compiler.target>
<maven.compiler.source>1.15</maven.compiler.source>
<maven.compiler.target>1.15</maven.compiler.target>
<maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'</maven.build.timestamp.format>
</properties>
@ -69,7 +69,7 @@
<dependency>
<groupId>net.dv8tion</groupId>
<artifactId>JDA</artifactId>
<version>4.2.0_228</version>
<version>4.2.0_231</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
@ -94,17 +94,17 @@
<dependency>
<groupId>org.kohsuke</groupId>
<artifactId>github-api</artifactId>
<version>1.122</version>
<version>1.123</version>
</dependency>
<dependency>
<groupId>com.sedmelluq</groupId>
<artifactId>lavaplayer</artifactId>
<version>1.3.67</version>
<version>1.3.72</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.12.1</version>
<version>2.12.2</version>
</dependency>
</dependencies>
@ -159,8 +159,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>13</source>
<target>13</target>
<source>15</source>
<target>15</target>
</configuration>
</plugin>
<plugin>