Skip to content
This repository was archived by the owner on Dec 19, 2023. It is now read-only.

Commit 39cfadd

Browse files
committed
chore: remove google code format
1 parent ebd736e commit 39cfadd

File tree

6 files changed

+9
-67
lines changed

6 files changed

+9
-67
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,6 @@ jobs:
1313
- uses: actions/checkout@v2
1414
- uses: gradle/wrapper-validation-action@v1
1515

16-
verify-google-java-format:
17-
name: Google Java Format Verification
18-
runs-on: ubuntu-latest
19-
needs: validation
20-
steps:
21-
- name: Checkout
22-
uses: actions/checkout@v2
23-
- name: Setup Java
24-
uses: actions/setup-java@v2
25-
with:
26-
distribution: 'zulu'
27-
java-version: 15
28-
- name: Cache Gradle
29-
uses: actions/cache@v2
30-
env:
31-
java-version: 15
32-
with:
33-
path: |
34-
~/.gradle/caches
35-
~/.gradle/wrapper
36-
key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
37-
restore-keys: ${{ runner.os }}-${{ env.java-version }}-gradle-
38-
- name: Make gradlew executable
39-
run: chmod +x ./gradlew
40-
- name: Gradle Check
41-
run: ./gradlew --info build -x test
42-
4316
test:
4417
name: Test run
4518
needs: validation
@@ -66,7 +39,7 @@ jobs:
6639
- name: Make gradlew executable
6740
run: chmod +x ./gradlew
6841
- name: Gradle Check
69-
run: ./gradlew --info check -x verifyGoogleJavaFormat
42+
run: ./gradlew --info check
7043

7144
build:
7245
name: Publish snapshot
@@ -98,7 +71,7 @@ jobs:
9871
env:
9972
OSS_USER_TOKEN_KEY: ${{ secrets.OSS_USER_TOKEN_KEY }}
10073
OSS_USER_TOKEN_PASS: ${{ secrets.OSS_USER_TOKEN_PASS }}
101-
run: ./gradlew clean build publish -x test -x verifyGoogleJavaFormat
74+
run: ./gradlew clean build publish -x test
10275

10376
sonar:
10477
name: Sonar analysis
@@ -130,4 +103,4 @@ jobs:
130103
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
131104
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
132105
if: env.SONAR_TOKEN != null
133-
run: ./gradlew build jacocoTestReport sonarqube --info -x verifyGoogleJavaFormat
106+
run: ./gradlew build jacocoTestReport sonarqube --info

.github/workflows/pull-request.yml

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,6 @@ jobs:
1111
- uses: actions/checkout@v2
1212
- uses: gradle/wrapper-validation-action@v1
1313

14-
verify-google-java-format:
15-
name: Google Java Format Verification
16-
runs-on: ubuntu-latest
17-
needs: validation
18-
steps:
19-
- name: Checkout
20-
uses: actions/checkout@v2
21-
- name: Setup Java
22-
uses: actions/setup-java@v2
23-
with:
24-
distribution: 'zulu'
25-
java-version: 11
26-
- name: Cache Gradle
27-
uses: actions/cache@v2
28-
env:
29-
java-version: 11
30-
with:
31-
path: |
32-
~/.gradle/caches
33-
~/.gradle/wrapper
34-
key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
35-
restore-keys: ${{ runner.os }}-${{ env.java-version }}-gradle-
36-
- name: Make gradlew executable
37-
run: chmod +x ./gradlew
38-
- name: Gradle Check
39-
run: ./gradlew --info build -x test
40-
4114
commitlint:
4215
name: Validate conventional commits
4316
runs-on: ubuntu-latest
@@ -86,11 +59,11 @@ jobs:
8659
run: chmod +x ./gradlew
8760
- name: Gradle Check (non-Windows)
8861
if: matrix.os != 'windows-latest'
89-
run: ./gradlew --info check -x verifyGoogleJavaFormat
62+
run: ./gradlew --info check
9063
- name: Gradle Check (Windows)
9164
if: matrix.os == 'windows-latest'
9265
shell: cmd
93-
run: gradlew --info check -x verifyGoogleJavaFormat
66+
run: gradlew --info check
9467

9568
build:
9669
name: Sonar analysis
@@ -128,4 +101,4 @@ jobs:
128101
env:
129102
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
130103
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
131-
run: ./gradlew build jacocoTestReport sonarqube --info -x verifyGoogleJavaFormat
104+
run: ./gradlew build jacocoTestReport sonarqube --info

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Make gradlew executable
3636
run: chmod +x ./gradlew
3737
- name: Gradle Check
38-
run: ./gradlew --info check -x verifyGoogleJavaFormat
38+
run: ./gradlew --info check
3939

4040
build:
4141
name: Publish release

build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ plugins {
2525
id "org.sonarqube" version "$PLUGIN_SONARQUBE_VER"
2626
id "jacoco"
2727
id 'io.codearte.nexus-staging' version "$PLUGIN_NEXUS_STAGING_VER"
28-
id 'com.github.sherter.google-java-format' version "$PLUGIN_GOOGLE_JAVA_FORMAT_VER" apply false
2928
}
3029

3130
sonarqube {
@@ -49,7 +48,6 @@ subprojects {
4948
}
5049
apply plugin: 'maven-publish'
5150
apply plugin: 'signing'
52-
apply plugin: 'com.github.sherter.google-java-format'
5351

5452
group "$PROJECT_GROUP"
5553

@@ -116,8 +114,6 @@ subprojects {
116114
}
117115

118116
compileJava.dependsOn(processResources)
119-
120-
compileJava.mustRunAfter verifyGoogleJavaFormat
121117
}
122118

123119
if (!it.name.startsWith('example')) {

github-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ git config --global user.name "GitHub Actions"
4545
echo "Deploying release to Maven Central"
4646
removeSnapshots
4747

48-
./gradlew clean build publish closeAndReleaseRepository -x verifyGoogleJavaFormat
48+
./gradlew clean build publish closeAndReleaseRepository
4949

5050
commitRelease
5151
bumpVersion

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ TARGET_COMPATIBILITY=1.8
3434
LIB_GRAPHQL_JAVA_VER=16.2
3535
LIB_EXTENDED_SCALARS_VER=16.0.1
3636
LIB_SPRING_BOOT_VER=2.4.5
37-
LIB_GRAPHQL_SERVLET_VER=11.1.0
37+
LIB_GRAPHQL_SERVLET_VER=11.1.1-SNAPSHOT
3838
LIB_GRAPHQL_JAVA_TOOLS_VER=11.0.1
3939
LIB_GRAPHQL_ANNOTATIONS_VER=8.3
4040
LIB_REFLECTIONS_VER=0.9.11

0 commit comments

Comments
 (0)