Merge pull request #1060 from dota17/codeFormat-cleanup · java-codehunger/Java-WebSocket@2a91fe2 · GitHub
Skip to content

Commit 2a91fe2

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

173 files changed

Lines changed: 19665 additions & 17828 deletions

File tree

Some content is hidden

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

‎.github/workflows/checkstyle.yml‎

Lines changed: 20 additions & 0 deletions

‎.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

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)