Skip to content

Commit 2a91fe2

Browse files
authored
Merge pull request TooTallNate#1060 from dota17/codeFormat-cleanup
2 parents 12bb2f5 + 479462a commit 2a91fe2

File tree

173 files changed

+19665
-17828
lines changed

Some content is hidden

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

173 files changed

+19665
-17828
lines changed

.github/workflows/checkstyle.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# This workflow will build a Java project with Maven
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
3+
4+
name: Java Code Style Check with Maven
5+
6+
on: [push, pull_request]
7+
8+
jobs:
9+
build:
10+
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v2
15+
- name: Set up JDK 1.8
16+
uses: actions/setup-java@v1
17+
with:
18+
java-version: 1.8
19+
- name: Code Style Check
20+
run: mvn -B checkstyle:check --file pom.xml

.github/workflows/ci.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ jobs:
66
Build:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v1
10-
- name: Set up JDK 1.8
11-
uses: actions/setup-java@v1
12-
with:
13-
java-version: 1.8
14-
- name: Build
15-
run: mvn -DskipTests package --file pom.xml
16-
9+
- uses: actions/checkout@v1
10+
- name: Set up JDK 1.8
11+
uses: actions/setup-java@v1
12+
with:
13+
java-version: 1.8
14+
- name: Build
15+
run: mvn -DskipTests package --file pom.xml
16+
1717
Test:
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v1
21-
- name: Set up JDK 1.8
22-
uses: actions/setup-java@v1
23-
with:
24-
java-version: 1.8
25-
- name: Test
26-
run: mvn test --file pom.xml
20+
- uses: actions/checkout@v1
21+
- name: Set up JDK 1.8
22+
uses: actions/setup-java@v1
23+
with:
24+
java-version: 1.8
25+
- name: Test
26+
run: mvn test --file pom.xml

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ configure(install.repositories.mavenInstaller) {
2424
}
2525

2626
dependencies {
27-
deployerJars "org.apache.maven.wagon:wagon-webdav:1.0-beta-2"
27+
deployerJars "org.apache.maven.wagon:wagon-webdav:1.0-beta-2"
2828
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
2929
testCompile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25'
3030
testCompile group: 'junit', name: 'junit', version: '4.12'

checkstyle-suppressions.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0"?>
2+
3+
<!DOCTYPE suppressions PUBLIC
4+
"-//Checkstyle//DTD SuppressionFilter Configuration 1.0//EN"
5+
"https://checkstyle.org/dtds/suppressions_1_0.dtd">
6+
7+
<suppressions>
8+
<suppress checks="Javadoc" files="."/>
9+
<suppress checks="MagicNumberCheck" files="."/>
10+
<suppress checks="PackageName" files="."/>
11+
<suppress checks="AbbreviationAsWordInName" files="."/>
12+
<suppress checks="LineLength" files="."/>
13+
<suppress checks="VariableDeclarationUsageDistance" files="."/>
14+
<suppress checks="OverloadMethodsDeclarationOrder" files="."/>
15+
<suppress checks="NonEmptyAtclauseDescription" files="."/>
16+
<suppress checks="TypeName" files="Draft_6455.java"/>
17+
<suppress checks="RightCurly" files="Base64.java"/>
18+
</suppressions>

CodeFormatterProfile.xml renamed to eclipse-java-google-style.xml

Lines changed: 149 additions & 91 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)