From 7cf822188a2b9ee99a29a4c535dd9668078821db Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Sat, 28 Dec 2024 18:51:57 -0800 Subject: [PATCH 1/3] Update the diffplug/blowdryer-diffplug tag. --- settings.gradle | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/settings.gradle b/settings.gradle index 55dd926..8b5654b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,11 +8,11 @@ plugins { // https://github.com/diffplug/blowdryer/blob/main/CHANGELOG.md id 'com.diffplug.blowdryerSetup' version '1.7.1' // https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md - id 'com.diffplug.spotless' version '7.0.0.BETA2' apply false + id 'com.diffplug.spotless' version '7.0.0.BETA4' apply false // https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md id 'com.diffplug.spotless-changelog' version '3.1.2' apply false // https://plugins.gradle.org/plugin/com.gradle.plugin-publish - id 'com.gradle.plugin-publish' version '1.2.2' apply false + id 'com.gradle.plugin-publish' version '1.3.0' apply false // https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md id 'dev.equo.ide' version '1.7.7' apply false // https://github.com/gradle-nexus/publish-plugin/releases @@ -20,17 +20,17 @@ plugins { // https://plugins.gradle.org/plugin/org.jetbrains.dokka id 'org.jetbrains.dokka' version '1.9.20' apply false // https://plugins.gradle.org/plugin/org.jetbrains.kotlin.jvm - id 'org.jetbrains.kotlin.jvm' version '2.0.20' apply false + id 'org.jetbrains.kotlin.jvm' version '2.1.0' apply false // https://plugins.gradle.org/plugin/org.jetbrains.kotlin.plugin.serialization - id 'org.jetbrains.kotlin.plugin.serialization' version '2.0.20' apply false + id 'org.jetbrains.kotlin.plugin.serialization' version '2.1.0' apply false // https://plugins.gradle.org/plugin/org.jetbrains.kotlin.multiplatform - id 'org.jetbrains.kotlin.multiplatform' version '2.0.20' apply false + id 'org.jetbrains.kotlin.multiplatform' version '2.1.0' apply false // https://github.com/adamko-dev/dokkatoo/releases - id 'dev.adamko.dokkatoo-html' version '2.3.1' apply false + id 'dev.adamko.dokkatoo-html' version '2.4.0' apply false } blowdryerSetup { - github 'diffplug/blowdryer-diffplug', 'tag', '8.0.2' + github 'diffplug/blowdryer-diffplug', 'tag', '8.0.3' //devLocal '../blowdryer-diffplug' setPluginsBlockTo { it.file 'plugin.versions' From 4c1b8d1dbe7d821ef8b8fcaaa69e42748f74439a Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Sat, 28 Dec 2024 18:59:16 -0800 Subject: [PATCH 2/3] Use the latest Gradle action so we don't need a separate wrapper validation anymore. --- .github/workflows/changelog-print.yml | 4 +--- .../workflows/gradle-wrapper-validation.yml | 23 ------------------- 2 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 .github/workflows/gradle-wrapper-validation.yml diff --git a/.github/workflows/changelog-print.yml b/.github/workflows/changelog-print.yml index a77c434..88be1f9 100644 --- a/.github/workflows/changelog-print.yml +++ b/.github/workflows/changelog-print.yml @@ -16,7 +16,5 @@ jobs: java-version: 11 distribution: 'temurin' - name: gradle caching - uses: gradle/gradle-build-action@v3 - with: - gradle-home-cache-cleanup: true + uses: gradle/actions/setup-gradle@v4 - run: ./gradlew changelogPrint diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml deleted file mode 100644 index 8d5a16d..0000000 --- a/.github/workflows/gradle-wrapper-validation.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: "Validate Gradle Wrapper" -on: - push: - paths: - - 'gradlew' - - 'gradlew.bat' - - 'gradle/wrapper/' - pull_request: - paths: - - 'gradlew' - - 'gradlew.bat' - - 'gradle/wrapper/' - -permissions: - contents: read - -jobs: - validation: - name: "Validation" - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: gradle/wrapper-validation-action@v3 From d0b856ef1ca7c32f2fff67f184e52e92ba6f2146 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Sat, 28 Dec 2024 19:02:53 -0800 Subject: [PATCH 3/3] Use the latest Gradle action for all the CI scripts. --- .github/workflows/ci.yml | 4 +--- .github/workflows/deploy.yml | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 59642a5..5bd565b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,9 +25,7 @@ jobs: distribution: "temurin" java-version: ${{ matrix.jre }} - name: gradle caching - uses: gradle/gradle-build-action@v3 - with: - gradle-home-cache-cleanup: true + uses: gradle/actions/setup-gradle@v4 - name: git fetch origin main run: git fetch origin main - name: gradlew build diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b9b9552..be4a599 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -41,9 +41,7 @@ jobs: java-version: 11 distribution: 'temurin' - name: gradle caching - uses: gradle/gradle-build-action@v3 - with: - gradle-home-cache-cleanup: true + uses: gradle/actions/setup-gradle@v4 - run: git fetch origin main - name: publish all if: "${{ github.event.inputs.to_publish == 'all' }}"