Skip to content

Feature/format #319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 59 additions & 0 deletions .github/workflows/java-gradle-checkstyle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# yamllint disable rule:line-length
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.
# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
# yamllint enable rule:line-length
---

name: Java CI Tests with Gradle

on: # yamllint disable-line rule:truthy
push:
branches: ["main"]
pull_request:
# The branches below must be a subset of the branches above
branches: ["main"]
workflow_dispatch:

permissions:
contents: read

jobs:
gradle:
name: Java Gradle CI Test

strategy:
matrix:
os: ["windows-2022", "ubuntu-24.04", "macos-14"]
java: ['22', '23', '24']
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v4
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: temurin

- name: Tool test
run: |
echo "Java version: ${{ matrix.java }}"
java -version
echo "OS: ${{ matrix.os }}"
echo "Gradle version:"
./gradlew --version
- name: Validate Gradle wrapper
uses: gradle/actions/wrapper-validation@v4

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Clean
run: ./gradlew --console=verbose clean

- name: Lint
run: ./gradlew --console=verbose checkstyleMain checkstyleTest
2 changes: 1 addition & 1 deletion .github/workflows/java-gradle-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: 22
java-version: 24
# Alternative distribution options are available
distribution: temurin
- name: Validate Gradle wrapper
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/java-gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,5 @@ jobs:
- name: Clean
run: ./gradlew --console=verbose clean

- name: Lint
run: ./gradlew --console=verbose checkstyleMain checkstyleTest

- name: Run tests
run: ./gradlew --console=verbose test -x checkstyleMain checkstyleTest
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ lint: lint/markdown lint/yaml test/styling test/static
test/styling: dependencies
$(GRADLE) --console=verbose clean checkstyleMain checkstyleTest


format/sources:
$(GRADLE) --console=verbose rewriteRun

format: format/sources

test/static: dependencies

test: env
Expand Down
8 changes: 8 additions & 0 deletions algorithm-exercises-java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ plugins {
// Apply the application plugin to add support for building a CLI application in Java.
id 'application'
id 'checkstyle'
id 'org.openrewrite.rewrite' version '7.6.2'
id 'jacoco'
id 'org.barfuin.gradle.jacocolog' version '3.1.0'
id 'com.adarshr.test-logger' version '4.0.0'
Expand All @@ -35,6 +36,7 @@ dependencies {
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.19.0'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.19.0'

rewrite 'org.openrewrite.recipe:rewrite-static-analysis:latest.release'
}

application {
Expand All @@ -55,6 +57,12 @@ checkstyle {
showViolations = true
}

// Reference: https://docs.openrewrite.org/running-recipes/popular-recipe-guides/automatically-fix-checkstyle-violations
rewrite {
activeRecipe 'org.openrewrite.staticanalysis.CodeCleanup'
checkstyleConfigFile = file("checkstyle.xml")
}

configurations.checkstyle {
resolutionStrategy.capabilitiesResolution.withCapability("com.google.collections:google-collections") {
select("com.google.guava:guava:33.4.8-jre")
Expand Down