Switch to Google Java Format (AOSP) code style

koppor · Oct 26, 2023 · e58817c · e58817c
1 parent afb9e76
commit e58817c
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 342 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -25,8 +25,8 @@ permissions:
  pull-requests: write
 
 jobs:
- checkstyle:
- name: Checkstyle
+ gjf-checkstyle:
+ name: GJF (AOSP) and Checkstyle
  runs-on: ubuntu-latest
  steps:
  - name: Checkout source
@@ -40,6 +40,10 @@ jobs:
  java-version: 21.0.1
  distribution: 'liberica'
  cache: 'gradle'
+ - uses: axel-op/googlejavaformat-action@v3
+ with:
+ args: "--skip-sorting-imports --replace"
+ github-token: ${{ secrets.GITHUB_TOKEN }}
  - name: Run checkstyle reporter
  uses: nikitasavinov/checkstyle-action@master
  with:

diff --git a/config/IntelliJ Code Style.xml b/config/IntelliJ Code Style.xml
diff --git a/...setting-up-a-local-workspace/guidelines-intellij-codestyle-import-as-jabref.png b/...setting-up-a-local-workspace/guidelines-intellij-codestyle-import-as-jabref.png
diff --git a/...g-up-a-local-workspace/guidelines-intellij-codestyle-import-select-xml-file.png b/...g-up-a-local-workspace/guidelines-intellij-codestyle-import-select-xml-file.png
diff --git a/...lines-for-setting-up-a-local-workspace/guidelines-intellij-codestyle-import.png b/...lines-for-setting-up-a-local-workspace/guidelines-intellij-codestyle-import.png
diff --git a/...setting-up-a-local-workspace/guidelines-intellij-editor-javadoc-do-not-wrap.png b/...setting-up-a-local-workspace/guidelines-intellij-editor-javadoc-do-not-wrap.png
diff --git a/...de/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-gfm-aosp.png b/...de/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-gfm-aosp.png