From 27d31c35eda1f971b6f732d7cf7829ee4b1a3860 Mon Sep 17 00:00:00 2001 From: Agents Agent Date: Fri, 3 Jul 2026 06:56:44 +0000 Subject: [PATCH 1/2] ci: bump shared CI pins --- .github/workflows/ci.yml | 10 +++++----- .github/workflows/crac-train.yml | 2 +- .github/workflows/release.yml | 4 ++-- .github/workflows/repository-hygiene.yml | 2 +- gradle/libs.versions.toml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 64082fe..7ad8695 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: run: '${{ steps.actionlint.outputs.executable }} -color .github/workflows/*.yml' jvm: - uses: 'JorisJonkers-dev/github-workflows/.github/workflows/jvm-ci.yml@v0.8.0' + uses: 'JorisJonkers-dev/github-workflows/.github/workflows/jvm-ci.yml@v0.10.2' with: lint-gradle-args: ':api:detektMain :api:detektTest :api:detektIntegrationTest :api:ktlintCheck' test-gradle-args: >- @@ -42,7 +42,7 @@ jobs: client-dry-run: name: 'Client Dry Run' - uses: 'JorisJonkers-dev/github-workflows/.github/workflows/publish-api-clients.yml@v0.8.0' + uses: 'JorisJonkers-dev/github-workflows/.github/workflows/publish-api-clients.yml@v0.10.2' permissions: contents: 'read' packages: 'write' @@ -90,7 +90,7 @@ jobs: docker: needs: - 'jvm' - uses: 'JorisJonkers-dev/github-workflows/.github/workflows/docker-image-ci.yml@v0.8.0' + uses: 'JorisJonkers-dev/github-workflows/.github/workflows/docker-image-ci.yml@v0.10.2' with: image-name: 'auth-api/auth-api' context: '.' @@ -102,7 +102,7 @@ jobs: deploy-bundle: name: 'Deploy Bundle' - uses: 'JorisJonkers-dev/github-workflows/.github/workflows/deploy-bundle.yml@v0.8.0' + uses: 'JorisJonkers-dev/github-workflows/.github/workflows/deploy-bundle.yml@v0.10.2' permissions: contents: 'read' packages: 'write' @@ -117,7 +117,7 @@ jobs: packages-token: '${{ secrets.GITHUB_TOKEN }}' migration-guard: - uses: 'JorisJonkers-dev/github-workflows/.github/workflows/migration-guard.yml@v0.8.0' + uses: 'JorisJonkers-dev/github-workflows/.github/workflows/migration-guard.yml@v0.10.2' with: base-ref: '${{ github.head_ref == ''feat/migrate-jorisjonkers'' && github.event.pull_request.head.sha || '''' }}' migration-regex: '^api/src/main/resources/db/migration/V[0-9]+(?:_[0-9]+)*__[^/]+\.sql$' diff --git a/.github/workflows/crac-train.yml b/.github/workflows/crac-train.yml index 5a1fbff..2ddefef 100644 --- a/.github/workflows/crac-train.yml +++ b/.github/workflows/crac-train.yml @@ -9,7 +9,7 @@ permissions: jobs: train: - uses: 'JorisJonkers-dev/github-workflows/.github/workflows/crac-train.yml@v0.8.0' + uses: 'JorisJonkers-dev/github-workflows/.github/workflows/crac-train.yml@v0.10.2' with: service-matrix: >- [ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e52bf6e..70e27bf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,7 +36,7 @@ jobs: needs: - 'release-please' if: '${{ needs.release-please.outputs.release_created == ''true'' }}' - uses: 'JorisJonkers-dev/github-workflows/.github/workflows/container-publish.yml@v0.8.0' + uses: 'JorisJonkers-dev/github-workflows/.github/workflows/container-publish.yml@v0.10.2' with: image-name: 'auth-api/auth-api' version: '${{ needs.release-please.outputs.tag_name }}' @@ -50,7 +50,7 @@ jobs: needs: - 'release-please' if: '${{ needs.release-please.outputs.release_created == ''true'' }}' - uses: 'JorisJonkers-dev/github-workflows/.github/workflows/publish-api-clients.yml@v0.8.0' + uses: 'JorisJonkers-dev/github-workflows/.github/workflows/publish-api-clients.yml@v0.10.2' permissions: contents: 'read' packages: 'write' diff --git a/.github/workflows/repository-hygiene.yml b/.github/workflows/repository-hygiene.yml index 535a7a4..9de515d 100644 --- a/.github/workflows/repository-hygiene.yml +++ b/.github/workflows/repository-hygiene.yml @@ -9,5 +9,5 @@ permissions: jobs: repository-hygiene: - uses: 'JorisJonkers-dev/github-workflows/.github/workflows/repository-hygiene-guard.yml@v0.8.0' + uses: 'JorisJonkers-dev/github-workflows/.github/workflows/repository-hygiene-guard.yml@v0.10.2' secrets: 'inherit' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4a6d5af..d7528a6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] jorisjonkers-commons = "0.7.0" -jorisjonkers-conventions = "0.5.1" +jorisjonkers-conventions = "0.7.0" [libraries] kotlin-commons-archunit-test = { module = "dev.jorisjonkers:kotlin-commons-archunit-test", version.ref = "jorisjonkers-commons" } From 94607bd9dd7b287c1219067d3e8b40f5d6f85035 Mon Sep 17 00:00:00 2001 From: Agents Agent Date: Fri, 3 Jul 2026 07:26:48 +0000 Subject: [PATCH 2/2] fix: align kotlin plugin with detekt --- api/build.gradle.kts | 2 ++ gradle/libs.versions.toml | 3 +++ 2 files changed, 5 insertions(+) diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 0ff5f51..c955773 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -1,4 +1,6 @@ plugins { + alias(libs.plugins.jetbrains.kotlin.jvm) + alias(libs.plugins.jetbrains.kotlin.spring) alias(libs.plugins.jorisjonkers.spring) alias(libs.plugins.jorisjonkers.detekt) alias(libs.plugins.jorisjonkers.ktlint) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d7528a6..b101d21 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,7 @@ [versions] jorisjonkers-commons = "0.7.0" jorisjonkers-conventions = "0.7.0" +kotlin = "2.3.21" [libraries] kotlin-commons-archunit-test = { module = "dev.jorisjonkers:kotlin-commons-archunit-test", version.ref = "jorisjonkers-commons" } @@ -17,6 +18,8 @@ kotlin-commons-vault = { module = "dev.jorisjonkers:kotlin-commons-vault", versi kotlin-commons-web = { module = "dev.jorisjonkers:kotlin-commons-web", version.ref = "jorisjonkers-commons" } [plugins] +jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } +jetbrains-kotlin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" } jorisjonkers-kotlin = { id = "dev.jorisjonkers.kotlin", version.ref = "jorisjonkers-conventions" } jorisjonkers-detekt = { id = "dev.jorisjonkers.detekt", version.ref = "jorisjonkers-conventions" } jorisjonkers-ktlint = { id = "dev.jorisjonkers.ktlint", version.ref = "jorisjonkers-conventions" }