From 56d6b8694a9558c1d42482e4f9713bc6eb727223 Mon Sep 17 00:00:00 2001 From: CybAtax <62847599+CybAtax@users.noreply.github.com> Date: Sun, 17 Nov 2024 19:25:32 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Add=20spotless=20formatting=20(#?= =?UTF-8?q?2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 🎨 Add spotless formatting * 🚧 Add formatting check * 🚧 Fix workflow label, Add build workflow * 🛠️ Fix typos * 🏃 Make binaries ~run~executable * 🔧 Fix step name --- .github/workflows/build.yml | 25 +++++++++++++++++++++++++ .github/workflows/formatting.yml | 28 ++++++++++++++++++++++++++++ .prettierrc.yml | 7 +++++++ build.gradle.kts | 5 +++++ gradle/spotless.gradle | 14 ++++++++++++++ gradlew | 0 gradlew.bat | 0 7 files changed, 79 insertions(+) create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/formatting.yml create mode 100644 .prettierrc.yml create mode 100644 gradle/spotless.gradle mode change 100644 => 100755 gradlew mode change 100644 => 100755 gradlew.bat diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..9f420ea --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,25 @@ +name: Build + +on: + pull_request: + branches: + - main + +concurrency: + cancel-in-progress: true + group: ${{ github.workflow }}-${{ github.ref }} + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 21 + - uses: gradle/actions/setup-gradle@v4 + - name: Build gradle project + run: ./gradlew build \ No newline at end of file diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml new file mode 100644 index 0000000..9160dbf --- /dev/null +++ b/.github/workflows/formatting.yml @@ -0,0 +1,28 @@ +name: Check formatting + +on: + pull_request: + branches: + - main + +concurrency: + cancel-in-progress: true + group: ${{ github.workflow }}-${{ github.ref }} + +jobs: + check-formatting: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 21 + - uses: gradle/actions/setup-gradle@v4 + - uses: actions/setup-node@v4 + with: + node-version: 20 + - name: Run formatting check + run: ./gradlew spotlessCheck \ No newline at end of file diff --git a/.prettierrc.yml b/.prettierrc.yml new file mode 100644 index 0000000..3e42871 --- /dev/null +++ b/.prettierrc.yml @@ -0,0 +1,7 @@ +plugins: + - prettier-plugin-java +parser: java +printWidth: 120 +tabWidth: 4 +singleQuote: false +useTabs: false \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 22e30f7..68ae96d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,11 +2,16 @@ plugins { java id("org.springframework.boot") version "3.3.5" id("io.spring.dependency-management") version "1.1.6" + id("com.diffplug.spotless") version "6.25.0" } group = "io.github.markl4yg.hca" version = "0.0.1-SNAPSHOT" +apply( + from = file("./gradle/spotless.gradle") +) + java { toolchain { languageVersion = JavaLanguageVersion.of(21) diff --git a/gradle/spotless.gradle b/gradle/spotless.gradle new file mode 100644 index 0000000..8d4d307 --- /dev/null +++ b/gradle/spotless.gradle @@ -0,0 +1,14 @@ +import java.nio.charset.StandardCharsets + +spotless { + enforceCheck(false) + ratchetFrom "origin/main" + + java { + target "src/**/java/**/*.java" + encoding(StandardCharsets.UTF_8) + removeUnusedImports() + prettier(['prettier': '3.0.3', 'prettier-plugin-java': '2.3.0']) + .configFile('.prettierrc.yml') + } +} \ No newline at end of file diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/gradlew.bat b/gradlew.bat old mode 100644 new mode 100755