Skip to content

Commit dd42e0c

Browse files
committed
Merge branch 'master' into feat/aakatz3/mojangapi
2 parents fa22fff + 262edf1 commit dd42e0c

File tree

50 files changed

+742
-523
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+742
-523
lines changed

.github/dependabot.yml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
version: 2
2+
3+
updates:
4+
- package-ecosystem: gradle
5+
directory: "/"
6+
schedule:
7+
interval: daily
8+
time: "12:00"
9+
open-pull-requests-limit: 16
10+
ignore:
11+
# Using upstream minecraft version
12+
- dependency-name: io.netty:netty-codec
13+
versions:
14+
- "> 4.1.58.Final"
15+
# Using upstream minecraft version
16+
- dependency-name: org.yaml:snakeyaml
17+
versions:
18+
- "> 1.27"

.github/workflows/ci.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
version: ["11", "14", "15"]
10+
version: ["11", "14", "15", "16"]
1111
container:
1212
image: jcxldn/openjdk-alpine:${{matrix.version}}-jdk
1313
steps:
@@ -44,7 +44,7 @@ jobs:
4444
with:
4545
name: java-${{matrix.version}}-testing-mvn-repo
4646
path: build/testing-mvn-repo/*
47-
license-header-check:
47+
linting-check:
4848
runs-on: ubuntu-latest
4949
container:
5050
image: jcxldn/openjdk-alpine:11-jdk
@@ -54,8 +54,8 @@ jobs:
5454
- uses: actions/checkout@v2
5555
- name: Grant execute permission for gradlew
5656
run: chmod +x gradlew
57-
- name: Run the license formatter checker
58-
run: ./gradlew licenseMain licenseTest
57+
- name: Test our code against our spotless formatting options
58+
run: ./gradlew spotlessCheck
5959
javadoc-check:
6060
runs-on: ubuntu-latest
6161
container:

LICENSE_HEADER

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
Copyright (c) 2020-${year} DumbDogDiner <dumbdogdiner.com>. All rights reserved.
2-
Licensed under the MIT license, see LICENSE for more information...
1+
/*
2+
* Copyright (c) 2020-$YEAR DumbDogDiner <dumbdogdiner.com>. All rights reserved.
3+
* Licensed under the MIT license, see LICENSE for more information...
4+
*/

0 commit comments

Comments
 (0)