Merge branch 'development' into FS-37

This commit is contained in:
Ryan 2021-08-21 21:34:04 +01:00 committed by GitHub
commit 77fd4ff66a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 11 deletions

View file

@ -9,11 +9,15 @@ updates:
# Maintain Maven Updates # Maintain Maven Updates
- package-ecosystem: "maven" # See documentation for possible values - package-ecosystem: "maven" # See documentation for possible values
directory: "/" # Location of package manifests directory: "/" # Location of package manifests
target-branch: "development"
open-pull-requests-limit: 50
schedule: schedule:
interval: "daily" interval: "daily"
# Maintain dependencies for GitHub Actions # Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions" - package-ecosystem: "github-actions"
directory: "/" directory: "/"
target-branch: "development"
open-pull-requests-limit: 50
schedule: schedule:
interval: "daily" interval: "daily"

View file

@ -38,10 +38,11 @@ jobs:
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Setup Java JDK - name: Setup Java JDK
uses: actions/setup-java@v1.4.3 uses: actions/setup-java@v2.2.0
with: with:
# The Java version to make available on the path. Takes a whole or semver Java version, or 1.x syntax (e.g. 1.8 => Java 8.x). Early access versions can be specified in the form of e.g. 14-ea, 14.0.0-ea, or 14.0.0-ea.28 # The Java version to make available on the path. Takes a whole or semver Java version, or 1.x syntax (e.g. 1.8 => Java 8.x). Early access versions can be specified in the form of e.g. 14-ea, 14.0.0-ea, or 14.0.0-ea.28
java-version: 11 java-version: 11
distribution: 'adopt'
# Initializes the CodeQL tools for scanning. # Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL - name: Initialize CodeQL

View file

@ -30,7 +30,7 @@ jobs:
with: with:
upstream_repository: AtlasMediaGroup/TotalFreedomMod upstream_repository: AtlasMediaGroup/TotalFreedomMod
upstream_branch: main upstream_branch: main
target_branch: main target_branch: development
git_pull_args: --ff-only # optional arg use, defaults to simple 'pull' git_pull_args: --ff-only # optional arg use, defaults to simple 'pull'
# Step 3: Display a message if 'sync' step had new commits (simple test) # Step 3: Display a message if 'sync' step had new commits (simple test)

View file

@ -11,9 +11,20 @@ jobs:
# Java 11 Builds # Java 11 Builds
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Set up JDK 11 - name: Set up JDK 11
uses: actions/setup-java@v1 uses: actions/setup-java@v2.2.0
with: with:
java-version: 11 java-version: 11
distribution: 'adopt'
- name: Build with Maven
run: mvn -B package --file pom.xml
# Java 16 Builds
- uses: actions/checkout@v1
- name: Set up JDK 16
uses: actions/setup-java@v2.2.0
with:
java-version: 16
distribution: 'adopt'
- name: Build with Maven - name: Build with Maven
run: mvn -B package --file pom.xml run: mvn -B package --file pom.xml

20
pom.xml
View file

@ -5,7 +5,7 @@
<groupId>me.totalfreedom</groupId> <groupId>me.totalfreedom</groupId>
<artifactId>TotalFreedomMod</artifactId> <artifactId>TotalFreedomMod</artifactId>
<version>2021.05</version> <version>2021.06</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
@ -109,6 +109,11 @@
<id>ess-repo</id> <id>ess-repo</id>
<url>https://ci.ender.zone/plugin/repository/everything/</url> <url>https://ci.ender.zone/plugin/repository/everything/</url>
</repository> </repository>
<repository>
<id>total-freedom-libs-snapshot-local</id>
<url>https://atlasmedia.jfrog.io/artifactory/total-freedom-libs-snapshot-local/</url>
</repository>
</repositories> </repositories>
<dependencies> <dependencies>
@ -135,10 +140,9 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.speedxx</groupId> <groupId>ca.momoperes</groupId>
<artifactId>Mojangson</artifactId> <artifactId>mojangson</artifactId>
<version>1957eef8d6</version> <version>1.0-20210821.193420-1</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -193,7 +197,7 @@
<dependency> <dependency>
<groupId>net.coreprotect</groupId> <groupId>net.coreprotect</groupId>
<artifactId>coreprotect</artifactId> <artifactId>coreprotect</artifactId>
<version>19.3</version> <version>19.5</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@ -256,7 +260,7 @@
<dependency> <dependency>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId> <artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.1</version> <version>3.1.2</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -462,7 +466,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId> <artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.1</version> <version>3.1.2</version>
<configuration> <configuration>
<configLocation>checkstyle.xml</configLocation> <configLocation>checkstyle.xml</configLocation>
<failOnViolation>true</failOnViolation> <failOnViolation>true</failOnViolation>